1
0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-16 22:50:10 +03:00

F OpenNebula/one#5422: Add provision id to vnet table

This commit is contained in:
Sergio Betanzos 2021-07-01 10:56:47 +02:00
parent dafb42ed79
commit ffceed0cef
No known key found for this signature in database
GPG Key ID: E3E704F097737136
2 changed files with 18 additions and 4 deletions

View File

@ -14,12 +14,22 @@ export default [
accessor: row => getTotalOfResources(row?.CLUSTERS),
sortType: 'number'
},
{ Header: 'Used Leases', accessor: 'USED_LEASES', sortType: 'number' },
{
Header: 'Used Leases',
accessor: 'USED_LEASES',
sortType: 'number'
},
{
Header: 'Total Leases',
id: 'TOTAL_LEASES',
accessor: row => VirtualNetworkModel.getTotalLeases(row),
sortType: 'number'
},
{
Header: 'Provision ID',
id: 'PROVISION_ID',
accessor: row => row?.TEMPLATE?.PROVISION?.ID,
disableSortBy: true
}
]

View File

@ -1,7 +1,7 @@
import * as React from 'react'
import PropTypes from 'prop-types'
import { User, Group, Lock, Server, NetworkAlt } from 'iconoir-react'
import { User, Group, Lock, Server, Cloud } from 'iconoir-react'
import { Typography } from '@material-ui/core'
import { LinearProgressWithLabel } from 'client/components/Status'
@ -12,8 +12,8 @@ import * as VirtualNetworkModel from 'client/models/VirtualNetwork'
const Row = ({ original, value, ...props }) => {
const classes = rowStyles()
const {
ID, NAME, UNAME, GNAME, LOCK,
CLUSTERS, USED_LEASES, TOTAL_LEASES
ID, NAME, UNAME, GNAME, LOCK, CLUSTERS,
USED_LEASES, TOTAL_LEASES, PROVISION_ID
} = value
const { percentOfUsed, percentLabel } = VirtualNetworkModel.getLeasesInfo(original)
@ -45,6 +45,10 @@ const Row = ({ original, value, ...props }) => {
<Server size={16} />
<span>{` ${CLUSTERS}`}</span>
</span>
{PROVISION_ID && <span title={`Provision ID: #${PROVISION_ID}`}>
<Cloud size={16} />
<span>{` ${PROVISION_ID}`}</span>
</span>}
</div>
</div>
<div className={classes.secondary}>