diff --git a/package-lock.json b/package-lock.json index 2afe243c2..6bc8ff1f8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "business-create-ui", - "version": "5.6.1", + "version": "5.6.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "business-create-ui", - "version": "5.6.1", + "version": "5.6.2", "dependencies": { "@babel/compat-data": "^7.21.5", "@bcrs-shared-components/approval-type": "1.0.19", @@ -23,12 +23,13 @@ "@bcrs-shared-components/date-picker": "1.2.15", "@bcrs-shared-components/document-delivery": "1.2.0", "@bcrs-shared-components/effective-date-time": "1.1.15", - "@bcrs-shared-components/enums": "1.0.46", + "@bcrs-shared-components/enums": "1.1.1", + "@bcrs-shared-components/expandable-help": "1.0.1", "@bcrs-shared-components/genesys-web-message": "1.0.0", "@bcrs-shared-components/help-business-number": "1.1.1", - "@bcrs-shared-components/interfaces": "1.0.71", + "@bcrs-shared-components/interfaces": "1.1.1", "@bcrs-shared-components/limited-restoration-panel": "1.0.5", - "@bcrs-shared-components/mixins": "1.1.21", + "@bcrs-shared-components/mixins": "1.1.29", "@bcrs-shared-components/nature-of-business": "1.2.14", "@bcrs-shared-components/relationships-panel": "1.0.9", "@bcrs-shared-components/staff-comments": "1.3.15", @@ -238,11 +239,6 @@ "vue-property-decorator": "^9.1.2" } }, - "node_modules/@bcrs-shared-components/approval-type/node_modules/@bcrs-shared-components/corp-type-module": { - "version": "1.0.13", - "resolved": "https://registry.npmjs.org/@bcrs-shared-components/corp-type-module/-/corp-type-module-1.0.13.tgz", - "integrity": "sha512-Wa8H/bxo8GAlcG7YdiP4zl1wzqxewiCO0TC+pBaYUc4+eufuInlS3yYFa9MFg8+vIL/pDfamRtXqdg1I6C6QYA==" - }, "node_modules/@bcrs-shared-components/approval-type/node_modules/@bcrs-shared-components/date-picker": { "version": "1.2.34", "resolved": "https://registry.npmjs.org/@bcrs-shared-components/date-picker/-/date-picker-1.2.34.tgz", @@ -253,36 +249,6 @@ "vue": "^2.7.14" } }, - "node_modules/@bcrs-shared-components/approval-type/node_modules/@bcrs-shared-components/enums": { - "version": "1.0.51", - "resolved": "https://registry.npmjs.org/@bcrs-shared-components/enums/-/enums-1.0.51.tgz", - "integrity": "sha512-FTFovs3NUgqDVaoUJOjF/F4sHsh27Ih7KRArZ2fQUP6aMVGTKHII5poeaP5w0PeV9UsMKTBBVsKF3TILY7s3RA==", - "dependencies": { - "@bcrs-shared-components/corp-type-module": "^1.0.13" - } - }, - "node_modules/@bcrs-shared-components/approval-type/node_modules/@bcrs-shared-components/interfaces": { - "version": "1.0.76", - "resolved": "https://registry.npmjs.org/@bcrs-shared-components/interfaces/-/interfaces-1.0.76.tgz", - "integrity": "sha512-jsN6k8Du7gcV7WnRuqAIrpmxdlLNYtvInfHGzgTSHoADLd+G2NFhEW8E0qPR7eVMA+0EA7/sr6Ijp9m2gCpKzg==", - "dependencies": { - "@bcrs-shared-components/enums": "^1.0.51", - "vue": "^2.7.14" - } - }, - "node_modules/@bcrs-shared-components/approval-type/node_modules/@bcrs-shared-components/mixins": { - "version": "1.1.27", - "resolved": "https://registry.npmjs.org/@bcrs-shared-components/mixins/-/mixins-1.1.27.tgz", - "integrity": "sha512-/GEZKPhIwY8EXFaP37fV5Hlun+/F+Tx6hXeu/Djzk19xFv7Y5KQeFdsX2cLTHrkqtTZAhVzoUboQ+RCCo41lgw==", - "dependencies": { - "@bcrs-shared-components/enums": "^1.0.51", - "@bcrs-shared-components/interfaces": "^1.0.76", - "country-list": "^2.3.0", - "lodash": "4.17.21", - "provinces": "^1.11.0", - "vue": "^2.7.14" - } - }, "node_modules/@bcrs-shared-components/base-address": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/@bcrs-shared-components/base-address/-/base-address-2.0.3.tgz", @@ -421,9 +387,9 @@ } }, "node_modules/@bcrs-shared-components/enums": { - "version": "1.0.46", - "resolved": "https://registry.npmjs.org/@bcrs-shared-components/enums/-/enums-1.0.46.tgz", - "integrity": "sha512-lrZjTvyDHwZ97Ujsro0pvdemi6n1xSDNeo1OzSGHgf/mokTSfFiVJ0EzuiPxlgBj8VtaPA9PZmGahdrodkPEMg==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@bcrs-shared-components/enums/-/enums-1.1.1.tgz", + "integrity": "sha512-EyjoIo5NkzdXeJ/bAtjVgPErH1qH5LhObBa5//uoQ45DYZlKUdAcg8HPC4XStMZVFvjVzABYPqrQkdB8Zhh/Mw==", "dependencies": { "@bcrs-shared-components/corp-type-module": "^1.0.13" } @@ -433,6 +399,14 @@ "resolved": "https://registry.npmjs.org/@bcrs-shared-components/corp-type-module/-/corp-type-module-1.0.13.tgz", "integrity": "sha512-Wa8H/bxo8GAlcG7YdiP4zl1wzqxewiCO0TC+pBaYUc4+eufuInlS3yYFa9MFg8+vIL/pDfamRtXqdg1I6C6QYA==" }, + "node_modules/@bcrs-shared-components/expandable-help": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@bcrs-shared-components/expandable-help/-/expandable-help-1.0.1.tgz", + "integrity": "sha512-XhSYX1sSpoBUfCg5AoTe/1fKuOOtxuhhykhefRw8r+j34GK4hTJzeHYaUJBbXD87r2RkdITu3IFS4kA1yZm3OA==", + "dependencies": { + "vue": "^2.7.14" + } + }, "node_modules/@bcrs-shared-components/folio-number-input": { "version": "1.1.33", "resolved": "https://registry.npmjs.org/@bcrs-shared-components/folio-number-input/-/folio-number-input-1.1.33.tgz", @@ -442,28 +416,6 @@ "vue": "^2.7.14" } }, - "node_modules/@bcrs-shared-components/folio-number-input/node_modules/@bcrs-shared-components/corp-type-module": { - "version": "1.0.13", - "resolved": "https://registry.npmjs.org/@bcrs-shared-components/corp-type-module/-/corp-type-module-1.0.13.tgz", - "integrity": "sha512-Wa8H/bxo8GAlcG7YdiP4zl1wzqxewiCO0TC+pBaYUc4+eufuInlS3yYFa9MFg8+vIL/pDfamRtXqdg1I6C6QYA==" - }, - "node_modules/@bcrs-shared-components/folio-number-input/node_modules/@bcrs-shared-components/enums": { - "version": "1.0.51", - "resolved": "https://registry.npmjs.org/@bcrs-shared-components/enums/-/enums-1.0.51.tgz", - "integrity": "sha512-FTFovs3NUgqDVaoUJOjF/F4sHsh27Ih7KRArZ2fQUP6aMVGTKHII5poeaP5w0PeV9UsMKTBBVsKF3TILY7s3RA==", - "dependencies": { - "@bcrs-shared-components/corp-type-module": "^1.0.13" - } - }, - "node_modules/@bcrs-shared-components/folio-number-input/node_modules/@bcrs-shared-components/interfaces": { - "version": "1.0.76", - "resolved": "https://registry.npmjs.org/@bcrs-shared-components/interfaces/-/interfaces-1.0.76.tgz", - "integrity": "sha512-jsN6k8Du7gcV7WnRuqAIrpmxdlLNYtvInfHGzgTSHoADLd+G2NFhEW8E0qPR7eVMA+0EA7/sr6Ijp9m2gCpKzg==", - "dependencies": { - "@bcrs-shared-components/enums": "^1.0.51", - "vue": "^2.7.14" - } - }, "node_modules/@bcrs-shared-components/genesys-web-message": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@bcrs-shared-components/genesys-web-message/-/genesys-web-message-1.0.0.tgz", @@ -481,14 +433,20 @@ } }, "node_modules/@bcrs-shared-components/interfaces": { - "version": "1.0.71", - "resolved": "https://registry.npmjs.org/@bcrs-shared-components/interfaces/-/interfaces-1.0.71.tgz", - "integrity": "sha512-0cKLeAoiXQS//6zBZZmtTrxyExML6Jy28qP1RrlHAertmCmqNXNpmSqb49rj0x4tUki/nwc0HoKGV1qkzCayAg==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@bcrs-shared-components/interfaces/-/interfaces-1.1.1.tgz", + "integrity": "sha512-3ngJwqhgjSvpo5PykzhxTUGAQgdfUwD/xNiiXZWAHa6ipbCw+xcvbV3Ab4KRieKttAfn8kIcvCQQfECaXLUpwA==", "dependencies": { - "@bcrs-shared-components/enums": "^1.0.46", + "@bcrs-shared-components/corp-type-module": "^1.0.13", + "@bcrs-shared-components/enums": "^1.1.1", "vue": "^2.7.14" } }, + "node_modules/@bcrs-shared-components/interfaces/node_modules/@bcrs-shared-components/corp-type-module": { + "version": "1.0.13", + "resolved": "https://registry.npmjs.org/@bcrs-shared-components/corp-type-module/-/corp-type-module-1.0.13.tgz", + "integrity": "sha512-Wa8H/bxo8GAlcG7YdiP4zl1wzqxewiCO0TC+pBaYUc4+eufuInlS3yYFa9MFg8+vIL/pDfamRtXqdg1I6C6QYA==" + }, "node_modules/@bcrs-shared-components/limited-restoration-panel": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/@bcrs-shared-components/limited-restoration-panel/-/limited-restoration-panel-1.0.5.tgz", @@ -498,12 +456,12 @@ } }, "node_modules/@bcrs-shared-components/mixins": { - "version": "1.1.21", - "resolved": "https://registry.npmjs.org/@bcrs-shared-components/mixins/-/mixins-1.1.21.tgz", - "integrity": "sha512-5FJxo7GGCuNH/VDv58Jtjd/2x0x4RT21r1Ay3JwAslAASiEWBaeWy/nPNatxReDV3BUIu+XXc/1Ek/mXwqoCag==", + "version": "1.1.29", + "resolved": "https://registry.npmjs.org/@bcrs-shared-components/mixins/-/mixins-1.1.29.tgz", + "integrity": "sha512-SZvHBUXr2mccYRD0tjd2WF/O2mJihVP8Ws4pyA05h2vSEYreWgxOiFrz5rsquN7tiym/Jics+DceJJ98MkDdHA==", "dependencies": { - "@bcrs-shared-components/enums": "^1.0.46", - "@bcrs-shared-components/interfaces": "^1.0.71", + "@bcrs-shared-components/enums": "^1.1.1", + "@bcrs-shared-components/interfaces": "^1.1.1", "country-list": "^2.3.0", "lodash": "4.17.21", "provinces": "^1.11.0", diff --git a/package.json b/package.json index 8de5eba61..d1d063b4e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "business-create-ui", - "version": "5.6.1", + "version": "5.6.2", "private": true, "appName": "Create UI", "sbcName": "SBC Common Components", @@ -28,12 +28,13 @@ "@bcrs-shared-components/date-picker": "1.2.15", "@bcrs-shared-components/document-delivery": "1.2.0", "@bcrs-shared-components/effective-date-time": "1.1.15", - "@bcrs-shared-components/enums": "1.0.46", + "@bcrs-shared-components/enums": "1.1.1", + "@bcrs-shared-components/expandable-help": "1.0.1", "@bcrs-shared-components/genesys-web-message": "1.0.0", "@bcrs-shared-components/help-business-number": "1.1.1", - "@bcrs-shared-components/interfaces": "1.0.71", + "@bcrs-shared-components/interfaces": "1.1.1", "@bcrs-shared-components/limited-restoration-panel": "1.0.5", - "@bcrs-shared-components/mixins": "1.1.21", + "@bcrs-shared-components/mixins": "1.1.29", "@bcrs-shared-components/nature-of-business": "1.2.14", "@bcrs-shared-components/relationships-panel": "1.0.9", "@bcrs-shared-components/staff-comments": "1.3.15", diff --git a/src/App.vue b/src/App.vue index 585bf1694..acb4da980 100644 --- a/src/App.vue +++ b/src/App.vue @@ -252,9 +252,9 @@ import { CommonMixin, DateMixin, FilingTemplateMixin, NameRequestMixin } from '@ import { AccountInformationIF, AddressIF, BreadcrumbIF, BusinessIF, BusinessWarningIF, CompletingPartyIF, ConfirmDialogType, EmptyFees, FeesIF, FilingDataIF, NameRequestIF, OrgInformationIF, PartyIF, ResourceIF, StepIF } from '@/interfaces' -import { DissolutionResources, IncorporationResources, RegistrationResources, RestorationResources, - getEntityDashboardBreadcrumb, getMyBusinessRegistryBreadcrumb, getRegistryDashboardBreadcrumb, - getSbcStaffDashboardBreadcrumb, getStaffDashboardBreadcrumb } from '@/resources' +import { AmalgamationRegResources, DissolutionResources, IncorporationResources, RegistrationResources, + RestorationResources, getEntityDashboardBreadcrumb, getMyBusinessRegistryBreadcrumb, + getRegistryDashboardBreadcrumb, getSbcStaffDashboardBreadcrumb, getStaffDashboardBreadcrumb } from '@/resources' import { AuthServices, LegalServices, PayServices } from '@/services/' // Enums and Constants @@ -295,6 +295,7 @@ export default class App extends Mixins(CommonMixin, DateMixin, FilingTemplateMi @Getter(useStore) getUserLastName!: string @Getter(useStore) getUserEmail!: string @Getter(useStore) getUserPhone!: string + @Getter(useStore) isAmalgamationFiling!: boolean @Getter(useStore) isDissolutionFiling!: boolean @Getter(useStore) isIncorporationFiling!: boolean @Getter(useStore) isMobile!: boolean @@ -361,7 +362,7 @@ export default class App extends Mixins(CommonMixin, DateMixin, FilingTemplateMi readonly window = window /** The Update Current JS Date timer id. */ - private updateCurrentJsDateId = 0 + private updateCurrentJsDateId = null // may be number or NodeJS.Timeout /** The route breadcrumbs list. */ get breadcrumbs (): Array { @@ -674,14 +675,10 @@ export default class App extends Mixins(CommonMixin, DateMixin, FilingTemplateMi if (!this.getBusinessId && !this.getTempId) throw new Error('Neither business id nor temp id exist') if (this.getBusinessId) { - // this should be a Dissolution or Restoration filing - // (only dissolutions/restorations have a business id) - await this.handleDissolutionOrRestoration(this.getBusinessId) + await this.handleDraftWithBusinessId(this.getBusinessId) } if (this.getTempId) { - // this should be an Incorporation or Registration filing - // (only incorporations/registrations have a temp id) - await this.handleIaOrRegistration(this.getTempId) + await this.handleDraftWithTempId(this.getTempId) } } catch (error) { // Log exception to Sentry due to incomplete business data. @@ -733,22 +730,25 @@ export default class App extends Mixins(CommonMixin, DateMixin, FilingTemplateMi // then try to re-route them if (this.$route.meta.filingType !== this.getFilingType) { switch (this.getFilingType) { + case FilingTypes.AMALGAMATION: + this.$router.push(RouteNames.AMALG_REG_INFORMATION).catch(() => {}) + break case FilingTypes.DISSOLUTION: if (this.isTypeFirm) { this.$router.push(RouteNames.DISSOLUTION_FIRM).catch(() => {}) } else { this.$router.push(RouteNames.DISSOLUTION_DEFINE_DISSOLUTION).catch(() => {}) } - return + return // *** TODO: should this be "break"? case FilingTypes.INCORPORATION_APPLICATION: this.$router.push(RouteNames.INCORPORATION_DEFINE_COMPANY).catch(() => {}) - return + return // *** TODO: should this be "break"? case FilingTypes.REGISTRATION: this.$router.push(RouteNames.REGISTRATION_DEFINE_BUSINESS).catch(() => {}) - return + return // *** TODO: should this be "break"? case FilingTypes.RESTORATION: this.$router.push(RouteNames.RESTORATION_BUSINESS_NAME).catch(() => {}) - return + return // *** TODO: should this be "break"? default: this.invalidRouteDialog = true throw new Error(`fetchData(): invalid filing type = ${this.getFilingType}`) // go to catch() @@ -794,8 +794,11 @@ export default class App extends Mixins(CommonMixin, DateMixin, FilingTemplateMi } } - /** Fetches draft Dissolution or Restoration and sets the resources. */ - private async handleDissolutionOrRestoration (businessId: string): Promise { + /** + * Fetches draft Dissolution / Restoration and sets the resources. + * (Only dissolutions/restorations have a Business ID.) + */ + private async handleDraftWithBusinessId (businessId: string): Promise { // ensure user is authorized to use this business await this.checkAuth(businessId).catch(error => { console.log('Auth error =', error) // eslint-disable-line no-console @@ -836,7 +839,7 @@ export default class App extends Mixins(CommonMixin, DateMixin, FilingTemplateMi resources = RestorationResources.find(x => x.entityType === this.getEntityType) as ResourceIF break default: - throw new Error(`handleDissolutionOrRestoration(): invalid filing type = ${this.getFilingType}`) + throw new Error(`handleDraftWithBusinessId(): invalid filing type = ${this.getFilingType}`) } // set the resources @@ -853,8 +856,11 @@ export default class App extends Mixins(CommonMixin, DateMixin, FilingTemplateMi } } - /** Fetches draft IA or Registration and sets the resources. */ - private async handleIaOrRegistration (tempId: string): Promise { + /** + * Fetches draft Amalgamation / IA / Registration and sets the resources. + * (Only amalgamations/incorporations/registrations have a Temp ID.) + */ + private async handleDraftWithTempId (tempId: string): Promise { // ensure user is authorized to use this IA await this.checkAuth(tempId).catch(error => { console.log('Auth error =', error) // eslint-disable-line no-console @@ -875,6 +881,14 @@ export default class App extends Mixins(CommonMixin, DateMixin, FilingTemplateMi // parse draft filing into the store and get the resources let resources: ResourceIF switch (this.getFilingType) { + case FilingTypes.AMALGAMATION: + draftFiling = { + ...this.buildAmalgamationFiling(), + ...draftFiling + } + this.parseAmalgamationDraft(draftFiling) + resources = AmalgamationRegResources.find(x => x.entityType === this.getEntityType) as ResourceIF + break case FilingTypes.INCORPORATION_APPLICATION: draftFiling = { ...this.buildIncorporationFiling(), @@ -892,7 +906,7 @@ export default class App extends Mixins(CommonMixin, DateMixin, FilingTemplateMi resources = RegistrationResources.find(x => x.entityType === this.getEntityType) as ResourceIF break default: - throw new Error(`handleIaOrRegistration(): invalid filing type = ${this.getFilingType}`) + throw new Error(`handleDraftWithTempId(): invalid filing type = ${this.getFilingType}`) } // set the resources @@ -1231,6 +1245,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.DISSOLUTION_REVIEW_CONFIRM) || this.isRouteName(RouteNames.INCORPORATION_REVIEW_CONFIRM) || this.isRouteName(RouteNames.REGISTRATION_REVIEW_CONFIRM) || diff --git a/src/components/common/Actions.vue b/src/components/common/Actions.vue index 1a46fc05f..2f2775eaf 100644 --- a/src/components/common/Actions.vue +++ b/src/components/common/Actions.vue @@ -293,6 +293,8 @@ export default class Actions extends Mixins(CommonMixin, DateMixin, FilingTempla /** Prepare filing for saving/filing. */ private prepareFiling (): any { switch (this.getFilingType) { + case FilingTypes.AMALGAMATION: + return this.buildAmalgamationFiling() case FilingTypes.INCORPORATION_APPLICATION: return this.buildIncorporationFiling() case FilingTypes.REGISTRATION: diff --git a/src/components/common/EntityInfo.vue b/src/components/common/EntityInfo.vue index 88c2602cb..3ed9ac034 100644 --- a/src/components/common/EntityInfo.vue +++ b/src/components/common/EntityInfo.vue @@ -86,12 +86,12 @@ import { Component, Mixins } from 'vue-property-decorator' import { Getter } from 'pinia-class' import { useStore } from '@/store/store' import { FilingNames, FilingTypes } from '@/enums' -import { CorpTypeCd } from '@bcrs-shared-components/enums/' import { ContactPointIF, RegistrationStateIF } from '@/interfaces' import { DateMixin } from '@/mixins' import { StaffComments } from '@bcrs-shared-components/staff-comments' import { AxiosInstance as axios } from '@/utils' -import { GetCorpFullDescription, GetCorpNumberedDescription } from '@bcrs-shared-components/corp-type-module' +import { CorpTypeCd, GetCorpFullDescription, GetCorpNumberedDescription } + from '@bcrs-shared-components/corp-type-module' @Component({ components: { @@ -130,6 +130,8 @@ export default class EntityInfo extends Mixins(DateMixin) { // name comes from different places depending on filing type switch (this.getFilingType) { + case FilingTypes.AMALGAMATION: + return (this.getNameRequestApprovedName || numberedDescription) case FilingTypes.DISSOLUTION: return (this.getBusinessLegalName || numberedDescription) case FilingTypes.INCORPORATION_APPLICATION: diff --git a/src/components/common/ListPeopleAndRoles.vue b/src/components/common/ListPeopleAndRoles.vue index 670372e2d..f5e367e9c 100644 --- a/src/components/common/ListPeopleAndRoles.vue +++ b/src/components/common/ListPeopleAndRoles.vue @@ -9,6 +9,11 @@ mdi-information-outline This step is unfinished. + Return to this step to finish it mdi-information-outline This step is unfinished. Return to this step to finish it + Return to this step to finish it @@ -210,6 +216,8 @@ import { arrayMoveMutable } from 'array-move' export default class ListShareClass extends Vue { @Prop({ default: () => [] }) readonly shareClasses!: any @Prop({ default: false }) readonly componentDisabled!: boolean + @Prop({ default: false }) readonly isAmalgamationFiling!: boolean + @Prop({ default: false }) readonly isIncorporationFiling!: boolean @Prop({ default: false }) readonly isSummary!: boolean @Prop({ default: false }) readonly showErrorSummary!: boolean @@ -236,7 +244,7 @@ export default class ListShareClass extends Vue { * @param direction The direction of the move * @param seriesIndex The index of the series */ - protected moveIndex (indexFrom: number, direction: string, seriesIndex = -1): void { + moveIndex (indexFrom: number, direction: string, seriesIndex = -1): void { let indexTo: number if (seriesIndex >= 0) { indexTo = direction === 'up' ? seriesIndex - 1 : seriesIndex + 1 @@ -258,7 +266,7 @@ export default class ListShareClass extends Vue { * @param seriesIndex index of the series item * @returns A boolean indicating if a move is enabled */ - protected isMoveDisabled (index: number, direction: string, seriesIndex = -1): boolean { + isMoveDisabled (index: number, direction: string, seriesIndex = -1): boolean { const seriesCheck = seriesIndex >= 0 const arrBoundry = seriesCheck ? this.shareClasses[index].series.length - 1 : this.shareClasses.length - 1 switch (direction) { @@ -285,7 +293,7 @@ export default class ListShareClass extends Vue { */ @Emit('removeClass') // eslint-disable-next-line @typescript-eslint/no-unused-vars - protected emitRemoveClass (index: number): void {} + emitRemoveClass (index: number): void {} /** * Emit an index and event to the parent to handle removal. @@ -293,7 +301,7 @@ export default class ListShareClass extends Vue { */ @Emit('removeSeries') // eslint-disable-next-line @typescript-eslint/no-unused-vars - protected emitRemoveSeries (index: number, seriesIndex: number): void {} + emitRemoveSeries (index: number, seriesIndex: number): void {} /** * Emit an class and event to the parent to handle editing. @@ -301,7 +309,7 @@ export default class ListShareClass extends Vue { */ @Emit('addSeries') // eslint-disable-next-line @typescript-eslint/no-unused-vars - protected emitAddSeries (index: number): void {} + emitAddSeries (index: number): void {} /** * Emit an class and event to the parent to handle editing. @@ -309,7 +317,7 @@ export default class ListShareClass extends Vue { */ @Emit('editClass') // eslint-disable-next-line @typescript-eslint/no-unused-vars - protected emitShareClass (index: number): void {} + emitShareClass (index: number): void {} /** * Emit an series item and event to the parent to handle editing. @@ -317,7 +325,7 @@ export default class ListShareClass extends Vue { */ @Emit('editSeries') // eslint-disable-next-line @typescript-eslint/no-unused-vars - protected emitShareSeries (index: number, seriesIndex: number): void {} + emitShareSeries (index: number, seriesIndex: number): void {} } diff --git a/src/components/Incorporation/ShareStructure.vue b/src/components/common/ShareStructure.vue similarity index 100% rename from src/components/Incorporation/ShareStructure.vue rename to src/components/common/ShareStructure.vue diff --git a/src/components/common/Stepper.vue b/src/components/common/Stepper.vue index 673666284..6844b48c1 100644 --- a/src/components/common/Stepper.vue +++ b/src/components/common/Stepper.vue @@ -80,40 +80,43 @@ export default class Stepper extends Vue { @Getter(useStore) isCreateShareStructureValid!: boolean @Getter(useStore) isDefineCompanyValid!: boolean @Getter(useStore) isDissolutionDefineDissolutionValid!: boolean - @Getter(useStore) isDissolutionValid!: boolean + @Getter(useStore) isFilingValid!: boolean @Getter(useStore) isIncorporationAgreementValid!: boolean - @Getter(useStore) isIncorporationApplicationValid!: boolean @Getter(useStore) isMemorandumValid!: boolean - @Getter(useStore) isRegistrationValid!: boolean @Getter(useStore) isResolutionValid!: boolean @Getter(useStore) isRestoreBusinessNameValid!: boolean - @Getter(useStore) isRestorationValid!: boolean @Getter(useStore) isRulesValid!: boolean /** Returns true if the step route is valid. */ isValid (route: RouteNames): boolean { switch (route) { + case RouteNames.AMALG_REG_INFORMATION: return false // *** TODO + case RouteNames.AMALG_REG_BUSINESS_INFO: return false // *** TODO + 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.DISSOLUTION_AFFIDAVIT: return this.isAffidavitValid case RouteNames.DISSOLUTION_DEFINE_DISSOLUTION: return this.isDissolutionDefineDissolutionValid case RouteNames.DISSOLUTION_RESOLUTION: return this.isResolutionValid - case RouteNames.DISSOLUTION_REVIEW_CONFIRM: return this.isDissolutionValid + case RouteNames.DISSOLUTION_REVIEW_CONFIRM: return this.isFilingValid case RouteNames.INCORPORATION_AGREEMENT: return this.isIncorporationAgreementValid case RouteNames.INCORPORATION_DEFINE_COMPANY: return this.isDefineCompanyValid case RouteNames.INCORPORATION_MEMORANDUM: return this.isMemorandumValid case RouteNames.INCORPORATION_PEOPLE_ROLES: return this.isAddPeopleAndRolesValid - case RouteNames.INCORPORATION_REVIEW_CONFIRM: return this.isIncorporationApplicationValid + case RouteNames.INCORPORATION_REVIEW_CONFIRM: return this.isFilingValid case RouteNames.INCORPORATION_RULES: return this.isRulesValid case RouteNames.INCORPORATION_SHARE_STRUCTURE: return this.isCreateShareStructureValid case RouteNames.REGISTRATION_DEFINE_BUSINESS: return this.getRegistration.defineBusinessValid case RouteNames.REGISTRATION_PEOPLE_ROLES: return this.isAddPeopleAndRolesValid - case RouteNames.REGISTRATION_REVIEW_CONFIRM: return this.isRegistrationValid + case RouteNames.REGISTRATION_REVIEW_CONFIRM: return this.isFilingValid case RouteNames.RESTORATION_APPLICANT_INFORMATION: return this.isAddPeopleAndRolesValid case RouteNames.RESTORATION_BUSINESS_INFORMATION: return this.isDefineCompanyValid case RouteNames.RESTORATION_BUSINESS_NAME: return this.isRestoreBusinessNameValid - case RouteNames.RESTORATION_REVIEW_CONFIRM: return this.isRestorationValid + case RouteNames.RESTORATION_REVIEW_CONFIRM: return this.isFilingValid } return false } diff --git a/src/components/Incorporation/SummaryDefineCompany.vue b/src/components/common/SummaryDefineCompany.vue similarity index 79% rename from src/components/Incorporation/SummaryDefineCompany.vue rename to src/components/common/SummaryDefineCompany.vue index 7a2efa737..221feda37 100644 --- a/src/components/Incorporation/SummaryDefineCompany.vue +++ b/src/components/common/SummaryDefineCompany.vue @@ -8,6 +8,10 @@ mdi-information-outline This step is unfinished. + Return to this step to finish it + +