20818 Fixed draft amalgamation initial values (bcgov#647)

- app version = 7.1.11
- created better getAccountId store getter and used it in place of old code
- don't save empty legalName in draft regular amalgamation
- don't save null correctNameOption in draft regular amalgamation
- improved email/phone logic

Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "business-filings-ui",
-  "version": "7.1.10",
+  "version": "7.1.11",
   "private": true,
   "appName": "Filings UI",
   "sbcName": "SBC Common Components",

src/components/Dashboard/TodoList.vue

@@ -550,7 +550,7 @@
               v-if="EnumUtilities.isPayMethodOnlineBanking(item)"
               :filing="item"
               :payApiUrl="getPayApiUrl"
-              :accountId="accountId"
+              :accountId="getAccountId"
               class="mb-6"
             />
             <PaymentPending v-else />
@@ -627,7 +627,8 @@ import {
   TodoListResourceIF
 } from '@/interfaces'
 import { GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module'
-import { useBusinessStore, useConfigurationStore, useFilingHistoryListStore, useRootStore } from '@/stores'
+import { useAuthenticationStore, useBusinessStore, useConfigurationStore, useFilingHistoryListStore,
+  useRootStore } from '@/stores'
 
 @Component({
   components: {
@@ -669,10 +670,10 @@ export default class TodoList extends Mixins(AllowableActionsMixin, DateMixin, E
   inProcessFiling: number = null
   fetchAffiliationInvitationsErrorDialog = false
   authorizeAffiliationInvitationErrorDialog = false
-  accountId: number = null
 
   @Prop({ default: null }) readonly highlightId!: number
 
+  @Getter(useAuthenticationStore) getAccountId!: string
   @Getter(useConfigurationStore) getAuthWebUrl!: string
   @Getter(useConfigurationStore) getBusinessesUrl!: string
   @Getter(useConfigurationStore) getAuthApiUrl!: string
@@ -996,9 +997,8 @@ export default class TodoList extends Mixins(AllowableActionsMixin, DateMixin, E
     }
 
     // load all the invitations here and push them into todo items
-    this.accountId = JSON.parse(sessionStorage.getItem('CURRENT_ACCOUNT'))?.id
     const response =
-      await AuthServices.fetchAffiliationInvitations(this.getAuthApiUrl, this.getIdentifier, this.accountId)
+      await AuthServices.fetchAffiliationInvitations(this.getAuthApiUrl, this.getIdentifier, +this.getAccountId)
         .catch((err) => {
           console.log('Error fetching affiliation invitations for todo', err) // eslint-disable-line no-console
           this.fetchAffiliationInvitationsErrorDialog = true

src/components/Dashboard/TodoList/PaymentPendingOnlineBanking.vue

@@ -43,7 +43,7 @@ export default class PaymentPendingOnlineBanking extends Vue {
   /** The subject filing. */
   @Prop({ required: true }) readonly filing!: any
   @Prop({ required: true }) readonly payApiUrl!: string
-  @Prop({ required: true }) readonly accountId!: any
+  @Prop({ required: true }) readonly accountId!: string
 
   cfsAccountId: string = null;
 
@@ -53,7 +53,7 @@ export default class PaymentPendingOnlineBanking extends Vue {
   }
 
   async mounted () {
-    this.cfsAccountId = await PayServices.fetchCfsAccountId(this.payApiUrl, this.accountId)
+    this.cfsAccountId = await PayServices.fetchCfsAccountId(this.payApiUrl, +this.accountId)
   }
 }
 </script>

src/stores/authenticationStore.ts

@@ -5,6 +5,18 @@ import { defineStore } from 'pinia'
 
 export const useAuthenticationStore = defineStore('authentication', {
   getters: {
+    /** The Account ID, from session storage. */
+    getAccountId (): string {
+      // if we can't get account id from ACCOUNT_ID
+      // then try to get it from CURRENT_ACCOUNT
+      let accountId = sessionStorage.getItem('ACCOUNT_ID')
+      if (!accountId) {
+        const currentAccount = sessionStorage.getItem('CURRENT_ACCOUNT')
+        accountId = JSON.parse(currentAccount)?.id
+      }
+      return accountId
+    },
+
     /**
      * The (Keycloak) current account object.
      * @remarks This isn't set right away - may need to wait 200ms or more after login.

src/utils/navigate.ts

@@ -1,3 +1,9 @@
+import { createPinia, setActivePinia } from 'pinia'
+import { useAuthenticationStore } from '@/stores'
+
+setActivePinia(createPinia())
+const authenticationStore = useAuthenticationStore()
+
 /**
  * Navigates to the specified URL, including Account ID param if available.
  * This function may or may not return. The caller should account for this!
@@ -7,7 +13,7 @@ export function navigate (url: string): boolean {
     if (!url) throw new Error('empty URL')
 
     // get account id and set in params
-    const accountId = JSON.parse(sessionStorage.getItem('CURRENT_ACCOUNT'))?.id
+    const accountId = authenticationStore.getAccountId
     if (accountId) {
       if (url.includes('?')) {
         url += `&accountid=${accountId}`

src/views/AmalgamationSelection.vue

@@ -144,7 +144,7 @@
 </template>
 
 <script lang="ts">
-import { useBusinessStore, useConfigurationStore, useRootStore } from '@/stores'
+import { useAuthenticationStore, useBusinessStore, useConfigurationStore, useRootStore } from '@/stores'
 import { Action, Getter } from 'pinia-class'
 import { Component, Vue } from 'vue-property-decorator'
 import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module'
@@ -160,6 +160,7 @@ import { TechnicalErrorDialog } from '@/components/dialogs'
   }
 })
 export default class AmalgamationSelection extends Vue {
+  @Getter(useAuthenticationStore) getAccountId!: string
   @Getter(useConfigurationStore) getCreateUrl!: string
   @Getter(useRootStore) getBusinessEmail!: string
   @Getter(useRootStore) getFullPhoneNumber!: string
@@ -176,6 +177,7 @@ export default class AmalgamationSelection extends Vue {
   // enum for template
   readonly AmalgamationTypes = AmalgamationTypes
 
+  // local variable
   showErrorDialog = false
 
   /** Called when component is created. */
@@ -220,17 +222,25 @@ export default class AmalgamationSelection extends Vue {
    * @returns the business identifier of the newly created amalgamation application
    */
   private async createBusinessAA (type: AmalgamationTypes): Promise<string> {
-    const accountId = +JSON.parse(sessionStorage.getItem('CURRENT_ACCOUNT'))?.id || 0
-    const email = this.isShortFormAmalgamation(type) ? this.getBusinessEmail : ''
-    const phone = this.isShortFormAmalgamation(type) ? this.getFullPhoneNumber : ''
-    const legalName = this.isShortFormAmalgamation(type) ? this.getLegalName : ''
-    const correctNameOption = this.isShortFormAmalgamation(type) ? CorrectNameOptions.CORRECT_AML_ADOPT : null
+    // short-form amalgamations use the legal name of the primary business,
+    // otherwise don't set a legal name
+    const legalName = this.isShortFormAmalgamation(type) ? this.getLegalName : undefined
+
+    // short-form amalgamations adopt the name of the primary business,
+    // otherwise don't set a correct name option
+    const correctNameOption =
+      this.isShortFormAmalgamation(type) ? CorrectNameOptions.CORRECT_AML_ADOPT : undefined
+
+    // short-form amalgamations use the email and phone of the primary business (if they exist),
+    // otherwise set empty initial values
+    const email = (this.isShortFormAmalgamation(type) && this.getBusinessEmail) || ''
+    const phone = (this.isShortFormAmalgamation(type) && this.getFullPhoneNumber) || ''
 
     const draftAmalgamationApplication = {
       filing: {
         header: {
           name: FilingTypes.AMALGAMATION_APPLICATION,
-          accountId
+          accountId: this.getAccountId
         },
         business: {
           legalType: this.getLegalType
@@ -243,8 +253,8 @@ export default class AmalgamationSelection extends Vue {
           },
           type,
           contactPoint: {
-            email: email || '',
-            phone: phone || ''
+            email,
+            phone
           }
         }
       }