17186 - UXA for alterations + Fixes (#522)

bcgov · Aug 1, 2023 · ef4a03b · ef4a03b
1 parent 2f3f531
commit ef4a03b
Show file tree

Hide file tree

Showing 12 changed files with 113 additions and 32 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-edit-ui",
-  "version": "4.5.5",
+  "version": "4.5.6",
   "private": true,
   "appName": "Edit UI",
   "sbcName": "SBC Common Components",

diff --git a/src/components/Alteration/BcRegEntityDetails.vue b/src/components/Alteration/BcRegEntityDetails.vue
@@ -151,7 +151,11 @@
               </p>
               <div class="provision-help pa-10">
                 <span class="info-text">
-                  TEXT FOR RELATED LEGISLATION
+                  Refer to <span class="font-weight-bold">
+                    51.97, 257 and 259 of the Business Corporations Act. </span>
+                  Please read these sections carefully before you proceed with filing the Notice of
+                  Alteration. Every alteration to the company's Notice of Articles must be appropriately
+                  authorized by the company or the court.
                 </span>
               </div>
             </section>

diff --git a/src/components/Alteration/HelpSectionToggle.vue b/src/components/Alteration/HelpSectionToggle.vue
@@ -30,3 +30,13 @@ export default class HelpSectionToggle extends Vue {
     isHelpVisible = false
 }
 </script>
+<style lang="scss" scoped>
+@import '@/assets/styles/theme.scss';
+.help-toggle {
+  color: $app-blue;
+
+  :hover {
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/src/components/ViewWrapper.vue b/src/components/ViewWrapper.vue
@@ -38,7 +38,7 @@
                 :filingData="getFilingData"
                 :payApiUrl="payApiUrl"
                 :isLoading="isBusySaving"
-                :hasConflicts="isConflictingLegalType && getNameRequestNumber"
+                :hasConflicts="isConflictingLegalType && (getNameRequestNumber || isNameChangedByType)"
                 :confirmLabel="feeSummaryConfirmLabel"
                 :errorMessage="feeSummaryError"
                 :isSummaryMode="isSummaryMode"
@@ -110,6 +110,7 @@ export default class ViewWrapper extends Mixins(CommonMixin, FilingTemplateMixin
   @Getter(useStore) isCorrectionFiling!: boolean
   @Getter(useStore) isFirmChangeFiling!: boolean
   @Getter(useStore) isFirmConversionFiling!: boolean
+  @Getter(useStore) isNameChangedByType!: boolean
   @Getter(useStore) isRestorationFiling!: boolean
   @Getter(useStore) isSummaryMode!: boolean
   @Getter(useStore) isSpecialResolutionFiling!: boolean

diff --git a/src/components/common/YourCompany/ChangeBusinessType.vue b/src/components/common/YourCompany/ChangeBusinessType.vue
@@ -100,6 +100,7 @@
         <v-select
           id="business-type-selector"
           v-model="selectedEntityType"
+          :class="{ 'disabled-select': isEntityTypeChangedByName }"
           :disabled="isEntityTypeChangedByName"
           :items="entityTypeOptions"
           :hint="isEntityTypeChangedByName ? '' : 'Select a New Business Type'"
@@ -110,6 +111,27 @@
             <span class="list-item">{{ data.item.text }}</span>
           </template>
         </v-select>
+        <template v-if="isEntityTypeChangedByName && hasBusinessTypeChanged">
+          <!-- Reminder: Type changed based on name request -->
+          <v-row
+            no-gutters
+          >
+            <v-col cols="auto">
+              <v-icon
+                class="pr-2"
+                color="primary"
+              >
+                mdi-alert-circle-outline
+              </v-icon>
+            </v-col>
+
+            <v-col>
+              <div class="info-text">
+                We have changed your business type based on the Name Request you entered.
+              </div>
+            </v-col>
+          </v-row>
+        </template>
 
         <div
           v-if="minimumThreeDirectorError"
@@ -481,14 +503,6 @@ export default class ChangeBusinessType extends Mixins(CommonMixin) {
   line-height: 1.5rem
 }
 
-.help-toggle {
-  color: $app-blue;
-
-  :hover {
-    cursor: pointer;
-  }
-}
-
 .actions {
   position: absolute;
   right: 0;
@@ -522,6 +536,15 @@ export default class ChangeBusinessType extends Mixins(CommonMixin) {
   }
 }
 
+/*
+This rule changes the color and opacity of the text in a disabled v-select component.
+The :deep pseudo-element and !important flag are used to override Vuetify's default styles.
+*/
+:deep(.disabled-select.theme--light.v-select .v-select__selection--disabled) {
+  color: $gray9 !important;
+  opacity: 1 !important;
+}
+
 :deep(.theme--light.v-label) {
   font-size: .875rem;
   color: $gray7;

diff --git a/src/components/common/YourCompany/CorrectName/CorrectNameRequest.vue b/src/components/common/YourCompany/CorrectName/CorrectNameRequest.vue
@@ -235,7 +235,7 @@ export default class CorrectNameRequest extends Mixins(CommonMixin, NameRequestM
     const isNameEntityTypeDifferent = this.getEntityType !== nr.legalType
     const entityTypeOptions = this.getResource?.changeData?.entityTypeOptions
     const isValidConversionNameRequest = nr.request_action_cd === NrRequestActionCodes.CONVERSION &&
-          entityTypeOptions?.some(options => options.value === nr.legalType)
+      entityTypeOptions?.some(options => options.value === nr.legalType)
     return (isNameEntityTypeDifferent && !isValidConversionNameRequest)
   }
 
@@ -244,16 +244,16 @@ export default class CorrectNameRequest extends Mixins(CommonMixin, NameRequestM
     const isConversionOrAlterationNameRequest = nr.request_action_cd === NrRequestActionCodes.CONVERSION
     let dialogContent = ''
     if (isConversionOrAlterationNameRequest) {
-      dialogContent = `<p class="info-text">This alteration name request from
-        ${GetCorpFullDescription(nr.entity_type_cd)} to ${GetCorpFullDescription(nr.legalType)}
-        does not match the current business type
+      dialogContent = `<p class="info-text">
+        This alteration name request does not match the current business type
         <b>${GetCorpFullDescription(this.getEntityType)}</b>.\n\n
         The Name Request type must match the business type before you can continue.</p>`
     } else {
-      dialogContent = `<p class="info-text">This ${GetCorpFullDescription(nr.entity_type_cd)}
-      Name Request does not match the current business type
-      <b>${GetCorpFullDescription(this.getEntityType)}</b>.\n\n
-      The Name Request type must match the business type before you can continue.</p>`
+      dialogContent = `<p class="info-text">
+        This ${GetCorpFullDescription(nr.legalType)}
+        Name Request does not match the current business type
+        <b>${GetCorpFullDescription(this.getEntityType)}</b>.\n\n
+        The Name Request type must match the business type before you can continue.</p>`
     }
     return dialogContent
   }

diff --git a/src/components/common/YourCompany/EntityName.vue b/src/components/common/YourCompany/EntityName.vue
@@ -36,7 +36,10 @@
 
       <!-- Display Mode -->
       <template v-if="!isEditingNames">
-        <v-col cols="7">
+        <v-col
+          cols="7"
+          class="mt-1"
+        >
           <div class="company-name font-weight-bold text-uppercase">
             {{ companyName }}
           </div>

diff --git a/src/interfaces/correction-interfaces/correct-name-interface.ts b/src/interfaces/correction-interfaces/correct-name-interface.ts
@@ -20,7 +20,15 @@ export interface NrCorrectionIF {
   applicant: NameRequestApplicantIF
 }
 
+export interface NrActionIF {
+  URL: string | null,
+  entitiesFilingName: string | null,
+  filingName: string,
+  learTemplate: string | null
+}
+
 export interface NrResponseIF {
+  actions?: NrActionIF[]
   legalType: CorpTypeCd,
   entity_type_cd: CorpTypeCd, // eslint-disable-line camelcase
   expirationDate: string,

diff --git a/src/store/store.ts b/src/store/store.ts
@@ -150,6 +150,28 @@ export const useStore = defineStore('store', {
       return (this.getCorrectedFilingType === FilingTypes.CHANGE_OF_REGISTRATION)
     },
 
+    /** The original entity type, this is for entity type alteration */
+    getOriginLegalType (): CorpTypeCd {
+      return this.getEntitySnapshot?.businessInfo?.legalType
+    },
+
+    // Original entity type getters
+    isOriginBcCompany (): boolean {
+      return (this.getOriginLegalType === CorpTypeCd.BC_COMPANY)
+    },
+
+    isOriginBenefitCompany (): boolean {
+      return (this.getOriginLegalType === CorpTypeCd.BENEFIT_COMPANY)
+    },
+
+    isOriginBcUlcCompany (): boolean {
+      return (this.getOriginLegalType === CorpTypeCd.BC_ULC_COMPANY)
+    },
+
+    isOriginBcCcc (): boolean {
+      return (this.getOriginLegalType === CorpTypeCd.BC_CCC)
+    },
+
     /** The entity type. */
     getEntityType (): CorpTypeCd {
       return this.stateModel.tombstone.entityType

diff --git a/src/views/Alteration.vue b/src/views/Alteration.vue
@@ -171,10 +171,10 @@ export default class Alteration extends Mixins(CommonMixin, FeeMixin, FilingTemp
   @Getter(useStore) getAppValidate!: boolean
   @Getter(useStore) getUserFirstName!: string
   @Getter(useStore) getUserLastName!: string
-  @Getter(useStore) isBcCcc!: boolean
-  @Getter(useStore) isBcCompany!: boolean
-  @Getter(useStore) isBcUlcCompany!: boolean
-  @Getter(useStore) isBenefitCompany!: boolean
+  @Getter(useStore) isOriginBcCompany!: boolean
+  @Getter(useStore) isOriginBenefitCompany!: boolean
+  @Getter(useStore) isOriginBcCcc!: boolean
+  @Getter(useStore) isOriginBcUlcCompany!: boolean
   @Getter(useStore) isPremiumAccount!: boolean
   @Getter(useStore) isRoleStaff!: boolean
   @Getter(useStore) isSummaryMode!: boolean
@@ -207,10 +207,10 @@ export default class Alteration extends Mixins(CommonMixin, FeeMixin, FilingTemp
   /** The resource object for an alteration filing. */
   get alterationResource (): ResourceIF {
     switch (true) {
-      case this.isBcCompany: return BcAlterationResource
-      case this.isBenefitCompany: return BenAlterationResource
-      case this.isBcCcc: return CccAlterationResource
-      case this.isBcUlcCompany: return UlcAlterationResource
+      case this.isOriginBcCompany: return BcAlterationResource
+      case this.isOriginBenefitCompany: return BenAlterationResource
+      case this.isOriginBcCcc: return CccAlterationResource
+      case this.isOriginBcUlcCompany: return UlcAlterationResource
     }
     return null
   }

diff --git a/tests/unit/CorrectNameRequest.spec.ts b/tests/unit/CorrectNameRequest.spec.ts
@@ -446,7 +446,12 @@ describe('CorrectNameRequest', () => {
             applicants: {
               phoneNumber: '250 516 8257',
               emailAddress: 'mock@example.com'
-            }
+            },
+            actions: [
+              {
+                filingName: 'BC'
+              }
+            ]
           }
       }))
 
@@ -542,7 +547,12 @@ describe('CorrectNameRequest', () => {
             applicants: {
               phoneNumber: '250 516 8257',
               emailAddress: 'mock@example.com'
-            }
+            },
+            actions: [
+              {
+                filingName: 'BC'
+              }
+            ]
           }
       }))