Merge pull request #599 from meawong/23604-Changing-the-business-twic…

…e-does-not-refresh-company-name

23604 update logic for changing business name

package.json

@@ -1,6 +1,6 @@
 {
   "name": "business-edit-ui",
-  "version": "4.11.6",
+  "version": "4.11.7",
   "private": true,
   "appName": "Edit UI",
   "sbcName": "SBC Common Components",

src/components/common/YourCompany/ChangeBusinessType.vue

@@ -306,6 +306,7 @@ export default class ChangeBusinessType extends Mixins(CommonMixin) {
   @Getter(useStore) getEditedLabel!: string
   @Getter(useStore) getEntityType!: CorpTypeCd
   @Getter(useStore) getNameRequestLegalName!: string
+  @Getter(useStore) getNameRequestNumber!: string
   @Getter(useStore) getNumberOfDirectors!: number
   @Getter(useStore) getOriginalLegalName!: string
   @Getter(useStore) getOriginalLegalType!: CorpTypeCd
@@ -415,6 +416,11 @@ export default class ChangeBusinessType extends Mixins(CommonMixin) {
     return (this.isCommunityContribution && this.getNumberOfDirectors < 3)
   }
 
+  /** True if a new NR number has been entered. */
+  get hasNewNr (): boolean {
+    return !!this.getNameRequestNumber
+  }
+
   /** Reset company type values to original. */
   resetType () {
     this.setEntityType(this.getOriginalLegalType || null)
@@ -433,24 +439,20 @@ export default class ChangeBusinessType extends Mixins(CommonMixin) {
   submitTypeChange () {
     this.setEntityType(this.selectedEntityType)
     this.isEditingType = false
-    if (this.shouldUpdateName()) {
+    if (this.isNumberedCompany && !this.hasNewNr) {
       const originalName = this.getOriginalLegalName
       const updatedName = this.getUpdatedName(originalName)
+      this.setNameRequest({
+        legalType: this.selectedEntityType,
+        nrNum: this.getOriginalNrNumber
+      } as any)
+      this.setNameRequestLegalName(updatedName)
       if (originalName !== updatedName) {
-        this.setNameRequest({
-          legalType: this.selectedEntityType,
-          nrNum: this.getOriginalNrNumber
-        } as any)
-        this.setNameRequestLegalName(updatedName)
         this.setNameChangedByType(true)
       }
     }
   }
 
-  shouldUpdateName (): boolean {
-    return this.isNumberedCompany && !this.hasBusinessNameChanged
-  }
-
   getUpdatedName (originalName: string): string {
     if (this.isUnlimitedLiability) {
       originalName = originalName.replace(' LTD.', '')

src/components/common/YourCompany/EntityName.vue

@@ -450,8 +450,9 @@ export default class EntityName extends Mixins(CommonMixin, NameRequestMixin) {
     } as any)
     this.setNameRequestLegalName(this.getOriginalLegalName)
 
+    this.setEntityType(this.getOriginalLegalType || null)
+
     if (this.isEntityTypeChangedByName) {
-      this.setEntityType(this.getOriginalLegalType || null)
       this.setEntityTypeChangedByName(false)
     }
 

src/views/Alteration.vue

@@ -214,6 +214,7 @@ export default class Alteration extends Mixins(CommonMixin, FeeMixin, FilingTemp
     }
   }
 
+  @Watch('hasBusinessNameChanged')
   @Watch('hasBusinessTypeChanged')
   onBusinessTypeChanged () {
     const filingData = this.getFilingData