apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

ui: simplify code using optional chaining in ZoneWizardLaunchZone view (#5619)

Browse Source 
* simplify code using optinal chaining in ZoneWizardLaunchZone view

* simplify code using optonal chaining
This commit is contained in:
Daman Arora 2021-12-30 05:53:42 -05:00 committed by GitHub
parent d0721c5d66
commit 49b2dfc6e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 68 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

136
ui/src/views/infra/zone/ZoneWizardLaunchZone.vue
View File

@ -144,7 +144,7 @@ export default {
}, },
computed: { computed: {
zoneType () { zoneType () {
return this.prefillContent.zoneType ? this.prefillContent.zoneType.value : null return this.prefillContent.zoneType?.value || null
}, },
isBasicZone () { isBasicZone () {
return this.zoneType === BASIC_ZONE return this.zoneType === BASIC_ZONE
@ -153,25 +153,25 @@ export default {
return this.zoneType === ADVANCED_ZONE return this.zoneType === ADVANCED_ZONE
}, },
isDedicated () { isDedicated () {
return this.prefillContent.isDedicated ? this.prefillContent.isDedicated.value : false return this.prefillContent.isDedicated?.value || false
}, },
sgEnabled () { sgEnabled () {
return this.prefillContent.securityGroupsEnabled ? this.prefillContent.securityGroupsEnabled.value : false return this.prefillContent.securityGroupsEnabled?.value || false
}, },
havingNetscaler () { havingNetscaler () {
return this.prefillContent.networkOfferingSelected ? this.prefillContent.networkOfferingSelected.havingNetscaler : false return this.prefillContent.networkOfferingSelected?.havingNetscaler || false
}, },
havingSG () { havingSG () {
return this.prefillContent.networkOfferingSelected ? this.prefillContent.networkOfferingSelected.havingSG : false return this.prefillContent.networkOfferingSelected?.havingSG || false
}, },
havingEIP () { havingEIP () {
return this.prefillContent.networkOfferingSelected ? this.prefillContent.networkOfferingSelected.havingEIP : false return this.prefillContent.networkOfferingSelected?.havingEIP || false
}, },
havingELB () { havingELB () {
return this.prefillContent.networkOfferingSelected ? this.prefillContent.networkOfferingSelected.havingELB : false return this.prefillContent.networkOfferingSelected?.havingELB || false
}, },
selectedBaremetalProviders () { selectedBaremetalProviders () {
return this.prefillContent.networkOfferingSelected ? this.prefillContent.networkOfferingSelected.selectedBaremetalProviders : [] return this.prefillContent.networkOfferingSelected?.selectedBaremetalProviders || []
} }
}, },
mounted () { mounted () {
@ -301,7 +301,7 @@ export default {
async stepAddZone () { async stepAddZone () {
this.addStep('message.creating.zone', 'stepAddZone') this.addStep('message.creating.zone', 'stepAddZone')
const guestcidraddress = this.prefillContent.guestcidraddress ? this.prefillContent.guestcidraddress.value : null const guestcidraddress = this.prefillContent.guestcidraddress?.value || null
const params = {} const params = {}
params.networktype = this.zoneType params.networktype = this.zoneType
@ -322,14 +322,14 @@ export default {
} }
} }
params.name = this.prefillContent.name.value params.name = this.prefillContent.name.value
params.localstorageenabled = this.prefillContent.localstorageenabled ? this.prefillContent.localstorageenabled.value : false params.localstorageenabled = this.prefillContent.localstorageenabled?.value || false
params.dns1 = this.prefillContent.ipv4Dns1.value params.dns1 = this.prefillContent.ipv4Dns1.value
params.dns2 = this.prefillContent.ipv4Dns2 ? this.prefillContent.ipv4Dns2.value : null params.dns2 = this.prefillContent.ipv4Dns2?.value || null
params.ip6dns1 = this.prefillContent.ipv6Dns1 ? this.prefillContent.ipv6Dns1.value : null params.ip6dns1 = this.prefillContent.ipv6Dns1?.value || null
params.ip6dns2 = this.prefillContent.ipv6Dns2 ? this.prefillContent.ipv6Dns2.value : null params.ip6dns2 = this.prefillContent.ipv6Dns2?.value || null
params.internaldns1 = this.prefillContent.internalDns1 ? this.prefillContent.internalDns1.value : null params.internaldns1 = this.prefillContent.internalDns1?.value || null
params.internaldns2 = this.prefillContent.internalDns2 ? this.prefillContent.internalDns2.value : null params.internaldns2 = this.prefillContent.internalDns2?.value || null
params.domain = this.prefillContent.networkDomain ? this.prefillContent.networkDomain.value : null params.domain = this.prefillContent.networkDomain?.value || null
try { try {
if (!this.stepData.stepMove.includes('createZone')) { if (!this.stepData.stepMove.includes('createZone')) {
@ -355,8 +355,8 @@ export default {
const params = {} const params = {}
params.zoneid = this.stepData.zoneReturned.id params.zoneid = this.stepData.zoneReturned.id
params.domainid = this.prefillContent.domainId ? this.prefillContent.domainId.value : null params.domainid = this.prefillContent.domainId?.value || null
params.account = this.prefillContent.account ? this.prefillContent.account.value : null params.account = this.prefillContent.account?.value || null
try { try {
await this.dedicateZone(params) await this.dedicateZone(params)
@ -378,8 +378,8 @@ export default {
if (this.isBasicZone) { if (this.isBasicZone) {
const requestedTrafficTypeCount = this.prefillContent.physicalNetworks[0].traffics.length const requestedTrafficTypeCount = this.prefillContent.physicalNetworks[0].traffics.length
this.stepData.requestedTrafficTypeCount = requestedTrafficTypeCount this.stepData.requestedTrafficTypeCount = requestedTrafficTypeCount
this.stepData.returnedTrafficTypes = this.stepData.returnedTrafficTypes ? this.stepData.returnedTrafficTypes : [] this.stepData.returnedTrafficTypes = this.stepData?.returnedTrafficTypes || []
this.stepData.physicalNetworkReturned = this.stepData.physicalNetworkReturned ? this.stepData.physicalNetworkReturned : {} this.stepData.physicalNetworkReturned = this.stepData?.physicalNetworkReturned || {}
if (this.prefillContent.physicalNetworks && this.prefillContent.physicalNetworks.length > 0) { if (this.prefillContent.physicalNetworks && this.prefillContent.physicalNetworks.length > 0) {
params.name = this.prefillContent.physicalNetworks[0].name params.name = this.prefillContent.physicalNetworks[0].name
@ -434,8 +434,8 @@ export default {
this.setStepStatus(STATUS_FAILED) this.setStepStatus(STATUS_FAILED)
} }
} else { } else {
this.stepData.physicalNetworksReturned = this.stepData.physicalNetworksReturned ? this.stepData.physicalNetworksReturned : [] this.stepData.physicalNetworksReturned = this.stepData?.physicalNetworksReturned || []
this.stepData.physicalNetworkItem = this.stepData.physicalNetworkItem ? this.stepData.physicalNetworkItem : {} this.stepData.physicalNetworkItem = this.stepData?.physicalNetworkItem || {}
let physicalNetworkReturned = {} let physicalNetworkReturned = {}
if (this.stepData.physicalNetworksReturned.length === this.prefillContent.physicalNetworks.length) { if (this.stepData.physicalNetworksReturned.length === this.prefillContent.physicalNetworks.length) {
@ -732,18 +732,18 @@ export default {
const params = {} const params = {}
params.physicalnetworkid = this.stepData.physicalNetworkReturned.id params.physicalnetworkid = this.stepData.physicalNetworkReturned.id
params.username = this.prefillContent.netscalerUsername ? this.prefillContent.netscalerUsername.value : null params.username = this.prefillContent.netscalerUsername?.value || null
params.password = this.prefillContent.netscalerPassword ? this.prefillContent.netscalerPassword.value : null params.password = this.prefillContent.netscalerPassword?.value || null
params.networkdevicetype = this.prefillContent.netscalerType ? this.prefillContent.netscalerType.value : null params.networkdevicetype = this.prefillContent.netscalerType?.value || null
params.gslbprovider = this.prefillContent.gslbprovider ? this.prefillContent.gslbprovider.value : false params.gslbprovider = this.prefillContent.gslbprovider?.value || false
params.gslbproviderpublicip = this.prefillContent.gslbproviderpublicip ? this.prefillContent.gslbproviderpublicip.value : null params.gslbproviderpublicip = this.prefillContent.gslbproviderpublicip?.value || null
params.gslbproviderprivateip = this.prefillContent.gslbproviderprivateip ? this.prefillContent.gslbproviderprivateip.value : null params.gslbproviderprivateip = this.prefillContent.gslbproviderprivateip?.value || null
const url = [] const url = []
const ip = this.prefillContent.netscalerIp.value const ip = this.prefillContent.netscalerIp.value
url.push('https://' + ip) url.push('https://' + ip)
let isQuestionMarkAdded = false let isQuestionMarkAdded = false
const publicInterface = this.prefillContent.publicinterface ? this.prefillContent.publicinterface.value : null const publicInterface = this.prefillContent.publicinterface?.value || null
if (publicInterface != null && publicInterface.length > 0) { if (publicInterface != null && publicInterface.length > 0) {
if (!isQuestionMarkAdded) { if (!isQuestionMarkAdded) {
url.push('?') url.push('?')
@ -754,7 +754,7 @@ export default {
url.push('publicinterface=' + publicInterface) url.push('publicinterface=' + publicInterface)
} }
const privateInterface = this.prefillContent.privateinterface ? this.prefillContent.privateinterface.value : null const privateInterface = this.prefillContent.privateinterface?.value || null
if (privateInterface != null && privateInterface.length > 0) { if (privateInterface != null && privateInterface.length > 0) {
if (!isQuestionMarkAdded) { if (!isQuestionMarkAdded) {
url.push('?') url.push('?')
@ -765,7 +765,7 @@ export default {
url.push('privateinterface=' + publicInterface) url.push('privateinterface=' + publicInterface)
} }
const numretries = this.prefillContent.numretries ? this.prefillContent.numretries.value : null const numretries = this.prefillContent.value || null
if (numretries != null && numretries.length > 0) { if (numretries != null && numretries.length > 0) {
if (!isQuestionMarkAdded) { if (!isQuestionMarkAdded) {
url.push('?') url.push('?')
@ -776,7 +776,7 @@ export default {
url.push('numretries=' + numretries) url.push('numretries=' + numretries)
} }
const capacity = this.prefillContent.capacity ? this.prefillContent.capacity.value : null const capacity = this.prefillContent.capacity?.value || null
if (capacity != null && capacity.length > 0) { if (capacity != null && capacity.length > 0) {
if (!isQuestionMarkAdded) { if (!isQuestionMarkAdded) {
url.push('?') url.push('?')
@ -813,11 +813,11 @@ export default {
const params = {} const params = {}
params.zoneId = this.stepData.zoneReturned.id params.zoneId = this.stepData.zoneReturned.id
params.name = this.prefillContent.podName ? this.prefillContent.podName.value : null params.name = this.prefillContent.podName?.value || null
params.gateway = this.prefillContent.podReservedGateway ? this.prefillContent.podReservedGateway.value : null params.gateway = this.prefillContent.podReservedGateway?.value || null
params.netmask = this.prefillContent.podReservedNetmask ? this.prefillContent.podReservedNetmask.value : null params.netmask = this.prefillContent.podReservedNetmask?.value || null
params.startIp = this.prefillContent.podReservedStartIp ? this.prefillContent.podReservedStartIp.value : null params.startIp = this.prefillContent.podReservedStartIp?.value || null
params.endIp = this.prefillContent.podReservedStopIp ? this.prefillContent.podReservedStopIp.value : null params.endIp = this.prefillContent.podReservedStopIp?.value || null
try { try {
if (!this.stepData.stepMove.includes('createPod')) { if (!this.stepData.stepMove.includes('createPod')) {
@ -840,14 +840,14 @@ export default {
params.zoneid = this.stepData.zoneReturned.id params.zoneid = this.stepData.zoneReturned.id
params.name = 'defaultGuestNetwork' params.name = 'defaultGuestNetwork'
params.displaytext = 'defaultGuestNetwork' params.displaytext = 'defaultGuestNetwork'
params.networkofferingid = this.prefillContent.networkOfferingSelected ? this.prefillContent.networkOfferingSelected.id : null params.networkofferingid = this.prefillContent.networkOfferingSelected?.id || null
if (this.isAdvancedZone && this.sgEnabled) { if (this.isAdvancedZone && this.sgEnabled) {
params.gateway = this.prefillContent.guestGateway ? this.prefillContent.guestGateway.value : null params.gateway = this.prefillContent.guestGateway?.value || null
params.netmask = this.prefillContent.guestNetmask ? this.prefillContent.guestNetmask.value : null params.netmask = this.prefillContent.guestNetmask?.value || null
params.startip = this.prefillContent.guestStartIp ? this.prefillContent.guestStartIp.value : null params.startip = this.prefillContent.guestStartIp?.value || null
params.endip = this.prefillContent.guestStopIp ? this.prefillContent.guestStopIp.value : null params.endip = this.prefillContent.guestStopIp?.value || null
params.vlan = this.prefillContent.guestVlan ? this.prefillContent.guestVlan.value : null params.vlan = this.prefillContent.guestVlan?.value || null
} }
try { try {
@ -872,7 +872,7 @@ export default {
this.addStep('message.configuring.public.traffic', 'publicTraffic') this.addStep('message.configuring.public.traffic', 'publicTraffic')
let stopNow = false let stopNow = false
this.stepData.returnedPublicTraffic = this.stepData.returnedPublicTraffic ? this.stepData.returnedPublicTraffic : [] this.stepData.returnedPublicTraffic = this.stepData?.returnedPublicTraffic || []
for (let index = 0; index < this.prefillContent['public-ipranges'].length; index++) { for (let index = 0; index < this.prefillContent['public-ipranges'].length; index++) {
const publicVlanIpRange = this.prefillContent['public-ipranges'][index] const publicVlanIpRange = this.prefillContent['public-ipranges'][index]
let isExisting = false let isExisting = false
@ -968,7 +968,7 @@ export default {
this.currentStep++ this.currentStep++
this.addStep('message.configuring.storage.traffic', 'storageTraffic') this.addStep('message.configuring.storage.traffic', 'storageTraffic')
this.stepData.tasks = this.stepData.tasks ? this.stepData.tasks : [] this.stepData.tasks = this.stepData?.tasks || []
await this.prefillContent['storage-ipranges'].map(async (storageIpRange, index) => { await this.prefillContent['storage-ipranges'].map(async (storageIpRange, index) => {
const params = {} const params = {}
params.vlan = storageIpRange.vlan params.vlan = storageIpRange.vlan
@ -1052,10 +1052,10 @@ export default {
const params = {} const params = {}
params.podid = this.stepData.podReturned.id params.podid = this.stepData.podReturned.id
params.networkid = this.stepData.networkReturned.id params.networkid = this.stepData.networkReturned.id
params.gateway = this.prefillContent.guestGateway ? this.prefillContent.guestGateway.value : null params.gateway = this.prefillContent.guestGateway?.value || null
params.netmask = this.prefillContent.guestNetmask ? this.prefillContent.guestNetmask.value : null params.netmask = this.prefillContent.guestNetmask?.value || null
params.startip = this.prefillContent.guestStartIp ? this.prefillContent.guestStartIp.value : null params.startip = this.prefillContent.guestStartIp?.value || null
params.endip = this.prefillContent.guestStopIp ? this.prefillContent.guestStopIp.value : null params.endip = this.prefillContent.guestStopIp?.value || null
params.forVirtualNetwork = false params.forVirtualNetwork = false
try { try {
@ -1141,14 +1141,14 @@ export default {
let clusterName = this.prefillContent.clusterName.value let clusterName = this.prefillContent.clusterName.value
if (hypervisor === 'VMware') { if (hypervisor === 'VMware') {
params.username = this.prefillContent.vCenterUsername ? this.prefillContent.vCenterUsername.value : null params.username = this.prefillContent.vCenterUsername?.value || null
params.password = this.prefillContent.vCenterPassword ? this.prefillContent.vCenterPassword.value : null params.password = this.prefillContent.vCenterPassword?.value || null
params.vsmipaddress = this.prefillContent.vsmipaddress ? this.prefillContent.vsmipaddress.value : null params.vsmipaddress = this.prefillContent.vsmipaddress?.value || null
params.vsmusername = this.prefillContent.vsmusername ? this.prefillContent.vsmusername.value : null params.vsmusername = this.prefillContent.vsmusername?.value || null
params.vsmpassword = this.prefillContent.vsmpassword ? this.prefillContent.vsmpassword.value : null params.vsmpassword = this.prefillContent.vsmpassword?.value || null
const hostname = this.prefillContent.vCenterHost ? this.prefillContent.vCenterHost.value : null const hostname = this.prefillContent.vCenterHost?.value || null
const dcName = this.prefillContent.vCenterDatacenter ? this.prefillContent.vCenterDatacenter.value : null const dcName = this.prefillContent.vCenterDatacenter?.value || null
let url = null let url = null
if (hostname.indexOf('http://') === -1) { if (hostname.indexOf('http://') === -1) {
url = ['http://', hostname].join('') url = ['http://', hostname].join('')
@ -1165,10 +1165,10 @@ export default {
if (hypervisor === 'VMware') { if (hypervisor === 'VMware') {
const vmwareData = {} const vmwareData = {}
vmwareData.zoneId = this.stepData.zoneReturned.id vmwareData.zoneId = this.stepData.zoneReturned.id
vmwareData.username = this.prefillContent.vCenterUsername ? this.prefillContent.vCenterUsername.value : null vmwareData.username = this.prefillContent.vCenterUsername?.value || null
vmwareData.password = this.prefillContent.vCenterPassword ? this.prefillContent.vCenterPassword.value : null vmwareData.password = this.prefillContent.vCenterPassword?.value || null
vmwareData.name = this.prefillContent.vCenterDatacenter ? this.prefillContent.vCenterDatacenter.value : null vmwareData.name = this.prefillContent.vCenterDatacenter?.value || null
vmwareData.vcenter = this.prefillContent.vCenterHost ? this.prefillContent.vCenterHost.value : null vmwareData.vcenter = this.prefillContent.vCenterHost?.value || null
try { try {
if (!this.stepData.stepMove.includes('addVmwareDc')) { if (!this.stepData.stepMove.includes('addVmwareDc')) {
@ -1213,10 +1213,10 @@ export default {
hostData.clusterid = this.stepData.clusterReturned.id hostData.clusterid = this.stepData.clusterReturned.id
hostData.hypervisor = this.stepData.clusterReturned.hypervisortype hostData.hypervisor = this.stepData.clusterReturned.hypervisortype
hostData.clustertype = this.stepData.clusterReturned.clustertype hostData.clustertype = this.stepData.clusterReturned.clustertype
hostData.hosttags = this.prefillContent.hostTags ? this.prefillContent.hostTags.value : null hostData.hosttags = this.prefillContent.hostTags?.value || null
hostData.username = this.prefillContent.hostUserName ? this.prefillContent.hostUserName.value : null hostData.username = this.prefillContent.hostUserName?.value || null
hostData.password = this.prefillContent.hostPassword ? this.prefillContent.hostPassword.value : null hostData.password = this.prefillContent.hostPassword?.value || null
const hostname = this.prefillContent.hostName ? this.prefillContent.hostName.value : null const hostname = this.prefillContent.hostName?.value || null
let url = null let url = null
if (hostname.indexOf('http://') === -1) { if (hostname.indexOf('http://') === -1) {
url = ['http://', hostname].join('') url = ['http://', hostname].join('')
@ -1227,8 +1227,8 @@ export default {
const hypervisor = this.prefillContent.hypervisor.value const hypervisor = this.prefillContent.hypervisor.value
if (hypervisor === 'Ovm') { if (hypervisor === 'Ovm') {
hostData.agentusername = this.prefillContent.agentUserName ? this.prefillContent.agentUserName.value : null hostData.agentusername = this.prefillContent.agentUserName?.value || null
hostData.agentpassword = this.prefillContent.agentPassword ? this.prefillContent.agentPassword.value : null hostData.agentpassword = this.prefillContent.agentPassword?.value || null
} }
if (this.prefillContent.localstorageenabledforsystemvm.value) { if (this.prefillContent.localstorageenabledforsystemvm.value) {
@ -1389,7 +1389,7 @@ export default {
this.addStep('message.creating.secondary.storage', 'secondaryResource') this.addStep('message.creating.secondary.storage', 'secondaryResource')
const params = {} const params = {}
params.name = this.prefillContent.secondaryStorageName ? this.prefillContent.secondaryStorageName.value : null params.name = this.prefillContent.secondaryStorageName?.value || null
if (this.prefillContent.secondaryStorageProvider.value === 'NFS') { if (this.prefillContent.secondaryStorageProvider.value === 'NFS') {
const nfsServer = this.prefillContent.secondaryStorageServer.value const nfsServer = this.prefillContent.secondaryStorageServer.value
const path = this.prefillContent.secondaryStoragePath.value const path = this.prefillContent.secondaryStoragePath.value
@ -1421,7 +1421,7 @@ export default {
params['details[2].key'] = 'bucket' params['details[2].key'] = 'bucket'
params['details[2].value'] = this.prefillContent.secondaryStorageBucket.value params['details[2].value'] = this.prefillContent.secondaryStorageBucket.value
params['details[3].key'] = 'usehttps' params['details[3].key'] = 'usehttps'
params['details[3].value'] = this.prefillContent.secondaryStorageHttps ? this.prefillContent.secondaryStorageHttps.value : false params['details[3].value'] = this.prefillContent.secondaryStorageHttps?.value || false
let index = 4 let index = 4
if (this.prefillContent.secondaryStorageEndpoint && if (this.prefillContent.secondaryStorageEndpoint &&