From a5a9d7a9c7aacee9edaed0b1a6292fea04197853 Mon Sep 17 00:00:00 2001 From: Rakesh Venkatesh Date: Wed, 4 Nov 2020 17:38:17 +0100 Subject: [PATCH 1/2] Display network type in network overview Display "VPC Tier" as type if an isolated network belongs to VPC else display its regular type --- src/config/section/network.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/config/section/network.js b/src/config/section/network.js index 63553f578..916921b46 100644 --- a/src/config/section/network.js +++ b/src/config/section/network.js @@ -29,7 +29,16 @@ export default { icon: 'apartment', permission: ['listNetworks'], resourceType: 'Network', - columns: ['name', 'state', 'type', 'cidr', 'ip6cidr', 'broadcasturi', 'account', 'zonename'], + columns: ['name', 'state', + { + type: (record) => { + if (record.vpcid && record.vpcid !== '') { + return 'VPC Tier' + } + return record.type + } + }, + 'cidr', 'ip6cidr', 'broadcasturi', 'account', 'zonename'], details: ['name', 'id', 'description', 'type', 'traffictype', 'vpcid', 'vlan', 'broadcasturi', 'cidr', 'ip6cidr', 'netmask', 'gateway', 'aclname', 'ispersistent', 'restartrequired', 'reservediprange', 'redundantrouter', 'networkdomain', 'zonename', 'account', 'domain'], filters: ['all', 'isolated', 'shared', 'l2'], searchFilters: ['keyword', 'zoneid', 'domainid', 'account', 'tags'], From e392e34a0bc711e2e9afd55e7cd6bae8a163551e Mon Sep 17 00:00:00 2001 From: Rakesh Venkatesh Date: Thu, 19 Nov 2020 16:34:25 +0100 Subject: [PATCH 2/2] Display vpc name with router link --- src/config/section/network.js | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/config/section/network.js b/src/config/section/network.js index 916921b46..29b57e2f3 100644 --- a/src/config/section/network.js +++ b/src/config/section/network.js @@ -29,16 +29,7 @@ export default { icon: 'apartment', permission: ['listNetworks'], resourceType: 'Network', - columns: ['name', 'state', - { - type: (record) => { - if (record.vpcid && record.vpcid !== '') { - return 'VPC Tier' - } - return record.type - } - }, - 'cidr', 'ip6cidr', 'broadcasturi', 'account', 'zonename'], + columns: ['name', 'state', 'type', 'vpcname', 'cidr', 'ip6cidr', 'broadcasturi', 'domain', 'account', 'zonename'], details: ['name', 'id', 'description', 'type', 'traffictype', 'vpcid', 'vlan', 'broadcasturi', 'cidr', 'ip6cidr', 'netmask', 'gateway', 'aclname', 'ispersistent', 'restartrequired', 'reservediprange', 'redundantrouter', 'networkdomain', 'zonename', 'account', 'domain'], filters: ['all', 'isolated', 'shared', 'l2'], searchFilters: ['keyword', 'zoneid', 'domainid', 'account', 'tags'],