From d312ab94ca0cfa8fbe820e61b7aa5e1f41b79e9a Mon Sep 17 00:00:00 2001
From: Severin Beauvais <severin.beauvais@gov.bc.ca>
Date: Thu, 11 Jan 2024 12:31:12 -0800
Subject: [PATCH] - app version = 5.6.34 - fixed check for future effective
 filing - added missing filing statuses to enum

---
 package-lock.json                                      |  4 ++--
 package.json                                           |  2 +-
 src/components/Amalgamation/AmalgamatingBusinesses.vue | 10 ++++++++--
 src/enums/filingStatus.ts                              |  8 ++++++--
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index adf19ad67..587c28ca6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "business-create-ui",
-  "version": "5.6.33",
+  "version": "5.6.34",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "business-create-ui",
-      "version": "5.6.33",
+      "version": "5.6.34",
       "dependencies": {
         "@babel/compat-data": "^7.21.5",
         "@bcrs-shared-components/approval-type": "1.0.19",
diff --git a/package.json b/package.json
index ec9f577ec..9e91d8502 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "business-create-ui",
-  "version": "5.6.33",
+  "version": "5.6.34",
   "private": true,
   "appName": "Create UI",
   "sbcName": "SBC Common Components",
diff --git a/src/components/Amalgamation/AmalgamatingBusinesses.vue b/src/components/Amalgamation/AmalgamatingBusinesses.vue
index 6480d7760..86af45ddd 100644
--- a/src/components/Amalgamation/AmalgamatingBusinesses.vue
+++ b/src/components/Amalgamation/AmalgamatingBusinesses.vue
@@ -192,7 +192,7 @@ import { BusinessLookup } from '@bcrs-shared-components/business-lookup'
 import { Jurisdiction } from '@bcrs-shared-components/jurisdiction'
 import { CanJurisdictions, MrasJurisdictions } from '@bcrs-shared-components/jurisdiction/list-data'
 import { AmalgamatingBusinessIF, BusinessLookupResultIF, EmptyBusinessLookup } from '@/interfaces'
-import { AmlRoles, AmlTypes, EntityStates } from '@/enums'
+import { AmlRoles, AmlTypes, EntityStates, FilingStatus } from '@/enums'
 import { JurisdictionLocation } from '@bcrs-shared-components/enums'
 import BusinessTable from '@/components/Amalgamation/BusinessTable.vue'
 import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module'
@@ -366,6 +366,12 @@ export default class AmalgamatingBusinesses extends Mixins(AmalgamationMixin, Co
       return
     }
 
+    const isFutureEffective = (
+      business.firstFiling.isFutureEffective === true &&
+      business.firstFiling.status !== FilingStatus.COMPLETED &&
+      business.firstFiling.status !== FilingStatus.CORRECTED
+    )
+
     // Create amalgamating business object.
     const tingBusiness: AmalgamatingBusinessIF = {
       type: AmlTypes.LEAR,
@@ -376,7 +382,7 @@ export default class AmalgamatingBusinesses extends Mixins(AmalgamationMixin, Co
       legalType: business.businessInfo.legalType,
       address: business.addresses.registeredOffice.mailingAddress,
       isNotInGoodStanding: (business.businessInfo.goodStanding === false),
-      isFutureEffective: (business.firstFiling.isFutureEffective === true),
+      isFutureEffective,
       isLimitedRestoration: await this.isLimitedRestoration(business),
       isHistorical: (business.businessInfo.state === EntityStates.HISTORICAL)
     }
diff --git a/src/enums/filingStatus.ts b/src/enums/filingStatus.ts
index 7188098d3..259a9101b 100644
--- a/src/enums/filingStatus.ts
+++ b/src/enums/filingStatus.ts
@@ -1,10 +1,14 @@
 export enum FilingStatus {
+  CANCELLED = 'CANCELLED',
   COMPLETED = 'COMPLETED',
+  CORRECTED = 'CORRECTED',
+  DELETED = 'DELETED',
   DRAFT = 'DRAFT',
-  EPOCH = 'EPOCH',
+  EPOCH = 'EPOCH', // legacy, not used by UI
   ERROR = 'ERROR',
-  NEW = 'NEW',
+  NEW = 'NEW', // used for Todo List items only (ie, not yet a filing)
   PAID = 'PAID',
   PENDING = 'PENDING',
   PENDING_CORRECTION = 'PENDING_CORRECTION',
+  WITHDRAWN = 'WITHDRAWN',
 }