From a6442b760e6d1a25147443d19ca41eb184863a49 Mon Sep 17 00:00:00 2001
From: Hrvoje Fekete
Date: Tue, 10 Dec 2024 10:05:46 -0800
Subject: [PATCH 1/7] 24817 - fix: wrong redirect; missing start date for
filngs.
---
src/components/bcros/businessDetails/Links.vue | 9 +++++++--
src/stores/filings.ts | 1 +
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/components/bcros/businessDetails/Links.vue b/src/components/bcros/businessDetails/Links.vue
index 62527651..0677c575 100644
--- a/src/components/bcros/businessDetails/Links.vue
+++ b/src/components/bcros/businessDetails/Links.vue
@@ -168,7 +168,12 @@ const dissolveBusiness = async (): Promise => {
console.error('Filing error no filingId')
reject(new Error('Failed to create filing'))
}
- goToCreatePage('/dissolution-define-dissolution', { id: currentBusiness.value.identifier })
+ if (isFirm.value) {
+ goToCreatePage('/define-dissolution', { id: currentBusiness.value.identifier })
+ } else {
+ goToCreatePage('/dissolution-define-dissolution', { id: currentBusiness.value.identifier })
+ }
+ // goToCreatePage('/dissolution-define-dissolution', { id: currentBusiness.value.identifier })
resolve()
}
})
@@ -278,7 +283,7 @@ const contacts = getContactInfo('registries')
- {{ $t('label.comments.comment', (comments?.length || 0 )) }}
+ {{ $t('label.comments.comment', (comments?.length || 0)) }}
diff --git a/src/stores/filings.ts b/src/stores/filings.ts
index 2cb70a3a..9ce4c6a5 100644
--- a/src/stores/filings.ts
+++ b/src/stores/filings.ts
@@ -104,6 +104,7 @@ export const useBcrosFilings = defineStore('bcros/filings', () => {
identifier: business.identifier,
legalType: business.legalType,
legalName: business.legalName,
+ startDate: business.startDate,
foundingDate: business.foundingDate
}
}
From 05d0f8f8c3a2f4506a87a9bb29c0e51d6bc5fcef Mon Sep 17 00:00:00 2001
From: Hrvoje Fekete
Date: Tue, 10 Dec 2024 10:12:50 -0800
Subject: [PATCH 2/7] chore: remove comment.
---
src/components/bcros/businessDetails/Links.vue | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/components/bcros/businessDetails/Links.vue b/src/components/bcros/businessDetails/Links.vue
index 0677c575..fb1382d4 100644
--- a/src/components/bcros/businessDetails/Links.vue
+++ b/src/components/bcros/businessDetails/Links.vue
@@ -173,7 +173,6 @@ const dissolveBusiness = async (): Promise => {
} else {
goToCreatePage('/dissolution-define-dissolution', { id: currentBusiness.value.identifier })
}
- // goToCreatePage('/dissolution-define-dissolution', { id: currentBusiness.value.identifier })
resolve()
}
})
From e28df8838b85bd88fe8830865a0dc3793175b871 Mon Sep 17 00:00:00 2001
From: Hrvoje Fekete
Date: Tue, 10 Dec 2024 16:04:54 -0800
Subject: [PATCH 3/7] 24667 - fix missing body for retrieve business
information button when bootsrap business.
---
src/components/bcros/filing/CommonTemplate.vue | 6 ++++--
.../bcros/filing/item/AmalgamationFiling.vue | 9 +++++----
src/components/bcros/filing/item/ContinuationIn.vue | 8 ++++----
.../bcros/filing/item/IncorporationApplication.vue | 8 ++++----
.../bcros/filing/item/RegistrationFiling.vue | 11 ++++++-----
src/utils/navigate.ts | 8 +++++---
6 files changed, 28 insertions(+), 22 deletions(-)
diff --git a/src/components/bcros/filing/CommonTemplate.vue b/src/components/bcros/filing/CommonTemplate.vue
index c6d8fa62..1a98cf34 100644
--- a/src/components/bcros/filing/CommonTemplate.vue
+++ b/src/components/bcros/filing/CommonTemplate.vue
@@ -38,7 +38,6 @@
-
@@ -107,7 +106,10 @@ if (filing.value.commentsCount && filing.value.commentsLink) {
const isStatusPaid = computed(() => isFilingStatus(filing.value, FilingStatusE.PAID))
const isStatusApproved = computed(() => isFilingStatus(filing.value, FilingStatusE.APPROVED))
-const isShowBody = ref(false)
+
+const url = useRequestURL()
+const expandedFilingId = url.searchParams.get('filing_id')
+const isShowBody = ref(expandedFilingId && expandedFilingId === filing?.value?.filingId?.toString())
const showDetails = () => {
if (filing.value.documents === undefined && filing.value.documentsLink) {
diff --git a/src/components/bcros/filing/item/AmalgamationFiling.vue b/src/components/bcros/filing/item/AmalgamationFiling.vue
index 3ffee604..b62e83f4 100644
--- a/src/components/bcros/filing/item/AmalgamationFiling.vue
+++ b/src/components/bcros/filing/item/AmalgamationFiling.vue
@@ -10,14 +10,15 @@
{{ $t('text.filing.amalgamation.complete') }}
-
{{ currentBusinessName }} {{ $t('text.filing.amalgamation.successfullyAmalgamated') }}.
+
{{ currentBusinessName }} {{ $t('text.filing.amalgamation.successfullyAmalgamated') }}.
-
{{ $t('text.filing.amalgamation.systemCompletedProcessing') }}
+
{{ $t('text.filing.amalgamation.systemCompletedProcessing') }}
@@ -40,5 +41,5 @@ const props = defineProps({
filing: { type: Object as PropType, required: true }
})
-const tempRegNumber = !!sessionStorage.getItem('TEMP_REG_NUMBER')
+const { isBootstrapFiling } = storeToRefs(useBcrosBusinessBootstrap())
diff --git a/src/components/bcros/filing/item/ContinuationIn.vue b/src/components/bcros/filing/item/ContinuationIn.vue
index 7cc1fdc3..21be7636 100644
--- a/src/components/bcros/filing/item/ContinuationIn.vue
+++ b/src/components/bcros/filing/item/ContinuationIn.vue
@@ -31,10 +31,10 @@
-
+
{{ $t('text.filing.continuation.incorporationComplete') }}
-
{{ currentBusinessName }} {{ $t('text.filing.continuation.hasBeenSuccessfullyContinuedIn') }}
-
{{ $t('text.filing.common.systemCompletedProcessingFiling') }}
+
{{ currentBusinessName }} {{ $t('text.filing.continuation.hasBeenSuccessfullyContinuedIn') }}
+
{{ $t('text.filing.common.systemCompletedProcessingFiling') }}
@@ -54,5 +54,5 @@ const props = defineProps({
const isStatusRejected = isFilingStatus(props.filing, FilingStatusE.REJECTED)
const isStatusCompleted = isFilingStatus(props.filing, FilingStatusE.COMPLETED)
-const tempRegNumber = !!sessionStorage.getItem('TEMP_REG_NUMBER')
+const { isBootstrapFiling } = storeToRefs(useBcrosBusinessBootstrap())
diff --git a/src/components/bcros/filing/item/IncorporationApplication.vue b/src/components/bcros/filing/item/IncorporationApplication.vue
index e264fa19..23f081ad 100644
--- a/src/components/bcros/filing/item/IncorporationApplication.vue
+++ b/src/components/bcros/filing/item/IncorporationApplication.vue
@@ -11,15 +11,15 @@
-
+
{{ $t('text.filing.incorporationApplication.completed') }}
-
+
{{ currentBusinessName }}
{{ $t('text.filing.common.hasBeenSuccessfullyIncorporated') }}.
-
{{ $t('text.filing.incorporationApplication.systemCompletedProcessingFiling') }}.
+
{{ $t('text.filing.incorporationApplication.systemCompletedProcessingFiling') }}.
@@ -38,5 +38,5 @@ const props = defineProps({
})
const isStatusCompleted = isFilingStatus(props.filing, FilingStatusE.COMPLETED)
-const tempRegNumber = !!sessionStorage.getItem('TEMP_REG_NUMBER')
+const { isBootstrapFiling } = storeToRefs(useBcrosBusinessBootstrap())
diff --git a/src/components/bcros/filing/item/RegistrationFiling.vue b/src/components/bcros/filing/item/RegistrationFiling.vue
index 040261e4..e0d30fd9 100644
--- a/src/components/bcros/filing/item/RegistrationFiling.vue
+++ b/src/components/bcros/filing/item/RegistrationFiling.vue
@@ -1,15 +1,16 @@
-
+ {{ bootstrapName }}
+
{{ $t('text.filing.registration.completed') }}
-
- {{ currentBusinessName || 'This company' }}
+
+ {{ currentBusinessName || bootstrapName || 'This company' }}
{{ $t('text.filing.registration.hasBeenSuccessfullyRegistered') }}
-
{{ $t('text.filing.common.systemCompletedProcessingFiling') }}
+
{{ $t('text.filing.common.systemCompletedProcessingFiling') }}
@@ -27,5 +28,5 @@ const props = defineProps({
})
const isStatusCompleted = isFilingStatus(props.filing, FilingStatusE.COMPLETED)
-const tempRegNumber = !!sessionStorage.getItem('TEMP_REG_NUMBER')
+const { isBootstrapFiling, bootstrapName } = storeToRefs(useBcrosBusinessBootstrap())
diff --git a/src/utils/navigate.ts b/src/utils/navigate.ts
index fa862713..0c7423bb 100644
--- a/src/utils/navigate.ts
+++ b/src/utils/navigate.ts
@@ -1,7 +1,9 @@
/** Reloads Filings UI using business id instead of temporary registration number. */
-export const reloadWithBusinessId = () => {
+export const reloadWithBusinessId = (filing: ApiResponseFilingI) => {
// build the URL to the business dashboard with the business id and any URL parameters
// const url = getDashboardUrl + filing.businessIdentifier // + this.$route.fullPath
- const url = window.location.href
- window.location.assign(url)
+ const businessIdentifier = filing.businessIdentifier
+ const url = new URL(window.location.href)
+ url.pathname = `/${businessIdentifier}`
+ window.location.assign(url.toString())
}
From af9d462c08033807ce379b7403821efa9c2077dc Mon Sep 17 00:00:00 2001
From: Hrvoje Fekete
Date: Tue, 10 Dec 2024 16:10:17 -0800
Subject: [PATCH 4/7] fix: eslint
---
.../bcros/filing/item/AmalgamationFiling.vue | 10 +++++++---
src/components/bcros/filing/item/ContinuationIn.vue | 10 +++++++---
.../bcros/filing/item/IncorporationApplication.vue | 6 ++++--
.../bcros/filing/item/RegistrationFiling.vue | 6 ++++--
4 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/src/components/bcros/filing/item/AmalgamationFiling.vue b/src/components/bcros/filing/item/AmalgamationFiling.vue
index b62e83f4..682dcdc4 100644
--- a/src/components/bcros/filing/item/AmalgamationFiling.vue
+++ b/src/components/bcros/filing/item/AmalgamationFiling.vue
@@ -16,9 +16,13 @@
>
{{ $t('text.filing.amalgamation.complete') }}
- {{ currentBusinessName }} {{ $t('text.filing.amalgamation.successfullyAmalgamated') }}.
+
+ {{ currentBusinessName }} {{ $t('text.filing.amalgamation.successfullyAmalgamated') }}.
+
- {{ $t('text.filing.amalgamation.systemCompletedProcessing') }}
+
+ {{ $t('text.filing.amalgamation.systemCompletedProcessing') }}
+
@@ -41,5 +45,5 @@ const props = defineProps({
filing: { type: Object as PropType, required: true }
})
-const { isBootstrapFiling } = storeToRefs(useBcrosBusinessBootstrap())
+const { isBootstrapFiling } = storeToRefs(useBcrosBusinessBootstrap())
diff --git a/src/components/bcros/filing/item/ContinuationIn.vue b/src/components/bcros/filing/item/ContinuationIn.vue
index 21be7636..4e7743bf 100644
--- a/src/components/bcros/filing/item/ContinuationIn.vue
+++ b/src/components/bcros/filing/item/ContinuationIn.vue
@@ -33,8 +33,12 @@
{{ $t('text.filing.continuation.incorporationComplete') }}
-
{{ currentBusinessName }} {{ $t('text.filing.continuation.hasBeenSuccessfullyContinuedIn') }}
-
{{ $t('text.filing.common.systemCompletedProcessingFiling') }}
+
+ {{ currentBusinessName }} {{ $t('text.filing.continuation.hasBeenSuccessfullyContinuedIn') }}
+
+
+ {{ $t('text.filing.common.systemCompletedProcessingFiling') }}
+
@@ -54,5 +58,5 @@ const props = defineProps({
const isStatusRejected = isFilingStatus(props.filing, FilingStatusE.REJECTED)
const isStatusCompleted = isFilingStatus(props.filing, FilingStatusE.COMPLETED)
-const { isBootstrapFiling } = storeToRefs(useBcrosBusinessBootstrap())
+const { isBootstrapFiling } = storeToRefs(useBcrosBusinessBootstrap())
diff --git a/src/components/bcros/filing/item/IncorporationApplication.vue b/src/components/bcros/filing/item/IncorporationApplication.vue
index 23f081ad..9b9464f7 100644
--- a/src/components/bcros/filing/item/IncorporationApplication.vue
+++ b/src/components/bcros/filing/item/IncorporationApplication.vue
@@ -19,7 +19,9 @@
{{ $t('text.filing.common.hasBeenSuccessfullyIncorporated') }}.
- {{ $t('text.filing.incorporationApplication.systemCompletedProcessingFiling') }}.
+
+ {{ $t('text.filing.incorporationApplication.systemCompletedProcessingFiling') }}.
+
@@ -38,5 +40,5 @@ const props = defineProps({
})
const isStatusCompleted = isFilingStatus(props.filing, FilingStatusE.COMPLETED)
-const { isBootstrapFiling } = storeToRefs(useBcrosBusinessBootstrap())
+const { isBootstrapFiling } = storeToRefs(useBcrosBusinessBootstrap())
diff --git a/src/components/bcros/filing/item/RegistrationFiling.vue b/src/components/bcros/filing/item/RegistrationFiling.vue
index e0d30fd9..f15ee51e 100644
--- a/src/components/bcros/filing/item/RegistrationFiling.vue
+++ b/src/components/bcros/filing/item/RegistrationFiling.vue
@@ -10,7 +10,9 @@
{{ $t('text.filing.registration.hasBeenSuccessfullyRegistered') }}
- {{ $t('text.filing.common.systemCompletedProcessingFiling') }}
+
+ {{ $t('text.filing.common.systemCompletedProcessingFiling') }}
+
@@ -28,5 +30,5 @@ const props = defineProps({
})
const isStatusCompleted = isFilingStatus(props.filing, FilingStatusE.COMPLETED)
-const { isBootstrapFiling, bootstrapName } = storeToRefs(useBcrosBusinessBootstrap())
+const { isBootstrapFiling, bootstrapName } = storeToRefs(useBcrosBusinessBootstrap())
From 3faf61d4bd99622b17b0b85596a8e47a6b813d83 Mon Sep 17 00:00:00 2001
From: Hrvoje Fekete
Date: Tue, 10 Dec 2024 16:34:30 -0800
Subject: [PATCH 5/7] fix: lang texts.
---
src/components/bcros/filing/item/AmalgamationFiling.vue | 2 +-
src/components/bcros/filing/item/IncorporationApplication.vue | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/components/bcros/filing/item/AmalgamationFiling.vue b/src/components/bcros/filing/item/AmalgamationFiling.vue
index 682dcdc4..c8df3c25 100644
--- a/src/components/bcros/filing/item/AmalgamationFiling.vue
+++ b/src/components/bcros/filing/item/AmalgamationFiling.vue
@@ -21,7 +21,7 @@
- {{ $t('text.filing.amalgamation.systemCompletedProcessing') }}
+ {{ $t('text.filing.common.systemCompletedProcessingFiling') }}
diff --git a/src/components/bcros/filing/item/IncorporationApplication.vue b/src/components/bcros/filing/item/IncorporationApplication.vue
index 9b9464f7..3a043591 100644
--- a/src/components/bcros/filing/item/IncorporationApplication.vue
+++ b/src/components/bcros/filing/item/IncorporationApplication.vue
@@ -16,11 +16,11 @@
{{ currentBusinessName }}
- {{ $t('text.filing.common.hasBeenSuccessfullyIncorporated') }}.
+ {{ $t('text.filing.incorporationApplication.hasBeenSuccessfullyIncorporated') }}.
- {{ $t('text.filing.incorporationApplication.systemCompletedProcessingFiling') }}.
+ {{ $t('text.filing.common.systemCompletedProcessingFiling') }}.
From 4407c0c64431585fc800e2afd1f2509a70cf56a5 Mon Sep 17 00:00:00 2001
From: Hrvoje Fekete
Date: Tue, 10 Dec 2024 16:49:36 -0800
Subject: [PATCH 6/7] fix: boostrapName missing.
---
src/components/bcros/filing/item/AmalgamationFiling.vue | 4 ++--
src/components/bcros/filing/item/ContinuationIn.vue | 4 ++--
src/components/bcros/filing/item/IncorporationApplication.vue | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/components/bcros/filing/item/AmalgamationFiling.vue b/src/components/bcros/filing/item/AmalgamationFiling.vue
index c8df3c25..ddf6fed9 100644
--- a/src/components/bcros/filing/item/AmalgamationFiling.vue
+++ b/src/components/bcros/filing/item/AmalgamationFiling.vue
@@ -17,7 +17,7 @@
{{ $t('text.filing.amalgamation.complete') }}
- {{ currentBusinessName }} {{ $t('text.filing.amalgamation.successfullyAmalgamated') }}.
+ {{ currentBusinessName || bootstrapName }} {{ $t('text.filing.amalgamation.successfullyAmalgamated') }}.
@@ -45,5 +45,5 @@ const props = defineProps({
filing: { type: Object as PropType, required: true }
})
-const { isBootstrapFiling } = storeToRefs(useBcrosBusinessBootstrap())
+const { isBootstrapFiling, bootstrapName } = storeToRefs(useBcrosBusinessBootstrap())
diff --git a/src/components/bcros/filing/item/ContinuationIn.vue b/src/components/bcros/filing/item/ContinuationIn.vue
index 4e7743bf..7379d6a2 100644
--- a/src/components/bcros/filing/item/ContinuationIn.vue
+++ b/src/components/bcros/filing/item/ContinuationIn.vue
@@ -34,7 +34,7 @@
{{ $t('text.filing.continuation.incorporationComplete') }}
- {{ currentBusinessName }} {{ $t('text.filing.continuation.hasBeenSuccessfullyContinuedIn') }}
+ {{ currentBusinessName || bootstrapName }} {{ $t('text.filing.continuation.hasBeenSuccessfullyContinuedIn') }}
{{ $t('text.filing.common.systemCompletedProcessingFiling') }}
@@ -58,5 +58,5 @@ const props = defineProps({
const isStatusRejected = isFilingStatus(props.filing, FilingStatusE.REJECTED)
const isStatusCompleted = isFilingStatus(props.filing, FilingStatusE.COMPLETED)
-const { isBootstrapFiling } = storeToRefs(useBcrosBusinessBootstrap())
+const { isBootstrapFiling, bootstrapName } = storeToRefs(useBcrosBusinessBootstrap())
diff --git a/src/components/bcros/filing/item/IncorporationApplication.vue b/src/components/bcros/filing/item/IncorporationApplication.vue
index 3a043591..9f54b004 100644
--- a/src/components/bcros/filing/item/IncorporationApplication.vue
+++ b/src/components/bcros/filing/item/IncorporationApplication.vue
@@ -15,7 +15,7 @@
{{ $t('text.filing.incorporationApplication.completed') }}
- {{ currentBusinessName }}
+ {{ currentBusinessName || bootstrapName }}
{{ $t('text.filing.incorporationApplication.hasBeenSuccessfullyIncorporated') }}.
@@ -40,5 +40,5 @@ const props = defineProps({
})
const isStatusCompleted = isFilingStatus(props.filing, FilingStatusE.COMPLETED)
-const { isBootstrapFiling } = storeToRefs(useBcrosBusinessBootstrap())
+const { isBootstrapFiling, bootstrapName } = storeToRefs(useBcrosBusinessBootstrap())
From 4c4ba2e0cf9e794226fc74328790b6a7ce0cff51 Mon Sep 17 00:00:00 2001
From: Hrvoje Fekete
Date: Tue, 10 Dec 2024 17:03:27 -0800
Subject: [PATCH 7/7] fix: cleanup log out.
---
src/components/bcros/filing/item/RegistrationFiling.vue | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/components/bcros/filing/item/RegistrationFiling.vue b/src/components/bcros/filing/item/RegistrationFiling.vue
index f15ee51e..370612db 100644
--- a/src/components/bcros/filing/item/RegistrationFiling.vue
+++ b/src/components/bcros/filing/item/RegistrationFiling.vue
@@ -1,7 +1,6 @@
- {{ bootstrapName }}
{{ $t('text.filing.registration.completed') }}