- app version = 5.6.34 (bcgov#620)

- fixed check for future effective filing
- added missing filing statuses to enum

Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>

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",

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

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',
 }