From ffceed0cef97055e0a63a1df02dee14add00957e Mon Sep 17 00:00:00 2001 From: Sergio Betanzos Date: Thu, 1 Jul 2021 10:56:47 +0200 Subject: [PATCH] F OpenNebula/one#5422: Add provision id to vnet table --- .../client/components/Tables/VNetworks/columns.js | 12 +++++++++++- .../src/client/components/Tables/VNetworks/row.js | 10 +++++++--- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/fireedge/src/client/components/Tables/VNetworks/columns.js b/src/fireedge/src/client/components/Tables/VNetworks/columns.js index 0cdae6a0d4..2c392c301c 100644 --- a/src/fireedge/src/client/components/Tables/VNetworks/columns.js +++ b/src/fireedge/src/client/components/Tables/VNetworks/columns.js @@ -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 } ] diff --git a/src/fireedge/src/client/components/Tables/VNetworks/row.js b/src/fireedge/src/client/components/Tables/VNetworks/row.js index f2e387375d..73fb033f31 100644 --- a/src/fireedge/src/client/components/Tables/VNetworks/row.js +++ b/src/fireedge/src/client/components/Tables/VNetworks/row.js @@ -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 }) => { {` ${CLUSTERS}`} + {PROVISION_ID && + + {` ${PROVISION_ID}`} + }