- simplified Change Name flow

- fixed indentation - simplified Restoration / Reinstatement flow - also added SO to FF (in LaunchDarkly)
bcgov · Oct 31, 2023 · 4cea5ca · 4cea5ca
1 parent eed6695
commit 4cea5ca
Showing 1 changed file with 37 additions and 35 deletions.
diff --git a/src/components/new-request/search.vue b/src/components/new-request/search.vue
@@ -107,7 +107,7 @@
           :type="'request a name for'"
           :showDialog="showSocietiesInfo"
         />
-        <template v-if="isNameChangeable && !isSocietyDisabled">
+        <template v-else-if="isNameChangeable">
           <!-- XPRO jurisdiction -->
           <Jurisdiction
             v-if="isChangeNameXpro"
@@ -242,47 +242,49 @@
 
       <!-- Restoration / Reinstatement flow -->
       <template v-else-if="isRestoration">
-        <BusinessLookupFetch ref="MyBusinessLookup"/>
+        <BusinessLookupFetch ref="MyBusinessLookup" />
         <SocietiesInfo
-           v-if="isSocietyDisabled && showSocietiesInfo"
-           :type="'restore'"
+          v-if="isSocietyDisabled && showSocietiesInfo"
+          :type="'restore'"
           :showDialog="showSocietiesInfo"
         />
-        <CompanyType v-if="getSearchBusiness && isBcRestorable && isSupportedRestoration(getEntityTypeCd) && !isSocietyDisabled" />
-        <Jurisdiction
-          v-if="isSelectedXproAndRestorable && !isSocietyDisabled"
-          cols="12"
-          md="4"
-        />
-
-        <!-- federal sub-flow -->
-        <XproFederalBullets v-if="isFederal && getSearchBusiness" />
-
-        <template v-if="showRestoreNameInput && !isSocietyDisabled">
-          <v-col
-            cols="12"
-            :md="(showDesignation || isSelectedXproAndRestorable) ? '8' : '12'"
-          >
-            <NameInput
-              :is-mras-search="(isXproFlow && isMrasJurisdiction && !getHasNoCorpNum)"
-              @emit-corp-num-validity="corpNumValid = $event"
-            />
-          </v-col>
-          <Designation
-            v-if="showDesignation"
+        <template v-else>
+          <CompanyType v-if="getSearchBusiness && isBcRestorable && isSupportedRestoration(getEntityTypeCd)" />
+          <Jurisdiction
+            v-if="isSelectedXproAndRestorable && !isSocietyDisabled"
             cols="12"
             md="4"
           />
-          <v-col
-            v-if="isMrasJurisdiction"
-            cols="12"
-            class="d-flex justify-end"
-          >
-            <CorpNumberCheckbox />
-          </v-col>
-        </template>
 
-        <NumberedCompanyBullets v-if="isNumberedCompany" />
+          <!-- federal sub-flow -->
+          <XproFederalBullets v-if="isFederal && getSearchBusiness" />
+
+          <template v-if="showRestoreNameInput && !isSocietyDisabled">
+            <v-col
+              cols="12"
+              :md="(showDesignation || isSelectedXproAndRestorable) ? '8' : '12'"
+            >
+              <NameInput
+                :is-mras-search="(isXproFlow && isMrasJurisdiction && !getHasNoCorpNum)"
+                @emit-corp-num-validity="corpNumValid = $event"
+              />
+            </v-col>
+            <Designation
+              v-if="showDesignation"
+              cols="12"
+              md="4"
+            />
+            <v-col
+              v-if="isMrasJurisdiction"
+              cols="12"
+              class="d-flex justify-end"
+            >
+              <CorpNumberCheckbox />
+            </v-col>
+          </template>
+
+          <NumberedCompanyBullets v-if="isNumberedCompany" />
+        </template>
       </template>
     </v-row>