20779 Implemented Easy Legal Name Fix

package.json

@@ -1,6 +1,6 @@
 {
   "name": "business-edit-ui",
-  "version": "4.8.0",
+  "version": "4.9.0",
   "private": true,
   "appName": "Edit UI",
   "sbcName": "SBC Common Components",
@@ -31,7 +31,7 @@
     "@bcrs-shared-components/fee-summary": "1.2.5",
     "@bcrs-shared-components/folio-number": "1.1.1",
     "@bcrs-shared-components/help-business-number": "1.1.1",
-    "@bcrs-shared-components/interfaces": "1.1.11",
+    "@bcrs-shared-components/interfaces": "1.1.12",
     "@bcrs-shared-components/limited-restoration-panel": "2.0.1",
     "@bcrs-shared-components/nature-of-business": "1.2.4",
     "@bcrs-shared-components/relationships-panel": "1.0.14",

src/App.vue

@@ -226,7 +226,7 @@ export default class App extends Mixins(CommonMixin, FilingTemplateMixin) {
   haveData = false
 
   /** The Update Current JS Date timer id. */
-  private updateCurrentJsDateId = null // may be number or NodeJS.Timeout
+  private updateCurrentJsDateId = null as any // NodeJS.Timeout
 
   /** The route breadcrumbs list. */
   get breadcrumbs (): Array<BreadcrumbIF> {

src/components/Alteration/summary/BusinessType.vue

@@ -9,7 +9,7 @@
 
         <v-col cols="8">
           <span class="info-text">
-            Changing from a {{ GetCorpFullDescription(originalLegalType) }} to a
+            Changing from a {{ GetCorpFullDescription(getOriginalLegalType) }} to a
             {{ GetCorpFullDescription(getEntityType) }}
           </span>
 
@@ -38,17 +38,13 @@
 <script lang="ts">
 import { FilingTemplateMixin } from '@/mixins'
 import { Component, Mixins } from 'vue-property-decorator'
-import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module/'
+import { GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module/'
 import { ResourceUtilities } from '@/utils/resource-utils'
 
 @Component({})
 export default class BusinessType extends Mixins(FilingTemplateMixin) {
   readonly GetCorpFullDescription = GetCorpFullDescription // for template
 
-  get originalLegalType (): CorpTypeCd {
-    return this.getEntitySnapshot?.businessInfo?.legalType
-  }
-
   get articleInfo (): string {
     return ResourceUtilities.articleInfo(this.getEntityType)
   }

src/components/Conversion/ConversionNOB.vue

@@ -176,9 +176,9 @@ export default class ConversionNOB extends Mixins(CommonMixin) {
   @Action(useStore) setValidComponent!: (x: ActionKvIF) => void
 
   // local variables
-  protected dropdown = false // v-model for dropdown menu
-  protected onEditMode = false
-  protected naicsText = ''
+  dropdown = false // v-model for dropdown menu
+  onEditMode = false
+  naicsText = ''
 
   readonly naicsRules = [
     (v: string) => !!v || 'Nature of Business is required',
@@ -207,12 +207,12 @@ export default class ConversionNOB extends Mixins(CommonMixin) {
   }
 
   /** Called when user has clicked the Change button. */
-  protected onChangeClicked (): void {
+  onChangeClicked (): void {
     this.onEditMode = true
   }
 
   /** Called when user has clicked the Done button. */
-  protected onDoneClicked (): void {
+  onDoneClicked (): void {
     // eslint-disable-next-line no-undef
     let validForm = (this.$refs.form as Vue & { validate: () => boolean }).validate()
     if (validForm) {
@@ -227,19 +227,21 @@ export default class ConversionNOB extends Mixins(CommonMixin) {
   }
 
   /** Called when user has clicked the Cancel button. */
-  protected onCancelClicked (): void {
+  onCancelClicked (): void {
     this.onEditMode = false
   }
 
   /** Called when user has clicked the Undo button. */
-  protected onUndoClicked (): void {
+  onUndoClicked (): void {
     const code = this.getSnapshotNaics.naicsCode
     const desc = this.getSnapshotNaics.naicsDescription
     this.naicsText = null
     if (code && desc) {
       this.naicsText = this.hasNaicsChanged ? this.naicsText : `${code} - ${desc}`
     } else if (desc) {
       this.naicsText = desc
+    } else {
+      this.naicsText = ''
     }
     this.setNaics(this.getSnapshotNaics)
   }

src/components/SpecialResolution/ResolutionSummary.vue

@@ -149,7 +149,7 @@
 <script lang="ts">
 import { Component, Mixins, Watch } from 'vue-property-decorator'
 import { Action, Getter } from 'pinia-class'
-import { FormIF, EntitySnapshotIF } from '@/interfaces/'
+import { FormIF } from '@/interfaces/'
 import { CommonMixin, DateMixin } from '@/mixins/'
 import { HelpSection } from '@/components/common/'
 import { DatePicker as DatePickerShared } from '@bcrs-shared-components/date-picker/'
@@ -163,10 +163,10 @@ import { useStore } from '@/store/store'
   }
 })
 export default class ResolutionSummary extends Mixins(CommonMixin, DateMixin) {
-  @Getter(useStore) getSpecialResolution!: SpecialResolutionIF
   @Getter(useStore) getAppValidate!: boolean
+  @Getter(useStore) getOriginalLegalName!: string
+  @Getter(useStore) getSpecialResolution!: SpecialResolutionIF
   @Getter(useStore) getSpecialResolutionConfirmValid!: boolean
-  @Getter(useStore) getEntitySnapshot!: EntitySnapshotIF
 
   @Action(useStore) setSpecialResolution!: (x: SpecialResolutionIF) => void
   @Action(useStore) setSpecialResolutionConfirmStateValidity!: (x: boolean) => void
@@ -226,7 +226,7 @@ export default class ResolutionSummary extends Mixins(CommonMixin, DateMixin) {
   /** The company name. */
   get companyName (): string {
     // old company name need show even they change it
-    return this.getEntitySnapshot?.businessInfo?.legalName || ''
+    return this.getOriginalLegalName || ''
   }
 
   /** Set validate on file and pay click. */

src/components/SpecialResolution/SpecialResolutionSummary.vue

@@ -157,14 +157,9 @@ export default class SpecialResolutionSummary extends Mixins(DateMixin, FeeMixin
     return `${this.getBusinessNumber || '[Incorporation Number]'} B.C. Ltd.`
   }
 
-  /** The legal type before changes. */
-  get originalLegalType (): string {
-    return this.getEntitySnapshot?.businessInfo?.legalType
-  }
-
   /** The association type before changes. */
   get originalAssociationType (): string {
-    return this.getEntitySnapshot?.businessInfo?.associationType
+    return this.getOriginalBusinessInfo?.associationType
   }
 
   /** Calculates the sum of special resolution fees. */

src/components/common/EntityInfo.vue

@@ -49,33 +49,33 @@
 import { Component, Mixins } from 'vue-property-decorator'
 import { Getter } from 'pinia-class'
 import { CommonMixin } from '@/mixins/'
-import { BusinessInformationIF, EntitySnapshotIF } from '@/interfaces/'
+import { BusinessInformationIF } from '@/interfaces/'
 import { ContactPointIF } from '@bcrs-shared-components/interfaces/'
-import { GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module/'
-
+import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module/'
 import { useStore } from '@/store/store'
 
 @Component({})
 export default class EntityInfo extends Mixins(CommonMixin) {
   // Global getters
   @Getter(useStore) getBusinessId!: string
   @Getter(useStore) getBusinessInformation!: BusinessInformationIF
+  @Getter(useStore) getOriginalLegalType!: CorpTypeCd
   @Getter(useStore) getOriginalLegalName!: string
   @Getter(useStore) getBusinessContact!: ContactPointIF
-  @Getter(useStore) getEntitySnapshot!: EntitySnapshotIF
 
   /** The original entity type. */
   get originalEntityType (): string {
-    if (this.getEntitySnapshot?.businessInfo) {
-      return GetCorpFullDescription(this.getEntitySnapshot.businessInfo.legalType)
+    const legalType = this.getOriginalLegalType
+    if (legalType) {
+      return GetCorpFullDescription(legalType)
     } else {
       return 'Unknown'
     }
   }
 
   /** The business number (aka tax id). */
   get businessNumber (): string {
-    return this.getBusinessInformation?.taxId
+    return this.getBusinessInformation.taxId
   }
 }
 </script>

src/components/common/ShareStructure/ShareStructures.vue

@@ -69,8 +69,8 @@ export default class ShareStructures extends Mixins(CommonMixin) {
   @Action(useStore) setValidComponent!: (x: ActionKvIF) => void
 
   // Local propertiues
-  protected isEditing = false
-  protected showResolutionDateDialog = false
+  isEditing = false
+  showResolutionDateDialog = false
 
   /** Whether share section is invalid, only when prompted by app. */
   get invalidShareSection (): boolean {

src/components/common/YourCompany/AssociationType.vue

@@ -167,7 +167,7 @@ import { Component, Mixins, Watch } from 'vue-property-decorator'
 import { Action, Getter } from 'pinia-class'
 import { CoopTypes } from '@/enums'
 import { CommonMixin } from '@/mixins'
-import { ActionKvIF, BusinessInformationIF, EntitySnapshotIF } from '@/interfaces'
+import { ActionKvIF, BusinessInformationIF, EmptyBusinessInfo } from '@/interfaces'
 import { VuetifyRuleFunction } from '@/types'
 import { CoopTypeToDescription } from '@/utils'
 import { useStore } from '@/store/store'
@@ -180,7 +180,7 @@ export default class AssociationType extends Mixins(CommonMixin) {
   @Getter(useStore) getComponentValidate!: boolean
   @Getter(useStore) getEditLabel!: string
   @Getter(useStore) getEditedLabel!: string
-  @Getter(useStore) getEntitySnapshot!: EntitySnapshotIF
+  @Getter(useStore) getOriginalBusinessInfo!: BusinessInformationIF
   @Getter(useStore) hasAssociationTypeChanged!: boolean
 
   /** Global actions */
@@ -235,7 +235,7 @@ export default class AssociationType extends Mixins(CommonMixin) {
 
   /** Reset association type value to original */
   resetAssociationType () {
-    this.setBusinessInformation(this.getEntitySnapshot.businessInfo)
+    this.setBusinessInformation(this.getOriginalBusinessInfo || { ...EmptyBusinessInfo })
     this.onComponentValidateChanged()
     this.isEditingAssociationType = false
   }

src/components/common/YourCompany/BusinessContactInfo.vue

@@ -54,7 +54,7 @@ export default class BusinessContactInfo extends Mixins(CommonMixin) {
   @Action(useStore) setValidComponent!: (x: ActionKvIF) => void
 
   // Local variable
-  protected isEditingContact = false
+  isEditingContact = false
 
   /** The section validity state (when prompted by app). */
   get invalidSection (): boolean {
@@ -77,7 +77,7 @@ export default class BusinessContactInfo extends Mixins(CommonMixin) {
   }
 
   /** On Contact Info Change event, updates auth db and store. */
-  protected async onContactInfoChange (contactInfo: ContactPointIF): Promise<void> {
+  async onContactInfoChange (contactInfo: ContactPointIF): Promise<void> {
     // do nothing if contact info was not changed
     if (isEqual(contactInfo, this.getBusinessContact)) return
 
@@ -90,7 +90,7 @@ export default class BusinessContactInfo extends Mixins(CommonMixin) {
       // reset business contact to previous value
       const prev = this.getBusinessContact
       // toggle for reactivity
-      this.setBusinessContact({})
+      this.setBusinessContact({} as ContactPointIF)
       this.$nextTick(() => this.setBusinessContact(prev))
     }
   }

src/components/common/YourCompany/ChangeBusinessType.vue

@@ -284,7 +284,7 @@ import BcRegEntityDetails from '@/components/Alteration/BcRegEntityDetails.vue'
 import { BcRegContacts } from '@/components/common/'
 import { CommonMixin } from '@/mixins/'
 import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module/'
-import { EntitySnapshotIF, EntityTypeOption, ResourceIF } from '@/interfaces/'
+import { EntityTypeOption, ResourceIF } from '@/interfaces/'
 import { NameRequestIF } from '@bcrs-shared-components/interfaces'
 import { GetFeatureFlag, ResourceUtilities } from '@/utils'
 import { useStore } from '@/store/store'
@@ -304,16 +304,18 @@ export default class ChangeBusinessType extends Mixins(CommonMixin) {
   // Global getters
   @Getter(useStore) getEditLabel!: string
   @Getter(useStore) getEditedLabel!: string
-  @Getter(useStore) getEntitySnapshot!: EntitySnapshotIF
   @Getter(useStore) getEntityType!: CorpTypeCd
   @Getter(useStore) getNameRequestLegalName!: string
   @Getter(useStore) getNumberOfDirectors!: number
+  @Getter(useStore) getOriginalLegalName!: string
+  @Getter(useStore) getOriginalLegalType!: CorpTypeCd
+  @Getter(useStore) getOriginalNrNumber!: string
   @Getter(useStore) getResource!: ResourceIF
   @Getter(useStore) hasBusinessNameChanged!: boolean
   @Getter(useStore) hasBusinessTypeChanged!: boolean
   @Getter(useStore) isBcCompany!: boolean
-  @Getter(useStore) isBenefitCompany!: boolean
   @Getter(useStore) isBcUlcCompany!: boolean
+  @Getter(useStore) isBenefitCompany!: boolean
   @Getter(useStore) isConflictingLegalType!: boolean
   @Getter(useStore) isEntityTypeChangedByName!: boolean
   @Getter(useStore) isNameChangedByType!: boolean
@@ -358,7 +360,7 @@ export default class ChangeBusinessType extends Mixins(CommonMixin) {
   get isNewName (): boolean {
     return (
       this.getNameRequestLegalName &&
-      this.getNameRequestLegalName !== this.getEntitySnapshot?.businessInfo?.legalName
+      this.getNameRequestLegalName !== this.getOriginalLegalName
     )
   }
 
@@ -377,10 +379,10 @@ export default class ChangeBusinessType extends Mixins(CommonMixin) {
 
   get enableEditButton (): boolean {
     // Exclude CCC - Originally: isBcCompany || isBcUlcCompany || isBenefitCompany
-    if (this.getEntitySnapshot?.businessInfo?.legalType === CorpTypeCd.BC_CCC) {
+    if (this.getOriginalLegalType === CorpTypeCd.BC_CCC) {
       return false
     }
-    return this.supportedEntityTypes?.includes(this.getEntitySnapshot?.businessInfo?.legalType)
+    return this.supportedEntityTypes?.includes(this.getOriginalLegalType)
   }
 
   get nameRequestRequiredError (): boolean {
@@ -391,9 +393,9 @@ export default class ChangeBusinessType extends Mixins(CommonMixin) {
     if (this.isCommunityContribution || this.isUnlimitedLiability) {
       return true
     }
-    // Named ULC to BC Limited or BC Benefit require a name request.
-    if (this.getEntitySnapshot?.businessInfo?.legalType === CorpTypeCd.BC_ULC_COMPANY &&
-        (this.isBcLimited || this.isBenefitCompany)) {
+    // Named ULC to BC Limited require a name request.
+    if (this.getOriginalLegalType === CorpTypeCd.BC_ULC_COMPANY &&
+      (this.isBcLimited || this.isBenefitCompany)) {
       return true
     }
     return false
@@ -405,13 +407,13 @@ export default class ChangeBusinessType extends Mixins(CommonMixin) {
 
   /** Reset company type values to original. */
   resetType () {
-    this.setEntityType(this.getEntitySnapshot?.businessInfo?.legalType)
+    this.setEntityType(this.getOriginalLegalType || null)
     // reset name request
     this.setNameRequest({
-      legalType: this.getEntitySnapshot?.businessInfo?.legalType,
-      nrNum: this.getEntitySnapshot?.businessInfo?.nrNumber
+      legalType: this.getOriginalLegalType,
+      nrNum: this.getOriginalNrNumber
     } as any)
-    this.setNameRequestLegalName(this.getEntitySnapshot?.businessInfo?.legalName)
+    this.setNameRequestLegalName(this.getOriginalLegalName)
     this.setNameChangedByType(false)
     this.isEditingType = false
     this.confirmArticles = false
@@ -423,13 +425,13 @@ export default class ChangeBusinessType extends Mixins(CommonMixin) {
     this.isEditingType = false
 
     if (this.shouldUpdateName()) {
-      const originalName = this.getEntitySnapshot?.businessInfo.legalName
+      const originalName = this.getOriginalLegalName
       const updatedName = this.getUpdatedName(originalName)
 
       if (originalName !== updatedName) {
         this.setNameRequest({
           legalType: this.selectedEntityType,
-          nrNum: this.getEntitySnapshot?.businessInfo?.nrNumber
+          nrNum: this.getOriginalNrNumber
         } as any)
         this.setNameRequestLegalName(updatedName)
         this.setNameChangedByType(true)