@dyedurham/search-and-file-widget 1.6.22 → 1.6.23

package/dnd-filing-shell.js

@@ -56972,7 +56972,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       CanadianStreetType: isCanadianAddress ? deltaData?.streetType ?? (StreetType2 ? mapStreetType(StreetType2) : void 0) : null,
       CanadianStreetDirectionType: isCanadianAddress ? deltaData?.streetDirection ?? (StreetDirection2 ? mapStreetDirection(StreetDirection2) : null) : null
     }), suite && { UnitNumber: suite }), {
-      CanadianUnitType: isCanadianAddress ? deltaData?.unitType ?? null : null,
+      CanadianUnitType: isCanadianAddress ? mapUnitTypeToEcore(deltaData?.unitType) ?? null : null,
       UnitNumber: deltaData?.unitNumber ?? null,
       City: address.city,
       ProvinceState: provinceState,
@@ -58160,21 +58160,34 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       return "";
     return str.toLowerCase().replace(/(?:^|\s|[-/])\S/g, (match) => match.toUpperCase());
   }
-  function generateAffiliationKey(affiliation) {
+  function generateTaskAffiliationKey(affiliation) {
     const person = affiliation.participant;
     const firstName = person._profile.firstName || "";
     const lastName = person._profile.lastName || "";
     const middleName = person._profile.middleName || "";
     const role = affiliation.role.static_title || "";
-    return [firstName.toLowerCase(), middleName.toLowerCase(), lastName.toLowerCase(), role.toLowerCase()].filter(Boolean).join(" ");
+    const joinedName = [toTitleCase(firstName), toTitleCase(middleName), toTitleCase(lastName)].filter(Boolean).join(" ");
+    return [joinedName, toTitleCase(role)].filter(Boolean).join(", ");
   }
-  function generateAffiliationFullName(affiliation) {
+  function generateTaskAffiliationFullName(affiliation) {
     const person = affiliation.participant;
     const firstName = person._profile.firstName || "";
     const lastName = person._profile.lastName || "";
     const middleName = person._profile.middleName || "";
     return [firstName, middleName, lastName].filter(Boolean).join(" ");
   }
+  function generateCurrentDataAffiliationKey(payload) {
+    const firstName = payload?.PersonName?.FirstName ?? "";
+    const middleName = payload?.PersonName?.MiddleName ?? "";
+    const lastName = payload?.PersonName?.LastName ?? "";
+    const role = payload?.OfficerPositionName ?? payload?.PersonName?.Position ?? (payload?.IsDirector ? "Director" : "");
+    const joinedName = [
+      toTitleCase(firstName),
+      toTitleCase(middleName),
+      toTitleCase(lastName)
+    ].filter(Boolean).join(" ");
+    return [joinedName, toTitleCase(role)].filter(Boolean).join(", ");
+  }
   var init_common_utils = __esm({
     "src/app/utils/common.utils.ts"() {
       init_app_constants();
@@ -58426,6 +58439,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       init_OntarioConstants();
       init_address_utils();
       init_address_utils();
+      init_transform_utils();
       ONTARIO_NAME_TYPE_OPTIONS = Object.values(NameType).filter((v) => typeof v === "number").map((v) => ({ label: NameTypeLabel[v], value: v }));
       FORMATION_CARD_FORM_AFFILIATION_FIELDS_CANADIAN_NO_SUIT = [
         {
@@ -58843,11 +58857,11 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
                 form.get(FormationFormControls.StreetName)?.setValue(streetName, { emitEvent: false });
                 form.get(FormationFormControls.StreetNumber)?.setValue(streetNumberOnly, { emitEvent: false });
                 form.get(FormationFormControls.UnitNumber)?.setValue(suite ?? "", { emitEvent: false });
+                form.get(FormationFormControls.UnitType)?.setValue(suite && isCanadian ? ECoreCanadianUnitType.UNIT : "", { emitEvent: false });
                 form.get(FormationFormControls.City)?.setValue(address?.city ?? "", { emitEvent: false });
                 form.get(FormationFormControls.Province)?.setValue(address?.province_state ?? "", { emitEvent: false });
                 form.get(FormationFormControls.PostalCode)?.setValue(address?.postal_zip ?? "", { emitEvent: false });
-                form.get(FormationFormControls.UnitType)?.setValue(normalizedCountryCode ?? "", { emitEvent: false });
-                form.get(FormationFormControls.UnitType)?.setValue(address?.country ?? normalizedCountryCode ?? "", { emitEvent: false });
+                form.get(FormationFormControls.Country)?.setValue(address?.country ?? normalizedCountryCode ?? "", { emitEvent: false });
                 let affiliationAddressType;
                 if (isCanadian) {
                   affiliationAddressType = suite ? AffiliationAddressType.CanadianSuite : AffiliationAddressType.CanadianNoSuite;
@@ -59066,7 +59080,6 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         static generateLegalOpinionConfirmAddressFormGroup(deltaData, affiliations) {
           const affiliation = affiliations?.find((a) => a._id === deltaData?.lawyerSigning);
           const address = affiliation?.addresses?.at(0) || affiliation?.parent_affiliation?.addresses?.at(0);
-          console.log("Affiliation for legal opinion address:", address);
           const normalizedCountryCode = normalizeCountryCode(address?.country);
           const suite = getAddressComponent(address, "Suite/Apartment");
           const isCanadian = normalizedCountryCode === "CA";
@@ -59081,7 +59094,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           return new FormGroup({
             [FormationFormControls.LawyerSigningOpinion]: new FormControl(deltaData?.lawyerSigning ?? "", Validators.required),
             [FormationFormControls.LawFirm]: new FormControl(deltaData?.lawFirm ?? "", requiredIf(FormationFormControls.LawyerSigningOpinion)),
-            [FormationFormControls.UnitType]: new FormControl(deltaData?.address?.unitType ?? "", requiredIf(IRFormControls.UnitNumber)),
+            [FormationFormControls.UnitType]: new FormControl(deltaData?.address?.unitType ?? (suite && isCanadian ? ECoreCanadianUnitType.UNIT : ""), requiredIf(IRFormControls.UnitNumber)),
             [FormationFormControls.UnitNumber]: new FormControl(deltaData?.address?.unitNumber ?? "", requiredIf(IRFormControls.UnitType)),
             [FormationFormControls.StreetNumber]: new FormControl(deltaData?.address?.streetNumber ?? "", Validators.required),
             [FormationFormControls.StreetName]: new FormControl(deltaData?.address?.streetName ?? "", Validators.required),
@@ -59135,7 +59148,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             form2.addControl(FormationFormControls.StreetName, new FormControl(delta?.streetName ?? streetName, Validators.required));
             form2.addControl(FormationFormControls.StreetNumber, new FormControl(delta?.streetNumber ?? streetNumberOnly, Validators.required));
             form2.addControl(FormationFormControls.UnitNumber, new FormControl(delta?.unitNumber ?? suite, requiredIf(FormationFormControls.UnitType)));
-            form2.addControl(FormationFormControls.UnitType, new FormControl(delta?.unitType ?? (suite ? ECoreCanadianUnitType.UNIT : ""), requiredIf(FormationFormControls.UnitNumber)));
+            form2.addControl(FormationFormControls.UnitType, new FormControl(delta?.unitType ?? (suite && isCanadian ? ECoreCanadianUnitType.UNIT : ""), requiredIf(FormationFormControls.UnitNumber)));
             form2.addControl(FormationFormControls.City, new FormControl(address?.city));
             form2.addControl(FormationFormControls.Province, new FormControl(address?.province_state));
             form2.addControl(FormationFormControls.PostalCode, new FormControl(address?.postal_zip));
@@ -59317,7 +59330,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             config2[IRFormControls.StreetName] = new FormControl(delta?.[IRFormControls.StreetName] ?? streetName, Validators.required);
             config2[IRFormControls.StreetNumber] = new FormControl(delta?.[IRFormControls.StreetNumber] ?? streetNumberOnly, Validators.required);
             config2[IRFormControls.UnitNumber] = new FormControl(delta?.[IRFormControls.UnitNumber] ?? suite, requiredIf(IRFormControls.UnitType));
-            config2[IRFormControls.UnitType] = new FormControl(delta?.[IRFormControls.UnitType] ?? (suite ? ECoreCanadianUnitType.UNIT : ""), requiredIf(IRFormControls.UnitNumber));
+            config2[IRFormControls.UnitType] = new FormControl(delta?.[IRFormControls.UnitType] ?? (suite && isCanadian ? ECoreCanadianUnitType.UNIT : ""), requiredIf(IRFormControls.UnitNumber));
             config2[IRFormControls.City] = new FormControl(delta?.[IRFormControls.City] ?? address?.city);
             config2[IRFormControls.Province] = new FormControl(delta?.[IRFormControls.Province] ?? address?.province_state);
             config2[IRFormControls.PostalCode] = new FormControl(delta?.[IRFormControls.PostalCode] ?? address?.postal_zip);
@@ -59349,8 +59362,8 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           const address = affiliation.addresses.at(0) || affiliation.parent_affiliation?.addresses?.at(0);
           const communications = affiliation.participant.communications;
           const emailAddress = affiliation.participant.communicationEmail ?? communications?.find((item) => item.type.toLowerCase().includes("email"))?.value;
-          const name = generateAffiliationFullName(affiliation);
-          const key = generateAffiliationKey(affiliation).toLowerCase();
+          const name = generateTaskAffiliationFullName(affiliation);
+          const key = generateTaskAffiliationKey(affiliation);
           const currentData = comparisonData?.persons.get(key);
           let correctedAffiliationType = affiliationType;
           let isThisChangeToAnExistingEntity = false;
@@ -59367,7 +59380,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
                 correctedAffiliationType = IRAffiliationType.Update;
               } else {
                 const keys = Array.from(comparisonData?.persons.keys() ?? []);
-                const keyLikeField = keys.find((item) => item.includes(name.toLowerCase()));
+                const keyLikeField = keys.find((item) => item.toLowerCase().includes(name.toLowerCase()));
                 if (keyLikeField) {
                   isThisChangeToAnExistingEntity = false;
                   isThisChangeToAnExistingEntityVisible = true;
@@ -63035,6 +63048,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         isStatusIcon = input(false);
         isOpen = input(void 0);
         removable = input(false);
+        isLoading = input(false);
         toggled = output();
         remove = output();
         isExpanded = signal(true);
@@ -63067,7 +63081,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         static \u0275fac = function ExpandableCardComponent_Factory(__ngFactoryType__) {
           return new (__ngFactoryType__ || _ExpandableCardComponent)();
         };
-        static \u0275cmp = /* @__PURE__ */ \u0275\u0275defineComponent({ type: _ExpandableCardComponent, selectors: [["expandable-card"]], inputs: { title: [1, "title"], role: [1, "role"], isListItem: [1, "isListItem"], isExpandable: [1, "isExpandable"], border: [1, "border"], padded: [1, "padded"], isValid: [1, "isValid"], chipType: [1, "chipType"], isStatusIcon: [1, "isStatusIcon"], isOpen: [1, "isOpen"], removable: [1, "removable"] }, outputs: { toggled: "toggled", remove: "remove" }, ngContentSelectors: _c08, decls: 14, vars: 17, consts: [[1, "expandable-card"], [1, "expandable-card-header", 3, "click"], [1, "expandable-card-header-title"], [1, "expandable-card-header-container"], [3, "type", "title"], [3, "rotated"], [1, "expandable-card-content"], [1, "expandable-card-content-item"], [1, "expandable-card-content-item-actions"], [1, "expandable-card-header-status-icon"], [1, "body-1-regular", "light-blue", "pointer", 3, "click"]], template: function ExpandableCardComponent_Template(rf, ctx) {
+        static \u0275cmp = /* @__PURE__ */ \u0275\u0275defineComponent({ type: _ExpandableCardComponent, selectors: [["expandable-card"]], inputs: { title: [1, "title"], role: [1, "role"], isListItem: [1, "isListItem"], isExpandable: [1, "isExpandable"], border: [1, "border"], padded: [1, "padded"], isValid: [1, "isValid"], chipType: [1, "chipType"], isStatusIcon: [1, "isStatusIcon"], isOpen: [1, "isOpen"], removable: [1, "removable"], isLoading: [1, "isLoading"] }, outputs: { toggled: "toggled", remove: "remove" }, ngContentSelectors: _c08, decls: 14, vars: 17, consts: [[1, "expandable-card"], [1, "expandable-card-header", 3, "click"], [1, "expandable-card-header-title"], [1, "expandable-card-header-container"], [3, "type", "title"], [3, "rotated"], [1, "expandable-card-content"], [1, "expandable-card-content-item"], [1, "expandable-card-content-item-actions"], [1, "expandable-card-header-status-icon"], [1, "body-1-regular", "light-blue", "pointer", 3, "click"]], template: function ExpandableCardComponent_Template(rf, ctx) {
           if (rf & 1) {
             \u0275\u0275projectionDef();
             \u0275\u0275elementStart(0, "div", 0)(1, "div", 1);
@@ -63100,7 +63114,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             \u0275\u0275advance();
             \u0275\u0275conditional(ctx.isStatusIcon() ? 7 : -1);
             \u0275\u0275advance();
-            \u0275\u0275conditional(ctx.chipType() ? 8 : -1);
+            \u0275\u0275conditional(ctx.chipType() && !ctx.isLoading() ? 8 : -1);
             \u0275\u0275advance();
             \u0275\u0275conditional(ctx.isExpandable() ? 9 : -1);
             \u0275\u0275advance();
@@ -63169,7 +63183,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         }\r
       }\r
 \r
-      @if(chipType()) {\r
+      @if(chipType() && !isLoading()) {\r
         <chip [type]="chipType()" [title]="chipText()"/>\r
       }\r
 \r
@@ -79948,14 +79962,14 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       let tmp_12_0;
       let tmp_13_0;
       let tmp_19_0;
-      let tmp_22_0;
+      let tmp_23_0;
       const formGroup_r5 = ctx.$implicit;
       const \u0275$index_41_r4 = ctx.$index;
       const ctx_r0 = \u0275\u0275nextContext();
       \u0275\u0275advance(2);
-      \u0275\u0275property("isListItem", true)("title", (tmp_12_0 = ctx_r0.getFormGroup(\u0275$index_41_r4).get(ctx_r0.labelKey())) == null ? null : tmp_12_0.value)("role", (tmp_13_0 = ctx_r0.getFormGroup(\u0275$index_41_r4).get(ctx_r0.roleKey())) == null ? null : tmp_13_0.value)("isStatusIcon", ctx_r0.isStatusIcon())("isValid", ctx_r0.getFormGroupValid(\u0275$index_41_r4))("isOpen", ctx_r0.isItemExpanded(\u0275$index_41_r4))("border", false)("padded", false)("chipType", ctx_r0.affiliationTypeToChipType((tmp_19_0 = formGroup_r5.get(ctx_r0.controls.AffiliationType)) == null ? null : tmp_19_0.value))("removable", ctx_r0.removable());
+      \u0275\u0275property("isListItem", true)("title", (tmp_12_0 = ctx_r0.getFormGroup(\u0275$index_41_r4).get(ctx_r0.labelKey())) == null ? null : tmp_12_0.value)("role", (tmp_13_0 = ctx_r0.getFormGroup(\u0275$index_41_r4).get(ctx_r0.roleKey())) == null ? null : tmp_13_0.value)("isStatusIcon", ctx_r0.isStatusIcon())("isValid", ctx_r0.getFormGroupValid(\u0275$index_41_r4))("isOpen", ctx_r0.isItemExpanded(\u0275$index_41_r4))("border", false)("padded", false)("chipType", ctx_r0.affiliationTypeToChipType((tmp_19_0 = formGroup_r5.get(ctx_r0.controls.AffiliationType)) == null ? null : tmp_19_0.value))("isLoading", ctx_r0.isLoading())("removable", ctx_r0.removable());
       const form_r6 = ctx_r0.getFormGroup(\u0275$index_41_r4);
-      const configValue_r7 = (tmp_22_0 = (tmp_22_0 = ctx_r0.fields()) !== null && tmp_22_0 !== void 0 ? tmp_22_0 : (tmp_22_0 = ctx_r0.config()) == null ? null : tmp_22_0[(tmp_22_0 = form_r6.get(ctx_r0.configKey())) == null ? null : tmp_22_0.value]) !== null && tmp_22_0 !== void 0 ? tmp_22_0 : \u0275\u0275pureFunction0(14, _c27);
+      const configValue_r7 = (tmp_23_0 = (tmp_23_0 = ctx_r0.fields()) !== null && tmp_23_0 !== void 0 ? tmp_23_0 : (tmp_23_0 = ctx_r0.config()) == null ? null : tmp_23_0[(tmp_23_0 = form_r6.get(ctx_r0.configKey())) == null ? null : tmp_23_0.value]) !== null && tmp_23_0 !== void 0 ? tmp_23_0 : \u0275\u0275pureFunction0(15, _c27);
       \u0275\u0275advance(3);
       \u0275\u0275property("prevData", ctx_r0.prevData())("isSubmitted", ctx_r0.isSubmitted())("form", form_r6)("config", configValue_r7);
     }
@@ -79992,6 +80006,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         prevData = input();
         removable = input(false);
         isValid = input(false);
+        isLoading = input(false);
         remove = output();
         visiblyValidChange = output();
         dr = inject(DestroyRef);
@@ -80056,7 +80071,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         static \u0275fac = function ExpandableListCardComponent_Factory(__ngFactoryType__) {
           return new (__ngFactoryType__ || _ExpandableListCardComponent)();
         };
-        static \u0275cmp = /* @__PURE__ */ \u0275\u0275defineComponent({ type: _ExpandableListCardComponent, selectors: [["expandable-list-card"]], inputs: { title: [1, "title"], isStatusIcon: [1, "isStatusIcon"], areItemsOpen: [1, "areItemsOpen"], isSubmitted: [1, "isSubmitted"], fields: [1, "fields"], config: [1, "config"], configKey: [1, "configKey"], formArray: [1, "formArray"], labelKey: [1, "labelKey"], roleKey: [1, "roleKey"], prevData: [1, "prevData"], removable: [1, "removable"], isValid: [1, "isValid"] }, outputs: { remove: "remove", visiblyValidChange: "visiblyValidChange" }, ngContentSelectors: _c110, decls: 17, vars: 10, consts: [[1, "expandable-card"], [1, "expandable-card-header", 3, "click"], [1, "expandable-card-header-title"], [1, "expandable-card-header-container"], [1, "expandable-card-content"], [1, "expandable-card-actions"], [1, "expandable-card-actions-items"], [1, "expandable-card-header-status-icon"], [1, "expandable-card-actions-item", 3, "click"], [1, "expandable-card-actions-separator"], [1, "expandable-card-separator"], [1, "expandable-card-separator-line"], [3, "toggled", "remove", "isListItem", "title", "role", "isStatusIcon", "isValid", "isOpen", "border", "padded", "chipType", "removable"], [3, "prevData", "isSubmitted", "form", "config"]], template: function ExpandableListCardComponent_Template(rf, ctx) {
+        static \u0275cmp = /* @__PURE__ */ \u0275\u0275defineComponent({ type: _ExpandableListCardComponent, selectors: [["expandable-list-card"]], inputs: { title: [1, "title"], isStatusIcon: [1, "isStatusIcon"], areItemsOpen: [1, "areItemsOpen"], isSubmitted: [1, "isSubmitted"], fields: [1, "fields"], config: [1, "config"], configKey: [1, "configKey"], formArray: [1, "formArray"], labelKey: [1, "labelKey"], roleKey: [1, "roleKey"], prevData: [1, "prevData"], removable: [1, "removable"], isValid: [1, "isValid"], isLoading: [1, "isLoading"] }, outputs: { remove: "remove", visiblyValidChange: "visiblyValidChange" }, ngContentSelectors: _c110, decls: 17, vars: 10, consts: [[1, "expandable-card"], [1, "expandable-card-header", 3, "click"], [1, "expandable-card-header-title"], [1, "expandable-card-header-container"], [1, "expandable-card-content"], [1, "expandable-card-actions"], [1, "expandable-card-actions-items"], [1, "expandable-card-header-status-icon"], [1, "expandable-card-actions-item", 3, "click"], [1, "expandable-card-actions-separator"], [1, "expandable-card-separator"], [1, "expandable-card-separator-line"], [3, "toggled", "remove", "isListItem", "title", "role", "isStatusIcon", "isValid", "isOpen", "border", "padded", "chipType", "isLoading", "removable"], [3, "prevData", "isSubmitted", "form", "config"]], template: function ExpandableListCardComponent_Template(rf, ctx) {
           if (rf & 1) {
             \u0275\u0275projectionDef(_c014);
             \u0275\u0275elementStart(0, "div", 0)(1, "div", 1);
@@ -80079,7 +80094,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             \u0275\u0275elementEnd();
             \u0275\u0275template(14, ExpandableListCardComponent_Conditional_14_Template, 9, 6, "div", 6);
             \u0275\u0275elementEnd();
-            \u0275\u0275repeaterCreate(15, ExpandableListCardComponent_For_16_Template, 6, 15, null, null, \u0275\u0275repeaterTrackByIdentity);
+            \u0275\u0275repeaterCreate(15, ExpandableListCardComponent_For_16_Template, 6, 16, null, null, \u0275\u0275repeaterTrackByIdentity);
             \u0275\u0275elementEnd()();
           }
           if (rf & 2) {
@@ -80205,6 +80220,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             formGroup.get(controls.AffiliationType)?.value\r
           )\r
         "\r
+        [isLoading]="isLoading()"\r
         [removable]="removable()"\r
         (toggled)="toggleItem(i)"\r
         (remove)="remove.emit(i)"\r
@@ -81623,7 +81639,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       const directorsArray_r7 = \u0275\u0275readContextLet(8);
       const isOpen_r8 = ((tmp_7_0 = directorsArray_r7 == null ? null : directorsArray_r7.length) !== null && tmp_7_0 !== void 0 ? tmp_7_0 : 0) <= ctx_r0.initiallyOpenCardsCount;
       \u0275\u0275advance();
-      \u0275\u0275property("prevData", (tmp_8_0 = ctx_r0.prevData()) == null ? null : tmp_8_0.persons)("isSubmitted", ctx_r0.isSubmitted())("isValid", ctx_r0.sectionValidity["directors"])("areItemsOpen", isOpen_r8)("isStatusIcon", !ctx_r0.readonly())("config", ctx_r0.directorsFieldsMap)("configKey", ctx_r0.controls.AffiliationAddressType)("formArray", directorsArray_r7)("title", ctx_r0.groups.Directors);
+      \u0275\u0275property("prevData", (tmp_8_0 = ctx_r0.prevData()) == null ? null : tmp_8_0.persons)("isSubmitted", ctx_r0.isSubmitted())("isValid", ctx_r0.sectionValidity["directors"])("areItemsOpen", isOpen_r8)("isStatusIcon", !ctx_r0.readonly())("isLoading", ctx_r0.isLoading())("config", ctx_r0.directorsFieldsMap)("configKey", ctx_r0.controls.AffiliationAddressType)("formArray", directorsArray_r7)("title", ctx_r0.groups.Directors);
     }
   }
   function OntarioUpdateMaintainFormComponent_Conditional_10_Template(rf, ctx) {
@@ -81659,7 +81675,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       const officersArray_r10 = \u0275\u0275readContextLet(11);
       const isOpen_r11 = ((tmp_7_0 = officersArray_r10 == null ? null : officersArray_r10.length) !== null && tmp_7_0 !== void 0 ? tmp_7_0 : 0) <= ctx_r0.initiallyOpenCardsCount;
       \u0275\u0275advance();
-      \u0275\u0275property("prevData", (tmp_8_0 = ctx_r0.prevData()) == null ? null : tmp_8_0.persons)("isSubmitted", ctx_r0.isSubmitted())("areItemsOpen", isOpen_r11)("isStatusIcon", !ctx_r0.readonly())("config", ctx_r0.officersFieldsMap)("configKey", ctx_r0.controls.AffiliationAddressType)("formArray", officersArray_r10)("title", ctx_r0.groups.Officers)("isValid", ctx_r0.sectionValidity["officers"]);
+      \u0275\u0275property("prevData", (tmp_8_0 = ctx_r0.prevData()) == null ? null : tmp_8_0.persons)("isSubmitted", ctx_r0.isSubmitted())("areItemsOpen", isOpen_r11)("isStatusIcon", !ctx_r0.readonly())("isLoading", ctx_r0.isLoading())("config", ctx_r0.officersFieldsMap)("configKey", ctx_r0.controls.AffiliationAddressType)("formArray", officersArray_r10)("title", ctx_r0.groups.Officers)("isValid", ctx_r0.sectionValidity["officers"]);
     }
   }
   function OntarioUpdateMaintainFormComponent_Conditional_13_Template(rf, ctx) {
@@ -81748,6 +81764,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         isSubmitted = input(false);
         readonly = input(false);
         prevData = input();
+        isLoading = input(false);
         visiblyValidChange = output();
         groups = InitialReturnFillingFormGroups;
         generalCardFields = ONTARIO_INITIAL_RETURN_FORM_GENERAL_FIELDS;
@@ -81766,7 +81783,9 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             const personKeys = Array.from(prevData?.persons?.keys() ?? []);
             const options = personKeys.map((key) => {
               const person = prevData?.persons.get(key);
-              return { label: `${person?.fullName}, ${toTitleCase(person?.position ?? "")}`.trim(), value: key };
+              const item = person?.item;
+              const value = item ? generateCurrentDataAffiliationKey(person?.item) : "";
+              return { label: value, value };
             });
             this.directorsFieldsMap = generateOntarioInitialReturnFormDirectorsFieldsMap(options);
             this.officersFieldsMap = generateOntarioInitialReturnFormOfficerFieldsMap(options);
@@ -81795,7 +81814,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         static \u0275fac = function OntarioUpdateMaintainFormComponent_Factory(__ngFactoryType__) {
           return new (__ngFactoryType__ || _OntarioUpdateMaintainFormComponent)();
         };
-        static \u0275cmp = /* @__PURE__ */ \u0275\u0275defineComponent({ type: _OntarioUpdateMaintainFormComponent, selectors: [["ontario-update-maintain-form"]], inputs: { form: [1, "form"], task: [1, "task"], errors: [1, "errors"], isNote: [1, "isNote"], isSubmitted: [1, "isSubmitted"], readonly: [1, "readonly"], prevData: [1, "prevData"] }, outputs: { visiblyValidChange: "visiblyValidChange" }, decls: 20, vars: 17, consts: [[1, "ontario-update-maintain-form"], ["title", "Entity changed", "content", "A new draft needs to be generated as the Entity was changed since the last draft was produced.", 3, "type"], ["title", "The following issues need to be resolved before proceeding:", 3, "content"], [1, "ontario-update-maintain-form-content"], [3, "title", "isStatusIcon"], [3, "isStatusIcon", "isValid", "title"], [3, "prevData", "isSubmitted", "isValid", "areItemsOpen", "isStatusIcon", "config", "configKey", "formArray", "title"], [3, "title"], [3, "prevData", "isSubmitted", "areItemsOpen", "isStatusIcon", "config", "configKey", "formArray", "title", "isValid"], [3, "prevData", "isSubmitted", "form", "config"], [1, "body-1-regular"], [3, "visiblyValidChange", "isSubmitted", "prevData", "form", "config", "label"], [3, "visiblyValidChange", "prevData", "isSubmitted", "form", "config"], [3, "visiblyValidChange", "prevData", "isSubmitted", "isValid", "areItemsOpen", "isStatusIcon", "config", "configKey", "formArray", "title"], [3, "visiblyValidChange", "prevData", "isSubmitted", "areItemsOpen", "isStatusIcon", "config", "configKey", "formArray", "title", "isValid"], [3, "visiblyValidChange", "isSubmitted", "form", "config"]], template: function OntarioUpdateMaintainFormComponent_Template(rf, ctx) {
+        static \u0275cmp = /* @__PURE__ */ \u0275\u0275defineComponent({ type: _OntarioUpdateMaintainFormComponent, selectors: [["ontario-update-maintain-form"]], inputs: { form: [1, "form"], task: [1, "task"], errors: [1, "errors"], isNote: [1, "isNote"], isSubmitted: [1, "isSubmitted"], readonly: [1, "readonly"], prevData: [1, "prevData"], isLoading: [1, "isLoading"] }, outputs: { visiblyValidChange: "visiblyValidChange" }, decls: 20, vars: 17, consts: [[1, "ontario-update-maintain-form"], ["title", "Entity changed", "content", "A new draft needs to be generated as the Entity was changed since the last draft was produced.", 3, "type"], ["title", "The following issues need to be resolved before proceeding:", 3, "content"], [1, "ontario-update-maintain-form-content"], [3, "title", "isStatusIcon"], [3, "isStatusIcon", "isValid", "title"], [3, "prevData", "isSubmitted", "isValid", "areItemsOpen", "isStatusIcon", "isLoading", "config", "configKey", "formArray", "title"], [3, "title"], [3, "prevData", "isSubmitted", "areItemsOpen", "isStatusIcon", "isLoading", "config", "configKey", "formArray", "title", "isValid"], [3, "prevData", "isSubmitted", "form", "config"], [1, "body-1-regular"], [3, "visiblyValidChange", "isSubmitted", "prevData", "form", "config", "label"], [3, "visiblyValidChange", "prevData", "isSubmitted", "form", "config"], [3, "visiblyValidChange", "prevData", "isSubmitted", "isValid", "areItemsOpen", "isStatusIcon", "isLoading", "config", "configKey", "formArray", "title"], [3, "visiblyValidChange", "prevData", "isSubmitted", "areItemsOpen", "isStatusIcon", "isLoading", "config", "configKey", "formArray", "title", "isValid"], [3, "visiblyValidChange", "isSubmitted", "form", "config"]], template: function OntarioUpdateMaintainFormComponent_Template(rf, ctx) {
           if (rf & 1) {
             \u0275\u0275elementStart(0, "div", 0);
             \u0275\u0275template(1, OntarioUpdateMaintainFormComponent_Conditional_1_Template, 1, 1, "alert", 1)(2, OntarioUpdateMaintainFormComponent_Conditional_2_Template, 1, 1, "alert", 2);
@@ -81805,9 +81824,9 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             \u0275\u0275declareLet(6);
             \u0275\u0275template(7, OntarioUpdateMaintainFormComponent_Conditional_7_Template, 2, 7, "expandable-card", 5);
             \u0275\u0275declareLet(8);
-            \u0275\u0275template(9, OntarioUpdateMaintainFormComponent_Conditional_9_Template, 2, 9, "expandable-list-card", 6)(10, OntarioUpdateMaintainFormComponent_Conditional_10_Template, 4, 4, "expandable-card", 7);
+            \u0275\u0275template(9, OntarioUpdateMaintainFormComponent_Conditional_9_Template, 2, 10, "expandable-list-card", 6)(10, OntarioUpdateMaintainFormComponent_Conditional_10_Template, 4, 4, "expandable-card", 7);
             \u0275\u0275declareLet(11);
-            \u0275\u0275template(12, OntarioUpdateMaintainFormComponent_Conditional_12_Template, 2, 9, "expandable-list-card", 8)(13, OntarioUpdateMaintainFormComponent_Conditional_13_Template, 4, 4, "expandable-card", 7);
+            \u0275\u0275template(12, OntarioUpdateMaintainFormComponent_Conditional_12_Template, 2, 10, "expandable-list-card", 8)(13, OntarioUpdateMaintainFormComponent_Conditional_13_Template, 4, 4, "expandable-card", 7);
             \u0275\u0275declareLet(14);
             \u0275\u0275elementStart(15, "expandable-card", 5);
             \u0275\u0275template(16, OntarioUpdateMaintainFormComponent_Conditional_16_Template, 1, 4, "filing-form-group", 9)(17, OntarioUpdateMaintainFormComponent_Conditional_17_Template, 3, 3, "h2", 10);
@@ -81935,6 +81954,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         [isValid]="sectionValidity['directors']"\r
         [areItemsOpen]="isOpen"\r
         [isStatusIcon]="!readonly()"\r
+        [isLoading]="isLoading()"\r
         [config]="directorsFieldsMap"\r
         [configKey]="controls.AffiliationAddressType"\r
         [formArray]="directorsArray"\r
@@ -81959,6 +81979,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         [isSubmitted]="isSubmitted()"\r
         [areItemsOpen]="isOpen"\r
         [isStatusIcon]="!readonly()"\r
+        [isLoading]="isLoading()"\r
         [config]="officersFieldsMap"\r
         [configKey]="controls.AffiliationAddressType"\r
         [formArray]="officersArray"\r
@@ -82017,7 +82038,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         }], () => [], null);
       })();
       (() => {
-        (typeof ngDevMode === "undefined" || ngDevMode) && \u0275setClassDebugInfo(OntarioUpdateMaintainFormComponent, { className: "OntarioUpdateMaintainFormComponent", filePath: "src/app/components/ontario/update-maintain/update-maintain-form/update-maintain-form.component.ts", lineNumber: 44 });
+        (typeof ngDevMode === "undefined" || ngDevMode) && \u0275setClassDebugInfo(OntarioUpdateMaintainFormComponent, { className: "OntarioUpdateMaintainFormComponent", filePath: "src/app/components/ontario/update-maintain/update-maintain-form/update-maintain-form.component.ts", lineNumber: 46 });
       })();
     }
   });
@@ -82066,7 +82087,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         static \u0275fac = function OntarioUpdateMaintainDeltaFormComponent_Factory(__ngFactoryType__) {
           return new (__ngFactoryType__ || _OntarioUpdateMaintainDeltaFormComponent)();
         };
-        static \u0275cmp = /* @__PURE__ */ \u0275\u0275defineComponent({ type: _OntarioUpdateMaintainDeltaFormComponent, selectors: [["ontario-update-maintain-delta-form"]], inputs: { form: [1, "form"], actionsDisabled: [1, "actionsDisabled"], isNote: [1, "isNote"], task: [1, "task"], errors: [1, "errors"], prevData: [1, "prevData"] }, outputs: { close: "close", save: "save", validate: "validate" }, decls: 15, vars: 19, consts: [[1, "ontario-update-maintain-delta-form"], [1, "ontario-update-maintain-delta-form-content", 3, "visiblyValidChange", "form", "task", "errors", "isNote", "isSubmitted", "readonly", "prevData"], [1, "ontario-update-maintain-delta-form-actions"], ["mat-stroked-button", "", "mat-button", "", 3, "click", "disabled"], [1, "body-1-semibold"], ["color", "primary", "mat-flat-button", "", 1, "submit", 3, "click", "disabled"]], template: function OntarioUpdateMaintainDeltaFormComponent_Template(rf, ctx) {
+        static \u0275cmp = /* @__PURE__ */ \u0275\u0275defineComponent({ type: _OntarioUpdateMaintainDeltaFormComponent, selectors: [["ontario-update-maintain-delta-form"]], inputs: { form: [1, "form"], actionsDisabled: [1, "actionsDisabled"], isNote: [1, "isNote"], task: [1, "task"], errors: [1, "errors"], prevData: [1, "prevData"] }, outputs: { close: "close", save: "save", validate: "validate" }, decls: 15, vars: 20, consts: [[1, "ontario-update-maintain-delta-form"], [1, "ontario-update-maintain-delta-form-content", 3, "visiblyValidChange", "form", "task", "errors", "isNote", "isSubmitted", "readonly", "prevData", "isLoading"], [1, "ontario-update-maintain-delta-form-actions"], ["mat-stroked-button", "", "mat-button", "", 3, "click", "disabled"], [1, "body-1-semibold"], ["color", "primary", "mat-flat-button", "", 1, "submit", 3, "click", "disabled"]], template: function OntarioUpdateMaintainDeltaFormComponent_Template(rf, ctx) {
           if (rf & 1) {
             \u0275\u0275elementStart(0, "div", 0)(1, "ontario-update-maintain-form", 1);
             \u0275\u0275listener("visiblyValidChange", function OntarioUpdateMaintainDeltaFormComponent_Template_ontario_update_maintain_form_visiblyValidChange_1_listener($event) {
@@ -82100,19 +82121,19 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           }
           if (rf & 2) {
             \u0275\u0275advance();
-            \u0275\u0275property("form", ctx.form())("task", ctx.task())("errors", ctx.combinedErrors())("isNote", ctx.isNote())("isSubmitted", ctx.submitted())("readonly", false)("prevData", ctx.prevData());
+            \u0275\u0275property("form", ctx.form())("task", ctx.task())("errors", ctx.combinedErrors())("isNote", ctx.isNote())("isSubmitted", ctx.submitted())("readonly", false)("prevData", ctx.prevData())("isLoading", !ctx.prevData());
             \u0275\u0275advance(2);
             \u0275\u0275property("disabled", ctx.actionsDisabled());
             \u0275\u0275advance(2);
-            \u0275\u0275textInterpolate(\u0275\u0275pipeBind1(6, 13, "Close"));
+            \u0275\u0275textInterpolate(\u0275\u0275pipeBind1(6, 14, "Close"));
             \u0275\u0275advance(2);
             \u0275\u0275property("disabled", ctx.actionsDisabled());
             \u0275\u0275advance(2);
-            \u0275\u0275textInterpolate(\u0275\u0275pipeBind1(10, 15, "Save Changes"));
+            \u0275\u0275textInterpolate(\u0275\u0275pipeBind1(10, 16, "Save Changes"));
             \u0275\u0275advance(2);
             \u0275\u0275property("disabled", ctx.actionsDisabled());
             \u0275\u0275advance(2);
-            \u0275\u0275textInterpolate(\u0275\u0275pipeBind1(14, 17, "Validate & Generate Draft"));
+            \u0275\u0275textInterpolate(\u0275\u0275pipeBind1(14, 18, "Validate & Generate Draft"));
           }
         }, dependencies: [
           MatButton,
@@ -82137,6 +82158,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     [isSubmitted]="submitted()"\r
     [readonly]="false"\r
     [prevData]="prevData()"\r
+    [isLoading]="!prevData()"\r
     (visiblyValidChange)="onVisiblyValidChange($event)"\r
   />\r
 \r
@@ -87442,14 +87464,6 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     if (!corporationInfo)
       return { persons: personsMap, corporationInfo: { primaryActivity: "", email: "" } };
     const initialAdministrators = corporationInfo.CurrentData.InitialAdministrators;
-    const fullName = (payload) => {
-      return [
-        payload.PersonName.FirstName?.toLowerCase() ?? "",
-        payload.PersonName.MiddleName?.toLowerCase() ?? "",
-        payload.PersonName.LastName?.toLowerCase() ?? "",
-        payload.OfficerPositionName?.toLowerCase() ?? payload.PersonName.Position ?? ""
-      ].filter(Boolean).join(" ");
-    };
     const populatePersonsMap = (list) => {
       for (const payload of list ?? []) {
         if (!payload)
@@ -87459,12 +87473,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           continue;
         const email = ("EmailAddress" in payload ? payload.EmailAddress : "") ?? "";
         const ceasedRoles = "CeasedAppointedRoles" in payload && Array.isArray(payload.CeasedAppointedRoles) ? payload.CeasedAppointedRoles.map((role) => `${role.PositionFullName} - ${role.CeasedDate} (Appointed ${role.AppointedDate})`) : void 0;
-        const name = [
-          toTitleCase(payload.PersonName.FirstName ?? ""),
-          toTitleCase(payload.PersonName.MiddleName ?? ""),
-          toTitleCase(payload.PersonName.LastName ?? "")
-        ].filter(Boolean).join(" ");
-        personsMap.set(fullName(payload), __spreadProps(__spreadValues({}, deltaData), { email, ceasedRoles, position: payload.OfficerPositionName?.toLowerCase() ?? payload.PersonName.Position ?? "", fullName: name }));
+        personsMap.set(generateCurrentDataAffiliationKey(payload), __spreadProps(__spreadValues({}, deltaData), { email, ceasedRoles, position: payload.OfficerPositionName?.toLowerCase() ?? payload.PersonName.Position ?? "", item: payload }));
       }
     };
     populatePersonsMap(initialAdministrators);
@@ -87938,7 +87947,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       const entityAddr = aff.addresses?.at(0) || aff.parent_affiliation?.addresses?.at(0);
       const PostalAddress = buildPostalAddress(entityAddr, deltaEntry?.address);
       const PersonName = { FirstName: firstName, MiddleName: middleName, LastName: lastName };
-      const position = isOfficer ? OFFICER_TITLE_TO_ECORE_POSITION_CODE[toTitleCase(aff.role?.static_title ?? "")] ?? "" : "Director";
+      const position2 = isOfficer ? OFFICER_TITLE_TO_ECORE_POSITION_CODE[toTitleCase(aff.role?.static_title ?? "")] ?? "" : "Director";
       const matchingAdmin = getCurrentDataAdministrator(deltaEntry.currentName ?? "", isOfficer);
       const isCeaseAction = currentState === IRCurrentState.Ceased;
       const isDirectorFromRole = aff.role?.role_name === "Director";
@@ -87948,7 +87957,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       const personNameRoleId = isOfficer ? matchingAdmin?.RoleId ?? null : null;
       const mappedCeaseDate = currentState === IRCurrentState.Ceased ? ceaseDate : "";
       const mappedElectedDate = currentState === IRCurrentState.Added ? electedDate : "";
-      const positionName = ECORE_POSITION_CODE_TO_POSITION_NAME[position?.toUpperCase()];
+      const positionName = ECORE_POSITION_CODE_TO_POSITION_NAME[position2?.toUpperCase()];
       if (!isOfficer) {
         switch (currentState) {
           case IRCurrentState.Added:
@@ -88051,7 +88060,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
                 {
                   State: "",
                   StateName: "",
-                  Position: position,
+                  Position: position2,
                   PositionFullName: positionName,
                   CeasedDate: "",
                   AppointedDate: electedDate
@@ -88061,8 +88070,8 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
               EmailAddress: email,
               IsDirector: isDirectorFromRole,
               PersonName: __spreadProps(__spreadValues({}, PersonName), { RoleId: personNameRoleId }),
-              OfficerPosition: position,
-              Position: position,
+              OfficerPosition: position2,
+              Position: position2,
               PositionName: positionName,
               OfficerPositionName: positionName,
               OfficerPositionSpecified: true,
@@ -88083,7 +88092,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
                 {
                   State: matchingAdmin && isCeaseAction ? IRCurrentState.Ceased : "",
                   StateName: matchingAdmin && isCeaseAction ? "Ceased" : "",
-                  Position: position,
+                  Position: position2,
                   PositionFullName: positionName,
                   CeasedDate: matchingAdmin && isCeaseAction ? ceaseDate : "",
                   AppointedDate: ""
@@ -88108,7 +88117,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
                 {
                   State: matchingAdmin && isCeaseAction ? IRCurrentState.Ceased : "",
                   StateName: matchingAdmin && isCeaseAction ? "Ceased" : "",
-                  Position: position,
+                  Position: position2,
                   PositionFullName: positionName,
                   CeasedDate: matchingAdmin && isCeaseAction ? ceaseDate : "",
                   AppointedDate: ""
@@ -88121,7 +88130,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
               RoleId: mappedRoleId,
               IsDirector: isDirectorFromRole,
               ResidentCanadian: residentCanadian,
-              PersonName: __spreadProps(__spreadValues({}, PersonName), { RoleId: personNameRoleId, Position: position }),
+              PersonName: __spreadProps(__spreadValues({}, PersonName), { RoleId: personNameRoleId, Position: position2 }),
               CeaseDate: mappedCeaseDate,
               ElectedDate: mappedElectedDate,
               CeasedDateSpecified: false,
@@ -88180,13 +88189,14 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       }
       return false;
     });
+    const position = OFFICER_TITLE_TO_ECORE_POSITION_CODE[cert.officerTitle] ?? null;
     const certifier = {
       PersonName: {
         FirstName: cert.firstName,
         LastName: cert.lastName,
         MiddleName: cert.middleName,
         RoleId: initialAdministratorForCertifier?.RoleId,
-        Position: cert.type === "Officer" ? cert.officerTitle ?? null : null
+        Position: cert.type === "Officer" ? position : null
       },
       PostCode: certEntityAddr?.postal_zip ?? null,
       AdditionalDetails: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dyedurham/search-and-file-widget",
-  "version": "1.6.22",
+  "version": "1.6.23",
   "description": "",
   "main": "dnd-filing-shell.js",
   "scripts": {