diff --git a/package-lock.json b/package-lock.json index 49db6d82d..6fb4bc197 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "business-create-ui", - "version": "5.6.43", + "version": "5.7.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "business-create-ui", - "version": "5.6.43", + "version": "5.7.0", "dependencies": { "@babel/compat-data": "^7.21.5", "@bcrs-shared-components/approval-type": "1.0.19", diff --git a/package.json b/package.json index f52776a85..ce17fa94d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "business-create-ui", - "version": "5.6.43", + "version": "5.7.0", "private": true, "appName": "Create UI", "sbcName": "SBC Common Components", diff --git a/src/App.vue b/src/App.vue index cd7cbd6c8..4b2f3955f 100644 --- a/src/App.vue +++ b/src/App.vue @@ -156,8 +156,9 @@ lg="9" >
-

{{ getFilingName }}

+

{{ header }}

+

void @Action(useStore) setLastAnnualReportDate!: (x: string) => void @Action(useStore) setLastDirectorChangeDate!: (x: string) => void - @Action(useStore) setNameRequest!: (x: NameRequestIF) => void + // @Action(useStore) setNameRequest!: (x: NameRequestIF) => void @Action(useStore) setParties!: (x: Array) => void @Action(useStore) setResources!: (x: ResourceIF) => void @Action(useStore) setUserAddress!: (x: AddressIF) => void @@ -389,6 +393,19 @@ export default class App extends Mixins(CommonMixin, DateMixin, FilingTemplateMi return crumbs } + /** The page header (title). */ + get header (): string { + if (this.isAmalgamationFilingRegular) { + return `${this.getFilingName} (Regular)` + } else if (this.isAmalgamationFilingHorizontal) { + return `${this.getFilingName} (Horizontal Short-form)` + } else if (this.isAmalgamationFilingVertical) { + return `${this.getFilingName} (Vertical Short-form)` + } else { + return this.getFilingName + } + } + /** Data for fee summary component. */ get feeFilingData (): Array { let filingData = [] as Array @@ -733,7 +750,13 @@ export default class App extends Mixins(CommonMixin, DateMixin, FilingTemplateMi if (this.$route.meta.filingType !== this.getFilingType) { switch (this.getFilingType) { case FilingTypes.AMALGAMATION_APPLICATION: - this.$router.push(RouteNames.AMALG_REG_INFORMATION).catch(() => {}) + if (this.isAmalgamationFilingRegular) { + this.$router.push(RouteNames.AMALG_REG_INFORMATION).catch(() => {}) + } else if (this.isAmalgamationFilingHorizontal || this.isAmalgamationFilingVertical) { + this.$router.push(RouteNames.AMALG_SHORT_INFORMATION).catch(() => {}) + } else { + throw new Error('invalid amalgamation filing type') + } return case FilingTypes.DISSOLUTION: if (this.isTypeFirm) { @@ -889,7 +912,13 @@ export default class App extends Mixins(CommonMixin, DateMixin, FilingTemplateMi ...draftFiling } this.parseAmalgamationDraft(draftFiling) - resources = AmalgamationRegResources.find(x => x.entityType === this.getEntityType) as ResourceIF + if (this.isAmalgamationFilingRegular) { + resources = AmalgamationRegResources.find(x => x.entityType === this.getEntityType) as ResourceIF + } else if (this.isAmalgamationFilingHorizontal || this.isAmalgamationFilingVertical) { + resources = AmalgamationShortResources.find(x => x.entityType === this.getEntityType) as ResourceIF + } else { + throw new Error('invalid amalgamation filing type') + } break case FilingTypes.INCORPORATION_APPLICATION: draftFiling = { @@ -968,7 +997,7 @@ export default class App extends Mixins(CommonMixin, DateMixin, FilingTemplateMi } // ensure types match - if (nrResponse.legalType !== this.getEntityType) { + if ((nrResponse.legalType as unknown as CorpTypeCd) !== this.getEntityType) { console.log('NR legal type doesn\'t match entity type') // eslint-disable-line no-console this.nameRequestInvalidType = NameRequestStates.INVALID this.nameRequestInvalidErrorDialog = true @@ -1252,6 +1281,7 @@ export default class App extends Mixins(CommonMixin, DateMixin, FilingTemplateMi // enable validation when review pages are shown if ( this.isRouteName(RouteNames.AMALG_REG_REVIEW_CONFIRM) || + this.isRouteName(RouteNames.AMALG_SHORT_REVIEW_CONFIRM) || this.isRouteName(RouteNames.DISSOLUTION_REVIEW_CONFIRM) || this.isRouteName(RouteNames.INCORPORATION_REVIEW_CONFIRM) || this.isRouteName(RouteNames.REGISTRATION_REVIEW_CONFIRM) || diff --git a/src/components/Amalgamation/BusinessTable.vue b/src/components/Amalgamation/BusinessTable.vue index 23f2f24f1..dad1e3026 100644 --- a/src/components/Amalgamation/BusinessTable.vue +++ b/src/components/Amalgamation/BusinessTable.vue @@ -100,6 +100,8 @@ export default class BusinessTable extends Mixins(AmalgamationMixin) { readonly GetCorpFullDescription = GetCorpFullDescription @Getter(useStore) getNameRequestApprovedName!: string + // @Getter(useStore) isAmalgamationFilingHorizontal!: boolean + // @Getter(useStore) isAmalgamationFilingVertical!: boolean @Action(useStore) spliceAmalgamatingBusiness!: (x: number) => void @@ -162,7 +164,8 @@ export default class BusinessTable extends Mixins(AmalgamationMixin) { role (item: AmalgamatingBusinessIF): string { if (item.role === AmlRoles.AMALGAMATING) return 'Amalgamating Business' - if (item.role === AmlRoles.HOLDING) return 'Holding Company' + if (item.role === AmlRoles.HOLDING && this.isAmalgamationFilingHorizontal) return 'Primary Company' + if (item.role === AmlRoles.HOLDING && this.isAmalgamationFilingVertical) return 'Holding Company' return '(Unknown)' // should never happen } diff --git a/src/components/Amalgamation/BusinessTableSummary.vue b/src/components/Amalgamation/BusinessTableSummary.vue index 0edd728b4..9b09ed51a 100644 --- a/src/components/Amalgamation/BusinessTableSummary.vue +++ b/src/components/Amalgamation/BusinessTableSummary.vue @@ -71,6 +71,8 @@ export default class BusinessTableSummary extends Vue { readonly AmlTypes = AmlTypes @Getter(useStore) getAmalgamatingBusinesses!: AmalgamatingBusinessIF[] + @Getter(useStore) isAmalgamationFilingHorizontal!: boolean + @Getter(useStore) isAmalgamationFilingVertical!: boolean key (item: AmalgamatingBusinessIF): string { if (item?.type === AmlTypes.LEAR) return item.identifier @@ -102,7 +104,8 @@ export default class BusinessTableSummary extends Vue { role (item: AmalgamatingBusinessIF): string { if (item.role === AmlRoles.AMALGAMATING) return 'Amalgamating Business' - if (item.role === AmlRoles.HOLDING) return 'Holding Company' + if (item.role === AmlRoles.HOLDING && this.isAmalgamationFilingHorizontal) return 'Primary Company' + if (item.role === AmlRoles.HOLDING && this.isAmalgamationFilingVertical) return 'Holding Company' return '(Unknown)' // should never happen } } diff --git a/src/components/common/Actions.vue b/src/components/common/Actions.vue index afaeec0ad..230032621 100644 --- a/src/components/common/Actions.vue +++ b/src/components/common/Actions.vue @@ -140,6 +140,7 @@ export default class Actions extends Mixins(AmalgamationMixin, CommonMixin, get isSummaryStep (): boolean { return ( this.$route.name === RouteNames.AMALG_REG_REVIEW_CONFIRM || + this.$route.name === RouteNames.AMALG_SHORT_REVIEW_CONFIRM || this.$route.name === RouteNames.DISSOLUTION_REVIEW_CONFIRM || this.$route.name === RouteNames.INCORPORATION_REVIEW_CONFIRM || this.$route.name === RouteNames.REGISTRATION_REVIEW_CONFIRM || diff --git a/src/components/common/CardHeader.vue b/src/components/common/CardHeader.vue index e6c342702..6c3766bc6 100644 --- a/src/components/common/CardHeader.vue +++ b/src/components/common/CardHeader.vue @@ -1,9 +1,18 @@ @@ -12,8 +21,8 @@ import { Component, Prop, Vue } from 'vue-property-decorator' @Component({}) export default class CardHeader extends Vue { - @Prop({ required: true }) readonly icon!: string - @Prop({ required: true }) readonly label!: string + @Prop({ default: null }) readonly icon!: string + @Prop({ default: null }) readonly label!: string } diff --git a/src/components/common/ListPeopleAndRoles.vue b/src/components/common/ListPeopleAndRoles.vue index f5e367e9c..970502ac3 100644 --- a/src/components/common/ListPeopleAndRoles.vue +++ b/src/components/common/ListPeopleAndRoles.vue @@ -9,21 +9,31 @@ mdi-information-outline This step is unfinished. + Return to this step to finish it + + Return to this step to finish it + Return to this step to finish it + Return to this step to finish it + mdi-information-outline This step is unfinished. + + Return to this step to finish it + Add the Completing Party + @Getter(useStore) getValidateSteps!: boolean @Getter(useStore) isAddPeopleAndRolesValid!: boolean @Getter(useStore) isAffidavitValid!: boolean + @Getter(useStore) isAmalgamationInformationValid!: boolean @Getter(useStore) isBusySaving!: boolean @Getter(useStore) isCreateShareStructureValid!: boolean @Getter(useStore) isDefineCompanyValid!: boolean @@ -91,12 +91,17 @@ export default class Stepper extends Vue { /** Returns true if the step route is valid. */ isValid (route: RouteNames): boolean { switch (route) { - case RouteNames.AMALG_REG_INFORMATION: return this.isAmalgamationInformationRegValid + case RouteNames.AMALG_REG_INFORMATION: return this.isAmalgamationInformationValid case RouteNames.AMALG_REG_BUSINESS_INFO: return this.isDefineCompanyValid case RouteNames.AMALG_REG_PEOPLE_ROLES: return this.isAddPeopleAndRolesValid case RouteNames.AMALG_REG_SHARE_STRUCTURE: return this.isCreateShareStructureValid case RouteNames.AMALG_REG_REVIEW_CONFIRM: return this.isFilingValid + case RouteNames.AMALG_SHORT_INFORMATION: return this.isAmalgamationInformationValid + case RouteNames.AMALG_SHORT_BUSINESS_INFO: return this.isDefineCompanyValid + case RouteNames.AMALG_SHORT_PEOPLE_ROLES: return this.isAddPeopleAndRolesValid + case RouteNames.AMALG_SHORT_REVIEW_CONFIRM: return this.isFilingValid + case RouteNames.DISSOLUTION_AFFIDAVIT: return this.isAffidavitValid case RouteNames.DISSOLUTION_DEFINE_DISSOLUTION: return this.isDissolutionDefineDissolutionValid case RouteNames.DISSOLUTION_RESOLUTION: return this.isResolutionValid diff --git a/src/components/common/SummaryDefineCompany.vue b/src/components/common/SummaryDefineCompany.vue index f5b49bd55..68861378d 100644 --- a/src/components/common/SummaryDefineCompany.vue +++ b/src/components/common/SummaryDefineCompany.vue @@ -9,9 +9,9 @@ mdi-information-outline This step is unfinished. -