@dyedurham/search-and-file-widget 1.6.24 → 1.6.26

package/dnd-filing-shell.js

@@ -59087,11 +59087,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           addressForm.addControl("id", new FormControl(affiliation.participant._id));
           addressForm.addControl(FormationFormControls.OfficialEmail, new FormControl(affiliation.participant.communicationEmail || ""));
           addressForm.addControl(FormationFormControls.IsResident, new FormControl(deltaData?.residentCanadian ?? false, Validators.required));
-          const person = affiliation.participant;
-          const firstName = person._profile.firstName || "";
-          const lastName = person._profile.lastName || "";
-          const middleName = person._profile.middleName || "";
-          const name = `${firstName} ${lastName} ${middleName}`;
+          const name = generateTaskAffiliationFullName(affiliation);
           addressForm.addControl(FormationFormControls.AffiliationName, new FormControl({ value: name, disabled: true }));
           return addressForm;
         }
@@ -59223,7 +59219,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
               return form;
             }),
             ...ceasedDirectors.map((admin) => {
-              const form = _OntarioUpdateMaintainFormHelper.generateAffiliationForm(admin, IRAffiliationType.Ceased, isFirsSubmit ? null : comparisonData, directorDeltaData[admin._id]);
+              const form = _OntarioUpdateMaintainFormHelper.generateAffiliationForm(admin, IRAffiliationType.Ceased, comparisonData, directorDeltaData[admin._id]);
               form.addControl(IRFormControls.IsCanadianResident, new FormControl(directorDeltaData[admin._id]?.residentCanadian ?? false));
               return form;
             })
@@ -59231,7 +59227,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           const officerDeltaData = deltaData?.officers ?? {};
           config2[InitialReturnFillingFormGroups.Officers] = new FormArray([
             ...addedOfficers.map((admin) => _OntarioUpdateMaintainFormHelper.generateAffiliationForm(admin, IRAffiliationType.Add, isFirsSubmit ? null : comparisonData, officerDeltaData[admin._id])),
-            ...ceasedOfficers.map((admin) => _OntarioUpdateMaintainFormHelper.generateAffiliationForm(admin, IRAffiliationType.Ceased, isFirsSubmit ? null : comparisonData, officerDeltaData[admin._id]))
+            ...ceasedOfficers.map((admin) => _OntarioUpdateMaintainFormHelper.generateAffiliationForm(admin, IRAffiliationType.Ceased, comparisonData, officerDeltaData[admin._id]))
           ]);
           if (cert) {
             config2[InitialReturnFillingFormGroups.CertifiedBy] = _OntarioUpdateMaintainFormHelper.generateCertification(cert, deltaData?.certifiedBy);
@@ -87829,7 +87825,6 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
   }
   function buildOntarioUpdateMaintainValidationRequest(task, deltaData, serviceOrderId, corporationInfo) {
     const initialAdministrators = corporationInfo?.CurrentData.InitialAdministrators;
-    const normalizePersonTitle = (name) => (name ?? "").trim().replace(/\s+/g, " ").toLowerCase();
     const getCurrentDataAdministrator = (name, isOfficer) => {
       if (!name || !initialAdministrators?.length) {
         return null;
@@ -87838,12 +87833,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         if (!admin || Boolean(admin.IsDirector) === isOfficer) {
           return false;
         }
-        const adminTitle = normalizePersonTitle([
-          admin.PersonName?.FirstName?.toLowerCase(),
-          admin.PersonName?.MiddleName?.toLowerCase(),
-          admin.PersonName?.LastName?.toLowerCase(),
-          admin.OfficerPositionName?.toLowerCase()
-        ].filter(Boolean).join(" "));
+        const adminTitle = generateCurrentDataAffiliationKey(admin);
         return adminTitle === name;
       });
       return matchedOfficer ?? null;

package/package.json

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