From 8ca95a0215b00d31019d2a5b917d59aa5193df71 Mon Sep 17 00:00:00 2001
From: wadeking98 <wkingnumber2@gmail.com>
Date: Tue, 18 Oct 2022 13:34:00 -0700
Subject: [PATCH 1/2] added initial lear database entries

Signed-off-by: wadeking98 <wkingnumber2@gmail.com>
---
 src/i18n/en.json | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/src/i18n/en.json b/src/i18n/en.json
index 5136bea..2e84cc8 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -55,6 +55,36 @@
     "HIS": "Historical"
   },
   "reason_description": {
+    "filing_type": "filing_type",
+    "alteration": "alteration",
+    "amalgamation": "amalgamation",
+    "amalgamationApplication": "amalgamationApplication",
+    "amendedAGM": "amendedAGM",
+    "amendedAnnualReport": "amendedAnnualReport",
+    "amendedChangeOfDirectors": "amendedChangeOfDirectors",
+    "annualReport": "annualReport",
+    "changeOfAddress": "changeOfAddress",
+    "changeOfDirectors": "changeOfDirectors",
+    "changeOfName": "changeOfName",
+    "changeOfRegistration": "changeOfRegistration",
+    "conversion": "conversion",
+    "correction": "correction",
+    "courtOrder": "courtOrder",
+    "dissolution": "dissolution",
+    "dissolved": "dissolved",
+    "F.18": "F.18",
+    "incorporationApplication": "incorporationApplication",
+    "Involuntary Dissolution": "Involuntary Dissolution",
+    "lear_epoch": "lear_epoch",
+    "putBackOn": "putBackOn",
+    "registrarsNotation": "registrarsNotation",
+    "registrarsOrder": "registrarsOrder",
+    "registration": "registration",
+    "restorationApplication": "restorationApplication",
+    "specialResolution": "specialResolution",
+    "transition": "transition",
+    "voluntaryDissolution": "voluntaryDissolution",
+    "voluntaryLiquidation": "voluntaryLiquidation",
     "Event:ADCOMM": "Administer Comments",
     "Event:ADCORP": "Administer Corporation",
     "Event:ADDLEDGR": "Update Ledger",

From 527afbc5bc750732fb8897e1963fa9d6c6ab93d4 Mon Sep 17 00:00:00 2001
From: wadeking98 <wkingnumber2@gmail.com>
Date: Fri, 21 Oct 2022 16:41:08 -0700
Subject: [PATCH 2/2] LEAR translations working

Signed-off-by: wadeking98 <wkingnumber2@gmail.com>
---
 src/components/entity/CredentialItem.vue      |  29 +++-
 src/components/entity/EntityResult.vue        |  24 +++-
 .../entity/filter/EntityFilterFacetPanel.vue  |   3 +-
 .../entity/filter/EntityFilterFacetPanels.vue |   4 +-
 .../entity/filter/EntityFilterFacets.vue      |  10 +-
 src/i18n/en.json                              | 130 ++++++++++++++----
 src/i18n/translate.ts                         |  37 +++++
 src/utils/entity.ts                           |  12 ++
 8 files changed, 206 insertions(+), 43 deletions(-)
 create mode 100644 src/i18n/translate.ts

diff --git a/src/components/entity/CredentialItem.vue b/src/components/entity/CredentialItem.vue
index a87daa9..afc2657 100644
--- a/src/components/entity/CredentialItem.vue
+++ b/src/components/entity/CredentialItem.vue
@@ -17,7 +17,13 @@
           <v-col v-if="credTitle" cols="12" sm="12" class="pa-0">
             <p class="mb-1">
               {{ credTitle["key"] }}:
-              {{ translateValue(credTitle["accessor"], credTitle["value"]) }}
+              {{
+                translateValue(
+                  credTitle["accessor"],
+                  credTitle["value"],
+                  entityType
+                )
+              }}
             </p>
           </v-col>
         </div>
@@ -51,7 +57,7 @@
           >
             <div class="font-weight-bold">{{ attr["key"] }}</div>
             <div>
-              {{ translateValue(attr["accessor"], attr["value"]) }}
+              {{ translateValue(attr["accessor"], attr["value"], entityType) }}
             </div>
           </v-col>
         </v-row>
@@ -87,11 +93,12 @@ import { mapGetters } from "vuex";
 import { ICredentialDisplayType } from "@/interfaces/api/v4/credential.interface";
 import { selectFirstAttrItem } from "@/utils/attribute";
 import i18n from "@/i18n/index";
+import { $translate } from "@/i18n/translate";
 import { dateFilter } from "@/filters/date.filter";
 import { IFormattedTopic } from "@/interfaces/api/v2/topic.interface";
 import { ICredentialType } from "@/interfaces/api/v2/credential-type.interface";
 import { TranslateResult } from "vue-i18n";
-import { isExpired } from "@/utils/entity";
+import { isExpired, toTranslationFormat } from "@/utils/entity";
 
 @Component({
   computed: {
@@ -106,6 +113,7 @@ import { isExpired } from "@/utils/entity";
 export default class CredentialItem extends Vue {
   @Prop({}) cred!: ICredentialDisplayType;
 
+  @Prop({ default: "" }) entityType!: string;
   @Prop({ default: "" }) authority!: string;
   @Prop({ default: "" }) authorityLink!: string;
   @Prop({ default: "" }) effectiveDate!: string;
@@ -120,6 +128,8 @@ export default class CredentialItem extends Vue {
   credentialTypes!: ICredentialType[];
 
   isExpired = isExpired;
+  toTranslationFormate = toTranslationFormat;
+  $translate = $translate;
 
   get getAuthorityLink(): string | URL {
     return this.cred ? this.cred.authorityLink : this.authorityLink;
@@ -175,9 +185,16 @@ export default class CredentialItem extends Vue {
     }
   }
 
-  translateValue(accessor: string, val: string): string | TranslateResult {
-    const res = this.$t(accessor + "." + val);
-    if (res != accessor + "." + val) {
+  translateValue(
+    accessor: string,
+    val: string,
+    entityType: string
+  ): string | TranslateResult {
+    // need entity type to properly translate due to LEAR entries
+    const res = $translate(
+      toTranslationFormat(accessor + "." + val, entityType)
+    );
+    if (res != toTranslationFormat(accessor + "." + val, entityType)) {
       return res;
     }
     return val;
diff --git a/src/components/entity/EntityResult.vue b/src/components/entity/EntityResult.vue
index e4bc0d7..536fc23 100644
--- a/src/components/entity/EntityResult.vue
+++ b/src/components/entity/EntityResult.vue
@@ -38,6 +38,7 @@
     <EntityCard ref="registration" :expanded="credentialsExpanded">
       <template #expansionPanels>
         <CredentialItem
+          :entityType="entityJurisdiction"
           :authority="entityRegistrationIssuer"
           :authorityLink="entityRegistrationIssuerUrl"
           :effectiveDate="entityEffectiveDate"
@@ -125,6 +126,7 @@
             itemsDisplayed
           )"
           :key="i"
+          :entityType="entityJurisdiction"
           :expired="
             businessAsRelationship[i + relationshipStartIndex].credential
               .revoked
@@ -284,6 +286,7 @@
         <CredentialItem
           v-for="(_, i) in ownedByRelationship"
           :key="i"
+          :entityType="entityJurisdiction"
           :cred="credOrRelationshipToDisplay(ownedByRelationship[i], credSet)"
           :disableDefaultHeader="true"
           :effectiveDate="ownedByRelationship[i].credential.effective_date"
@@ -354,7 +357,7 @@
             md="4"
             class="pa-0"
           >
-            <EntityFilterFacetPanels />
+            <EntityFilterFacetPanels :entityType="entityJurisdiction" />
           </v-col>
           <v-col cols="12" md="8" class="pa-5 pl-3 pt-0">
             <EntityFilterChips class="pb-2" />
@@ -384,13 +387,22 @@
                     class="pl-0 timeline-cred"
                   >
                     <template #expansionPanels>
-                      <CredentialItem :cred="cred" :timeline="true">
+                      <CredentialItem
+                        :cred="cred"
+                        :entityType="entityJurisdiction"
+                        :timeline="true"
+                      >
                         <template #header>
                           <div class="text-body-2">
                             <div
                               v-if="cred.registration_reason"
                               class="font-weight-bold"
-                              v-t="cred.registration_reason"
+                              v-translate="
+                                toTranslationFormat(
+                                  cred.registration_reason,
+                                  entityJurisdiction
+                                )
+                              "
                             ></div>
                             <div
                               v-else-if="
@@ -439,6 +451,7 @@ import {
   credOrRelationshipToDisplay,
   isExpired,
   getCredentialLabel,
+  toTranslationFormat,
 } from "@/utils/entity";
 import BackTo from "@/components/shared/BackTo.vue";
 import CredentialItem from "@/components/entity/CredentialItem.vue";
@@ -452,6 +465,7 @@ import { IEntityFilter } from "@/interfaces/entity-filter.interface";
 import { ITopicName } from "@/interfaces/api/v2/topic.interface";
 import Dialog from "@/components/shared/Dialog.vue";
 import { IEntityDesc } from "@/interfaces/entity-desc";
+import { translate } from "@/i18n/translate";
 
 interface Data {
   currentTab: string;
@@ -505,6 +519,9 @@ interface Data {
       "fetchRelationships",
     ]),
   },
+  directives: {
+    translate,
+  },
 })
 export default class EntityResult extends Vue {
   setLoading!: (loading: boolean) => void;
@@ -552,6 +569,7 @@ export default class EntityResult extends Vue {
   ];
   getRelationshipName = getRelationshipName;
   getCredentialLabel = getCredentialLabel;
+  toTranslationFormat = toTranslationFormat;
   isExpired = isExpired;
 
   data(): Data {
diff --git a/src/components/entity/filter/EntityFilterFacetPanel.vue b/src/components/entity/filter/EntityFilterFacetPanel.vue
index ebd783a..1a24cb1 100644
--- a/src/components/entity/filter/EntityFilterFacetPanel.vue
+++ b/src/components/entity/filter/EntityFilterFacetPanel.vue
@@ -4,7 +4,7 @@
       <slot name="title">{{ title }}</slot>
     </v-expansion-panel-header>
     <v-expansion-panel-content>
-      <EntityFilterFacets :filterField="filterField" :fields="fields" />
+      <EntityFilterFacets :entityType="entityType" :filterField="filterField" :fields="fields" />
       <template v-if="more.length">
         <span
           class="flex-row flex-align-items-center justify-center fake-link"
@@ -32,6 +32,7 @@ interface Data {
   },
 })
 export default class EntityFilterFacetPanel extends Vue {
+  @Prop({ default: "" }) entityType!: string;
   @Prop({ default: () => [] }) filterField!: string;
   @Prop({ default: () => [] }) fields!: IEntityFacetField[];
   @Prop({ default: () => [] }) more!: IEntityFacetField[];
diff --git a/src/components/entity/filter/EntityFilterFacetPanels.vue b/src/components/entity/filter/EntityFilterFacetPanels.vue
index affd288..196ad9c 100644
--- a/src/components/entity/filter/EntityFilterFacetPanels.vue
+++ b/src/components/entity/filter/EntityFilterFacetPanels.vue
@@ -56,6 +56,7 @@
       </EntityFilterFacetPanel>
       <EntityFilterFacetPanel
         filterField="registration_type"
+        :entityType="entityType"
         :fields="getRegistrationTypes"
       >
         <template v-slot:title>
@@ -231,7 +232,7 @@
 </template>
 
 <script lang="ts">
-import { Component, Vue } from "vue-property-decorator";
+import { Component, Prop, Vue } from "vue-property-decorator";
 import { mapActions, mapGetters } from "vuex";
 import EntityFilterFacetPanel from "@/components/entity/filter/EntityFilterFacetPanel.vue";
 import CustomFilterFacetPanel from "@/components/entity/filter/CustomFilterFacetPanel.vue";
@@ -272,6 +273,7 @@ interface Data {
   },
 })
 export default class EntityFilterFacetPanels extends Vue {
+  @Prop({ default: "" }) entityType!: string;
   getAuthorities!: Array<IEntityFacetField>;
   getCredentialTypes!: Array<IEntityFacetField>;
   getRegistrationTypes!: Array<IEntityFacetField>;
diff --git a/src/components/entity/filter/EntityFilterFacets.vue b/src/components/entity/filter/EntityFilterFacets.vue
index d925653..d430a7d 100644
--- a/src/components/entity/filter/EntityFilterFacets.vue
+++ b/src/components/entity/filter/EntityFilterFacets.vue
@@ -29,7 +29,7 @@
               class="checkbox"
             ></v-simple-checkbox>
           </v-list-item-action>
-          <v-list-item-content class="pt-1 pb-1" v-t="field.value">
+          <v-list-item-content class="pt-1 pb-1" v-translate="toTranslationFormat(field.value, entityType)">
           </v-list-item-content>
           <v-list-item-action class="d-flex justify-end mt-1 mb-1">
             <div>{{ field.count }}</div>
@@ -47,7 +47,8 @@ import {
   IEntityFacetField,
   IEntityFilter,
 } from "@/interfaces/entity-filter.interface";
-import { isEntityFilterActive } from "@/utils/entity";
+import { translate } from "@/i18n/translate";
+import { isEntityFilterActive, toTranslationFormat } from "@/utils/entity";
 
 @Component({
   computed: {
@@ -56,11 +57,16 @@ import { isEntityFilterActive } from "@/utils/entity";
   methods: {
     ...mapActions(["toggleEntityFilter"]),
   },
+  directives: {
+    translate,
+  },
 })
 export default class EntityFilterFacets extends Vue {
+  @Prop({ default: "" }) entityType!: string;
   @Prop({ default: () => [] }) filterField!: string;
   @Prop({ default: () => [] }) fields!: IEntityFacetField[];
   getEntityFilters!: IEntityFilter;
+  toTranslationFormat = toTranslationFormat;
   isEntityFilterActive: (
     filterField: string,
     getEntityFilters: IEntityFilter,
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 2e84cc8..814ac28 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -55,36 +55,106 @@
     "HIS": "Historical"
   },
   "reason_description": {
-    "filing_type": "filing_type",
-    "alteration": "alteration",
-    "amalgamation": "amalgamation",
-    "amalgamationApplication": "amalgamationApplication",
-    "amendedAGM": "amendedAGM",
-    "amendedAnnualReport": "amendedAnnualReport",
-    "amendedChangeOfDirectors": "amendedChangeOfDirectors",
-    "annualReport": "annualReport",
-    "changeOfAddress": "changeOfAddress",
-    "changeOfDirectors": "changeOfDirectors",
-    "changeOfName": "changeOfName",
-    "changeOfRegistration": "changeOfRegistration",
-    "conversion": "conversion",
-    "correction": "correction",
-    "courtOrder": "courtOrder",
-    "dissolution": "dissolution",
-    "dissolved": "dissolved",
-    "F.18": "F.18",
-    "incorporationApplication": "incorporationApplication",
-    "Involuntary Dissolution": "Involuntary Dissolution",
-    "lear_epoch": "lear_epoch",
-    "putBackOn": "putBackOn",
-    "registrarsNotation": "registrarsNotation",
-    "registrarsOrder": "registrarsOrder",
-    "registration": "registration",
-    "restorationApplication": "restorationApplication",
-    "specialResolution": "specialResolution",
-    "transition": "transition",
-    "voluntaryDissolution": "voluntaryDissolution",
-    "voluntaryLiquidation": "voluntaryLiquidation",
+    "affidavit": {
+      "title": "Affidavit",
+      "displayName": "Affidavit"
+    },
+    "alteration": {
+      "title": "Notice of Alteration Filing",
+      "displayName": "Alteration"
+    },
+    "annualReport": {
+      "title": "Annual Report Filing",
+      "displayName": "Annual Report"
+    },
+    "changeOfAddress": {
+      "title": "Change of Address Filing",
+      "displayName": "Address Change"
+    },
+    "changeOfDirectors": {
+      "title": "Change of Directors Filing",
+      "displayName": "Director Change"
+    },
+    "changeOfName": {
+      "title": "Change of Name Filing",
+      "displayName": "Legal Name Change"
+    },
+    "conversion": {
+      "title": "Conversion Ledger",
+      "displayName": {
+        "BEN": "Conversion",
+        "SP": "Record Conversion",
+        "GP": "Record Conversion"
+      }
+    },
+    "correction": {
+      "title": "Correction",
+      "displayName": {
+        "BEN": "Correction",
+        "CP": "Correction",
+        "SP": "Register Correction Application",
+        "GP": "Register Correction Application"
+      }
+    },
+    "courtOrder": {
+      "title": "Court Order",
+      "displayName": "Court Order"
+    },
+    "dissolution": {
+      "title": "Voluntary Dissolution",
+      "displayName": {
+        "CP": "Voluntary Dissolution",
+        "BC": "Voluntary Dissolution",
+        "BEN": "Voluntary Dissolution",
+        "ULC": "Voluntary Dissolution",
+        "CC": "Voluntary Dissolution",
+        "LLC": "Voluntary Dissolution",
+        "SP": "Statement of Dissolution",
+        "GP": "Statement of Dissolution"
+      }
+    },
+    "incorporationApplication": {
+      "title": "Incorporation Application",
+      "displayName": {
+        "BC": "Incorporation Application",
+        "BEN": "BC Benefit Company Incorporation Application",
+        "CP": "Incorporation Application"
+      }
+    },
+    "registrarsNotation": {
+      "title": "Registrars Notation",
+      "displayName": "Registrar's Notation"
+    },
+    "registrarsOrder": {
+      "title": "Registrars Order",
+      "displayName": "Registrar's Order"
+    },
+    "registration": {
+      "title": "Registration",
+      "displayName": {
+        "SP": "BC Sole Proprietorship Registration",
+        "GP": "BC General Partnership Registration"
+      }
+    },
+    "specialResolution": {
+      "title": "Special Resolution",
+      "displayName": "Special Resolution"
+    },
+    "transition": {
+      "title": "Transition",
+      "displayName": "Transition Application"
+    },
+    "changeOfRegistration": {
+      "title": "Change of Registration",
+      "displayName": {
+        "SP": "Change of Registration Application",
+        "GP": "Change of Registration Application"
+      }
+    },
+    "putBackOn": {
+      "title": "Put Back On",
+      "displayName": "Correction - Put Back On"
+    },
     "Event:ADCOMM": "Administer Comments",
     "Event:ADCORP": "Administer Corporation",
     "Event:ADDLEDGR": "Update Ledger",
diff --git a/src/i18n/translate.ts b/src/i18n/translate.ts
new file mode 100644
index 0000000..2570517
--- /dev/null
+++ b/src/i18n/translate.ts
@@ -0,0 +1,37 @@
+import { DirectiveFunction } from "vue";
+import { DirectiveBinding } from "vue/types/options";
+import VueI18n from "."
+
+export const translate: DirectiveFunction = (el: Element, binding: DirectiveBinding) => {
+    el.textContent = $translate(binding.value)
+}
+
+// Uses the entity_type as well as the registration description to lookup translations for entries from the LEAR database
+export const $translate = (value: string): string => {
+    const messages = VueI18n.messages
+    const locale = VueI18n.locale
+    const bindingValues = value.split(".")
+    let transReturn
+    // try old translation first
+    if (bindingValues.length >= 2) {
+        const translationAttempt = (messages[locale][bindingValues[0]] as { [key: string]: string | any })?.[bindingValues[1]]
+        if (typeof (translationAttempt) === "string") {
+            transReturn = translationAttempt
+        } else {
+            // we know we're working with an entity from LEAR
+            const description = translationAttempt?.displayName ?? translationAttempt?.title
+            if (typeof (description) === "string") {
+                transReturn = description
+            } else if (typeof (description) !== "undefined") {
+                // we are working with a description object, indexed by entity type: BC, SP, etc.
+                if (bindingValues.length >= 3) {
+                    // if entity type is passed in as a binding value
+                    transReturn = description[bindingValues[2]]
+                } else {
+                    transReturn = translationAttempt?.title
+                }
+            }
+        }
+    }
+    return transReturn ?? value
+}
diff --git a/src/utils/entity.ts b/src/utils/entity.ts
index 16b692c..732f18f 100644
--- a/src/utils/entity.ts
+++ b/src/utils/entity.ts
@@ -14,6 +14,18 @@ export function isCredential(item: ICredential | IRelationship): boolean {
   return (item as ICredential)?.credential_type !== undefined;
 }
 
+// Used to append entity_type to the suffix of the string. This is needed to work with 
+// entries from the LEAR database
+export function toTranslationFormat(base: string, entityType?: string): string {
+  if (entityType) {
+    const entityTypeSplit = entityType.split('.')
+    if (entityTypeSplit.length >= 2) {
+      return base + "." + entityTypeSplit[1]
+    }
+  }
+  return base
+}
+
 export function getHighlightedAttributes(
   item: ICredential | IRelationship,
   title: string | undefined,