15602 Merge Legal Name changes into main branch

.env.example

@@ -1,22 +1,22 @@
 # Base Path Openshift: /businesses/edit Firebase: /
 VUE_APP_PATH="/"
 
-#vaults Shared
+# vaults Shared
 VUE_APP_ADDRESS_COMPLETE_KEY=
 
-#vaults web-url
+# vaults web-url
 VUE_APP_REGISTRY_HOME_URL="https://dev.bcregistry.gov.bc.ca/"
 VUE_APP_AUTH_WEB_URL="https://dev.account.bcregistry.gov.bc.ca/"
 VUE_APP_BUSINESSES_URL="https://dev.account.bcregistry.gov.bc.ca/"
-VUE_APP_DASHBOARD_URL="https://dev.business.bcregistry.gov.bc.ca/"
+VUE_APP_DASHBOARD_URL="https://business-filings-le-dev.web.app/"
 VUE_APP_SITEMINDER_LOGOUT_URL="https://logontest7.gov.bc.ca/clp-cgi/logoff.cgi"
 
-#vaults API
+# vaults API
 VUE_APP_AUTH_API_URL="https://auth-api-dev.apps.silver.devops.gov.bc.ca"
 VUE_APP_AUTH_API_VERSION="/api/v1"
-VUE_APP_LEGAL_API_URL="https://legal-api-dev.apps.silver.devops.gov.bc.ca"
+VUE_APP_LEGAL_API_URL="https://business-api-dev-dy4loprnwa-nn.a.run.app"
 VUE_APP_LEGAL_API_VERSION_2="/api/v2"
-VUE_APP_NAICS_API_URL="https://legal-api-dev.apps.silver.devops.gov.bc.ca"
+VUE_APP_NAICS_API_URL="https://business-api-dev-dy4loprnwa-nn.a.run.app"
 VUE_APP_NAICS_API_VERSION_2="/api/v2"
 VUE_APP_STATUS_API_URL="https://status-api-dev.apps.silver.devops.gov.bc.ca"
 VUE_APP_STATUS_API_VERSION="/api/v1"
@@ -26,16 +26,16 @@ VUE_APP_REGISTRIES_SEARCH_API_URL="https://bcregistry-dev.apigee.net/registry-se
 VUE_APP_REGISTRIES_SEARCH_API_VERSION="/api/v1"
 VUE_APP_REGISTRIES_SEARCH_API_KEY=
 
-#vaults launchdarkly
+# vaults launchdarkly
 VUE_APP_BUSINESS_EDIT_LD_CLIENT_ID="642af8daefad6f134479c602"
 
-#vaults keycloak
+# vaults keycloak
 VUE_APP_KEYCLOAK_AUTH_URL="https://dev.loginproxy.gov.bc.ca/auth"
 VUE_APP_KEYCLOAK_REALM="bcregistry"
 VUE_APP_KEYCLOAK_CLIENTID="entity-web"
 
-#vaults sentry
+# vaults sentry
 VUE_APP_SENTRY_DSN=
 
-#vaults hotjar
+# vaults hotjar
 VUE_APP_HOTJAR_ID=

.github/workflows/cd.yml

@@ -1,9 +1,9 @@
-name: BUSINESS EDIT UI CD
+name: BUSINESS EDIT UI CD - legal name
 
 on:
   push:
     branches:
-      - main
+      - feature-legal-name
   workflow_dispatch:
     inputs:
       environment:
@@ -27,6 +27,6 @@ jobs:
       environment: ${{ inputs.environment }}
       tagname: ${{ inputs.tagname }}
     secrets:
-      APP_NAME: "business-edit"
+      APP_NAME: "business-edit-le"
       OP_CONNECT_URL: ${{ secrets.OP_CONNECT_URL }}
       OP_CONNECT_TOKEN: ${{ secrets.OP_CONNECT_TOKEN }}

devops/vaults.env

@@ -1,23 +1,23 @@
 # Base Path Openshift: /businesses/edit Firebase: /
 VUE_APP_PATH="/"
 
-#vaults Shared
+# vaults Shared
 VUE_APP_ADDRESS_COMPLETE_KEY="op://canadapost/$APP_ENV/address-key/ADDRESS_COMPLETE_KEY"
 
-#vaults web-url
+# vaults web-url
 VUE_APP_REGISTRY_HOME_URL="op://web-url/$APP_ENV/registry/REGISTRY_HOME_URL"
 VUE_APP_AUTH_WEB_URL="op://web-url/$APP_ENV/auth-web/AUTH_WEB_URL"
 VUE_APP_BUSINESSES_URL="op://web-url/$APP_ENV/business/BUSINESSES_URL"
-VUE_APP_DASHBOARD_URL="op://web-url/$APP_ENV/business/DASHBOARD_URL"
+VUE_APP_DASHBOARD_URL="op://web-url/$APP_ENV/business-le/DASHBOARD_URL"
 VUE_APP_SITEMINDER_LOGOUT_URL="op://web-url/$APP_ENV/siteminder/SITEMINDER_LOGOUT_URL"
 
-#vaults API
+# vaults API
 VUE_APP_AUTH_API_URL="op://API/$APP_ENV/auth-api/AUTH_API_URL"
 VUE_APP_AUTH_API_VERSION="op://API/$APP_ENV/auth-api/AUTH_API_VERSION"
-VUE_APP_LEGAL_API_URL="op://API/$APP_ENV/legal-api/LEGAL_API_URL"
-VUE_APP_LEGAL_API_VERSION_2="op://API/$APP_ENV/legal-api/LEGAL_API_VERSION_2"
-VUE_APP_NAICS_API_URL="op://API/$APP_ENV/naics-api/NAICS_API_URL"
-VUE_APP_NAICS_API_VERSION_2="op://API/$APP_ENV/naics-api/NAICS_API_VERSION"
+VUE_APP_LEGAL_API_URL="op://API/$APP_ENV/legal-api-le/LEGAL_API_URL"
+VUE_APP_LEGAL_API_VERSION_2="op://API/$APP_ENV/legal-api-le/LEGAL_API_VERSION_2"
+VUE_APP_NAICS_API_URL="op://API/$APP_ENV/naics-api-le/NAICS_API_URL"
+VUE_APP_NAICS_API_VERSION_2="op://API/$APP_ENV/naics-api-le/NAICS_API_VERSION"
 VUE_APP_STATUS_API_URL="op://API/$APP_ENV/status-api/STATUS_API_URL"
 VUE_APP_STATUS_API_VERSION="op://API/$APP_ENV/status-api/STATUS_API_VERSION"
 VUE_APP_PAY_API_URL="op://API/$APP_ENV/pay-api/PAY_API_URL"
@@ -26,16 +26,16 @@ VUE_APP_REGISTRIES_SEARCH_API_URL="op://API/$APP_ENV/registries-search-api/REGIS
 VUE_APP_REGISTRIES_SEARCH_API_VERSION="op://API/$APP_ENV/registries-search-api/REGISTRIES_SEARCH_API_VERSION"
 VUE_APP_REGISTRIES_SEARCH_API_KEY="op://API/$APP_ENV/registries-search-api/REGISTRIES_SEARCH_API_KEY"
 
-#vaults launchdarkly
+# vaults launchdarkly
 VUE_APP_BUSINESS_EDIT_LD_CLIENT_ID="op://launchdarkly/$APP_ENV/business-edit/BUSINESS_EDIT_LD_CLIENT_ID"
 
-#vaults keycloak
+# vaults keycloak
 VUE_APP_KEYCLOAK_AUTH_URL="op://keycloak/$APP_ENV/base/KEYCLOAK_AUTH_BASE_URL"
 VUE_APP_KEYCLOAK_REALM="op://keycloak/$APP_ENV/base/KEYCLOAK_REALMNAME"
 VUE_APP_KEYCLOAK_CLIENTID="op://keycloak/$APP_ENV/entity-web/UI_KEYCLOAK_RESOURCE_NAME"
 
-#vaults sentry
+# vaults sentry
 VUE_APP_SENTRY_DSN="op://sentry/$APP_ENV/entity/SENTRY_DSN"
 
-#vaults hotjar (hotjar id - ready to use)
+# vaults hotjar (hotjar id - ready to use)
 VUE_APP_HOTJAR_ID=

firebase.json

@@ -20,7 +20,7 @@
             { "key" : "X-XSS-Protection", "value" : "1; mode=block" },
             {
               "key": "Content-Security-Policy",
-              "value": "default-src 'self'; frame-src 'self' *.gov.bc.ca *.hotjar.com *.googleapis.com https://*.nr-data.net https://*.newrelic.com https://*.cac1.pure.cloud; script-src 'self' 'unsafe-eval' 'unsafe-inline' *.gov.bc.ca *.hotjar.com *.googleapis.com https://*.nr-data.net https://*.newrelic.com https://*.cac1.pure.cloud; style-src 'self' 'unsafe-inline' *.cloudflare.com *.googleapis.com; font-src 'self' *.gov.bc.ca *.hotjar.com *.cloudflare.com *.googleapis.com *.gstatic.com *.jsdelivr.net; img-src 'self' *.postescanada-canadapost.ca https://*.cac1.pure.cloud data: *.hotjar.com https://*.cac1.pure.cloud; connect-src 'self' *.gov.bc.ca *.launchdarkly.com *.hotjar.com *.postescanada-canadapost.ca *.sentry.io *.apigee.net wss://*.hotjar.com *.hotjar.io https://*.nr-data.net https://shyrka-prod-cac1.s3.ca-central-1.amazonaws.com https://*.newrelic.com https://*.cac1.pure.cloud wss://*.cac1.pure.cloud; manifest-src 'self'; media-src 'self' https://*.cac1.pure.cloud; object-src 'self' https://*.cac1.pure.cloud; child-src 'self' https://*.cac1.pure.cloud;"
+              "value": "default-src 'self'; frame-src 'self' *.gov.bc.ca *.hotjar.com *.googleapis.com https://*.nr-data.net https://*.newrelic.com https://*.cac1.pure.cloud; script-src 'self' 'unsafe-eval' 'unsafe-inline' *.gov.bc.ca *.hotjar.com *.googleapis.com https://*.nr-data.net https://*.newrelic.com https://*.cac1.pure.cloud; style-src 'self' 'unsafe-inline' *.cloudflare.com *.googleapis.com; font-src 'self' *.gov.bc.ca *.hotjar.com *.cloudflare.com *.googleapis.com *.gstatic.com *.jsdelivr.net; img-src 'self' *.postescanada-canadapost.ca https://*.cac1.pure.cloud data: *.hotjar.com https://*.cac1.pure.cloud; connect-src 'self' *.gov.bc.ca https://*.run.app *.launchdarkly.com *.hotjar.com *.postescanada-canadapost.ca *.sentry.io *.apigee.net wss://*.hotjar.com *.hotjar.io https://*.nr-data.net https://shyrka-prod-cac1.s3.ca-central-1.amazonaws.com https://*.newrelic.com https://*.cac1.pure.cloud wss://*.cac1.pure.cloud; manifest-src 'self'; media-src 'self' https://*.cac1.pure.cloud; object-src 'self' https://*.cac1.pure.cloud; child-src 'self' https://*.cac1.pure.cloud;"
             },
             { "key": "Cache-Control", "value": "no-cache, no-store, must-revalidate"},
             { "key": "Pragma", "value": "no-cache"},

package.json

@@ -1,6 +1,6 @@
 {
   "name": "business-edit-ui",
-  "version": "4.7.16",
+  "version": "5.0.2",
   "private": true,
   "appName": "Edit UI",
   "sbcName": "SBC Common Components",
@@ -27,7 +27,7 @@
     "@bcrs-shared-components/court-order-poa": "2.1.3",
     "@bcrs-shared-components/date-picker": "1.2.5",
     "@bcrs-shared-components/detail-comment": "1.1.3",
-    "@bcrs-shared-components/enums": "1.0.46",
+    "@bcrs-shared-components/enums": "1.1.9",
     "@bcrs-shared-components/fee-summary": "1.2.5",
     "@bcrs-shared-components/folio-number": "1.1.1",
     "@bcrs-shared-components/help-business-number": "1.1.1",

src/App.vue

@@ -226,7 +226,7 @@ export default class App extends Mixins(CommonMixin, FilingTemplateMixin) {
   haveData = false
 
   /** The Update Current JS Date timer id. */
-  private updateCurrentJsDateId = null // may be number or NodeJS.Timeout
+  private updateCurrentJsDateId = null as any // NodeJS.Timeout
 
   /** The route breadcrumbs list. */
   get breadcrumbs (): Array<BreadcrumbIF> {

src/components/Alteration/summary/BusinessType.vue

@@ -9,7 +9,7 @@
 
         <v-col cols="8">
           <span class="info-text">
-            Changing from a {{ GetCorpFullDescription(originalLegalType) }} to a
+            Changing from a {{ GetCorpFullDescription(getOriginalLegalType) }} to a
             {{ GetCorpFullDescription(getEntityType) }}
           </span>
 
@@ -38,17 +38,13 @@
 <script lang="ts">
 import { FilingTemplateMixin } from '@/mixins'
 import { Component, Mixins } from 'vue-property-decorator'
-import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module/'
+import { GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module/'
 import { ResourceUtilities } from '@/utils/resource-utils'
 
 @Component({})
 export default class BusinessType extends Mixins(FilingTemplateMixin) {
   readonly GetCorpFullDescription = GetCorpFullDescription // for template
 
-  get originalLegalType (): CorpTypeCd {
-    return this.getEntitySnapshot?.businessInfo?.legalType
-  }
-
   get articleInfo (): string {
     return ResourceUtilities.articleInfo(this.getEntityType)
   }

src/components/Conversion/ConversionNOB.vue

@@ -176,9 +176,9 @@ export default class ConversionNOB extends Mixins(CommonMixin) {
   @Action(useStore) setValidComponent!: (x: ActionKvIF) => void
 
   // local variables
-  protected dropdown = false // v-model for dropdown menu
-  protected onEditMode = false
-  protected naicsText = ''
+  dropdown = false // v-model for dropdown menu
+  onEditMode = false
+  naicsText = ''
 
   readonly naicsRules = [
     (v: string) => !!v || 'Nature of Business is required',
@@ -207,12 +207,12 @@ export default class ConversionNOB extends Mixins(CommonMixin) {
   }
 
   /** Called when user has clicked the Change button. */
-  protected onChangeClicked (): void {
+  onChangeClicked (): void {
     this.onEditMode = true
   }
 
   /** Called when user has clicked the Done button. */
-  protected onDoneClicked (): void {
+  onDoneClicked (): void {
     // eslint-disable-next-line no-undef
     let validForm = (this.$refs.form as Vue & { validate: () => boolean }).validate()
     if (validForm) {
@@ -227,19 +227,21 @@ export default class ConversionNOB extends Mixins(CommonMixin) {
   }
 
   /** Called when user has clicked the Cancel button. */
-  protected onCancelClicked (): void {
+  onCancelClicked (): void {
     this.onEditMode = false
   }
 
   /** Called when user has clicked the Undo button. */
-  protected onUndoClicked (): void {
-    const code = this.getSnapshotNaics.naicsCode
-    const desc = this.getSnapshotNaics.naicsDescription
+  onUndoClicked (): void {
+    const code = this.getSnapshotNaics.naicsCode // may be undefined
+    const desc = this.getSnapshotNaics.naicsDescription // may be undefined
     this.naicsText = null
     if (code && desc) {
       this.naicsText = this.hasNaicsChanged ? this.naicsText : `${code} - ${desc}`
     } else if (desc) {
       this.naicsText = desc
+    } else {
+      this.naicsText = ''
     }
     this.setNaics(this.getSnapshotNaics)
   }

src/components/SpecialResolution/Memorandum.vue

@@ -269,7 +269,7 @@
 <script lang="ts">
 import Vue from 'vue'
 import { HelpSection } from '@/components/common/'
-import { EntitySnapshotIF, RulesMemorandumIF } from '@/interfaces'
+import { RulesMemorandumIF } from '@/interfaces'
 import DateUtilities from '@/services/date-utilities'
 import { FormIF } from '@bcrs-shared-components/interfaces'
 import { Component, Watch } from 'vue-property-decorator'
@@ -288,7 +288,6 @@ export default class Memorandum extends Vue {
   @Getter(useStore) getComponentValidate!: boolean
   @Getter(useStore) getEditedLabel!: string
   @Getter(useStore) getEditLabel!: string
-  @Getter(useStore) getEntitySnapshot!: EntitySnapshotIF
   @Getter(useStore) getSpecialResolutionMemorandum!: RulesMemorandumIF
   @Getter(useStore) hasSpecialResolutionMemorandumChanged!: boolean
   @Getter(useStore) hasResolutionSection!: boolean

src/components/SpecialResolution/ResolutionSummary.vue

@@ -149,7 +149,7 @@
 <script lang="ts">
 import { Component, Mixins, Watch } from 'vue-property-decorator'
 import { Action, Getter } from 'pinia-class'
-import { FormIF, EntitySnapshotIF } from '@/interfaces/'
+import { FormIF } from '@/interfaces/'
 import { CommonMixin, DateMixin } from '@/mixins/'
 import { HelpSection } from '@/components/common/'
 import { DatePicker as DatePickerShared } from '@bcrs-shared-components/date-picker/'
@@ -163,10 +163,10 @@ import { useStore } from '@/store/store'
   }
 })
 export default class ResolutionSummary extends Mixins(CommonMixin, DateMixin) {
-  @Getter(useStore) getSpecialResolution!: SpecialResolutionIF
   @Getter(useStore) getAppValidate!: boolean
+  @Getter(useStore) getOriginalLegalName!: string
+  @Getter(useStore) getSpecialResolution!: SpecialResolutionIF
   @Getter(useStore) getSpecialResolutionConfirmValid!: boolean
-  @Getter(useStore) getEntitySnapshot!: EntitySnapshotIF
 
   @Action(useStore) setSpecialResolution!: (x: SpecialResolutionIF) => void
   @Action(useStore) setSpecialResolutionConfirmStateValidity!: (x: boolean) => void
@@ -226,7 +226,7 @@ export default class ResolutionSummary extends Mixins(CommonMixin, DateMixin) {
   /** The company name. */
   get companyName (): string {
     // old company name need show even they change it
-    return this.getEntitySnapshot?.businessInfo?.legalName || ''
+    return this.getOriginalLegalName || ''
   }
 
   /** Set validate on file and pay click. */

src/components/SpecialResolution/SpecialResolutionSummary.vue

@@ -156,14 +156,9 @@ export default class SpecialResolutionSummary extends Mixins(DateMixin, FeeMixin
     return `${this.getBusinessNumber || '[Incorporation Number]'} B.C. Ltd.`
   }
 
-  /** The legal type before changes. */
-  get originalLegalType (): string {
-    return this.getEntitySnapshot?.businessInfo?.legalType
-  }
-
   /** The association type before changes. */
   get originalAssociationType (): string {
-    return this.getEntitySnapshot?.businessInfo?.associationType
+    return this.getOriginalBusinessInfo?.associationType
   }
 
   /** Calculates the sum of special resolution fees. */

src/components/common/EntityInfo.vue

@@ -49,33 +49,33 @@
 import { Component, Mixins } from 'vue-property-decorator'
 import { Getter } from 'pinia-class'
 import { CommonMixin } from '@/mixins/'
-import { BusinessInformationIF, EntitySnapshotIF } from '@/interfaces/'
+import { BusinessInformationIF } from '@/interfaces/'
 import { ContactPointIF } from '@bcrs-shared-components/interfaces/'
-import { GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module/'
-
+import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module/'
 import { useStore } from '@/store/store'
 
 @Component({})
 export default class EntityInfo extends Mixins(CommonMixin) {
   // Global getters
   @Getter(useStore) getBusinessId!: string
   @Getter(useStore) getBusinessInformation!: BusinessInformationIF
+  @Getter(useStore) getOriginalLegalType!: CorpTypeCd
   @Getter(useStore) getOriginalLegalName!: string
   @Getter(useStore) getBusinessContact!: ContactPointIF
-  @Getter(useStore) getEntitySnapshot!: EntitySnapshotIF
 
   /** The original entity type. */
   get originalEntityType (): string {
-    if (this.getEntitySnapshot?.businessInfo) {
-      return GetCorpFullDescription(this.getEntitySnapshot.businessInfo.legalType)
+    const legalType = this.getOriginalLegalType
+    if (legalType) {
+      return GetCorpFullDescription(legalType)
     } else {
       return 'Unknown'
     }
   }
 
   /** The business number (aka tax id). */
   get businessNumber (): string {
-    return this.getBusinessInformation?.taxId
+    return this.getBusinessInformation.taxId
   }
 }
 </script>