From 62ab40b8af26f33449ebb17d18f5f5ba41a13c2c Mon Sep 17 00:00:00 2001 From: Damans227 <61474540+Damans227@users.noreply.github.com> Date: Fri, 10 Dec 2021 15:23:17 -0500 Subject: [PATCH 1/2] simplify code using optonal chaining in multiple config files --- ui/src/config/section/infra/clusters.js | 12 ++++-------- ui/src/config/section/infra/hosts.js | 15 +++++---------- ui/src/config/section/infra/zones.js | 12 ++++-------- 3 files changed, 13 insertions(+), 26 deletions(-) diff --git a/ui/src/config/section/infra/clusters.js b/ui/src/config/section/infra/clusters.js index b1d99971d4ba..4c8a1d9d14ae 100644 --- a/ui/src/config/section/infra/clusters.js +++ b/ui/src/config/section/infra/clusters.js @@ -114,8 +114,7 @@ export default { message: 'label.outofbandmanagement.enable', dataView: true, show: (record) => { - return record.resourcedetails && record.resourcedetails.outOfBandManagementEnabled && - record.resourcedetails.outOfBandManagementEnabled === 'false' + return record.resourcedetails?.outOfBandManagementEnabled === 'false' }, args: ['clusterid'], mapping: { @@ -131,8 +130,7 @@ export default { message: 'label.outofbandmanagement.disable', dataView: true, show: (record) => { - return !(record.resourcedetails && record.resourcedetails.outOfBandManagementEnabled && - record.resourcedetails.outOfBandManagementEnabled === 'false') + return !(record.resourcedetails?.outOfBandManagementEnabled === 'false') }, args: ['clusterid'], mapping: { @@ -148,8 +146,7 @@ export default { message: 'label.ha.enable', dataView: true, show: (record) => { - return record.resourcedetails && record.resourcedetails.resourceHAEnabled && - record.resourcedetails.resourceHAEnabled === 'false' + return record.resourcedetails?.resourceHAEnabled === 'false' }, args: ['clusterid'], mapping: { @@ -165,8 +162,7 @@ export default { message: 'label.ha.disable', dataView: true, show: (record) => { - return !(record.resourcedetails && record.resourcedetails.resourceHAEnabled && - record.resourcedetails.resourceHAEnabled === 'false') + return !(record.resourcedetails?.resourceHAEnabled === 'false') }, args: ['clusterid'], mapping: { diff --git a/ui/src/config/section/infra/hosts.js b/ui/src/config/section/infra/hosts.js index 6ab3c29c43bf..7cca0934c633 100644 --- a/ui/src/config/section/infra/hosts.js +++ b/ui/src/config/section/infra/hosts.js @@ -152,8 +152,7 @@ export default { docHelp: 'adminguide/hosts.html#out-of-band-management', dataView: true, show: (record) => { - return !(record.outofbandmanagement && record.outofbandmanagement.enabled && - record.outofbandmanagement.enabled === true) + return !(record.outofbandmanagement?.enabled === true) }, args: ['hostid'], mapping: { @@ -170,8 +169,7 @@ export default { docHelp: 'adminguide/hosts.html#out-of-band-management', dataView: true, show: (record) => { - return record.outofbandmanagement && record.outofbandmanagement.enabled && - record.outofbandmanagement.enabled === true + return record.outofbandmanagement?.enabled === true }, args: ['hostid'], mapping: { @@ -188,8 +186,7 @@ export default { docHelp: 'adminguide/hosts.html#out-of-band-management', dataView: true, show: (record) => { - return record.outofbandmanagement && record.outofbandmanagement.enabled && - record.outofbandmanagement.enabled === true + return record.outofbandmanagement?.enabled === true }, args: ['hostid', 'action'], mapping: { @@ -209,8 +206,7 @@ export default { docHelp: 'adminguide/hosts.html#out-of-band-management', dataView: true, show: (record) => { - return record.outofbandmanagement && record.outofbandmanagement.enabled && - record.outofbandmanagement.enabled === true + return record.outofbandmanagement?.enabled === true }, args: ['hostid', 'password'], mapping: { @@ -245,8 +241,7 @@ export default { docHelp: 'adminguide/reliability.html#ha-for-hosts', dataView: true, show: (record) => { - return !(record.hostha && record.hostha.haenable && - record.hostha.haenable === true) + return !(record.hostha?.haenable === true) }, args: ['hostid'], mapping: { diff --git a/ui/src/config/section/infra/zones.js b/ui/src/config/section/infra/zones.js index 4df57a540564..f904963c6389 100644 --- a/ui/src/config/section/infra/zones.js +++ b/ui/src/config/section/infra/zones.js @@ -126,8 +126,7 @@ export default { message: 'label.outofbandmanagement.enable', dataView: true, show: (record) => { - return record.resourcedetails && record.resourcedetails.outOfBandManagementEnabled && - record.resourcedetails.outOfBandManagementEnabled === 'false' + return record.resourcedetails?.outOfBandManagementEnabled === 'false' }, args: ['zoneid'], mapping: { @@ -143,8 +142,7 @@ export default { message: 'label.outofbandmanagement.disable', dataView: true, show: (record) => { - return !(record.resourcedetails && record.resourcedetails.outOfBandManagementEnabled && - record.resourcedetails.outOfBandManagementEnabled === 'false') + return !(record.resourcedetails?.outOfBandManagementEnabled === 'false') }, args: ['zoneid'], mapping: { @@ -160,8 +158,7 @@ export default { message: 'label.ha.enable', dataView: true, show: (record) => { - return record.resourcedetails && record.resourcedetails.resourceHAEnabled && - record.resourcedetails.resourceHAEnabled === 'false' + return record.resourcedetails?.resourceHAEnabled === 'false' }, args: ['zoneid'], mapping: { @@ -177,8 +174,7 @@ export default { message: 'label.ha.disable', dataView: true, show: (record) => { - return !(record.resourcedetails && record.resourcedetails.resourceHAEnabled && - record.resourcedetails.resourceHAEnabled === 'false') + return !(record.resourcedetails?.resourceHAEnabled === 'false') }, args: ['zoneid'], mapping: { From e4e04520c10fc777b654a1b57e97218a84d50aca Mon Sep 17 00:00:00 2001 From: Damans227 <61474540+Damans227@users.noreply.github.com> Date: Tue, 14 Dec 2021 17:53:50 -0500 Subject: [PATCH 2/2] add optional chaining to record too --- ui/src/config/section/infra/clusters.js | 8 ++++---- ui/src/config/section/infra/hosts.js | 10 +++++----- ui/src/config/section/infra/zones.js | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ui/src/config/section/infra/clusters.js b/ui/src/config/section/infra/clusters.js index 4c8a1d9d14ae..726ac09af323 100644 --- a/ui/src/config/section/infra/clusters.js +++ b/ui/src/config/section/infra/clusters.js @@ -114,7 +114,7 @@ export default { message: 'label.outofbandmanagement.enable', dataView: true, show: (record) => { - return record.resourcedetails?.outOfBandManagementEnabled === 'false' + return record?.resourcedetails?.outOfBandManagementEnabled === 'false' }, args: ['clusterid'], mapping: { @@ -130,7 +130,7 @@ export default { message: 'label.outofbandmanagement.disable', dataView: true, show: (record) => { - return !(record.resourcedetails?.outOfBandManagementEnabled === 'false') + return !(record?.resourcedetails?.outOfBandManagementEnabled === 'false') }, args: ['clusterid'], mapping: { @@ -146,7 +146,7 @@ export default { message: 'label.ha.enable', dataView: true, show: (record) => { - return record.resourcedetails?.resourceHAEnabled === 'false' + return record?.resourcedetails?.resourceHAEnabled === 'false' }, args: ['clusterid'], mapping: { @@ -162,7 +162,7 @@ export default { message: 'label.ha.disable', dataView: true, show: (record) => { - return !(record.resourcedetails?.resourceHAEnabled === 'false') + return !(record?.resourcedetails?.resourceHAEnabled === 'false') }, args: ['clusterid'], mapping: { diff --git a/ui/src/config/section/infra/hosts.js b/ui/src/config/section/infra/hosts.js index 7cca0934c633..cd14880bcabf 100644 --- a/ui/src/config/section/infra/hosts.js +++ b/ui/src/config/section/infra/hosts.js @@ -152,7 +152,7 @@ export default { docHelp: 'adminguide/hosts.html#out-of-band-management', dataView: true, show: (record) => { - return !(record.outofbandmanagement?.enabled === true) + return !(record?.outofbandmanagement?.enabled === true) }, args: ['hostid'], mapping: { @@ -169,7 +169,7 @@ export default { docHelp: 'adminguide/hosts.html#out-of-band-management', dataView: true, show: (record) => { - return record.outofbandmanagement?.enabled === true + return record?.outofbandmanagement?.enabled === true }, args: ['hostid'], mapping: { @@ -186,7 +186,7 @@ export default { docHelp: 'adminguide/hosts.html#out-of-band-management', dataView: true, show: (record) => { - return record.outofbandmanagement?.enabled === true + return record?.outofbandmanagement?.enabled === true }, args: ['hostid', 'action'], mapping: { @@ -206,7 +206,7 @@ export default { docHelp: 'adminguide/hosts.html#out-of-band-management', dataView: true, show: (record) => { - return record.outofbandmanagement?.enabled === true + return record?.outofbandmanagement?.enabled === true }, args: ['hostid', 'password'], mapping: { @@ -241,7 +241,7 @@ export default { docHelp: 'adminguide/reliability.html#ha-for-hosts', dataView: true, show: (record) => { - return !(record.hostha?.haenable === true) + return !(record?.hostha?.haenable === true) }, args: ['hostid'], mapping: { diff --git a/ui/src/config/section/infra/zones.js b/ui/src/config/section/infra/zones.js index f904963c6389..cfea2d3058ec 100644 --- a/ui/src/config/section/infra/zones.js +++ b/ui/src/config/section/infra/zones.js @@ -126,7 +126,7 @@ export default { message: 'label.outofbandmanagement.enable', dataView: true, show: (record) => { - return record.resourcedetails?.outOfBandManagementEnabled === 'false' + return record?.resourcedetails?.outOfBandManagementEnabled === 'false' }, args: ['zoneid'], mapping: { @@ -142,7 +142,7 @@ export default { message: 'label.outofbandmanagement.disable', dataView: true, show: (record) => { - return !(record.resourcedetails?.outOfBandManagementEnabled === 'false') + return !(record?.resourcedetails?.outOfBandManagementEnabled === 'false') }, args: ['zoneid'], mapping: { @@ -158,7 +158,7 @@ export default { message: 'label.ha.enable', dataView: true, show: (record) => { - return record.resourcedetails?.resourceHAEnabled === 'false' + return record?.resourcedetails?.resourceHAEnabled === 'false' }, args: ['zoneid'], mapping: { @@ -174,7 +174,7 @@ export default { message: 'label.ha.disable', dataView: true, show: (record) => { - return !(record.resourcedetails?.resourceHAEnabled === 'false') + return !(record?.resourcedetails?.resourceHAEnabled === 'false') }, args: ['zoneid'], mapping: {