- app version = 5.6.2 (bcgov#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.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",

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()

src/components/common/ListPeopleAndRoles.vue

@@ -28,6 +28,11 @@
             :to="{ path: `/${RouteNames.CONTINUATION_IN_PEOPLE_ROLES}` }"
           >Return to this step to finish it</router-link>
 
+          <router-link
+            v-if="isAmalgamationFiling"
+            id="router-link"
+            :to="{ path: `/${RouteNames.AMALG_REG_PEOPLE_ROLES}` }"
+          >Return to this step to finish it</router-link>
           <router-link
             v-if="isIncorporationFiling"
             id="router-link"

src/components/common/SummaryDefineCompany.vue

@@ -36,6 +36,10 @@
             :to="{ path: `/${RouteNames.CONTINUATION_IN_BUSINESS_BC}` }"
           >Return to this step to finish it</router-link>
 
+          <router-link
+            v-if="isAmalgamationFiling"
+            :to="{ path: `/${RouteNames.AMALG_REG_INFORMATION}` }"
+          >Return to this step to finish it</router-link>
           <router-link
             v-if="isIncorporationFiling"
             :to="{ path: `/${RouteNames.INCORPORATION_DEFINE_COMPANY}` }"

src/enums/routeNames.ts

@@ -54,4 +54,11 @@ export enum RouteNames {
   RESTORATION_BUSINESS_INFORMATION = 'restoration-business-information',
   RESTORATION_BUSINESS_NAME = 'restoration-business-name',
   RESTORATION_REVIEW_CONFIRM = 'restoration-review-confirm',
+
+  // Amalgamation (regular) route names
+  AMALG_REG_BUSINESS_INFO = 'amalg-reg-business-info',
+  AMALG_REG_INFORMATION = 'amalg-reg-information',
+  AMALG_REG_PEOPLE_ROLES = 'amalg-reg-people-roles',
+  AMALG_REG_REVIEW_CONFIRM = 'amalg-reg-review-confirm',
+  AMALG_REG_SHARE_STRUCTURE = 'amalg-reg-share-structure',
 }

src/router/routes.ts

@@ -38,6 +38,61 @@ export const routes = [
   ...IncorporationRoutes,
   ...RegistrationRoutes,
   ...RestorationRoutes,
+  {
+    path: '/amalg-reg-information',
+    name: RouteNames.AMALG_REG_INFORMATION,
+    component: Views.AmalgRegInformation,
+    meta: {
+      step: 1,
+      requiresAuth: true,
+      filingType: FilingTypes.AMALGAMATION,
+      filingSubType: AmalgamationTypes.REGULAR
+    }
+  },
+  {
+    path: '/amalg-reg-business-info',
+    name: RouteNames.AMALG_REG_BUSINESS_INFO,
+    component: Views.AmalgRegBusinessInfo,
+    meta: {
+      step: 2,
+      requiresAuth: true,
+      filingType: FilingTypes.AMALGAMATION,
+      filingSubType: AmalgamationTypes.REGULAR
+    }
+  },
+  {
+    path: '/amalg-reg-people-roles',
+    name: RouteNames.AMALG_REG_PEOPLE_ROLES,
+    component: Views.AmalgRegPeopleRoles,
+    meta: {
+      step: 3,
+      requiresAuth: true,
+      filingType: FilingTypes.AMALGAMATION,
+      filingSubType: AmalgamationTypes.REGULAR
+    }
+  },
+  {
+    path: '/amalg-reg-share-structure',
+    name: RouteNames.AMALG_REG_SHARE_STRUCTURE,
+    component: Views.AmalgRegShareStructure,
+    meta: {
+      step: 4,
+      requiresAuth: true,
+      filingType: FilingTypes.AMALGAMATION,
+      filingSubType: AmalgamationTypes.REGULAR
+    }
+  },
+  {
+    path: '/amalg-reg-review-confirm',
+    name: RouteNames.AMALG_REG_REVIEW_CONFIRM,
+    component: Views.AmalgRegReviewConfirm,
+    meta: {
+      step: 5,
+      requiresAuth: true,
+      filingType: FilingTypes.AMALGAMATION,
+      filingSubType: AmalgamationTypes.REGULAR
+    }
+  },
   {
     // default/fallback route
     // must be last