Skip to content

Commit

Permalink
- app version = 5.9.11 (bcgov#674)
Browse files Browse the repository at this point in the history
- saved correct name option for other filings (not used but denotes code intent for future debugging/audit)
- updated unit tests

Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>
  • Loading branch information
severinbeauvais and Severin Beauvais authored Apr 16, 2024
1 parent 222a701 commit 3b79986
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 4 deletions.
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "business-create-ui",
"version": "5.9.10",
"version": "5.9.11",
"private": true,
"appName": "Create UI",
"sbcName": "SBC Common Components",
Expand Down
6 changes: 6 additions & 0 deletions src/mixins/filing-template-mixin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,7 @@ export default class FilingTemplateMixin extends Mixins(AmalgamationMixin, DateM
switch (this.getCorrectNameOption) {
case CorrectNameOptions.CORRECT_AML_ADOPT:
// save adopted name
// *** FUTURE: is there really an adopted name option in a continuation in?
filing.continuationIn.nameRequest.correctNameOption = CorrectNameOptions.CORRECT_AML_ADOPT
filing.continuationIn.nameRequest.legalName = this.getNameRequestApprovedName
break
Expand Down Expand Up @@ -584,9 +585,13 @@ export default class FilingTemplateMixin extends Mixins(AmalgamationMixin, DateM
}

// If this is a named IA then add Name Request Number and Approved Name.
// Otherwise it's a numbered IA.
if (this.getNameRequestNumber) {
filing.incorporationApplication.nameRequest.correctNameOption = CorrectNameOptions.CORRECT_NEW_NR
filing.incorporationApplication.nameRequest.nrNumber = this.getNameRequestNumber
filing.incorporationApplication.nameRequest.legalName = this.getNameRequestApprovedName
} else {
filing.incorporationApplication.nameRequest.correctNameOption = CorrectNameOptions.CORRECT_NAME_TO_NUMBER
}

// If this is a future effective filing then save the effective date.
Expand Down Expand Up @@ -772,6 +777,7 @@ export default class FilingTemplateMixin extends Mixins(AmalgamationMixin, DateM
: {}
},
nameRequest: {
correctNameOption: CorrectNameOptions.CORRECT_NEW_NR,
legalName: this.getNameRequestApprovedName,
legalType: this.getEntityType,
nrNumber: this.getNameRequestNumber
Expand Down
3 changes: 2 additions & 1 deletion tests/unit/Actions.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import Actions from '@/components/common/Actions.vue'
import mockRouter from './MockRouter'
import LegalServices from '@/services/legal-services'
import { FilingTypes } from '@/enums'
import { NameRequestStates } from '@bcrs-shared-components/enums'
import { CorrectNameOptions, NameRequestStates } from '@bcrs-shared-components/enums'
import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module'
import { CourtOrderStepIF, DefineCompanyIF, EffectiveDateTimeIF, IncorporationAgreementIF, NameRequestIF,
OrgPersonIF, PeopleAndRoleIF, ShareStructureIF, TombstoneIF } from '@/interfaces'
Expand Down Expand Up @@ -212,6 +212,7 @@ describe('Actions component - Filing Functionality', () => {
},
incorporationApplication: {
nameRequest: {
correctNameOption: CorrectNameOptions.CORRECT_NEW_NR,
nrNumber: 'NR 1234567',
legalType: 'BEN',
legalName: 'My Name Request Inc.'
Expand Down
2 changes: 2 additions & 0 deletions tests/unit/filing-template-mixin.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { useStore } from '@/store/store'
import { BusinessTypes, PartyTypes, RoleTypes } from '@/enums'
import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module'
import { NameRequestIF } from '@/interfaces'
import { CorrectNameOptions } from '@bcrs-shared-components/enums'

setActivePinia(createPinia())
const store = useStore()
Expand Down Expand Up @@ -202,6 +203,7 @@ describe('Registration Filing', () => {
extension: 444
},
nameRequest: {
correctNameOption: CorrectNameOptions.CORRECT_NEW_NR,
legalName: 'My Approved Name',
legalType: 'SP',
nrNumber: 'NR 1234567'
Expand Down

0 comments on commit 3b79986

Please sign in to comment.