Fix 23520 - Dashboard Updates for Continuation States (#697)

* handle APPROVED status Signed-off-by: Qin <[email protected]> * change NR to Name Request, per new design Signed-off-by: Qin <[email protected]> * add a divider line Signed-off-by: Qin <[email protected]> * update change requested status wording Signed-off-by: Qin <[email protected]> * add contact info for awaiting review Signed-off-by: Qin <[email protected]> * add NR Info for awaiting review Signed-off-by: Qin <[email protected]> * update continuation authorization filing name Signed-off-by: Qin <[email protected]> * FE subtitle updates Signed-off-by: Qin <[email protected]> * update awaiting review language Signed-off-by: Qin <[email protected]> * update package version Signed-off-by: Qin <[email protected]> * update unit tests Signed-off-by: Qin <[email protected]> * update package enum Signed-off-by: Qin <[email protected]> * update package enum 2 Signed-off-by: Qin <[email protected]> * re-structure methods Signed-off-by: Qin <[email protected]> * adjust change_requested NR display Signed-off-by: Qin <[email protected]> * adjust change_requested NR display 2 Signed-off-by: Qin <[email protected]> * re-structure methods 2 Signed-off-by: Qin <[email protected]> * handle NR expired situation Signed-off-by: Qin <[email protected]> * load NR for Pending List Signed-off-by: Qin <[email protected]> * update unit tests Signed-off-by: Qin <[email protected]> * fix header status type Signed-off-by: Qin <[email protected]> * updates for filing label - continuation application and authorization Signed-off-by: Qin <[email protected]> * add unit tests for filing names Signed-off-by: Qin <[email protected]> * remove FE section for pending Continuation Signed-off-by: Qin <[email protected]> * add a space for subtitle Signed-off-by: Qin <[email protected]> * move continuation subtitles together in one place Signed-off-by: Qin <[email protected]> * update unit tests, no FE pending continuation now Signed-off-by: Qin <[email protected]> * remove FE pending continuation not needed Signed-off-by: Qin <[email protected]> * adjust styles Signed-off-by: Qin <[email protected]> * adjust subtitle and draftTitle Signed-off-by: Qin <[email protected]> * handle rejected continuation Signed-off-by: Qin <[email protected]> * update FE continuation per new design Signed-off-by: Qin <[email protected]> * update FE continuation per new design 2 Signed-off-by: Qin <[email protected]> * update unit tests Signed-off-by: Qin <[email protected]> * no need to handle rejected paid Signed-off-by: Qin <[email protected]> * adjust space Signed-off-by: Qin <[email protected]> * update comments in todo list Signed-off-by: Qin <[email protected]> * remove unused getter Signed-off-by: Qin <[email protected]> * remove unused condition Signed-off-by: Qin <[email protected]> --------- Signed-off-by: Qin <[email protected]>
bcgov · Oct 18, 2024 · 5cc4b75 · 5cc4b75
1 parent b5e22fb
commit 5cc4b75
Show file tree

Hide file tree

Showing 16 changed files with 170 additions and 160 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "business-filings-ui",
-  "version": "7.3.26",
+  "version": "7.3.27",
   "private": true,
   "appName": "Filings UI",
   "sbcName": "SBC Common Components",
@@ -21,7 +21,7 @@
     "@bcrs-shared-components/court-order-poa": "2.1.4",
     "@bcrs-shared-components/date-picker": "1.2.39",
     "@bcrs-shared-components/document-delivery": "1.2.1",
-    "@bcrs-shared-components/enums": "1.1.11",
+    "@bcrs-shared-components/enums": "1.1.12",
     "@bcrs-shared-components/expandable-help": "1.0.1",
     "@bcrs-shared-components/folio-number-input": "1.1.18",
     "@bcrs-shared-components/interfaces": "1.1.13",

diff --git a/src/App.vue b/src/App.vue
@@ -472,9 +472,9 @@ export default class App extends Mixins(
         const response = await LegalServices.fetchBootstrapFiling(this.tempRegNumber)
         this.storeBootstrapItem(response)
 
-        // if it is a todo (not a filing), and it has a NR, load it
-        // (this is to display the NR details in the Todo List)
-        if (this.isBootstrapTodo && this.localNrNumber) {
+        // if it is a todo or a pending filing, and it has a NR, load it
+        // (this is to display the NR details in the Todo List/Pending List)
+        if ((this.isBootstrapTodo || this.isBootstrapPending) && this.localNrNumber) {
           const nr = await LegalServices.fetchNameRequest(this.localNrNumber)
           this.storeNrData(nr, response)
         }
@@ -666,10 +666,11 @@ export default class App extends Mixins(
     // NB: these were already validated in storeBootstrapItem()
     const header = filing.header
     const data = filing[header.name]
+    const status = header.status
 
     const description = GetCorpFullDescription(data.nameRequest.legalType)
     const dba = this.isEntitySoleProp ? ' / Doing Business As (DBA) ' : ' '
-    const filingName = EnumUtilities.filingTypeToName(header.name, null, data.type)
+    const filingName = EnumUtilities.filingTypeToName(header.name, null, data.type, status)
 
     // save display name for later
     filing.displayName = EnumUtilities.isTypeAmalgamationApplication(header)
@@ -691,6 +692,7 @@ export default class App extends Mixins(
     // NB: these were already validated in storeBootstrapItem()
     const header = filing.header
     const data = filing[header.name]
+    const status = header.status
 
     // set addresses
     this.storeAddresses({ data: data.offices || [] })
@@ -699,7 +701,7 @@ export default class App extends Mixins(
     this.storeParties({ data: { parties: data.parties || [] } })
 
     const description = GetCorpFullDescription(data.nameRequest.legalType)
-    const filingName = EnumUtilities.filingTypeToName(header.name, null, data.type)
+    const filingName = EnumUtilities.filingTypeToName(header.name, null, data.type, status)
 
     // save display name for later
     filing.displayName = `${description} ${filingName}`
@@ -714,6 +716,7 @@ export default class App extends Mixins(
     // NB: these were already validated in storeBootstrapItem()
     const header = filing.header
     const data = filing[header.name]
+    const status = header.status
 
     // set addresses
     this.storeAddresses({ data: data.offices || [] })
@@ -722,7 +725,7 @@ export default class App extends Mixins(
     this.storeParties({ data: { parties: data.parties || [] } })
 
     const description = GetCorpFullDescription(data.nameRequest.legalType)
-    const filingName = EnumUtilities.filingTypeToName(header.name, null, data.type)
+    const filingName = EnumUtilities.filingTypeToName(header.name, null, data.type, status)
     const displayName = EnumUtilities.isTypeAmalgamationApplication(header)
       ? filingName
       : `${description} ${filingName}`

diff --git a/src/components/Dashboard/FilingHistoryList/bodies/BodyFutureEffective.vue b/src/components/Dashboard/FilingHistoryList/bodies/BodyFutureEffective.vue
@@ -72,8 +72,8 @@ export default class BodyFutureEffective extends Vue {
     }
     if (EnumUtilities.isTypeContinuationIn(this.filing)) {
       return {
-        subtitle: 'Future Effective Incorporation Date',
-        filingLabel: 'incorporation',
+        subtitle: 'Future Effective Continuation Date',
+        filingLabel: 'filing',
         filingTitle: FilingNames.CONTINUATION_IN_APPLICATION
       }
     }

diff --git a/src/components/Dashboard/FilingHistoryList/bodies/BodyFutureEffectivePending.vue b/src/components/Dashboard/FilingHistoryList/bodies/BodyFutureEffectivePending.vue
@@ -63,8 +63,8 @@ export default class BodyFutureEffectivePending extends Vue {
     }
     if (EnumUtilities.isTypeContinuationIn(this.filing)) {
       return {
-        subtitle: 'Incorporation Pending',
-        filingLabel: 'incorporation'
+        subtitle: 'Continuation Pending',
+        filingLabel: 'filing'
       }
     }
     return {

diff --git a/src/components/Dashboard/FilingHistoryList/subtitles/SubtitleFutureEffectivePaid.vue b/src/components/Dashboard/FilingHistoryList/subtitles/SubtitleFutureEffectivePaid.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="subtitle-future-effective-paid">
     <span v-if="isTypeIncorporationApplication">FUTURE EFFECTIVE INCORPORATION</span>
+    <span v-else-if="isTypeContinuationApplication">FUTURE EFFECTIVE</span>
     <span v-else-if="isTypeAlteration">FUTURE EFFECTIVE ALTERATION</span>
     <span v-else-if="isTypeDissolutionVoluntary">FUTURE EFFECTIVE DISSOLUTION</span>
     <span v-else>FUTURE EFFECTIVE FILING</span>
@@ -45,6 +46,11 @@ export default class SubtitleFutureEffectivePaid extends Vue {
     return EnumUtilities.isTypeIncorporationApplication(this.filing)
   }
 
+  /** Whether this is an continuation application. */
+  get isTypeContinuationApplication (): boolean {
+    return EnumUtilities.isTypeContinuationIn(this.filing)
+  }
+
   /** Whether this is an alteration. */
   get isTypeAlteration (): boolean {
     return EnumUtilities.isTypeAlteration(this.filing)

diff --git a/src/components/Dashboard/FilingHistoryList/subtitles/SubtitleRejected.vue b/src/components/Dashboard/FilingHistoryList/subtitles/SubtitleRejected.vue
@@ -2,7 +2,11 @@
   <div class="subtitle-rejected">
     <span class="orange--text text--darken-2">REJECTED</span>
     <span class="vert-pipe" />
-    <span>PAID (filed by {{ filing.submitter }} on <DateTooltip :date="submittedDate" />)</span>
+    <!-- Handle Continuation Filings -->
+    <span v-if="EnumUtilities.isTypeContinuationIn(filing)">
+      Submitted by {{ filing.submitter }} on <DateTooltip :date="submittedDate" />
+    </span>
+    <span v-else>PAID (filed by {{ filing.submitter }} on <DateTooltip :date="submittedDate" />)</span>
 
     <!-- <v-btn
       class="details-btn"
@@ -24,6 +28,7 @@ import { Action } from 'pinia-class'
 import { ApiFilingIF } from '@/interfaces'
 import { useFilingHistoryListStore } from '@/stores'
 import { DateTooltip } from '@/components/common'
+import { EnumUtilities } from '@/services/'
 import FiledLabel from '../FiledLabel.vue'
 
 @Component({
@@ -38,6 +43,8 @@ export default class SubtitleRejected extends Vue {
 
   @Action(useFilingHistoryListStore) toggleFilingHistoryItem!: (x: number) => Promise<void>
 
+  readonly EnumUtilities = EnumUtilities
+
   get submittedDate (): Date {
     return new Date(this.filing.submittedDate)
   }

diff --git a/src/components/Dashboard/PendingList/PendingTemplate.vue b/src/components/Dashboard/PendingList/PendingTemplate.vue
@@ -26,7 +26,10 @@
             <div class="item-header-subtitle">
               <span>PENDING STAFF REVIEW</span>
               <span class="vert-pipe" />
-              <span>Submitted on <DateTooltip :date="submittedDate" />)</span>
+              <span>Submitted by {{ item.header.submitter }} on <DateTooltip :date="submittedDate" />)</span>
+              <p v-if="getNameRequest">
+                Name Request APPROVED -  {{ expiresText(getNameRequest) }}
+              </p>
             </div>
           </slot>
         </div>
@@ -57,16 +60,21 @@
 </template>
 
 <script lang="ts">
-import { Component, Prop, Vue } from 'vue-property-decorator'
+import { Component, Prop, Mixins } from 'vue-property-decorator'
 import { DateTooltip } from '@/components/common'
+import { DateMixin } from '@/mixins'
+import { Getter } from 'pinia-class'
+import { useRootStore } from '@/stores'
 
 @Component({
   components: { DateTooltip }
 })
-export default class PendingTemplate extends Vue {
+export default class PendingTemplate extends Mixins(DateMixin) {
   @Prop({ required: true }) readonly item!: any
   @Prop({ required: true }) readonly index!: number
 
+  @Getter(useRootStore) getNameRequest!: any
+
   get submitter (): Date {
     return this.item.header.submitter
   }

diff --git a/src/components/Dashboard/PendingList/filings/ContinuationIn.vue b/src/components/Dashboard/PendingList/filings/ContinuationIn.vue
@@ -7,79 +7,37 @@
   >
     <template #body>
       <div class="body-2">
-        <h4 v-if="isFutureEffectivePast || isFutureEffective">
-          Future Effective Incorporation
-        </h4>
-
+        <v-divider class="mt-1 mb-4" />
         <p
           class="mb-0"
-          :class="{ 'mt-4': isFutureEffectivePast || isFutureEffective }"
-        >
-          BC Registries will review your
-          Continuation Authorization documents and contact you with the results within 2 business days.
-        </p>
-
-        <p
-          v-if="isFutureEffectivePast"
-          class="mt-4 mb-0"
-        >
-          If approved, the incorporation date and time for {{ getLegalName || 'this company' }} will be
-          recorded as <strong>{{ effectiveDateTime || '[unknown]' }}</strong>.
-        </p>
-
-        <p
-          v-if="isFutureEffective"
-          class="mt-4 mb-0"
         >
-          If approved, the incorporation date and time for {{ getLegalName || 'this company' }} will be
-          <strong>{{ effectiveDateTime || '[unknown]' }}</strong>.
+          BC Registries will review your documents and contact you with the results within 5 business days.
         </p>
+        <ContactInfo class="mt-4 contact-info-warning" />
       </div>
     </template>
   </PendingTemplate>
 </template>
 
 <script lang="ts">
 import { Component, Prop, Vue } from 'vue-property-decorator'
-import { Getter } from 'pinia-class'
-import { useBusinessStore } from '@/stores'
-import { DateUtilities } from '@/services'
+import { ContactInfo } from '@/components/common'
 import PendingTemplate from '../PendingTemplate.vue'
 import { GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
 
 @Component({
   components: {
+    ContactInfo,
     PendingTemplate
   }
 })
 export default class ContinuationIn extends Vue {
   @Prop({ required: true }) readonly item!: any
   @Prop({ required: true }) readonly index!: number
 
-  @Getter(useBusinessStore) getLegalName!: string
-
   get entityType (): string {
     return GetCorpFullDescription(this.item.business.legalType)
   }
-
-  get isFutureEffectivePast (): boolean {
-    return (
-      this.item.header.isFutureEffective &&
-      DateUtilities.isDatePast(this.item.header.effectiveDate)
-    )
-  }
-
-  get isFutureEffective (): boolean {
-    return (
-      this.item.header.isFutureEffective &&
-      DateUtilities.isDateFuture(this.item.header.effectiveDate)
-    )
-  }
-
-  get effectiveDateTime (): string {
-    const effectiveDate = this.item.header.effectiveDate
-    return effectiveDate ? DateUtilities.dateToPacificDateTime(new Date(effectiveDate)) : '[unknown]'
-  }
 }
 </script>