From e269132e217694d6ca5f97576c115f90853ef60d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9verin=20Beauvais?= Date: Tue, 21 Nov 2023 13:32:07 -0800 Subject: [PATCH] - app version = 5.6.2 (#583) - imported latest shared enums - imported latest shared interfaces - imported latest shared mixins - added route names to enum - added views to enum - added filing interface - added resource interface - updated state interface - added amalgamation state interface - updated filing template mixin - added initial amalgamation resources - added amalgamation steps - added amalgamation routes - added/updated getters/actions to store - updated state model - added initial amalgamation views - renamed some methods in App.vue - added amalgamations to App.vue - added amalgamations to Actions.vue - added amalgamations to EntityInfo.vue - added amalgamations to SaveErrorDialog.vue - added fallbacks to amalgamations in filing-template-mixin.ts - added amalgamations to BreadCrumbResource.ts - added amalgamations to legal-services.ts - added amalgamations to feature-flag-utils.ts - misc cleanup - initial updates to Business Info page - initial updates to Information page - added Expandable Help - added error return links - added amalg blocks to Summary Define Company - added misc placeholders for future components - moved SummaryDefineCompany to common folder - moved ListShareClass to common folder - moved ShareStructure to common folder - updated validity in Stepper --- package-lock.json | 22 +- package.json | 2 +- src/App.vue | 8 +- src/components/common/ListPeopleAndRoles.vue | 5 + .../common/SummaryDefineCompany.vue | 4 + src/enums/routeNames.ts | 7 + src/router/routes.ts | 55 +++ .../AmalgamationRegular/BusinessInfo.vue | 235 +++++++++++ src/views/AmalgamationRegular/Information.vue | 182 ++++++++ src/views/AmalgamationRegular/PeopleRoles.vue | 76 ++++ .../AmalgamationRegular/ReviewConfirm.vue | 333 +++++++++++++++ .../AmalgamationRegular/ShareStructure.vue | 393 ++++++++++++++++++ 12 files changed, 1310 insertions(+), 12 deletions(-) create mode 100644 src/views/AmalgamationRegular/BusinessInfo.vue create mode 100644 src/views/AmalgamationRegular/Information.vue create mode 100644 src/views/AmalgamationRegular/PeopleRoles.vue create mode 100644 src/views/AmalgamationRegular/ReviewConfirm.vue create mode 100644 src/views/AmalgamationRegular/ShareStructure.vue diff --git a/package-lock.json b/package-lock.json index 86fdc378b..527dab5aa 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", @@ -241,11 +241,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", @@ -405,6 +400,14 @@ "vue": "^2.7.14" } }, + "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", @@ -449,6 +452,11 @@ "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", diff --git a/package.json b/package.json index da0889603..56290b0c8 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", diff --git a/src/App.vue b/src/App.vue index 6410b9fc1..b5e1c20f5 100644 --- a/src/App.vue +++ b/src/App.vue @@ -770,16 +770,16 @@ export default class App extends Mixins(CommonMixin, DateMixin, FilingTemplateMi } 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() diff --git a/src/components/common/ListPeopleAndRoles.vue b/src/components/common/ListPeopleAndRoles.vue index 9c064c259..148f0e982 100644 --- a/src/components/common/ListPeopleAndRoles.vue +++ b/src/components/common/ListPeopleAndRoles.vue @@ -28,6 +28,11 @@ :to="{ path: `/${RouteNames.CONTINUATION_IN_PEOPLE_ROLES}` }" >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 +
+ +
+
+

+ Registered and Records Office Addresses +

+

+ Enter the Registered Office and Records Office Mailing and Delivery Addresses of the Resulting + businesses. All addresses must be located in BC. +

+
+ +
+ +
+
+ + +
+
+

Registered Office Contact Information

+

+ Enter the contact information for the resulting business. The BC Business Registry will use this + to communicate with the business in the future, including sending documents and notifications. +

+
+ + + + +
+
+ + + + + diff --git a/src/views/AmalgamationRegular/Information.vue b/src/views/AmalgamationRegular/Information.vue new file mode 100644 index 000000000..cb0d2f762 --- /dev/null +++ b/src/views/AmalgamationRegular/Information.vue @@ -0,0 +1,182 @@ + + + + + diff --git a/src/views/AmalgamationRegular/PeopleRoles.vue b/src/views/AmalgamationRegular/PeopleRoles.vue new file mode 100644 index 000000000..b30ea7b9b --- /dev/null +++ b/src/views/AmalgamationRegular/PeopleRoles.vue @@ -0,0 +1,76 @@ + + + + + diff --git a/src/views/AmalgamationRegular/ReviewConfirm.vue b/src/views/AmalgamationRegular/ReviewConfirm.vue new file mode 100644 index 000000000..e14353b8c --- /dev/null +++ b/src/views/AmalgamationRegular/ReviewConfirm.vue @@ -0,0 +1,333 @@ + + + + + diff --git a/src/views/AmalgamationRegular/ShareStructure.vue b/src/views/AmalgamationRegular/ShareStructure.vue new file mode 100644 index 000000000..0cbabbe36 --- /dev/null +++ b/src/views/AmalgamationRegular/ShareStructure.vue @@ -0,0 +1,393 @@ + + + + +