- app version = 5.7.1 (bcgov#634)

- don't show Add Person for short-form amalgamation
- set initial OfficeAddresses validity
- deleted unneeded data from amalg IF
- finished short amalg Office Addresses layout

Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "business-create-ui",
-  "version": "5.7.0",
+  "version": "5.7.1",
   "private": true,
   "appName": "Create UI",
   "sbcName": "SBC Common Components",

src/components/common/PeopleAndRoles.vue

@@ -184,8 +184,8 @@
         <span>Add the Completing Party</span>
       </v-btn>
 
-      <!-- *** FUTURE: don't show Add a Person for short-form amalgamation -->
       <v-btn
+        v-if="getPeopleAndRolesResource.addPerson !== false"
         id="btn-add-person"
         outlined
         color="primary"

src/interfaces/resource-interfaces/resource-interface.ts

@@ -15,21 +15,6 @@ export interface AmalgamationResourceIF {
   reviewAndConfirm: {
     completingPartyStatement: CompletingPartyStatementIF
   }
-
-  shareClasses?: {
-    countMinimum: number
-  }
-  incorporationArticles?: {
-    articles: string,
-    articlesTooltip: string,
-    provisions?: string,
-    provisionTooltip?: string
-  }
-  incorporationAgreement?: {
-    helpSection: Array<HelpSectionIF>
-    article: string
-    documents: Array<IncorporationAgreementTypeIF>
-  }
 }
 
 /** Dissolution resource interface. */

src/interfaces/stepper-interfaces/AddPeopleAndRole/people-and-roles-resource-interface.ts

@@ -16,6 +16,7 @@ export interface PeopleAndRolesResourceIF {
   }
   blurb2?: string | Array<string>
   addIncorporator?: boolean
+  addPerson?: boolean
   addOrganization?: boolean
   addBusiness?: boolean
   rules: Array<RuleIF>

src/resources/AmalgamationRegular/BC.ts

@@ -29,9 +29,6 @@ export const AmalgamationRegResourceBc: AmalgamationResourceIF = {
       }
     ]
   },
-  shareClasses: {
-    countMinimum: 1
-  },
   reviewAndConfirm: {
     completingPartyStatement: {
       certifyStatements: [],

src/resources/AmalgamationRegular/BEN.ts

@@ -29,9 +29,6 @@ export const AmalgamationRegResourceBen: AmalgamationResourceIF = {
       }
     ]
   },
-  shareClasses: {
-    countMinimum: 1
-  },
   reviewAndConfirm: {
     completingPartyStatement: {
       certifyStatements: [],

src/resources/AmalgamationRegular/CC.ts

@@ -29,9 +29,6 @@ export const AmalgamationRegResourceCc: AmalgamationResourceIF = {
       }
     ]
   },
-  shareClasses: {
-    countMinimum: 1
-  },
   reviewAndConfirm: {
     completingPartyStatement: {
       certifyStatements: [],

src/resources/AmalgamationRegular/ULC.ts

@@ -29,9 +29,6 @@ export const AmalgamationRegResourceUlc: AmalgamationResourceIF = {
       }
     ]
   },
-  shareClasses: {
-    countMinimum: 1
-  },
   reviewAndConfirm: {
     completingPartyStatement: {
       certifyStatements: [],

src/resources/AmalgamationShort/BC.ts

@@ -22,6 +22,7 @@ export const AmalgamationShortResourceBc: AmalgamationResourceIF = {
     header: '1. Add People to your Application',
     blurb: 'Add the Completing Party to this application',
     helpSection: null,
+    addPerson: false,
     rules: [
       {
         id: RuleIds.NUM_COMPLETING_PARTY,

src/resources/AmalgamationShort/BEN.ts

@@ -22,6 +22,7 @@ export const AmalgamationShortResourceBen: AmalgamationResourceIF = {
     header: '1. Add People to your Application',
     blurb: 'Add the Completing Party to this application',
     helpSection: null,
+    addPerson: false,
     rules: [
       {
         id: RuleIds.NUM_COMPLETING_PARTY,

src/resources/AmalgamationShort/CC.ts

@@ -22,6 +22,7 @@ export const AmalgamationShortResourceCc: AmalgamationResourceIF = {
     header: '1. Add People to your Application',
     blurb: 'Add the Completing Party to this application',
     helpSection: null,
+    addPerson: false,
     rules: [
       {
         id: RuleIds.NUM_COMPLETING_PARTY,

src/resources/AmalgamationShort/ULC.ts

@@ -22,6 +22,7 @@ export const AmalgamationShortResourceUlc: AmalgamationResourceIF = {
     header: '1. Add People to your Application',
     blurb: 'Add the Completing Party to this application',
     helpSection: null,
+    addPerson: false,
     rules: [
       {
         id: RuleIds.NUM_COMPLETING_PARTY,

src/store/store.ts

@@ -66,7 +66,8 @@ import {
   StateIF,
   StepIF,
   UploadAffidavitIF,
-  ValidationDetailIF
+  ValidationDetailIF,
+  PeopleAndRolesResourceIF
 } from '@/interfaces'
 
 // It's possible to move getters / actions into seperate files:
@@ -592,8 +593,10 @@ export const useStore = defineStore('store', {
         )
       } else {
         return (
-          // *** FUTURE: verify/update this as needed
-          this.getAmalgamatingBusinessesValid
+          // *** FUTURE: update this when Resulting Company Name is implemented
+          this.getAmalgamatingBusinessesValid &&
+          !!this.getCorrectNameOption &&
+          this.getNameTranslationsValid
         )
       }
     },
@@ -880,7 +883,7 @@ export const useStore = defineStore('store', {
     },
 
     /** The People and Roles object. */
-    getPeopleAndRolesResource (): any {
+    getPeopleAndRolesResource (): PeopleAndRolesResourceIF {
       return this.resourceModel.peopleAndRoles
     },
 

src/views/Amalgamation/BusinessInfo.vue

@@ -7,23 +7,27 @@
     >
       <header id="office-address-header">
         <h2>Registered and Records Office Addresses</h2>
+
         <p v-if="isAmalgamationFilingRegular">
           Enter the Registered Office and Records Office Mailing and Delivery Addresses of the Resulting
           businesses. All addresses must be located in BC.
         </p>
+
         <p v-if="isAmalgamationFilingHorizontal || isAmalgamationFilingVertical">
           The resulting business will adopt the following Registered Office and Records Office Mailing
-          and Delivery Addresses of the holding / primary company in this amalgamation.
+          and Delivery Addresses of the {{ isAmalgamationFilingHorizontal ? 'primary' : 'holding' }}
+          company in this amalgamation.
         </p>
       </header>
 
-      <OfficeAddresses
-        v-if="isAmalgamationFilingRegular"
-        :showErrors="getShowErrors"
-        :inputAddresses="addresses"
-        @update:addresses="setOfficeAddresses($event)"
-        @valid="onOfficeAddressesValid($event)"
-      />
+      <template v-if="isAmalgamationFilingRegular">
+        <OfficeAddresses
+          :showErrors="getShowErrors"
+          :inputAddresses="addresses"
+          @update:addresses="setOfficeAddresses($event)"
+          @valid="onOfficeAddressesValid($event)"
+        />
+      </template>
 
       <template v-if="isAmalgamationFilingHorizontal || isAmalgamationFilingVertical">
         <v-card
@@ -42,11 +46,13 @@
           class="mt-6"
         >
           <CardHeader label="Addresses" />
-          <!-- *** FUTURE: need to finish layout here -->
-          <OfficeAddresses
-            :inputAddresses="addresses"
-            :isEditing="false"
-          />
+          <article class="section-container">
+            <OfficeAddresses
+              :inputAddresses="addresses"
+              :isEditing="false"
+              @valid="onOfficeAddressesValid($event)"
+            />
+          </article>
         </v-card>
       </template>
     </section>