- app version = 5.0.43

- misc cleanup - renamed EntityType -> EntityTypes - renamed CompanyType -> CompanyTypes - cleaned up PickEntityOrConversion.vue - added category table for xpro (amalgamation only) - moved many NrApprovedGrayBox props into component - renamed isSupportedEntity -> isSupportedIncorporationRegistration - changed isXProCompany -> isXproEntityType - added Alter Now button to NrApprovedGrayBox - added template blocks for amalgamation to Search - renamed companyRadioBtnApplicable -> showCompanyTypeRadioButtons - added amalgamation form URL to Search - added AML blurbs to Entity Types Data - added "Extraprovincial" to all xpro business labels - added XCR and XCP to AML xpro mapping - renamed isSupportedEntity -> isSupportedEntityType - added isSupportedAmalgamation() - added some store getters - deleted debugging strings - removed debugging code
bcgov · Sep 12, 2023 · a44f5d2 · a44f5d2
1 parent fd440fe
commit a44f5d2
Show file tree

Hide file tree

Showing 35 changed files with 682 additions and 613 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "name-request",
-  "version": "5.0.42",
+  "version": "5.0.43",
   "private": true,
   "appName": "Name Request UI",
   "sbcName": "SBC Common Components",

diff --git a/src/App.vue b/src/App.vue
@@ -253,7 +253,7 @@ export default class App extends Mixins(
       sessionStorage.removeItem('NR_DATA')
     }
 
-    // if there is stored legal type for an IA then incorporate it now
+    // if there is stored legal type for an IA then incorporate/register it now
     const legaltype = sessionStorage.getItem('LEGAL_TYPE')
     if (legaltype) {
       try {

diff --git a/src/components/common/app-title-cols.vue b/src/components/common/app-title-cols.vue
@@ -1,15 +1,13 @@
 <template>
-  <div>
-    <v-row no-gutters>
-      <v-col cols="12" md="6" lg="6" class="mt-4" :class="{'pt-10': !isMobile}">
-        <span class="h2 colour-white" id="app-title">Name Request
-        </span>
-      </v-col>
-      <v-col cols="12" md="6" lg="6">
-        <Stats />
-      </v-col>
-    </v-row>
-  </div>
+  <v-row no-gutters>
+    <v-col cols="12" md="6" lg="6" class="mt-4" :class="{'pt-10': !isMobile}">
+      <span class="h2 colour-white" id="app-title">Name Request
+      </span>
+    </v-col>
+    <v-col cols="12" md="6" lg="6">
+      <Stats />
+    </v-col>
+  </v-row>
 </template>
 
 <script lang="ts">

diff --git a/src/components/common/names-capture.vue b/src/components/common/names-capture.vue
@@ -255,13 +255,13 @@ import NameRequestDetails from '@/components/existing-request/name-request-detai
 import { NameChoicesIF, NameRequestI } from '@/interfaces'
 import { sanitizeName } from '@/plugins'
 import { ActionBindingIF } from '@/interfaces/store-interfaces'
-import { EntityType, Location } from '@/enums'
+import { EntityTypes, Location } from '@/enums'
 import { CommonMixin } from '@/mixins'
 import { Designations } from '@/list-data'
 
 /**
  * This is the component that displays the name choices.
- * It also shows the menu here when editing a NR.
+ * It also shows the name request details here when editing a NR.
  */
 @Component({
   components: {
@@ -277,7 +277,7 @@ export default class NamesCapture extends Mixins(CommonMixin) {
   @Getter getDisplayedComponent!: string
   @Getter getDesignation!: string
   @Getter getEditMode!: boolean
-  @Getter getEntityTypeCd!: EntityType
+  @Getter getEntityTypeCd!: EntityTypes
   @Getter getLocation!: Location
   @Getter getName!: string
   @Getter getNameChoices!: NameChoicesIF
@@ -358,10 +358,10 @@ export default class NamesCapture extends Mixins(CommonMixin) {
 
   get showSecondAndThirdNameChoices () {
     if (this.getLocation !== Location.BC) {
-      if (this.getEntityTypeCd === EntityType.XLP ||
-        this.getEntityTypeCd === EntityType.XLL ||
-        this.getEntityTypeCd === EntityType.XCP ||
-        this.getEntityTypeCd === EntityType.XSO) {
+      if (this.getEntityTypeCd === EntityTypes.XLP ||
+        this.getEntityTypeCd === EntityTypes.XLL ||
+        this.getEntityTypeCd === EntityTypes.XCP ||
+        this.getEntityTypeCd === EntityTypes.XSO) {
         return false
       }
     }
@@ -490,9 +490,9 @@ export default class NamesCapture extends Mixins(CommonMixin) {
   // define the text for the name designation error message for the entity types that require it
   get entityTypeText (): string {
     switch (this.getEntityTypeCd) {
-      case EntityType.SO: return 'Society'
-      case EntityType.CC: return 'Community Contribution Company'
-      case EntityType.CP: return 'Cooperative'
+      case EntityTypes.SO: return 'Society'
+      case EntityTypes.CC: return 'Community Contribution Company'
+      case EntityTypes.CP: return 'Cooperative'
 
       // for other no name designation required entity types, return an empty string
       default: return ''
@@ -646,7 +646,7 @@ export default class NamesCapture extends Mixins(CommonMixin) {
 
   get items (): string[] {
     let output: string[] = Designations[this.getEntityTypeCd].words
-    if (this.getEntityTypeCd === EntityType.CC) {
+    if (this.getEntityTypeCd === EntityTypes.CC) {
       output = Designations['CR'].words
     }
     return output

diff --git a/src/components/dialogs/pick-entity-or-conversion.vue b/src/components/dialogs/pick-entity-or-conversion.vue
@@ -1,9 +1,9 @@
 <template>
-  <v-dialog :value="getPickEntityModalVisible" :max-width="width" persistent>
+  <v-dialog :value="getPickEntityModalVisible" :max-width="maxWidth" persistent>
     <v-card class="no-border pick-entity-card">
       <v-row>
         <v-col cols="10">
-          <span class="ml-1 copy-small">{{ locationText }}:</span>
+          <span class="copy-small" v-if="!showSocietiesInfo">{{ getLocationText }}</span>
         </v-col>
         <v-col cols="2">
           <v-icon class="float-right" md color="primary" @click="closeIconClicked()">mdi-close</v-icon>
@@ -16,16 +16,17 @@
             <v-row class="category-bg">
               <v-col cols="12" class="font-weight-bold">Alterations</v-col>
             </v-row>
-            <v-row v-for="(conversion, i) in ConversionTypes" :key="'conv-' + i">
+            <v-row v-for="(conversion, i) in ConversionTypes" :key="`conv-${i}`">
               <v-col cols="12" class="clickable-cell"
                      :id="conversion.value"
-                     @click="chooseConversion(conversion)">
+                     @click="chooseConversion(conversion)"
+              >
                 <v-tooltip bottom content-class="bottom-tooltip" transition="fade-transition" :disabled="isMobile">
                   <template v-slot:activator="scope">
                     <button v-on="scope.on" class="link-sm-sans-ul entity-link">{{ conversion.desc }}</button>
                   </template>
-                  <div v-for="(text, i) in entityBlurbs(conversion.value)" :key="'blurb-' + i">
-                    <span>{{ text }}</span>
+                  <div v-for="(blurb, i) in entityBlurbs(conversion.value)" :key="`blurb-${i}`">
+                    <span>{{ blurb }}</span>
                   </div>
                 </v-tooltip>
               </v-col>
@@ -34,29 +35,41 @@
         </v-card-text>
       </template>
 
-      <!--  List Tables -->
-      <template v-else-if="!showSocietiesInfo">
-        <v-card-text class="">
+      <!-- Special case for societies -->
+      <template v-if="showSocietiesInfo">
+        <v-card-text class="mt-n12">
+          <v-container fluid>
+            <v-row no-gutters class="text-center">
+              <v-col cols="12">To request a name for a Society</v-col>
+              <v-col cols="12">please use the Societies Online website</v-col>
+              <v-col cols="12">
+                <a href="https://www.bcregistry.ca/societies/">https://www.bcregistry.ca/societies/</a>
+              </v-col>
+            </v-row>
+          </v-container>
+        </v-card-text>
+      </template>
+
+      <!-- Category tables -->
+      <template v-else>
+        <v-card-text class="pt-4">
           <v-row no-gutters>
-            <v-col v-for="(category, i) in tableData" :key="'cat' + i">
+            <v-col v-for="(category, i) in tableData" :key="`cat-${i}`">
               <v-simple-table>
                 <tr class="category-bg cell">
                   <th>
                     <span class="font-weight-bold">{{ category.text }}</span>
                   </th>
                 </tr>
-                <tr v-for="(entity, n) in category.entities" :key="'ent' + n">
+                <tr v-for="(entity, n) in category.entities" :key="`ent-${n}`">
                   <td class="clickable-cell" :id="entity.value" @click="chooseType(entity)">
                     <v-tooltip bottom content-class="bottom-tooltip" transition="fade-transition" :disabled="isMobile">
                       <template v-slot:activator="scope">
                         <button v-on="scope.on" class="link-sm-sans-ul entity-link">{{ entity.text }}</button>
                       </template>
                       <template>
-                        <div v-for="(item, index) in entityBlurbs(entity.value)"
-                             :key="`Blurb-${index}`">
-                      <span :class="{ 'tooltip-bullet': index !== 0}">
-                        {{ item }}
-                      </span>
+                        <div v-for="(blurb, index) in entityBlurbs(entity.value)" :key="`blurb-${index}`">
+                          <span :class="{ 'tooltip-bullet': index !== 0}">{{ blurb }}</span>
                         </div>
                       </template>
                     </v-tooltip>
@@ -68,17 +81,40 @@
         </v-card-text>
       </template>
 
-      <template v-else>
-        <v-card-text>
-          <v-container fluid>
-            <v-row no-gutters class="text-center">
-              <v-col cols="12">To request a name for a Society</v-col>
-              <v-col cols="12">please use the Societies Online website</v-col>
-              <v-col cols="12">
-                <a href="https://www.bcregistry.ca/societies/">https://www.bcregistry.ca/societies/</a>
-              </v-col>
-            </v-row>
-          </v-container>
+      <!-- Category tables - xpro (amalgamation only) -->
+      <template v-if="isAmalgamation">
+        <v-row class="pt-4">
+          <v-col cols="12">
+            <span class="copy-small">Extraprovincial:</span>
+          </v-col>
+        </v-row>
+
+        <v-card-text class="pt-4">
+          <v-row no-gutters>
+            <v-col v-for="(category, i) in tableDataXPRO" :key="`cat-xpro-${i}`">
+              <v-simple-table>
+                <tr class="category-bg cell">
+                  <th>
+                    <span class="font-weight-bold">{{ category.text }}</span>
+                  </th>
+                </tr>
+                <tr v-for="(entity, n) in category.entities" :key="`ent-xpro-${n}`">
+                  <td class="clickable-cell" :id="entity.value" @click="chooseType(entity)">
+                    <v-tooltip bottom content-class="bottom-tooltip" transition="fade-transition" :disabled="isMobile">
+                      <template v-slot:activator="scope">
+                        <button v-on="scope.on" class="link-sm-sans-ul entity-link">{{ entity.text }}</button>
+                      </template>
+                      <template>
+                        <div v-for="(blurb, index) in entityBlurbs(entity.value)" :key="`blurb-xpro-${index}`">
+                          <span :class="{ 'tooltip-bullet': index !== 0}">{{ blurb }}</span>
+                        </div>
+                      </template>
+                    </v-tooltip>
+                  </td>
+                </tr>
+              </v-simple-table>
+            </v-col>
+          </v-row>
         </v-card-text>
       </template>
     </v-card>
@@ -90,7 +126,7 @@ import { Component, Watch } from 'vue-property-decorator'
 import { Action, Getter } from 'vuex-class'
 import { ConversionTypesI, EntityI, SelectOptionsI } from '@/interfaces'
 import { ActionBindingIF } from '@/interfaces/store-interfaces'
-import { EntityType, Location } from '@/enums'
+import { EntityTypes, Location } from '@/enums'
 import { ConversionTypes } from '@/list-data'
 import { CommonMixin } from '@/mixins'
 
@@ -101,14 +137,15 @@ export default class PickEntityOrConversionDialog extends CommonMixin {
 
   // Global getters
   @Getter getConversionTypeOptions!: ConversionTypesI[]
-  @Getter getEntityBlurbs!: Array<EntityI>
-  @Getter getEntityTypeCd!: EntityType
+  @Getter getEntityBlurbs!: Array<EntityI | ConversionTypesI>
+  @Getter getEntityTypeCd!: EntityTypes
   @Getter getEntityTypeOptions!: Array<EntityI>
   @Getter getEntityTypesBC!: Array<EntityI>
   @Getter getEntityTypesXPRO!: Array<EntityI>
   @Getter getLocation!: Location
   @Getter getLocationText!: string
   @Getter getPickEntityModalVisible!: boolean
+  @Getter isAmalgamation!: boolean
   @Getter isConversion!: boolean
   @Getter isMobile!: boolean
 
@@ -123,7 +160,7 @@ export default class PickEntityOrConversionDialog extends CommonMixin {
 
   closeIconClicked () {
     this.setPickEntityModalVisible(false)
-    // clear "View all business types" selection
+    // clear empty string selection
     this.setEntityTypeCd(null)
   }
 
@@ -134,18 +171,14 @@ export default class PickEntityOrConversionDialog extends CommonMixin {
     }
   }
 
-  get entity_type_cd (): EntityType {
+  get entity_type_cd (): EntityTypes {
     return this.getEntityTypeCd
   }
 
-  set entity_type_cd (value: EntityType) {
+  set entity_type_cd (value: EntityTypes) {
     this.setEntityTypeCd(value)
   }
 
-  get locationText (): string {
-    return (this.getLocationText === 'BC') ? 'British Columbia' : this.getLocationText
-  }
-
   get tableData (): any[] {
     if (this.getLocation === Location.BC) {
       return this.tableDataBC
@@ -194,24 +227,25 @@ export default class PickEntityOrConversionDialog extends CommonMixin {
     return output
   }
 
-  get width (): string {
-    if (this.showSocietiesInfo || this.isConversion) {
+  get maxWidth (): string {
+    if (this.showSocietiesInfo || this.isConversion || this.isAmalgamation) {
       return '550px'
     }
-    let cols = this.tableData.length
-    const maxThreshold = this.$vuetify.breakpoint.thresholds.sm
 
-    // 210 per column with a max threshold of 960px
-    return `${210 * cols > maxThreshold ? maxThreshold : 210 * cols}px`
+    // 210 per column with a max threshold of 960px (sm)
+    const cols = this.tableData.length
+    const maxThreshold = this.$vuetify.breakpoint.thresholds.sm
+    const val = (210 * cols > maxThreshold) ? maxThreshold : (210 * cols)
+    return `${val}px`
   }
 
   // FUTURE: clean up return type
   entityBlurbs (entity_type_cd: string): string[][] | string[] | string {
-    return this.getEntityBlurbs?.find(type => type.value === entity_type_cd)?.blurbs || []
+    return this.getEntityBlurbs.find(type => type.value === entity_type_cd)?.blurbs || []
   }
 
   clearEntitySelection (): void {
-    this.entity_type_cd = EntityType.INFO
+    this.entity_type_cd = EntityTypes.INFO
   }
 
   chooseConversion (conversion) {
@@ -229,7 +263,7 @@ export default class PickEntityOrConversionDialog extends CommonMixin {
 
   chooseType (entity: SelectOptionsI) {
     // show an URL of creating society NR if Societies NR needs to be released AFTER the way of navigating changes
-    if (!this.isSocietyEnabled() && (entity.value === EntityType.SO || entity.value === EntityType.XSO)) {
+    if (!this.isSocietyEnabled() && (entity.value === EntityTypes.SO || entity.value === EntityTypes.XSO)) {
       this.showSocietiesInfo = true
       this.clearEntitySelection()
       return

diff --git a/src/components/existing-request/check-status-gray-box.vue b/src/components/existing-request/check-status-gray-box.vue
@@ -2,8 +2,9 @@
   <v-row no-gutters class="bg-light-gray">
     <v-col class="text-body-4 px-5 py-4">
       <p>
-        To check on the status of this Name Request in the future, enter the request number <strong>{{nrNum}}</strong>
-        plus the Applicant Phone Number or Email Address using the "Manage My Name Request tab" on the site.
+        To check on the status of this Name Request in the future, enter the request number
+        <strong>{{nrNum}}</strong> plus the Applicant Phone Number or Email Address using the "Manage My Name
+        Request tab" on the site.
       </p>
       <v-row no-gutters>
         <v-col cols="auto" class="pt-1 mr-2">