17468 Misc cleanup and prep for xpro aml #683

severinbeauvais · 2023-09-12T16:11:55Z

Note that xpro aml is BROKEN (not yet complete). All pre-existing flows should be OK.

Description of changes:

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

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of the namerequest license (Apache 2.0).

severinbeauvais · 2023-09-12T16:13:16Z

src/components/dialogs/pick-entity-or-conversion.vue

-      <!--  List Tables -->
-      <template v-else-if="!showSocietiesInfo">
-        <v-card-text class="">
+      <!-- Special case for societies -->


I simply moved this up from below.

(I think it's easier to understand "if true else everything else" instead of "if not true ...".)

severinbeauvais · 2023-09-12T16:14:16Z

src/components/dialogs/pick-entity-or-conversion.vue

    this.setEntityTypeCd(value)
  }

-  get locationText (): string {
-    return (this.getLocationText === 'BC') ? 'British Columbia' : this.getLocationText
-  }


It turns out the store getter getLocationText already returns "British Columbia", so this computed is not needed.

severinbeauvais · 2023-09-12T16:14:39Z

src/components/dialogs/pick-entity-or-conversion.vue

+    const cols = this.tableData.length
+    const maxThreshold = this.$vuetify.breakpoint.thresholds.sm
+    const val = (210 * cols > maxThreshold) ? maxThreshold : (210 * cols)
+    return `${val}px`


Just cleanup.

When you added the .sm, you're targeting the threshold for small screens?

I didn't actually change this code; I just cleaned it up.

But, yes, this.$vuetify.breakpoint.thresholds.sm is the value (960) for "small" screens.

severinbeauvais · 2023-09-12T16:15:12Z

src/components/existing-request/existing-request-display.vue

-            :showAlterNowButton="showAlterNowButton"
-            :isAllowAlterOnline="isAlterOnline(nr.requestTypeCd)"
-            :showOpenExternalIcon="showOpenExternalIcon"
-            :showGoToSocietiesButton="showGoToSocietiesButton"


I moved these into the sub-component (along with their supporting functions).

- 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

severinbeauvais · 2023-09-12T16:24:13Z

src/components/new-request/search.vue

          <!-- Xpro/Federal bullets -->
          <v-col v-if="isXproFlow && isFederal" cols="12" :md="isSelectedCompanyXPro ? 10 : 8">
            <ul class="bullet-points">
              <li>Federally incorporated businesses do not need a Name Request.</li>
-              <li v-if="isRestoration && isSelectedXproAndRestorable">
+
+              <li v-if="isAmalgamation">


There's a bit of new amalgamation code in this PR but it shouldn't affect the other flows. I'm preparing here for my next refactoring PR...

severinbeauvais · 2023-09-12T16:25:09Z

src/components/new-request/search.vue

@@ -770,27 +777,29 @@ export default class Search extends Mixins(CommonMixin, NrAffiliationMixin) {
    }
  }

-  /** Returns whether the selected XPRO is restorable. */
+  /** Whether the selected XPRO is restorable. */
  get isSelectedXproAndRestorable (): boolean {


These are getters. They don't "return" anything -- they "are" something.

(FYI, getters aka computed are evaluated the first time they're needed, then they're cached until something in them changes, ie they are reactive. So they can be faster than a function!)

severinbeauvais · 2023-09-12T16:25:34Z

src/components/new-request/search.vue

@@ -888,6 +897,7 @@ export default class Search extends Mixins(CommonMixin, NrAffiliationMixin) {

    // set default location for requests where there is only one location option
    if (this.isNewBcBusiness || this.isContinuationIn || this.isConversion || this.isAmalgamation) {
+      // *** TODO: set location for amalgamation later (depending on entity type selected)


A note to myself for upcoming xpro amalgamation flow.

severinbeauvais · 2023-09-12T16:26:44Z

src/enums/index.ts

-export * from './company-type'
-export * from './entity-type'
+export * from './company-types'
+export * from './entity-types'


First, I prefer enums to be plural (since they are a list of values -- arrays should be plural).

Second, in my next PR, I will have a couple of components named CompanyType and EntityType, so this resolves the name conflict.

severinbeauvais · 2023-09-12T16:27:16Z

src/list-data/entity-type-data.ts

@@ -235,13 +235,16 @@ export const EntityTypesBcData: EntityI[] = [
      'Has name protection in BC',
      'Must use Societies Online to register a name and incorporate'
    ],
+    amlBlurbs: [
+      'Society amalgamation'
+    ],


Without this, you get a blank tooltip.

In Dev:

severinbeauvais · 2023-09-12T16:27:56Z

src/list-data/entity-type-data.ts

-          is extraprovincially registered in BC.`
-      ]
+      `Register an amalgamation or merger that occurred in another jurisdiction where at least one of the companies
+        is extraprovincially registered in BC.`


We can't distinguish between a Canadian or International amalgamation, so we don't need this array and I combined the verbiage.

Screenshot

severinbeauvais · 2023-09-12T16:28:29Z

src/list-data/entity-type-data.ts

@@ -280,8 +283,8 @@ export const EntityTypesBcData: EntityI[] = [

 export const EntityTypesXproData: EntityI[] = [
  {
-    text: 'Limited Company',
-    value: EntityType.XCR,
+    text: 'Extraprovincial Limited Company',


I renamed all the xpro text per UI designs.

See screenshot attached to comment above for example.

severinbeauvais · 2023-09-12T16:28:52Z

src/list-data/request-action-mapping.ts

  ]
 }

 export const XproMapping: MappingI = {
+  AML: [
+    EntityTypes.XCR,
+    EntityTypes.XCP


Just these 2 types for xpro aml.

severinbeauvais · 2023-09-12T16:32:13Z

/gcbrun

bcregistry-sre · 2023-09-12T16:36:19Z

Temporary Url for review: https://namerequest-dev--pr-683-scw91tbu.web.app

severinbeauvais · 2023-09-12T16:58:24Z

src/components/dialogs/pick-entity-or-conversion.vue

-              </v-col>
-            </v-row>
-          </v-container>
+      <!-- Category tables - xpro (amalgamation only) -->


This is the second block for amalgamations only. Note that it displays Xpro data directly. (The block above, for amalgamations, displayed BC data.)

See screenshot attached to comment above for example.

severinbeauvais · 2023-09-12T16:59:03Z

src/components/dialogs/pick-entity-or-conversion.vue

@@ -194,24 +227,25 @@ export default class PickEntityOrConversionDialog extends CommonMixin {
    return output
  }

-  get width (): string {
-    if (this.showSocietiesInfo || this.isConversion) {
+  get maxWidth (): string {


Needed for double-wide table layout.

See screenshot attached to comment above for example.

JazzarKarim · 2023-09-12T18:18:36Z

src/components/existing-request/nr-approved-gray-box.vue

+  }
+
+  /** True if the Incorporate button should be shown. */
+  get showIncorporateButton (): boolean {


I think it's awesome that these getters are now here instead.

src/components/new-request/search.vue

JazzarKarim

LGTM Sev! 👍

ketaki-deodhar

Looks Good!

severinbeauvais self-assigned this Sep 12, 2023

severinbeauvais commented Sep 12, 2023

View reviewed changes

severinbeauvais force-pushed the 17468-misc-cleanup branch from a44f5d2 to de15465 Compare September 12, 2023 16:21

severinbeauvais commented Sep 12, 2023

View reviewed changes

severinbeauvais requested review from JazzarKarim, ketaki-deodhar and leodube-aot September 12, 2023 16:32

severinbeauvais marked this pull request as ready for review September 12, 2023 16:32

severinbeauvais changed the title ~~17468 Misc cleanup~~ 17468 Misc cleanup and prep for xpro aml Sep 12, 2023

severinbeauvais commented Sep 12, 2023

View reviewed changes

JazzarKarim reviewed Sep 12, 2023

View reviewed changes

JazzarKarim approved these changes Sep 12, 2023

View reviewed changes

ketaki-deodhar approved these changes Sep 12, 2023

View reviewed changes

severinbeauvais merged commit 90744cb into bcgov:main Sep 12, 2023
5 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

17468 Misc cleanup and prep for xpro aml #683

17468 Misc cleanup and prep for xpro aml #683

severinbeauvais commented Sep 12, 2023 •

edited

Loading

severinbeauvais Sep 12, 2023 •

edited

Loading

severinbeauvais Sep 12, 2023

severinbeauvais Sep 12, 2023

JazzarKarim Sep 12, 2023

severinbeauvais Sep 12, 2023

severinbeauvais Sep 12, 2023

severinbeauvais Sep 12, 2023

severinbeauvais Sep 12, 2023 •

edited

Loading

severinbeauvais Sep 12, 2023

severinbeauvais Sep 12, 2023

severinbeauvais Sep 12, 2023 •

edited

Loading

severinbeauvais Sep 12, 2023 •

edited

Loading

severinbeauvais Sep 12, 2023 •

edited

Loading

severinbeauvais Sep 12, 2023

severinbeauvais commented Sep 12, 2023

bcregistry-sre commented Sep 12, 2023

severinbeauvais Sep 12, 2023

severinbeauvais Sep 12, 2023

JazzarKarim Sep 12, 2023

JazzarKarim left a comment

ketaki-deodhar left a comment

17468 Misc cleanup and prep for xpro aml #683

17468 Misc cleanup and prep for xpro aml #683

Conversation

severinbeauvais commented Sep 12, 2023 • edited Loading

severinbeauvais Sep 12, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

severinbeauvais Sep 12, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

severinbeauvais Sep 12, 2023 • edited Loading

Choose a reason for hiding this comment

severinbeauvais Sep 12, 2023 • edited Loading

Choose a reason for hiding this comment

severinbeauvais Sep 12, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

severinbeauvais commented Sep 12, 2023

bcregistry-sre commented Sep 12, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

JazzarKarim left a comment

Choose a reason for hiding this comment

ketaki-deodhar left a comment

Choose a reason for hiding this comment

severinbeauvais commented Sep 12, 2023 •

edited

Loading

severinbeauvais Sep 12, 2023 •

edited

Loading

severinbeauvais Sep 12, 2023 •

edited

Loading

severinbeauvais Sep 12, 2023 •

edited

Loading

severinbeauvais Sep 12, 2023 •

edited

Loading

severinbeauvais Sep 12, 2023 •

edited

Loading