- imported CorpTypeCd directly from module to avoid type confusion

bcgov · Nov 16, 2023 · 40d31aa · 40d31aa
1 parent 90c2285
commit 40d31aa
Show file tree

Hide file tree

Showing 22 changed files with 30 additions and 41 deletions.
diff --git a/src/interfaces/filing-interfaces/filing-data-interface.ts b/src/interfaces/filing-interfaces/filing-data-interface.ts
@@ -1,5 +1,5 @@
 import { FilingCodes } from '@/enums'
-import { CorpTypeCd } from '@bcrs-shared-components/enums/'
+import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module/'
 
 /** Filing data for SBC Fee Summary component. */
 export interface FilingDataIF {

diff --git a/src/interfaces/filing-interfaces/filing-interfaces.ts b/src/interfaces/filing-interfaces/filing-interfaces.ts
@@ -2,7 +2,8 @@ import { BusinessAddressIF, CourtOrderIF, RegisteredRecordsAddressesIF, NaicsIF,
   OfficeAddressIF, PartyIF, ShareClassIF, SpecialResolutionIF } from '@/interfaces'
 import { ApprovalTypes, BusinessTypes, DissolutionStatementTypes, DissolutionTypes, FilingTypes,
   RestorationTypes, RelationshipTypes } from '@/enums'
-import { CorpTypeCd, CorrectNameOptions } from '@bcrs-shared-components/enums/'
+import { CorrectNameOptions } from '@bcrs-shared-components/enums/'
+import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module/'
 import { ContactPointIF } from '@bcrs-shared-components/interfaces'
 
 /**
@@ -78,7 +79,7 @@ export interface IncorporationFilingIF {
 /** Interface for registration filing data saved to the Legal API. */
 export interface RegistrationFilingIF {
   header: {
-    name: string
+    name: FilingTypes
     certifiedBy: string
     date: string
     effectiveDate?: string // not saved by UI but may be provided by API
@@ -118,7 +119,7 @@ export interface RegistrationFilingIF {
 /** Interface for dissolution filing data saved to the Legal API. */
 export interface DissolutionFilingIF {
   header: {
-    name: string
+    name: FilingTypes
     certifiedBy: string
     date: string
     effectiveDate?: string // Optional and should be set only for future effective filings
@@ -168,7 +169,7 @@ export interface DissolutionFilingIF {
 /** Interface for restoration filing data saved to the Legal API. */
 export interface RestorationFilingIF {
   header: {
-    name: string
+    name: FilingTypes
     certifiedBy: string
     date: string
     effectiveDate?: string // not saved by UI but may be provided by API

diff --git a/src/interfaces/resource-interfaces/resource-interface.ts b/src/interfaces/resource-interfaces/resource-interface.ts
@@ -3,7 +3,7 @@ import {
   PeopleAndRolesResourceIF, StepIF, CreateRulesResourceIF, CreateMemorandumResourceIF,
   CreateResolutionResourceIF, CustodianResourceIF, CompletingPartyStatementIF
 } from '@/interfaces'
-import { CorpTypeCd } from '@bcrs-shared-components/enums/'
+import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module'
 
 /** Dissolution resource interface. */
 export interface DissolutionResourceIF {

diff --git a/src/interfaces/store-interfaces/state-interface.ts b/src/interfaces/store-interfaces/state-interface.ts
@@ -1,4 +1,5 @@
-import { CorpTypeCd, CorrectNameOptions } from '@bcrs-shared-components/enums/'
+import { CorrectNameOptions } from '@bcrs-shared-components/enums/'
+import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module'
 import {
   AccountInformationIF,
   ContactPointIF,

diff --git a/src/mixins/filing-template-mixin.ts b/src/mixins/filing-template-mixin.ts
@@ -14,7 +14,8 @@ import {
 import { ApprovalTypes, BusinessTypes, CoopTypes, DissolutionTypes, EffectOfOrders, FilingTypes,
   PartyTypes, RelationshipTypes, RestorationTypes, RoleTypes, StaffPaymentOptions
 } from '@/enums'
-import { CorpTypeCd, CorrectNameOptions } from '@bcrs-shared-components/enums/'
+import { CorrectNameOptions } from '@bcrs-shared-components/enums/'
+import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module/'
 
 /**
  * Mixin that provides the integration with the Legal API.

diff --git a/src/resources/BreadCrumbResource.ts b/src/resources/BreadCrumbResource.ts
@@ -1,9 +1,8 @@
 import { FilingTypes } from '@/enums'
-import { CorpTypeCd } from '@bcrs-shared-components/enums/'
+import { GetCorpNumberedDescription } from '@bcrs-shared-components/corp-type-module'
 import { BreadcrumbIF } from '@/interfaces'
 import { createPinia, setActivePinia } from 'pinia'
 import { useStore } from '@/store/store'
-import { GetCorpNumberedDescription } from '@bcrs-shared-components/corp-type-module'
 
 setActivePinia(createPinia())
 const store = useStore()
@@ -24,7 +23,7 @@ function getLegalName (): string {
 
 /** Returns numbered entity name. */
 function getNumberedEntityName (): string {
-  const getEntityType = store.getEntityType as CorpTypeCd
+  const getEntityType = store.getEntityType
   return GetCorpNumberedDescription(getEntityType)
 }
 

diff --git a/src/resources/Dissolution/BC.ts b/src/resources/Dissolution/BC.ts
@@ -1,7 +1,6 @@
 import { DissolutionResourceIF } from '@/interfaces'
 import { BulletListTypes, FilingCodes, ItemTypes } from '@/enums'
-import { CorpTypeCd } from '@bcrs-shared-components/enums/'
-import { GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
+import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
 import { DissolutionStepsCorp } from './steps'
 
 export const DissolutionResourceBc: DissolutionResourceIF = {

diff --git a/src/resources/Dissolution/BEN.ts b/src/resources/Dissolution/BEN.ts
@@ -1,7 +1,6 @@
 import { DissolutionResourceIF } from '@/interfaces'
 import { BulletListTypes, FilingCodes, ItemTypes } from '@/enums'
-import { CorpTypeCd } from '@bcrs-shared-components/enums/'
-import { GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
+import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
 import { DissolutionStepsCorp } from './steps'
 
 export const DissolutionResourceBen: DissolutionResourceIF = {

diff --git a/src/resources/Dissolution/CC.ts b/src/resources/Dissolution/CC.ts
@@ -1,7 +1,6 @@
 import { DissolutionResourceIF } from '@/interfaces'
 import { BulletListTypes, FilingCodes, ItemTypes } from '@/enums'
-import { CorpTypeCd } from '@bcrs-shared-components/enums/'
-import { GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
+import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
 import { DissolutionStepsCorp } from './steps'
 
 export const DissolutionResourceCc: DissolutionResourceIF = {

diff --git a/src/resources/Dissolution/CP.ts b/src/resources/Dissolution/CP.ts
@@ -1,7 +1,6 @@
 import { DissolutionResourceIF } from '@/interfaces'
 import { BulletListTypes, DissolutionStatementTypes, FilingCodes, ItemTypes } from '@/enums'
-import { CorpTypeCd } from '@bcrs-shared-components/enums/'
-import { GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
+import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
 import { DissolutionStepsCoop } from './steps'
 
 export const DissolutionResourceCp: DissolutionResourceIF = {

diff --git a/src/resources/Dissolution/GP.ts b/src/resources/Dissolution/GP.ts
@@ -1,7 +1,6 @@
 import { DissolutionResourceIF } from '@/interfaces'
 import { FilingCodes, ItemTypes } from '@/enums'
-import { CorpTypeCd } from '@bcrs-shared-components/enums/'
-import { GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
+import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
 import { DissolutionStepsFirm } from './steps'
 
 export const DissolutionResourceGp: DissolutionResourceIF = {

diff --git a/src/resources/Dissolution/SP.ts b/src/resources/Dissolution/SP.ts
@@ -1,7 +1,6 @@
 import { DissolutionResourceIF } from '@/interfaces'
 import { FilingCodes, ItemTypes } from '@/enums'
-import { CorpTypeCd } from '@bcrs-shared-components/enums/'
-import { GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
+import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
 import { DissolutionStepsFirm } from './steps'
 
 export const DissolutionResourceSp: DissolutionResourceIF = {

diff --git a/src/resources/Dissolution/ULC.ts b/src/resources/Dissolution/ULC.ts
@@ -1,7 +1,6 @@
 import { DissolutionResourceIF } from '@/interfaces'
 import { BulletListTypes, FilingCodes, ItemTypes } from '@/enums'
-import { CorpTypeCd } from '@bcrs-shared-components/enums/'
-import { GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
+import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
 import { DissolutionStepsCorp } from './steps'
 
 export const DissolutionResourceUlc: DissolutionResourceIF = {

diff --git a/src/resources/Incorporation/BC.ts b/src/resources/Incorporation/BC.ts
@@ -1,8 +1,7 @@
 import { IncorporationResourceIF } from '@/interfaces'
 import { FilingCodes, RuleIds } from '@/enums'
-import { CorpTypeCd } from '@bcrs-shared-components/enums/'
+import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
 import { IncorporationStepsCorp } from './steps'
-import { GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
 
 export const IncorporationResourceBc: IncorporationResourceIF = {
   entityType: CorpTypeCd.BC_COMPANY,

diff --git a/src/resources/Incorporation/BEN.ts b/src/resources/Incorporation/BEN.ts
@@ -1,8 +1,7 @@
 import { IncorporationResourceIF } from '@/interfaces'
 import { FilingCodes, RuleIds } from '@/enums'
-import { CorpTypeCd } from '@bcrs-shared-components/enums/'
+import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
 import { IncorporationStepsCorp } from './steps'
-import { GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
 
 export const IncorporationResourceBen: IncorporationResourceIF = {
   entityType: CorpTypeCd.BENEFIT_COMPANY,

diff --git a/src/resources/Incorporation/CC.ts b/src/resources/Incorporation/CC.ts
@@ -1,8 +1,7 @@
 import { IncorporationResourceIF } from '@/interfaces'
 import { FilingCodes, RuleIds } from '@/enums'
-import { CorpTypeCd } from '@bcrs-shared-components/enums/'
+import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
 import { IncorporationStepsCorp } from './steps'
-import { GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
 
 export const IncorporationResourceCc: IncorporationResourceIF = {
   entityType: CorpTypeCd.BC_CCC,

diff --git a/src/resources/Incorporation/CP.ts b/src/resources/Incorporation/CP.ts
@@ -1,7 +1,6 @@
 import { IncorporationResourceIF } from '@/interfaces'
 import { FilingCodes, RuleIds, ItemTypes } from '@/enums'
-import { CorpTypeCd } from '@bcrs-shared-components/enums/'
-import { GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
+import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
 import { IncorporationStepsCoop } from '@/resources/Incorporation/steps'
 
 export const IncorporationResourceCp: IncorporationResourceIF = {

diff --git a/src/resources/Incorporation/ULC.ts b/src/resources/Incorporation/ULC.ts
@@ -1,8 +1,7 @@
 import { IncorporationResourceIF } from '@/interfaces'
 import { FilingCodes, RuleIds } from '@/enums'
-import { CorpTypeCd } from '@bcrs-shared-components/enums/'
+import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
 import { IncorporationStepsCorp } from './steps'
-import { GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
 
 export const IncorporationResourceUlc: IncorporationResourceIF = {
   entityType: CorpTypeCd.BC_ULC_COMPANY,

diff --git a/src/resources/Registration/GP.ts b/src/resources/Registration/GP.ts
@@ -1,7 +1,6 @@
 import { RegistrationResourceIF } from '@/interfaces'
 import { FilingCodes, RuleIds } from '@/enums'
-import { CorpTypeCd } from '@bcrs-shared-components/enums/'
-import { GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
+import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
 import { RegistrationSteps } from './steps'
 
 export const RegistrationResourceGp: RegistrationResourceIF = {

diff --git a/src/resources/Registration/SP.ts b/src/resources/Registration/SP.ts
@@ -1,7 +1,6 @@
 import { RegistrationResourceIF } from '@/interfaces'
 import { FilingCodes, RuleIds } from '@/enums'
-import { CorpTypeCd } from '@bcrs-shared-components/enums/'
-import { GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
+import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
 import { RegistrationSteps } from './steps'
 
 export const RegistrationResourceSp: RegistrationResourceIF = {

diff --git a/src/services/pay-services.ts b/src/services/pay-services.ts
@@ -1,6 +1,6 @@
 import { AxiosInstance as axios } from '@/utils'
 import { FilingCodes } from '@/enums'
-import { CorpTypeCd } from '@bcrs-shared-components/enums/'
+import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module/'
 import { FeesIF } from '@/interfaces'
 
 /**

diff --git a/src/store/store.ts b/src/store/store.ts
@@ -14,7 +14,8 @@ import {
   RelationshipTypes,
   RestorationTypes
 } from '@/enums'
-import { CorpTypeCd, CorrectNameOptions } from '@bcrs-shared-components/enums/'
+import { CorrectNameOptions } from '@bcrs-shared-components/enums/'
+import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module'
 import {
   AccountInformationIF,
   AddressIF,