Add extra-pro TING companies

package.json

@@ -1,6 +1,6 @@
 {
   "name": "business-create-ui",
-  "version": "5.6.17",
+  "version": "5.6.18",
   "private": true,
   "appName": "Create UI",
   "sbcName": "SBC Common Components",

src/components/Amalgamation/AmalgamatingBusinesses.vue

@@ -276,6 +276,34 @@ export default class AmalgamatingBusinesses extends Mixins(AmalgamationMixin, Co
     // Show spinner since the network calls below can take a few seconds.
     this.$root.$emit('showSpinner', true)
 
+    // Special case to handle Extra-pro A companies
+    if (businessLookup.legalType === 'A') {
+      const tingBusiness = {
+        type: AmlTypes.FOREIGN,
+        role: AmlRoles.AMALGAMATING,
+        foreignJurisdiction: {
+          region: 'British Columbia',
+          country: 'CA'
+        },
+        legalName: businessLookup.name,
+        corpNumber: businessLookup.identifier
+      } as AmalgamatingBusinessIF
+
+      // Check for duplicate
+      if (this.checkForDuplicateInTable(tingBusiness, true)) {
+        // Hide spinner.
+        this.$root.$emit('showSpinner', false)
+        return
+      }
+
+      this.pushAmalgamatingBusiness(tingBusiness)
+      // Close the "Add an Amalgamating Business" panel.
+      this.isAddingAmalgamatingBusiness = false
+      // Hide spinner.
+      this.$root.$emit('showSpinner', false)
+      return
+    }
+
     // Get the business information
     const business = await this.fetchAmalgamatingBusinessInfo(businessLookup)
 
@@ -322,13 +350,9 @@ export default class AmalgamatingBusinesses extends Mixins(AmalgamationMixin, Co
     }
 
     // Check for duplicate.
-    if (this.getAmalgamatingBusinesses.find((b: any) => b.identifier === business.businessInfo.identifier)) {
-      this.snackbarText = 'Business is already in table.'
-      this.snackbar = true
-
+    if (this.checkForDuplicateInTable(business, false)) {
       // Hide spinner.
       this.$root.$emit('showSpinner', false)
-
       return
     }
 
@@ -381,6 +405,30 @@ export default class AmalgamatingBusinesses extends Mixins(AmalgamationMixin, Co
     this.isAddingAmalgamatingForeignBusiness = false
   }
 
+  /**
+   * Check if business is already in table and display snackbar text.
+   * @param business The business being added.
+   * @param extraPro Whether we are adding an extra provincial company or not (A companies).
+   */
+  checkForDuplicateInTable (business: any, extraPro: boolean): boolean {
+    // Check if duplicate exists for a company that is not an extra-provincial.
+    const duplicateNonExtraPro = !extraPro &&
+      this.getAmalgamatingBusinesses.find(
+        (b: any) => (b.identifier && b.identifier === business.businessInfo.identifier))
+
+    // Check if duplicate exists for a company that is an extra-provincial (A company).
+    const duplicateExtraPro = extraPro &&
+      this.getAmalgamatingBusinesses.find(
+        (b: any) => (b.corpNumber && b.corpNumber === business.corpNumber))
+
+    if (duplicateNonExtraPro || duplicateExtraPro) {
+      this.snackbarText = 'Business is already in table.'
+      this.snackbar = true
+      return true
+    }
+    return false
+  }
+
   /** Validate Add Amalgamating Foreign Business. */
   validateAddAmalgamatingForeignBusiness (): void {
     this.isForeignBusinessValid = (

src/mixins/amalgamation-mixin.ts

@@ -88,7 +88,7 @@ export default class AmalgamationMixin extends Vue {
     if (!this.isRoleStaff && business.type === AmlTypes.FOREIGN) {
       return AmlStatuses.ERROR_FOREIGN
     }
-    if (!this.isRoleStaff && business.type === AmlTypes.LEAR && business.legalType === CorpTypeCd.EXTRA_PRO_A) {
+    if (!this.isRoleStaff && business.type === AmlTypes.FOREIGN && business.corpNumber[0] === CorpTypeCd.EXTRA_PRO_A) {
       return AmlStatuses.ERROR_FOREIGN
     }
     return null
@@ -121,8 +121,8 @@ export default class AmalgamationMixin extends Vue {
   /** Disallow extra-pro (A company) into ULC or CCC. */
   xproUlcCcc (business: AmalgamatingBusinessIF): AmlStatuses {
     if (
-      business.type === AmlTypes.LEAR &&
-      business.legalType === CorpTypeCd.EXTRA_PRO_A &&
+      business.type === AmlTypes.FOREIGN &&
+      business.corpNumber[0] === CorpTypeCd.EXTRA_PRO_A &&
       (!this.isTypeBcUlcCompany || !this.isTypeBcCcc)
     ) {
       return AmlStatuses.ERROR_XPRO_ULC_CCC
@@ -248,15 +248,6 @@ export default class AmalgamationMixin extends Vue {
     return this.getAmalgamatingBusinesses.every(business => (business.type === AmlTypes.FOREIGN))
   }
 
-  /** True if all companies in the table are foreign or extra-provincial. */
-  get isAllForeignOrEp (): boolean {
-    return this.getAmalgamatingBusinesses.every(business =>
-      (business.type === AmlTypes.FOREIGN ||
-        (business.type === AmlTypes.LEAR && business.legalType === CorpTypeCd.EXTRA_PRO_A)
-      )
-    )
-  }
-
   /** True if there a foreign company in the table. */
   get isAnyForeign (): boolean {
     return this.getAmalgamatingBusinesses.some(business => (business.type === AmlTypes.FOREIGN))