Skip to content

Commit 649be0d

Browse files
authored
simplify code using optional chaining in multiple views (#5630)
* simplify code using optional chaining in multiple views * Undo simplify chaining in CreateL2NetworkForm
1 parent e3f0e3b commit 649be0d

3 files changed

Lines changed: 5 additions & 7 deletions

File tree

ui/src/views/infra/network/IpRangesTabPublic.vue

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -546,8 +546,7 @@ export default {
546546
}).catch(error => {
547547
this.$notification.error({
548548
message: `${this.$t('label.error')} ${error.response.status}`,
549-
description: error.response.data.createvlaniprangeresponse
550-
? error.response.data.createvlaniprangeresponse.errortext : error.response.data.errorresponse.errortext,
549+
description: error.response.data.createvlaniprangeresponse?.errortext || error.response.data.errorresponse.errortext,
551550
duration: 0
552551
})
553552
}).finally(() => {
@@ -578,8 +577,7 @@ export default {
578577
}).catch(error => {
579578
this.$notification.error({
580579
message: `${this.$t('label.error')} ${error.response.status}`,
581-
description: error.response.data.updatevlaniprangeresponse
582-
? error.response.data.updatevlaniprangeresponse.errortext : error.response.data.errorresponse.errortext,
580+
description: error.response.data.updatevlaniprangeresponse?.errortext || error.response.data.errorresponse.errortext,
583581
duration: 0
584582
})
585583
}).finally(() => {

ui/src/views/infra/network/IpRangesTabStorage.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ export default {
235235
},
236236
returnPodName (id) {
237237
const match = this.pods.find(i => i.id === id)
238-
return match ? match.name : null
238+
return match?.name || null
239239
},
240240
handleOpenAddIpRangeModal () {
241241
this.addIpRangeModal = true

ui/src/views/infra/network/providers/ProviderItem.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ export default {
144144
const params = {}
145145
if (args.mapping) {
146146
Object.keys(args.mapping).map(key => {
147-
params[key] = 'value' in args.mapping[key] ? args.mapping[key].value(this.resource) : null
147+
params[key] = 'value' in args.mapping[key]?.value(this.resource) || null
148148
})
149149
}
150150
params.page = this.page
@@ -190,7 +190,7 @@ export default {
190190
this.listData[args.title].loading = false
191191
this.$notification.error({
192192
message: this.$t('message.request.failed'),
193-
description: (error.response && error.response.headers && error.response.headers['x-description']) || error.message
193+
description: (error.response?.headers?.['x-description']) || error.message
194194
})
195195
}
196196
this.$forceUpdate()

0 commit comments

Comments
 (0)