Merge branch 'main' into 24298-update

app/components/examine/recipe/match/BCCorp.vue

@@ -5,11 +5,11 @@
       <p>BC Corporation</p>
 
       <h3 class="font-bold">Corp Number</h3>
-      <p>{{ data['incorp #'] }}</p>
+      <p>{{ data['identifier'] }}</p>
 
       <h3 class="font-bold">Directors</h3>
       <div class="flex flex-col">
-        <p v-if="data.directors === 'Not Available'">Not Available</p>
+        <p v-if="!data?.directors?.length">Not Available</p>
         <p v-else v-for="director in data.directors">{{ director }}</p>
       </div>
 
@@ -20,7 +20,7 @@
     <div class="grid basis-1/2 grid-cols-2 overflow-x-auto">
       <h3 class="font-bold">Records Office Delivery Address</h3>
       <div>
-        <p v-if="data['records office delivery address'] === 'Not Available'">
+        <p v-if="!data?.['records office delivery address']?.length">
           Not Available
         </p>
         <p
@@ -34,7 +34,7 @@
       </div>
 
       <h3 class="font-bold">Registered Office Delivery Address</h3>
-      <div>
+      <div v-if="data['registered office delivery address']">
         <p
           v-for="addrLine in parseAddress(
             data['registered office delivery address']

app/components/examine/recipe/match/XproCorp.vue

@@ -5,11 +5,11 @@
       <p>XPRO Corporation</p>
 
       <h3 class="font-bold">Corp Number</h3>
-      <p>{{ conflict['incorp #'] }}</p>
+      <p>{{ conflict['identifier'] }}</p>
 
       <h3 class="font-bold">Attorneys</h3>
       <div class="flex flex-col">
-        <p v-if="isNotAvailable(conflict['attorney names'])">Not available</p>
+        <p v-if="!conflict?.['attorney names']?.length">Not available</p>
         <p v-else v-for="attorney in conflict['attorney names']">
           {{ attorney }}
         </p>
@@ -22,12 +22,12 @@
     <div class="grid basis-1/2 grid-cols-2 overflow-x-auto">
       <h3 class="font-bold">Directors</h3>
       <div class="flex flex-col">
-        <p v-if="isNotAvailable(conflict.directors)">Not available</p>
+        <p v-if="!conflict?.directors?.length">Not available</p>
         <p v-else v-for="director in conflict.directors">{{ director }}</p>
       </div>
 
       <h3 class="font-bold">Head Office</h3>
-      <div>
+      <div v-if="conflict['head office']" >
         <p v-for="addrLine in parseAddress(conflict['head office'])">
           {{ addrLine }}
         </p>

app/components/examine/recipe/match/index.vue

@@ -4,7 +4,7 @@
   </div>
   <div v-else-if="conflictData">
     <ExamineRecipeMatchNames
-      v-if="conflict.source === 'NR' || conflict.source === 'NRO'"
+      v-if="conflict.source === 'NAMEREQUEST' || conflict.source === 'NRO'"
       :conflict="(conflictData as NameRequest)"
     />
     <ExamineRecipeMatchBCCorp

app/data/request_type_rules.json

@@ -99,6 +99,16 @@
         "is_lp_nwpta_type": false,
         "is_cp_nwpta_type": false
     },
+    {
+        "request_type": "BECC",
+        "nwpta_required": false,
+        "jurisdiction_required": false,
+        "prev_nr_required": false,
+        "corp_num_required": true,
+        "additional_info_template": "**<corp_num>**",
+        "is_lp_nwpta_type": false,
+        "is_cp_nwpta_type": false
+    },
     {
         "request_type": "BECR",
         "nwpta_required": false,
@@ -748,4 +758,4 @@
         "is_lp_nwpta_type": false,
         "is_cp_nwpta_type": false
     }
-]
+]

app/data/request_types.json

@@ -496,15 +496,26 @@
   },
   {
     "value": "CCV",
-    "short_desc": "CCC - BC to CCC Conversion",
-    "text": "CCC - BC to CCC Conversion",
+    "short_desc": "BC Limited to CCC Conversion",
+    "text": "BC Limited to Community Contribution Company Conversion",
     "class_type_cd": "CORP",
     "legacy_cd": "CN",
     "additional_info": "Change of Name",
     "source_application": "COLIN",
     "entity_type_cd": "CC",
     "request_action_cd": "CNV"
   },
+  {
+    "value": "BECC",
+    "short_desc": "Benefit Company to CCC Conversion",
+    "text": "Benefit Company to Community Contribution Company Conversion",
+    "class_type_cd": "CORP",
+    "legacy_cd": "BECC",
+    "additional_info": "",
+    "source_application": "COLIN",
+    "entity_type_cd": "CC",
+    "request_action_cd": "CNV"
+  },
   {
     "value": "CCC",
     "short_desc": "CCC - Change of Name",
@@ -552,26 +563,26 @@
   {
     "value": "UC",
     "short_desc": "Unlimited Liability Company ",
-    "text": "BC to Unlimited Liability Company Conversion",
+    "text": "BC Limited to Unlimited Liability Company Conversion",
     "class_type_cd": "CORP",
     "legacy_cd": "UC",
     "additional_info": "",
     "source_application": "COLIN",
-    "entity_type_cd": "UC",
+    "entity_type_cd": "UL",
     "request_action_cd": "CNV"
   },
   {
     "value": "ULCB",
     "short_desc": "B.C. Company",
-    "text": "B.C. Company - ULC to BC Conversion",
+    "text": "Unlimited Liability Company to BC Limited Conversion",
     "class_type_cd": "CORP",
-    "legacy_cd": "ULCB", 
+    "legacy_cd": "ULCB",
     "additional_info": "",
     "source_application": "COLIN",
     "entity_type_cd": "CR",
     "request_action_cd": "CNV"
   },
-{
+  {
     "value": "CUL",
     "short_desc": "Unlimited Liability Company ",
     "text": "Change of Name of Unlimited Liability Company",
@@ -806,7 +817,7 @@
   {
     "value": "BECV",
     "short_desc": "Benefit Company",
-    "text": "BC Benefit Company - BC to Benefit Conversion",
+    "text": "BC Limited to Benefit Company Conversion",
     "class_type_cd": "CORP",
     "legacy_cd": "BECV",
     "additional_info": "",
@@ -817,34 +828,23 @@
   {
     "value": "BECR",
     "short_desc": "Benefit Company",
-    "text": "BC Benefit Company - Benefit to BC Conversion",
+    "text": "Benefit Company to BC Limited Conversion",
     "class_type_cd": "CORP",
     "legacy_cd": "BECR",
     "additional_info": "",
     "source_application": "COLIN",
     "entity_type_cd": "CR",
     "request_action_cd": "CNV"
   },
-  {
-    "value": "ULCB",
-    "short_desc": "B.C. Company",
-    "text": "B.C. Company - ULC to BC Conversion",
-    "class_type_cd": "CORP",
-    "legacy_cd": "ULCB", 
-    "additional_info": "",
-    "source_application": "COLIN",
-    "entity_type_cd": "CR",
-    "request_action_cd": "CNV"
-  },
   {
     "value": "ULBE",
     "short_desc": "BC Benefit Company",
-    "text": "BC Benefit Company - ULC to Benefit Conversion",
+    "text": "Unlimited Liability Company to Benefit Company Conversion",
     "class_type_cd": "CORP",
     "legacy_cd": "ULBE",
     "additional_info": "",
     "source_application": "COLIN",
     "entity_type_cd": "BC",
     "request_action_cd": "CNV"
   }
-]
+]

app/enums/codes.ts

@@ -176,6 +176,12 @@ export enum RequestTypeCode {
   BERE = 'BERE',
   /** BC Benefit Company - BC to Benefit Conversion */
   BECV = 'BECV',
+  /** BC Benefit Company - Community Contribution Company Conversion */
+  BECC = 'BECC',
+  /** Unlimited Liability Company - BC Limited Conversion */
+  ULCB = 'ULCB',
+  /** Unlimited Liability Company - Benefit Company Conversion */
+  ULBE = 'ULBE',
   /** BC Benefit Company - Benefit to BC Conversion */
   BECR = 'BECR',
 }

app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "name-examination",
-  "version": "1.2.34",
+  "version": "1.2.36",
   "private": true,
   "scripts": {
     "build": "nuxt generate",

app/store/examine/conflict-data.ts

@@ -5,7 +5,7 @@ import {
   type Corporation,
   type NameRequest,
 } from '~/types'
-import { getCorporation, getNameRequest } from '~/util/namex-api'
+import { getBusiness, getCorporation, getNameRequest } from '~/util/namex-api'
 
 export const useConflictData = defineStore('conflict-data', () => {
   async function getCorpConflict(corpNum: string): Promise<Corporation> {

app/store/examine/index.ts

@@ -483,13 +483,6 @@ export const useExamination = defineStore('examine', () => {
       consentDate.value = getDateFromDateTime(parsedConsentDate) ?? undefined
     }
 
-    // if the current state is not INPROGRESS, HOLD, or DRAFT clear any existing name record in currentNameObj
-    if (
-      ![Status.InProgress, Status.Hold, Status.Draft].includes(nrStatus.value)
-    ) {
-      setCurrentNameChoice(undefined)
-    }
-
     // we keep the original data so that if fields exist that we do not use, we don't lose that
     // data when we put new data
     clientFirstName.value = info.applicants.clientFirstName ?? undefined

app/types/index.ts

@@ -34,19 +34,19 @@ export interface Comment {
 export type ConflictData = NameRequest | Corporation
 
 export interface Corporation {
-  'incorp #': string
-  directors: string[] | 'Not Available'
+  'identifier': string
+  directors: string[]
   'nature of business': string
   jurisdiction: string
 }
 
 export interface BCCorporation extends Corporation {
-  'records office delivery address': string[] | 'Not Available'
+  'records office delivery address': string[]
   'registered office delivery address': string[]
 }
 
 export interface XproCorporation extends Corporation {
-  'attorney names': string[] | 'Not Available'
+  'attorney names': string[]
   'head office': string[]
 }
 
@@ -75,7 +75,7 @@ export interface Histories {
 
 export enum ConflictSource {
   Corp = 'CORP',
-  NameRequest = 'NR',
+  NameRequest = 'NAMEREQUEST',
   NRO = 'NRO',
 }
 

testing/cypress/pageObjects/examinePage.ts

@@ -176,7 +176,7 @@ class ExaminePage {
   clickApproveButton() {
     cy.intercept('PATCH', '**/api/v1/requests/NR*').as('approvePatchRequest')
     cy.get(this.primaryApproveBtn).should('be.visible').click({ force: true })
-    cy.wait('@approvePatchRequest') // TO_DO: This button is returning a 401
+    cy.wait('@approvePatchRequest').its('response.statusCode').should('eq', 200)
     cy.wait(1000)
   }
 
@@ -187,7 +187,7 @@ class ExaminePage {
   clickQuickApproveButton() {
     cy.intercept('PATCH', '**/api/v1/requests/NR*').as('quickApprovePatchRequest')
     cy.get(this.quickApproveBtn).should('be.visible').click({ force: true })
-    cy.wait('@quickApprovePatchRequest') // TO_DO: This button is returning a 401
+    cy.wait('@quickApprovePatchRequest').its('response.statusCode').should('eq', 200)
     cy.wait(1000)
   }