From 575e18c00af80f15f2cfb7d19bea06d086dc9779 Mon Sep 17 00:00:00 2001 From: Hoang Nguyen Date: Thu, 1 Apr 2021 16:01:57 +0700 Subject: [PATCH] ui: Restored the Basic Networking (#4882) * zone wizard: restored the basic networking * set enabled Basic Networking --- ui/public/config.json | 3 ++- .../views/infra/zone/ZoneWizardZoneTypeStep.vue | 15 ++++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ui/public/config.json b/ui/public/config.json index 45cc974ffeb..9f3b723c27f 100644 --- a/ui/public/config.json +++ b/ui/public/config.json @@ -47,5 +47,6 @@ "sc": "label.simplified.chinese.keyboard" }, "docHelpMappings": {}, - "plugins": [] + "plugins": [], + "basicZoneEnabled": true } diff --git a/ui/src/views/infra/zone/ZoneWizardZoneTypeStep.vue b/ui/src/views/infra/zone/ZoneWizardZoneTypeStep.vue index 722df4fa46c..72b4a60dd19 100644 --- a/ui/src/views/infra/zone/ZoneWizardZoneTypeStep.vue +++ b/ui/src/views/infra/zone/ZoneWizardZoneTypeStep.vue @@ -30,10 +30,18 @@ initialValue: zoneType }] }]"> + + + {{ $t('label.basic') }} + + + {{ $t(zoneDescription.Basic) }} + + - - + {{ $t('label.advanced') }} + {{ $t('label.advanced') }} @@ -86,6 +94,7 @@ export default { wrapperCol: { span: 14 } }, zoneDescription: { + Basic: 'message.desc.basic.zone', Advanced: 'message.desc.advanced.zone', SecurityGroups: 'message.advanced.security.group' } @@ -108,7 +117,7 @@ export default { return this.zoneType === 'Advanced' }, zoneType () { - return this.prefillContent.zoneType ? this.prefillContent.zoneType.value : 'Advanced' + return this.prefillContent.zoneType ? this.prefillContent.zoneType.value : (this.$config.basicZoneEnabled ? 'Basic' : 'Advanced') }, securityGroupsEnabled () { return this.isAdvancedZone && (this.prefillContent.securityGroupsEnabled ? this.prefillContent.securityGroupsEnabled.value : false)