From 101c8a52c94de5d141d3018b5aa05fae9e56cf81 Mon Sep 17 00:00:00 2001
From: utchoang <hoangnm@unitech.vn>
Date: Wed, 11 Aug 2021 08:29:36 +0700
Subject: [PATCH 1/2] zone wizard: fix wrong step for localstorageenabled

---
 .../infra/zone/ZoneWizardAddResources.vue     | 102 +++++++++++-------
 1 file changed, 66 insertions(+), 36 deletions(-)

diff --git a/ui/src/views/infra/zone/ZoneWizardAddResources.vue b/ui/src/views/infra/zone/ZoneWizardAddResources.vue
index 9be315bcc601..81f9d015066e 100644
--- a/ui/src/views/infra/zone/ZoneWizardAddResources.vue
+++ b/ui/src/views/infra/zone/ZoneWizardAddResources.vue
@@ -42,39 +42,65 @@
     />
 
     <div v-if="hypervisor !== 'VMware'">
-      <static-inputs-form
-        v-if="currentStep === 1"
-        @nextPressed="nextPressed"
-        @backPressed="handleBack"
-        @fieldsChanged="fieldsChanged"
-        @submitLaunchZone="submitLaunchZone"
-        :fields="hostFields"
-        :prefillContent="prefillContent"
-        :description="steps[currentStep].description"
-        :isFixError="isFixError"
-      />
-      <static-inputs-form
-        v-if="currentStep === 2"
-        @nextPressed="nextPressed"
-        @backPressed="handleBack"
-        @fieldsChanged="fieldsChanged"
-        @submitLaunchZone="submitLaunchZone"
-        :fields="primaryStorageFields"
-        :prefillContent="prefillContent"
-        :description="steps[currentStep].description"
-        :isFixError="isFixError"
-      />
-      <static-inputs-form
-        v-if="currentStep === 3"
-        @nextPressed="nextPressed"
-        @backPressed="handleBack"
-        @fieldsChanged="fieldsChanged"
-        @submitLaunchZone="submitLaunchZone"
-        :fields="secondaryStorageFields"
-        :prefillContent="prefillContent"
-        :description="steps[currentStep].description"
-        :isFixError="isFixError"
-      />
+      <div v-if="localstorageenabled && localstorageenabledforsystemvm">
+        <static-inputs-form
+          v-if="currentStep === 1"
+          @nextPressed="nextPressed"
+          @backPressed="handleBack"
+          @fieldsChanged="fieldsChanged"
+          @submitLaunchZone="submitLaunchZone"
+          :fields="hostFields"
+          :prefillContent="prefillContent"
+          :description="steps[currentStep].description"
+          :isFixError="isFixError"
+        />
+        <static-inputs-form
+          v-if="currentStep === 2"
+          @nextPressed="nextPressed"
+          @backPressed="handleBack"
+          @fieldsChanged="fieldsChanged"
+          @submitLaunchZone="submitLaunchZone"
+          :fields="secondaryStorageFields"
+          :prefillContent="prefillContent"
+          :description="steps[currentStep].description"
+          :isFixError="isFixError"
+        />
+      </div>
+      <div v-else>
+        <static-inputs-form
+          v-if="currentStep === 1"
+          @nextPressed="nextPressed"
+          @backPressed="handleBack"
+          @fieldsChanged="fieldsChanged"
+          @submitLaunchZone="submitLaunchZone"
+          :fields="hostFields"
+          :prefillContent="prefillContent"
+          :description="steps[currentStep].description"
+          :isFixError="isFixError"
+        />
+        <static-inputs-form
+          v-if="currentStep === 2"
+          @nextPressed="nextPressed"
+          @backPressed="handleBack"
+          @fieldsChanged="fieldsChanged"
+          @submitLaunchZone="submitLaunchZone"
+          :fields="primaryStorageFields"
+          :prefillContent="prefillContent"
+          :description="steps[currentStep].description"
+          :isFixError="isFixError"
+        />
+        <static-inputs-form
+          v-if="currentStep === 3"
+          @nextPressed="nextPressed"
+          @backPressed="handleBack"
+          @fieldsChanged="fieldsChanged"
+          @submitLaunchZone="submitLaunchZone"
+          :fields="secondaryStorageFields"
+          :prefillContent="prefillContent"
+          :description="steps[currentStep].description"
+          :isFixError="isFixError"
+        />
+      </div>
     </div>
     <div v-else>
       <static-inputs-form
@@ -135,11 +161,15 @@ export default {
     hypervisor () {
       return this.prefillContent.hypervisor ? this.prefillContent.hypervisor.value : null
     },
+    localstorageenabled () {
+      return this.prefillContent?.localstorageenabled?.value || false
+    },
+    localstorageenabledforsystemvm () {
+      return this.prefillContent?.localstorageenabledforsystemvm?.value || false
+    },
     steps () {
       const steps = []
       const hypervisor = this.prefillContent.hypervisor ? this.prefillContent.hypervisor.value : null
-      const localStorageEnabled = this.prefillContent.localstorageenabled.value
-      const localStorageEnabledForSystemVM = this.prefillContent.localstorageenabledforsystemvm.value
       steps.push({
         title: 'label.cluster',
         fromKey: 'clusterResource',
@@ -152,7 +182,7 @@ export default {
           description: 'message.desc.host'
         })
       }
-      if (!localStorageEnabled || !localStorageEnabledForSystemVM) {
+      if (!this.localstorageenabled || !this.localstorageenabledforsystemvm) {
         steps.push({
           title: 'label.primary.storage',
           fromKey: 'primaryResource',

From c014da306660741098980111dd7a350eb667325b Mon Sep 17 00:00:00 2001
From: utchoang <hoangnm@unitech.vn>
Date: Tue, 17 Aug 2021 14:34:05 +0700
Subject: [PATCH 2/2] fix show zone resource, shorten the if-else

---
 .../infra/zone/ZoneWizardAddResources.vue     | 104 +++++++-----------
 1 file changed, 41 insertions(+), 63 deletions(-)

diff --git a/ui/src/views/infra/zone/ZoneWizardAddResources.vue b/ui/src/views/infra/zone/ZoneWizardAddResources.vue
index 81f9d015066e..f1a82dafde5f 100644
--- a/ui/src/views/infra/zone/ZoneWizardAddResources.vue
+++ b/ui/src/views/infra/zone/ZoneWizardAddResources.vue
@@ -26,11 +26,11 @@
       <a-step
         v-for="(step, index) in steps"
         :ref="`resourceStep${index}`"
-        :key="step.title"
+        :key="step.formKey"
         :title="$t(step.title)"></a-step>
     </a-steps>
     <static-inputs-form
-      v-if="currentStep === 0"
+      v-if="checkVisibleResource('clusterResource')"
       @nextPressed="nextPressed"
       @backPressed="handleBack"
       @fieldsChanged="fieldsChanged"
@@ -42,69 +42,43 @@
     />
 
     <div v-if="hypervisor !== 'VMware'">
-      <div v-if="localstorageenabled && localstorageenabledforsystemvm">
-        <static-inputs-form
-          v-if="currentStep === 1"
-          @nextPressed="nextPressed"
-          @backPressed="handleBack"
-          @fieldsChanged="fieldsChanged"
-          @submitLaunchZone="submitLaunchZone"
-          :fields="hostFields"
-          :prefillContent="prefillContent"
-          :description="steps[currentStep].description"
-          :isFixError="isFixError"
-        />
-        <static-inputs-form
-          v-if="currentStep === 2"
-          @nextPressed="nextPressed"
-          @backPressed="handleBack"
-          @fieldsChanged="fieldsChanged"
-          @submitLaunchZone="submitLaunchZone"
-          :fields="secondaryStorageFields"
-          :prefillContent="prefillContent"
-          :description="steps[currentStep].description"
-          :isFixError="isFixError"
-        />
-      </div>
-      <div v-else>
-        <static-inputs-form
-          v-if="currentStep === 1"
-          @nextPressed="nextPressed"
-          @backPressed="handleBack"
-          @fieldsChanged="fieldsChanged"
-          @submitLaunchZone="submitLaunchZone"
-          :fields="hostFields"
-          :prefillContent="prefillContent"
-          :description="steps[currentStep].description"
-          :isFixError="isFixError"
-        />
-        <static-inputs-form
-          v-if="currentStep === 2"
-          @nextPressed="nextPressed"
-          @backPressed="handleBack"
-          @fieldsChanged="fieldsChanged"
-          @submitLaunchZone="submitLaunchZone"
-          :fields="primaryStorageFields"
-          :prefillContent="prefillContent"
-          :description="steps[currentStep].description"
-          :isFixError="isFixError"
-        />
-        <static-inputs-form
-          v-if="currentStep === 3"
-          @nextPressed="nextPressed"
-          @backPressed="handleBack"
-          @fieldsChanged="fieldsChanged"
-          @submitLaunchZone="submitLaunchZone"
-          :fields="secondaryStorageFields"
-          :prefillContent="prefillContent"
-          :description="steps[currentStep].description"
-          :isFixError="isFixError"
-        />
-      </div>
+      <static-inputs-form
+        v-if="checkVisibleResource('hostResource')"
+        @nextPressed="nextPressed"
+        @backPressed="handleBack"
+        @fieldsChanged="fieldsChanged"
+        @submitLaunchZone="submitLaunchZone"
+        :fields="hostFields"
+        :prefillContent="prefillContent"
+        :description="steps[currentStep].description"
+        :isFixError="isFixError"
+      />
+      <static-inputs-form
+        v-if="(!localstorageenabled || !localstorageenabledforsystemvm) && checkVisibleResource('primaryResource')"
+        @nextPressed="nextPressed"
+        @backPressed="handleBack"
+        @fieldsChanged="fieldsChanged"
+        @submitLaunchZone="submitLaunchZone"
+        :fields="primaryStorageFields"
+        :prefillContent="prefillContent"
+        :description="steps[currentStep].description"
+        :isFixError="isFixError"
+      />
+      <static-inputs-form
+        v-if="checkVisibleResource('secondaryResource')"
+        @nextPressed="nextPressed"
+        @backPressed="handleBack"
+        @fieldsChanged="fieldsChanged"
+        @submitLaunchZone="submitLaunchZone"
+        :fields="secondaryStorageFields"
+        :prefillContent="prefillContent"
+        :description="steps[currentStep].description"
+        :isFixError="isFixError"
+      />
     </div>
     <div v-else>
       <static-inputs-form
-        v-if="currentStep === 1"
+        v-if="checkVisibleResource('primaryResource')"
         @nextPressed="nextPressed"
         @backPressed="handleBack"
         @fieldsChanged="fieldsChanged"
@@ -115,7 +89,7 @@
         :isFixError="isFixError"
       />
       <static-inputs-form
-        v-if="currentStep === 2"
+        v-if="checkVisibleResource('secondaryResource')"
         @nextPressed="nextPressed"
         @backPressed="handleBack"
         @fieldsChanged="fieldsChanged"
@@ -956,6 +930,10 @@ export default {
     },
     submitLaunchZone () {
       this.$emit('submitLaunchZone')
+    },
+    checkVisibleResource (key) {
+      const formKey = this.steps[this.currentStep]?.fromKey || ''
+      return formKey === key
     }
   }
 }