- added conditional to ULC Info on step 1

- changed "BC Registries staff" -> "BC Registries" in a few places per designs - combined Upload Affidavit component with ULC Info component
bcgov · Oct 23, 2024 · d4f9e3f · d4f9e3f
1 parent c16f7be
commit d4f9e3f
Show file tree

Hide file tree

Showing 16 changed files with 473 additions and 453 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "business-create-ui",
-  "version": "5.12.8",
+  "version": "5.12.9",
   "private": true,
   "appName": "Create UI",
   "sbcName": "SBC Common Components",

diff --git a/src/components/ContinuationIn/AuthorizationInformation.vue b/src/components/ContinuationIn/AuthorizationInformation.vue
@@ -129,7 +129,10 @@
       <v-divider class="my-6" />
 
       <!-- Unlimited Liability Corporation Information -->
-      <v-row no-gutters>
+      <v-row
+        v-if="getExistingBusinessInfo.affidavitFile"
+        no-gutters
+      >
         <v-col
           cols="12"
           sm="3"
@@ -159,7 +162,10 @@
         </v-col>
       </v-row>
 
-      <v-divider class="my-6" />
+      <v-divider
+        v-if="getExistingBusinessInfo.affidavitFile"
+        class="my-6"
+      />
 
       <!-- Confirmation -->
       <v-row

diff --git a/src/components/ContinuationIn/ExtraproRegistration.vue b/src/components/ContinuationIn/ExtraproRegistration.vue
@@ -173,30 +173,6 @@
             />
           </v-col>
         </v-row>
-
-        <!-- Unlimited Liability Corporation Information -->
-        <v-row
-          v-if="isContinuationInAffidavitRequired"
-          class="mt-6"
-          no-gutters
-        >
-          <v-col
-            cols="12"
-            sm="3"
-          >
-            <label>Unlimited Liability Corporation Information</label>
-          </v-col>
-
-          <v-col
-            cols="12"
-            sm="9"
-          >
-            <UploadAffidavit
-              :business="business"
-              @valid="affidavitValid = $event"
-            />
-          </v-col>
-        </v-row>
       </v-form>
 
       <!-- historical business -->
@@ -317,7 +293,6 @@ import { Rules } from '@/rules'
 import ExtraproBusinessLookup from './ExtraproBusinessLookup.vue'
 import MessageBox from '@/components/common/MessageBox.vue'
 import RegistriesContactInfo from '@/components/common/RegistriesContactInfo.vue'
-import UploadAffidavit from './UploadAffidavit.vue'
 import { DatePicker as DatePickerShared } from '@bcrs-shared-components/date-picker'
 
 @Component({
@@ -327,8 +302,7 @@ import { DatePicker as DatePickerShared } from '@bcrs-shared-components/date-pic
     GenericErrorDialog,
     Jurisdiction,
     MessageBox,
-    RegistriesContactInfo,
-    UploadAffidavit
+    RegistriesContactInfo
   },
   directives: {
     mask
@@ -346,7 +320,6 @@ export default class ExtraproRegistration extends Mixins(DateMixin) {
   @Getter(useStore) getCurrentDate!: string
   @Getter(useStore) getExistingBusinessInfo!: ExistingBusinessInfoIF
   @Getter(useStore) getShowErrors!: boolean
-  @Getter(useStore) isContinuationInAffidavitRequired!: boolean
 
   @Action(useStore) setExistingBusinessInfo!: (x: ExistingBusinessInfoIF) => void
   @Action(useStore) setHaveChanges!: (x: boolean) => void
@@ -355,7 +328,6 @@ export default class ExtraproRegistration extends Mixins(DateMixin) {
   active = false
   business = {} as ExistingBusinessInfoIF
   formValid = false
-  affidavitValid = false
   uploadMemorandumDoc = null as File
   uploadMemorandumDocKey = null as string
   errorDialog = false
@@ -537,7 +509,6 @@ export default class ExtraproRegistration extends Mixins(DateMixin) {
   /** Emits form validity. */
   @Watch('isBusinessActive')
   @Watch('business', { deep: true })
-  @Watch('affidavitValid')
   @Watch('formValid')
   @Watch('getShowErrors')
   @Emit('valid')
@@ -548,15 +519,12 @@ export default class ExtraproRegistration extends Mixins(DateMixin) {
     // this component is valid if we have an active business
     // and we have the home jurisdiction (custom component)
     // and we have the home incorporation date (custom component)
-    // and we have the affidavit file, if required (custom component)
     // and the other form (Vuetify) components are valid
-    // show tick mark only when user visits Review Page
     return (
       this.getShowErrors &&
       this.isBusinessActive &&
       !!this.business.previousJurisdiction &&
       !!this.business.prevIncorporationDate &&
-      (!this.isContinuationInAffidavitRequired || this.affidavitValid) &&
       this.formValid
     )
   }

diff --git a/src/components/ContinuationIn/ManualBusinessInfo.vue b/src/components/ContinuationIn/ManualBusinessInfo.vue
@@ -139,30 +139,6 @@
             />
           </v-col>
         </v-row>
-
-        <!-- Unlimited Liability Corporation Information -->
-        <v-row
-          v-if="isContinuationInAffidavitRequired"
-          class="mt-6"
-          no-gutters
-        >
-          <v-col
-            cols="12"
-            sm="3"
-          >
-            <label>Unlimited Liability Corporation Information</label>
-          </v-col>
-
-          <v-col
-            cols="12"
-            sm="9"
-          >
-            <UploadAffidavit
-              :business="business"
-              @valid="affidavitValid = $event"
-            />
-          </v-col>
-        </v-row>
       </v-form>
     </template>
   </div>
@@ -183,14 +159,12 @@ import { DatePicker as DatePickerShared } from '@bcrs-shared-components/date-pic
 import { JurisdictionLocation } from '@bcrs-shared-components/enums'
 import { CountriesProvincesMixin } from '@/mixins/'
 import { FormIF } from '@bcrs-shared-components/interfaces'
-import UploadAffidavit from './UploadAffidavit.vue'
 
 @Component({
   components: {
     DatePickerShared,
     Jurisdiction,
-    MessageBox,
-    UploadAffidavit
+    MessageBox
   },
   directives: {
     mask
@@ -208,7 +182,6 @@ export default class ManualBusinessInfo extends Mixins(CountriesProvincesMixin,
   @Getter(useStore) getCurrentDate!: string
   @Getter(useStore) getExistingBusinessInfo!: ExistingBusinessInfoIF
   @Getter(useStore) getShowErrors!: boolean
-  @Getter(useStore) isContinuationInAffidavitRequired!: boolean
 
   @Action(useStore) setExistingBusinessInfo!: (x: ExistingBusinessInfoIF) => void
   @Action(useStore) setHaveChanges!: (x: boolean) => void
@@ -217,7 +190,6 @@ export default class ManualBusinessInfo extends Mixins(CountriesProvincesMixin,
   active = false
   business = {} as ExistingBusinessInfoIF
   formValid = false
-  affidavitValid = false
 
   readonly identifyingNumberRules: Array<VuetifyRuleFunction> = [
     (v) => !!v?.trim() || 'Identifying Number is required',
@@ -309,7 +281,6 @@ export default class ManualBusinessInfo extends Mixins(CountriesProvincesMixin,
   /** Emits form validity. */
   @Watch('business', { deep: true })
   @Watch('formValid')
-  @Watch('affidavitValid')
   @Watch('getShowErrors')
   @Emit('valid')
   private onComponentValid (): boolean {
@@ -318,14 +289,11 @@ export default class ManualBusinessInfo extends Mixins(CountriesProvincesMixin,
 
     // this form is valid if we have the previous jurisdiction (custom component)
     // and we have the incorporation date (custom component)
-    // and we have the affidavit file, if required (custom component)
     // and the other form (Vuetify) components are valid
-    // show tick mark only when user visits Review Page
     return (
       this.getShowErrors &&
       !!this.business.previousJurisdiction &&
       !!this.business.prevIncorporationDate &&
-      (!this.isContinuationInAffidavitRequired || this.affidavitValid) &&
       this.formValid
     )
   }