@dyedurham/search-and-file-widget 1.6.19 → 1.6.21

package/dnd-filing-shell.js

@@ -55905,6 +55905,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         FormationFormControls2["wasLegalOpinionObtained"] = "wasLegalOpinionObtained";
         FormationFormControls2["RequestedDateForIncorporation"] = "requestedDateForIncorporation";
         FormationFormControls2["LawyerSigningOpinion"] = "lawyerSigningOpinion";
+        FormationFormControls2["LawFirm"] = "lawFirm";
         FormationFormControls2["OtherProvisions"] = "otherProvisions";
         FormationFormControls2["Contact"] = "contact";
       })(FormationFormControls || (FormationFormControls = {}));
@@ -57052,6 +57053,41 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       }
     };
   }
+  function createTelephone(phone) {
+    const digits = (phone ?? "").replace(/\D/g, "");
+    if (!digits) {
+      return { CountryCode: "1", AreaCode: "", PhoneNumber: "" };
+    }
+    const { countryCode, areaCode, number } = getPhoneData(digits);
+    return {
+      CountryCode: countryCode,
+      AreaCode: areaCode,
+      PhoneNumber: number
+    };
+  }
+  function createLegalOpinion(task, deltaData) {
+    const legalOpinionDelta = deltaData?.legalOpinion;
+    if (!legalOpinionDelta?.wasLegalOpinionObtained) {
+      return void 0;
+    }
+    const lawyerAffiliation = task.entity.affiliations.find((aff) => aff._id === legalOpinionDelta.lawyerSigning);
+    const lawyer = lawyerAffiliation?.participant;
+    const lawyerAddress = lawyerAffiliation?.addresses?.[0] || lawyerAffiliation?.parent_affiliation?.addresses?.[0];
+    const firstName = lawyer?._profile?.firstName || "";
+    const middleName = lawyer?._profile?.middleName || "";
+    const lastName = lawyer?._profile?.lastName || "";
+    const email = lawyer?.communicationEmail || "";
+    const phone = lawyer?.communicationPhone || "";
+    return __spreadProps(__spreadValues({
+      LawFirm: legalOpinionDelta.lawFirm || "",
+      LawyerFirstName: firstName
+    }, middleName && { LawyerMiddleName: middleName }), {
+      LawyerLastName: lastName,
+      LawyerEmail: email,
+      Address: transformAddress(lawyerAddress ?? {}, legalOpinionDelta.address),
+      ContactPhone: createTelephone(phone)
+    });
+  }
   function findRegisteredOfficeAddress(task) {
     const registeredOffice = [...task.entity.affiliations ?? []].find((aff) => aff.kind === "EntityAffiliationV3" && aff.role.role_name === "Shared Address" && aff.role.static_title === "Registered Office");
     const registeredOfficeAddress = registeredOffice?.addresses?.[0] || registeredOffice?.parent_affiliation?.addresses?.[0];
@@ -57087,15 +57123,17 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     const restrictionsOnShareRights = task.entity._articles?.share_restrictions_text || "None";
     const restrictionsOnShareTransfers = task.entity._articles?.transfer_restrictions_text || "None";
     const otherProvisions = task.entity._articles?.other_provisions || "None";
-    const eCorePayload = __spreadProps(__spreadValues({
+    const legalOpinion = createLegalOpinion(task, deltaData);
+    const eCorePayload = __spreadProps(__spreadValues(__spreadProps(__spreadValues({
       IncorporationType: mapNameTypeToECore(entityDetails?.corporationNameType),
       LegalEnding: legalEnding,
       EnglishName: englishName,
       FrenchName: frenchName,
       RegisteredOffice: transformAddress(registeredOfficeAddress, deltaData.registeredOfficeAddress),
-      CoverLetter: createCoverLetter(deltaData),
+      CoverLetter: createCoverLetter(deltaData)
+    }, legalOpinion && { LegalOpinion: legalOpinion }), {
       DirectorNumberType: task.entity._articles?.min_directors === task.entity._articles?.max_directors ? ECoreDirectorNumberType.Fixed : ECoreDirectorNumberType.Range
-    }, task.entity._articles?.min_directors === task.entity._articles?.max_directors ? { FixedNumberOfDirectors: task.entity._articles?.min_directors } : {
+    }), task.entity._articles?.min_directors === task.entity._articles?.max_directors ? { FixedNumberOfDirectors: task.entity._articles?.min_directors } : {
       MinimumNumberOfDirectors: task.entity._articles?.min_directors,
       MaximumNumberOfDirectors: task.entity._articles?.max_directors
     }), {
@@ -57814,7 +57852,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
 
   // src/app/utils/common.utils.ts
   function buildValidationError(httpStatus, r) {
-    const msgs = (r.Errors ?? []).map((e) => e.Message || e.message || e.Code || JSON.stringify(e)).filter(Boolean);
+    const msgs = (r.Errors ?? []).map((e) => e.ErrorMessage || e.Message || e.message || e.Code || JSON.stringify(e)).filter(Boolean);
     const status = r.Status ? String(r.Status) : "ValidationFailed";
     return new Error(msgs.length ? `eCore validation failed (HTTP ${httpStatus}, ${status}): ${msgs.join(" | ")}` : `eCore validation failed (HTTP ${httpStatus}, ${status}).`);
   }
@@ -57917,7 +57955,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       }
       return d.length >= 10 ? d.slice(0, 10) : d;
     }
-    if (isNaN(d.getTime())) {
+    if (d instanceof Date && isNaN(d.getTime())) {
       return "Not specified";
     }
     return d.toISOString().slice(0, 10);
@@ -58388,7 +58426,6 @@ 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 = [
         {
@@ -58633,6 +58670,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             formControlName: FormationFormControls.CorporationNameType,
             required: true,
             options: ONTARIO_NAME_TYPE_OPTIONS,
+            needTranslate: true,
             onChange: (form) => {
               const corporationNameType = form.get(FormationFormControls.CorporationNameType)?.value;
               const isNumbered = corporationNameType === NameType.Numbered;
@@ -58805,7 +58843,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 ? 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 });
                 let affiliationAddressType;
                 if (isCanadian) {
                   affiliationAddressType = suite ? AffiliationAddressType.CanadianSuite : AffiliationAddressType.CanadianNoSuite;
@@ -58816,6 +58858,14 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
               }
             },
             options: lawyerOptions
+          },
+          {
+            type: FormType.Input,
+            label: "Law Firm",
+            formControlName: FormationFormControls.LawFirm,
+            required: true,
+            isVisible: (form) => Boolean(form.get(FormationFormControls.LawyerSigningOpinion)?.value),
+            class: "span-12"
           }
         ];
       };
@@ -59015,12 +59065,13 @@ 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";
           let affiliationAddressType = "";
           if (affiliation) {
-            const address = affiliation?.addresses.at(0) || affiliation?.parent_affiliation?.addresses?.at(0);
-            const normalizedCountryCode = normalizeCountryCode(address?.country);
-            const suite = getAddressComponent(address, "Suite/Apartment");
-            const isCanadian = normalizedCountryCode === "CA";
             if (isCanadian) {
               affiliationAddressType = suite ? AffiliationAddressType.CanadianSuite : AffiliationAddressType.CanadianNoSuite;
             } else {
@@ -59029,12 +59080,18 @@ 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.UnitNumber]: new FormControl(deltaData?.address?.unitType ?? "", requiredIf(IRFormControls.UnitType)),
+            [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),
             [FormationFormControls.StreetType]: new FormControl(deltaData?.address?.streetType ?? ""),
             [FormationFormControls.StreetDirection]: new FormControl(deltaData?.address?.streetDirection ?? ""),
+            [FormationFormControls.City]: new FormControl(address?.city ?? ""),
+            [FormationFormControls.Province]: new FormControl(address?.province_state ?? ""),
+            [FormationFormControls.PostalCode]: new FormControl(address?.postal_zip ?? ""),
+            [FormationFormControls.CountryCode]: new FormControl(normalizedCountryCode ?? ""),
+            [FormationFormControls.Country]: new FormControl(address?.country ?? normalizedCountryCode ?? ""),
             [FormationFormControls.AffiliationAddressType]: new FormControl(affiliationAddressType)
           });
         }
@@ -59151,23 +59208,8 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       init_app_enums();
       init_ontario_formation_form_constants();
       OntarioUpdateMaintainFormHelper = class _OntarioUpdateMaintainFormHelper {
-        static normalizePersonKey(value) {
-          return (value ?? "").toLowerCase().replace(/\s+/g, " ").trim();
-        }
-        static getCurrentPersonData(comparisonData, affiliation) {
-          const lookupName = _OntarioUpdateMaintainFormHelper.normalizePersonKey(generateAffiliationFullName(affiliation));
-          if (!lookupName || !comparisonData?.persons?.size) {
-            return void 0;
-          }
-          for (const [personKey, personData] of comparisonData.persons.entries()) {
-            const normalizedKey = _OntarioUpdateMaintainFormHelper.normalizePersonKey(personKey);
-            if (normalizedKey === lookupName || normalizedKey.startsWith(`${lookupName} -`)) {
-              return personData;
-            }
-          }
-          return void 0;
-        }
         static generateInitialForm(task, comparisonData) {
+          const isFirsSubmit = isInitialReturn(task);
           const config2 = {};
           const { _ext, incomingAffiliations, outgoingAffiliations } = task;
           const deltaData = task.deltaData;
@@ -59190,20 +59232,20 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           const directorDeltaData = deltaData?.directors ?? {};
           config2[InitialReturnFillingFormGroups.Directors] = new FormArray([
             ...addedDirectors.map((admin) => {
-              const form = _OntarioUpdateMaintainFormHelper.generateAffiliationForm(admin, IRAffiliationType.Add, comparisonData, directorDeltaData[admin._id]);
+              const form = _OntarioUpdateMaintainFormHelper.generateAffiliationForm(admin, IRAffiliationType.Add, isFirsSubmit ? null : comparisonData, directorDeltaData[admin._id]);
               form.addControl(IRFormControls.IsCanadianResident, new FormControl(directorDeltaData[admin._id]?.residentCanadian ?? false));
               return form;
             }),
             ...ceasedDirectors.map((admin) => {
-              const form = _OntarioUpdateMaintainFormHelper.generateAffiliationForm(admin, IRAffiliationType.Ceased, comparisonData, directorDeltaData[admin._id]);
+              const form = _OntarioUpdateMaintainFormHelper.generateAffiliationForm(admin, IRAffiliationType.Ceased, isFirsSubmit ? null : comparisonData, directorDeltaData[admin._id]);
               form.addControl(IRFormControls.IsCanadianResident, new FormControl(directorDeltaData[admin._id]?.residentCanadian ?? false));
               return form;
             })
           ]);
           const officerDeltaData = deltaData?.officers ?? {};
           config2[InitialReturnFillingFormGroups.Officers] = new FormArray([
-            ...addedOfficers.map((admin) => _OntarioUpdateMaintainFormHelper.generateAffiliationForm(admin, IRAffiliationType.Add, comparisonData, officerDeltaData[admin._id])),
-            ...ceasedOfficers.map((admin) => _OntarioUpdateMaintainFormHelper.generateAffiliationForm(admin, IRAffiliationType.Ceased, comparisonData, officerDeltaData[admin._id]))
+            ...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]))
           ]);
           if (cert) {
             config2[InitialReturnFillingFormGroups.CertifiedBy] = _OntarioUpdateMaintainFormHelper.generateCertification(cert, deltaData?.certifiedBy);
@@ -59309,22 +59351,28 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           const emailAddress = affiliation.participant.communicationEmail ?? communications?.find((item) => item.type.toLowerCase().includes("email"))?.value;
           const name = generateAffiliationFullName(affiliation);
           const key = generateAffiliationKey(affiliation).toLowerCase();
-          const currentData = _OntarioUpdateMaintainFormHelper.getCurrentPersonData(comparisonData, affiliation);
+          const currentData = comparisonData?.persons.get(key);
           let correctedAffiliationType = affiliationType;
           let isThisChangeToAnExistingEntity = false;
           let isThisChangeToAnExistingEntityVisible = false;
-          if (deltaData) {
-            if (deltaData.currentName) {
-              isThisChangeToAnExistingEntity = true;
-              isThisChangeToAnExistingEntityVisible = true;
-            }
-            correctedAffiliationType = IRAffiliationType.Update;
-          } else {
-            if (currentData) {
+          if (affiliationType !== IRAffiliationType.Ceased) {
+            if (deltaData) {
+              if (deltaData.currentName && !currentData) {
+                isThisChangeToAnExistingEntity = true;
+                isThisChangeToAnExistingEntityVisible = true;
+              }
               correctedAffiliationType = IRAffiliationType.Update;
             } else {
-              isThisChangeToAnExistingEntity = false;
-              isThisChangeToAnExistingEntityVisible = true;
+              if (currentData) {
+                correctedAffiliationType = IRAffiliationType.Update;
+              } else {
+                const keys = Array.from(comparisonData?.persons.keys() ?? []);
+                const keyLikeField = keys.find((item) => item.includes(name.toLowerCase()));
+                if (keyLikeField) {
+                  isThisChangeToAnExistingEntity = false;
+                  isThisChangeToAnExistingEntityVisible = true;
+                }
+              }
             }
           }
           const config2 = {
@@ -59335,7 +59383,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             [IRFormControls.CeaseDate]: new FormControl(affiliation.end_date ? toYyyyMmDd(affiliation.end_date) : ""),
             [IRFormControls.Email]: new FormControl(emailAddress ?? ""),
             [IRFormControls.AffiliationType]: new FormControl(correctedAffiliationType),
-            [IRFormControls.CurrentName]: new FormControl(deltaData ? deltaData.currentName : IRAffiliationType.Update === correctedAffiliationType ? key : "", requiredIf(IRFormControls.IsThisChangeToAnExistingEntity)),
+            [IRFormControls.CurrentName]: new FormControl(deltaData ? deltaData.currentName : currentData ? key : "", requiredIf(IRFormControls.IsThisChangeToAnExistingEntity)),
             [IRFormControls.IsThisChangeToAnExistingEntity]: new FormControl(isThisChangeToAnExistingEntity),
             [IRFormControls.IsThisChangeToAnExistingEntityVisible]: new FormControl(isThisChangeToAnExistingEntityVisible)
           };
@@ -63090,7 +63138,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             MatIcon,
             ChipComponent,
             TranslatePipe
-          ], changeDetection: ChangeDetectionStrategy.OnPush, animations: [
+          ], changeDetection: ChangeDetectionStrategy.OnPush, standalone: true, animations: [
             trigger("expandCollapse", [
               state("true", style({
                 height: "*",
@@ -63150,7 +63198,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         }], () => [], null);
       })();
       (() => {
-        (typeof ngDevMode === "undefined" || ngDevMode) && \u0275setClassDebugInfo(ExpandableCardComponent, { className: "ExpandableCardComponent", filePath: "src/app/components/expandable-card/expandable-card.component.ts", lineNumber: 37 });
+        (typeof ngDevMode === "undefined" || ngDevMode) && \u0275setClassDebugInfo(ExpandableCardComponent, { className: "ExpandableCardComponent", filePath: "src/app/components/expandable-card/expandable-card.component.ts", lineNumber: 38 });
       })();
     }
   });
@@ -78587,9 +78635,10 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     }
     if (rf & 2) {
       const option_r5 = ctx.$implicit;
+      const field_r3 = \u0275\u0275nextContext(3).$implicit;
       \u0275\u0275property("value", option_r5.value);
       \u0275\u0275advance();
-      \u0275\u0275textInterpolate1(" ", \u0275\u0275pipeBind1(2, 2, option_r5.label), " ");
+      \u0275\u0275textInterpolate1(" ", field_r3.needTranslate ? \u0275\u0275pipeBind1(2, 2, option_r5.label) : option_r5.label, " ");
     }
   }
   function FilingFormGroupComponent_For_5_Conditional_0_Case_1_Conditional_10_Template(rf, ctx) {
@@ -79150,18 +79199,19 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
          */
         getDisplayFn(field) {
           const form = this.form();
+          const translate = (label) => field.needTranslate ? this.translateService.instant(label) : label;
           return (value) => {
             if (value === null || value === void 0 || value === "")
               return "";
             const staticOpt = (field.options ?? []).find((o) => o.value === value);
             if (staticOpt)
-              return this.translateService.instant(staticOpt.label);
+              return translate(staticOpt.label);
             if (field.dynamicOptions) {
               const dynOpt = field.dynamicOptions(form).find((o) => o.value === value);
               if (dynOpt)
-                return this.translateService.instant(dynOpt.label);
+                return translate(dynOpt.label);
             }
-            return this.translateService.instant(String(value));
+            return translate(String(value));
           };
         }
         /**
@@ -79303,7 +79353,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
                       class="filing-form-group-select-option"\r
                       [value]="option.value"\r
                     >\r
-                      {{ option.label | translate }}\r
+                      {{ field.needTranslate ? (option.label | translate) : option.label }}\r
                     </mat-option>\r
                   }\r
                   @if (getFilteredOptions(field).length === 0) {\r
@@ -80079,7 +80129,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             TranslatePipe,
             FilingFormGroupComponent,
             ExpandableCardComponent
-          ], changeDetection: ChangeDetectionStrategy.OnPush, animations: [
+          ], standalone: true, changeDetection: ChangeDetectionStrategy.OnPush, animations: [
             trigger("expandCollapse", [
               state("true", style({
                 height: "*",
@@ -80176,7 +80226,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         }], () => [], null);
       })();
       (() => {
-        (typeof ngDevMode === "undefined" || ngDevMode) && \u0275setClassDebugInfo(ExpandableListCardComponent, { className: "ExpandableListCardComponent", filePath: "src/app/components/expandable-list-card/expandable-list-card.component.ts", lineNumber: 66 });
+        (typeof ngDevMode === "undefined" || ngDevMode) && \u0275setClassDebugInfo(ExpandableListCardComponent, { className: "ExpandableListCardComponent", filePath: "src/app/components/expandable-list-card/expandable-list-card.component.ts", lineNumber: 67 });
       })();
     }
   });
@@ -82613,6 +82663,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             data.legalOpinion = {
               wasLegalOpinionObtained: corpDetails?.[FormationFormControls.wasLegalOpinionObtained] ?? false,
               lawyerSigning: legalOpinionData?.[FormationFormControls.LawyerSigningOpinion] ?? null,
+              lawFirm: legalOpinionData?.[FormationFormControls.LawFirm] ?? null,
               address: this.mapFormationAddressDelta(legalOpinionData)
             };
           }
@@ -87392,11 +87443,12 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       return { persons: personsMap, corporationInfo: { primaryActivity: "", email: "" } };
     const initialAdministrators = corporationInfo.CurrentData.InitialAdministrators;
     const fullName = (payload) => {
+      console.log(payload);
       return [
         payload.PersonName.FirstName?.toLowerCase() ?? "",
         payload.PersonName.MiddleName?.toLowerCase() ?? "",
         payload.PersonName.LastName?.toLowerCase() ?? "",
-        payload.OfficerPositionName?.toLowerCase() ?? ""
+        payload.OfficerPositionName?.toLowerCase() ?? payload.PersonName.Position ?? ""
       ].filter(Boolean).join(" ");
     };
     const populatePersonsMap = (list) => {
@@ -87413,7 +87465,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           toTitleCase(payload.PersonName.MiddleName ?? ""),
           toTitleCase(payload.PersonName.LastName ?? "")
         ].filter(Boolean).join(" ");
-        personsMap.set(fullName(payload), __spreadProps(__spreadValues({}, deltaData), { email, ceasedRoles, position: payload.OfficerPositionName, fullName: name }));
+        personsMap.set(fullName(payload), __spreadProps(__spreadValues({}, deltaData), { email, ceasedRoles, position: payload.OfficerPositionName?.toLowerCase() ?? payload.PersonName.Position ?? "", fullName: name }));
       }
     };
     populatePersonsMap(initialAdministrators);
@@ -88118,11 +88170,23 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     const certStreetOnly = getAddressComponent(certEntityAddr, "Street Only");
     const { StreetName: certStreetName, StreetType: certStreetType, StreetDirection: certStreetDir } = parseStreetAddress(certStreetOnly);
     const isCanadianCertifierAddress = certifierCountry === "CA";
+    const initialAdministratorForCertifier = initialAdministrators?.find((admin) => {
+      if ((admin.PersonName.FirstName ?? "").toLowerCase() === (cert.firstName ?? "").toLowerCase() && (admin.PersonName.LastName ?? "").toLowerCase() === (cert.lastName ?? "").toLowerCase() && (admin.PersonName.MiddleName ?? "").toLowerCase() === (cert.middleName ?? "").toLowerCase()) {
+        if (cert.type === "Director" && admin.IsDirector) {
+          return admin;
+        }
+        if (cert.type !== "Director" && (cert.officerTitle === admin.OfficerPositionName || cert.officerTitle === admin.Position)) {
+          return admin;
+        }
+      }
+      return false;
+    });
     const certifier = {
       PersonName: {
         FirstName: cert.firstName,
         LastName: cert.lastName,
         MiddleName: cert.middleName,
+        RoleId: initialAdministratorForCertifier?.RoleId,
         Position: cert.type === "Officer" ? cert.officerTitle ?? null : null
       },
       PostCode: certEntityAddr?.postal_zip ?? null,
@@ -88928,7 +88992,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
                     validatedOn: /* @__PURE__ */ new Date(),
                     provider: "obr",
                     draftPdf,
-                    documentName: this.validateOptions()?.documentName ?? "Initial Return Draft",
+                    documentName: this.validateOptions()?.documentName ?? this.getUpdateMaintainDraftName(task),
                     documentType: "pdf"
                   });
                 }
@@ -88941,6 +89005,15 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             }
           });
         }
+        getUpdateMaintainDraftName(task) {
+          if (isNoticeOfChangeTask(task)) {
+            return "Notice of Change Draft";
+          }
+          if (isAnnualReturnTask(task)) {
+            return "Annual Return Draft";
+          }
+          return "Initial Return Draft";
+        }
         onEditClick() {
           if (isUpdateMaintain(this.task())) {
             this.serviceOrderId = "";
@@ -88949,7 +89022,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           this.activeStep.set(Step.Validate);
         }
         parseError(errors) {
-          return errors.map((item) => (item["ErrorMessage"] ?? item["Message"] ?? "").toString());
+          return errors.map((item) => (item["ErrorMessage"] ?? item["Message"] ?? "").toString().trim()).filter((message) => message.length > 0);
         }
         /**
          * Checks a successful response for validation errors.
@@ -88968,9 +89041,13 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
          */
         handleCatchError(response) {
           console.error(response);
-          if (response instanceof Error) {
-            this.errors.set([response.message]);
-            return;
+          const validateErrors = response?.validateResult?.["Errors"];
+          if (validateErrors?.length) {
+            const messages = this.parseError(validateErrors);
+            if (messages.length) {
+              this.errors.set(messages);
+              return;
+            }
           }
           let parsed = response;
           try {
@@ -93717,6 +93794,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         "A legal opinion was obtained to use the proposed name": "A legal opinion was obtained to use the proposed name",
         "Legal Opinion": "Legal Opinion",
         "Lawyer Signing Opinion": "Lawyer Signing Opinion",
+        "Law Firm": "Law Firm",
         "Laywer Signing Opinion is required": "Laywer Signing Opinion is required",
         "Unit Type is required": "Unit Type is required",
         "Unit Number is required": "Unit Number is required",
@@ -93985,6 +94063,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         "A legal opinion was obtained to use the proposed name": "Un avis juridique a \xE9t\xE9 obtenu concernant l'utilisation du nom propos\xE9",
         "Legal Opinion": "Avis juridique",
         "Lawyer Signing Opinion": "Avocat signataire de l'avis",
+        "Law Firm": "Cabinet d'avocats",
         "Laywer Signing Opinion is required": "L'avocat signataire de l'avis est requis",
         "Unit Type is required": "Le type d'unit\xE9 est requis",
         "Unit Number is required": "Le num\xE9ro d'unit\xE9 est requis",

package/package.json

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