Skip to content

Commit 38f9f02

Browse files
19693 continuation in nr and draft filing (#2774)
1 parent 7cfddc5 commit 38f9f02

File tree

8 files changed

+90
-188
lines changed

8 files changed

+90
-188
lines changed

auth-web/package-lock.json

Lines changed: 30 additions & 175 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

auth-web/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "auth-web",
3-
"version": "2.5.19",
3+
"version": "2.5.20",
44
"appName": "Auth Web",
55
"sbcName": "SBC Common Components",
66
"private": true,
@@ -17,9 +17,9 @@
1717
"dependencies": {
1818
"@bcrs-shared-components/base-address": "2.0.3",
1919
"@bcrs-shared-components/bread-crumb": "1.0.8",
20-
"@bcrs-shared-components/corp-type-module": "1.0.13",
21-
"@bcrs-shared-components/enums": "1.1.7",
22-
"@bcrs-shared-components/interfaces": "1.0.71",
20+
"@bcrs-shared-components/corp-type-module": "1.0.16",
21+
"@bcrs-shared-components/enums": "1.1.10",
22+
"@bcrs-shared-components/interfaces": "1.1.13",
2323
"@mdi/font": "^4.5.95",
2424
"@sentry/vue": "^7.49.0",
2525
"@vue/compiler-dom": "^3.2.45",

auth-web/src/components/auth/manage-business/EntityManagement.vue

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -733,6 +733,9 @@ export default class EntityManagement extends Mixins(AccountMixin, AccountChange
733733
} else if (removeBusinessPayload.business.corpType.code === CorpTypes.AMALGAMATION_APPLICATION) {
734734
this.populateAmalagmationModalValues()
735735
this.$refs.removalConfirmDialog.open()
736+
} else if (removeBusinessPayload.business.corpType.code === CorpTypes.CONTINUATION_IN) {
737+
this.populateContinuationInModalValues()
738+
this.$refs.removalConfirmDialog.open()
736739
} else if (removeBusinessPayload.business.corpType.code === CorpTypes.REGISTRATION) {
737740
this.populateRegistrationModalValues()
738741
this.$refs.removalConfirmDialog.open()
@@ -786,6 +789,15 @@ export default class EntityManagement extends Mixins(AccountMixin, AccountChange
786789
this.secondaryBtnHandler = this.cancelRemoval
787790
}
788791
792+
populateContinuationInModalValues () {
793+
this.dialogTitle = this.$t('removeContinuationInConfirmTitle').toString()
794+
this.dialogText = this.$t('removeContinuationInConfirmText').toString()
795+
this.primaryBtnText = 'Delete Continuation In'
796+
this.secondaryBtnText = 'Keep Continuation In'
797+
this.primaryBtnHandler = this.confirmRemovalContinuationIn
798+
this.secondaryBtnHandler = this.cancelRemoval
799+
}
800+
789801
populateRegistrationModalValues () {
790802
this.dialogTitle = this.$t('removeRegistrationConfirmTitle').toString()
791803
this.dialogText = this.$t('removeRegistrationConfirmText').toString()
@@ -823,6 +835,11 @@ export default class EntityManagement extends Mixins(AccountMixin, AccountChange
823835
this.remove('', false, 'removeAmalgamationSuccessTitle', 'removeAmalgamationSuccessText')
824836
}
825837
838+
confirmRemovalContinuationIn () {
839+
this.$refs.removalConfirmDialog.close()
840+
this.remove('', false, 'removeContinuationInSuccessTitle', 'removeContinuationInSuccessText')
841+
}
842+
826843
confirmRemovalNr () {
827844
this.$refs.removalConfirmDialog.close()
828845
this.remove('', false, 'removeNRSuccessTitle', 'removeNRSuccessText')

auth-web/src/composables/affiliations-factory.ts

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ export const useAffiliations = () => {
3939
return (
4040
(business.corpType?.code || business.corpType) === CorpTypes.AMALGAMATION_APPLICATION ||
4141
(business.corpType?.code || business.corpType) === CorpTypes.INCORPORATION_APPLICATION ||
42+
(business.corpType?.code || business.corpType) === CorpTypes.CONTINUATION_IN ||
4243
(business.corpType?.code || business.corpType) === CorpTypes.REGISTRATION
4344
)
4445
}
@@ -55,6 +56,8 @@ export const useAffiliations = () => {
5556
switch ((business.corpType?.code || business.corpType) as CorpTypes) {
5657
case CorpTypes.AMALGAMATION_APPLICATION:
5758
return AffiliationTypes.AMALGAMATION_APPLICATION
59+
case CorpTypes.CONTINUATION_IN:
60+
return AffiliationTypes.CONTINUATION_IN
5861
case CorpTypes.INCORPORATION_APPLICATION:
5962
return AffiliationTypes.INCORPORATION_APPLICATION
6063
case CorpTypes.REGISTRATION:
@@ -87,9 +90,11 @@ export const useAffiliations = () => {
8790
if (!state) return 'Unknown'
8891
if (state === NrState.INPROGRESS) return NrDisplayStates.DRAFT
8992
if (state === NrState.APPROVED && (!business.nameRequest.expirationDate)) return NrDisplayStates.PROCESSING
90-
else if (business.corpType.code === CorpTypes.INCORPORATION_APPLICATION ||
91-
business.corpType.code === CorpTypes.REGISTRATION ||
92-
state === NrState.DRAFT) {
93+
else if (state === NrState.DRAFT ||
94+
[CorpTypes.AMALGAMATION_APPLICATION,
95+
CorpTypes.INCORPORATION_APPLICATION,
96+
CorpTypes.CONTINUATION_IN,
97+
CorpTypes.REGISTRATION].includes(business.corpType.code)) {
9398
return NrDisplayStates[NrState.HOLD]
9499
} else return NrDisplayStates[state] || 'Unknown'
95100
}

0 commit comments

Comments
 (0)