From 312bfcc75a85fae35faaffecff475d39ccfcc164 Mon Sep 17 00:00:00 2001
From: Damans227 <61474540+Damans227@users.noreply.github.com>
Date: Tue, 26 Oct 2021 09:32:08 -0400
Subject: [PATCH 1/2] simplify code using optional chaining in multiple views

---
 ui/src/views/infra/network/IpRangesTabPublic.vue      | 6 ++----
 ui/src/views/infra/network/IpRangesTabStorage.vue     | 2 +-
 ui/src/views/infra/network/providers/ProviderItem.vue | 4 ++--
 ui/src/views/network/CreateL2NetworkForm.vue          | 4 ++--
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/ui/src/views/infra/network/IpRangesTabPublic.vue b/ui/src/views/infra/network/IpRangesTabPublic.vue
index 1e4e03c8804d..568345f5dc37 100644
--- a/ui/src/views/infra/network/IpRangesTabPublic.vue
+++ b/ui/src/views/infra/network/IpRangesTabPublic.vue
@@ -546,8 +546,7 @@ export default {
         }).catch(error => {
           this.$notification.error({
             message: `${this.$t('label.error')} ${error.response.status}`,
-            description: error.response.data.createvlaniprangeresponse
-              ? error.response.data.createvlaniprangeresponse.errortext : error.response.data.errorresponse.errortext,
+            description: error.response.data.createvlaniprangeresponse?.errortext || error.response.data.errorresponse.errortext,
             duration: 0
           })
         }).finally(() => {
@@ -578,8 +577,7 @@ export default {
         }).catch(error => {
           this.$notification.error({
             message: `${this.$t('label.error')} ${error.response.status}`,
-            description: error.response.data.updatevlaniprangeresponse
-              ? error.response.data.updatevlaniprangeresponse.errortext : error.response.data.errorresponse.errortext,
+            description: error.response.data.updatevlaniprangeresponse?.errortext || error.response.data.errorresponse.errortext,
             duration: 0
           })
         }).finally(() => {
diff --git a/ui/src/views/infra/network/IpRangesTabStorage.vue b/ui/src/views/infra/network/IpRangesTabStorage.vue
index 7b6735f7fa41..db35d77095fa 100644
--- a/ui/src/views/infra/network/IpRangesTabStorage.vue
+++ b/ui/src/views/infra/network/IpRangesTabStorage.vue
@@ -235,7 +235,7 @@ export default {
     },
     returnPodName (id) {
       const match = this.pods.find(i => i.id === id)
-      return match ? match.name : null
+      return match?.name || null
     },
     handleOpenAddIpRangeModal () {
       this.addIpRangeModal = true
diff --git a/ui/src/views/infra/network/providers/ProviderItem.vue b/ui/src/views/infra/network/providers/ProviderItem.vue
index 73931bd071c5..5cbdf782b610 100644
--- a/ui/src/views/infra/network/providers/ProviderItem.vue
+++ b/ui/src/views/infra/network/providers/ProviderItem.vue
@@ -144,7 +144,7 @@ export default {
       const params = {}
       if (args.mapping) {
         Object.keys(args.mapping).map(key => {
-          params[key] = 'value' in args.mapping[key] ? args.mapping[key].value(this.resource) : null
+          params[key] = 'value' in args.mapping[key]?.value(this.resource) || null
         })
       }
       params.page = this.page
@@ -190,7 +190,7 @@ export default {
         this.listData[args.title].loading = false
         this.$notification.error({
           message: this.$t('message.request.failed'),
-          description: (error.response && error.response.headers && error.response.headers['x-description']) || error.message
+          description: (error.response?.headers?.['x-description']) || error.message
         })
       }
       this.$forceUpdate()
diff --git a/ui/src/views/network/CreateL2NetworkForm.vue b/ui/src/views/network/CreateL2NetworkForm.vue
index 7109c2664c5a..27de66b671eb 100644
--- a/ui/src/views/network/CreateL2NetworkForm.vue
+++ b/ui/src/views/network/CreateL2NetworkForm.vue
@@ -114,7 +114,7 @@
             </a-select>
           </a-form-item>
           <a-form-item v-if="!this.isObjectEmpty(this.selectedNetworkOffering) && this.selectedNetworkOffering.specifyvlan">
-            <tooltip-label slot="label" :title="$t('label.vlan')" :tooltip="apiParams.vlan ? apiParams.vlan.description : null"/>
+            <tooltip-label slot="label" :title="$t('label.vlan')" :tooltip="apiParams.vlan?.description || null"/>
             <a-input
               v-decorator="['vlanid', {
                 rules: [{ required: true, message: $t('message.please.enter.value') }]
@@ -122,7 +122,7 @@
               :placeholder="this.$t('label.vlanid')"/>
           </a-form-item>
           <a-form-item v-if="!this.isObjectEmpty(this.selectedNetworkOffering) && this.selectedNetworkOffering.specifyvlan">
-            <tooltip-label slot="label" :title="$t('label.bypassvlanoverlapcheck')" :tooltip="apiParams.bypassvlanoverlapcheck ? apiParams.bypassvlanoverlapcheck.description : null"/>
+            <tooltip-label slot="label" :title="$t('label.bypassvlanoverlapcheck')" :tooltip="apiParams.bypassvlanoverlapcheck?.description || null"/>
             <a-switch v-decorator="['bypassvlanoverlapcheck']" />
           </a-form-item>
           <a-form-item v-if="!this.isObjectEmpty(this.selectedNetworkOffering) && this.selectedNetworkOffering.specifyvlan">

From 13ae30eda2b83f8c8435893b142409245c1aabc6 Mon Sep 17 00:00:00 2001
From: Damans227 <61474540+Damans227@users.noreply.github.com>
Date: Thu, 11 Nov 2021 20:46:53 -0500
Subject: [PATCH 2/2] Undo simplify chaining in CreateL2NetworkForm

---
 ui/src/views/network/CreateL2NetworkForm.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/src/views/network/CreateL2NetworkForm.vue b/ui/src/views/network/CreateL2NetworkForm.vue
index 27de66b671eb..7109c2664c5a 100644
--- a/ui/src/views/network/CreateL2NetworkForm.vue
+++ b/ui/src/views/network/CreateL2NetworkForm.vue
@@ -114,7 +114,7 @@
             </a-select>
           </a-form-item>
           <a-form-item v-if="!this.isObjectEmpty(this.selectedNetworkOffering) && this.selectedNetworkOffering.specifyvlan">
-            <tooltip-label slot="label" :title="$t('label.vlan')" :tooltip="apiParams.vlan?.description || null"/>
+            <tooltip-label slot="label" :title="$t('label.vlan')" :tooltip="apiParams.vlan ? apiParams.vlan.description : null"/>
             <a-input
               v-decorator="['vlanid', {
                 rules: [{ required: true, message: $t('message.please.enter.value') }]
@@ -122,7 +122,7 @@
               :placeholder="this.$t('label.vlanid')"/>
           </a-form-item>
           <a-form-item v-if="!this.isObjectEmpty(this.selectedNetworkOffering) && this.selectedNetworkOffering.specifyvlan">
-            <tooltip-label slot="label" :title="$t('label.bypassvlanoverlapcheck')" :tooltip="apiParams.bypassvlanoverlapcheck?.description || null"/>
+            <tooltip-label slot="label" :title="$t('label.bypassvlanoverlapcheck')" :tooltip="apiParams.bypassvlanoverlapcheck ? apiParams.bypassvlanoverlapcheck.description : null"/>
             <a-switch v-decorator="['bypassvlanoverlapcheck']" />
           </a-form-item>
           <a-form-item v-if="!this.isObjectEmpty(this.selectedNetworkOffering) && this.selectedNetworkOffering.specifyvlan">