@dyedurham/search-and-file-widget 2.1.7 → 2.1.9

package/dnd-filing-shell.js

@@ -84312,12 +84312,12 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     const entityDetails = deltaData.entityDetails;
     const isNamed2 = entityDetails?.corporationNameType === BCNameType.Named;
     const nameTranslations = entityDetails?.usesNameTranslation ? (entityDetails.nameTranslations ?? []).filter(Boolean) : [];
-    const registeredOffice = findSharedAddressAffiliation(affiliations, AddressTitle2.REGISTERED_OFFICE);
-    const recordsOffice = findSharedAddressAffiliation(affiliations, AddressTitle2.RECORDS_OFFICE);
-    const regMailing = pickAddress(registeredOffice?.addresses, "Mailing");
-    const regDelivery = pickAddress(registeredOffice?.addresses, "Delivery");
-    const recMailing = pickAddress(recordsOffice?.addresses, "Mailing");
-    const recDelivery = pickAddress(recordsOffice?.addresses, "Delivery");
+    const registeredOfficeAddresses = collectSharedAddresses(affiliations, AddressTitle2.REGISTERED_OFFICE);
+    const recordsOfficeAddresses = collectSharedAddresses(affiliations, AddressTitle2.RECORDS_OFFICE);
+    const regMailing = pickAddress(registeredOfficeAddresses, "Mailing");
+    const regDelivery = pickAddress(registeredOfficeAddresses, "Delivery");
+    const recMailing = pickAddress(recordsOfficeAddresses, "Mailing");
+    const recDelivery = pickAddress(recordsOfficeAddresses, "Delivery");
     const regMailingBC = mapAddress(regMailing);
     const regDeliveryBC = regDelivery ? mapAddress(regDelivery) : void 0;
     const recMailingBC = recMailing ? mapAddress(recMailing) : void 0;
@@ -84358,6 +84358,26 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     };
     return pruneUndefined(request);
   }
+  function findBCOfficeAddressIssues(task) {
+    const affiliations = task.entity.affiliations ?? [];
+    const issues = [];
+    const offices = [
+      { name: "Registered Office", title: AddressTitle2.REGISTERED_OFFICE, required: true },
+      { name: "Records Office", title: AddressTitle2.RECORDS_OFFICE, required: false }
+    ];
+    for (const { name, title, required } of offices) {
+      const addresses = collectSharedAddresses(affiliations, title);
+      if (!addresses.length && !required) {
+        continue;
+      }
+      for (const type of ["Mailing", "Delivery"]) {
+        if (!pickAddress(addresses, type)) {
+          issues.push(`The ${name} has no ${type} address.`);
+        }
+      }
+    }
+    return issues;
+  }
   function findBCRequestIssues(request) {
     const issues = [];
     const email = request.companyEmail?.trim() ?? "";
@@ -84366,9 +84386,6 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     } else if (email.length > 150) {
       issues.push("Company Email must be 150 characters or fewer.");
     }
-    if (!request.registeredOfficeMailingAddress?.streetAddress?.trim()) {
-      issues.push("The Registered Office has no Mailing address.");
-    }
     for (const director of request.directors ?? []) {
       if (!director.mailingAddress?.streetAddress?.trim()) {
         issues.push(`Director ${`${director.firstName} ${director.lastName}`.trim()} has no Mailing address.`);
@@ -84473,6 +84490,9 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
   function findSharedAddressAffiliation(affiliations, staticTitle) {
     return affiliations.find((a) => a.role?.role_name === AddressRole2.SHARED_ADDRESS && a.role?.static_title === staticTitle && isActiveAffiliation(a));
   }
+  function collectSharedAddresses(affiliations, staticTitle) {
+    return affiliations.filter((a) => a.role?.role_name === AddressRole2.SHARED_ADDRESS && a.role?.static_title === staticTitle && isActiveAffiliation(a)).flatMap((a) => a.addresses ?? []);
+  }
   function pickAddress(addresses, locationType, fallbackToFirst = false) {
     const match = addresses?.find((a) => (a.computed_location_type ?? a.location_type)?.toLowerCase() === locationType.toLowerCase());
     return match ?? (fallbackToFirst ? addresses?.[0] : void 0);
@@ -84609,7 +84629,8 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           const affiliations = task.entity.affiliations ?? [];
           const delta = task.deltaData;
           const registeredOffice = findSharedAddressAffiliation(affiliations, AddressTitle2.REGISTERED_OFFICE);
-          const recordsOffice = findSharedAddressAffiliation(affiliations, AddressTitle2.RECORDS_OFFICE);
+          const registeredOfficeAddresses = collectSharedAddresses(affiliations, AddressTitle2.REGISTERED_OFFICE);
+          const recordsOfficeAddresses = collectSharedAddresses(affiliations, AddressTitle2.RECORDS_OFFICE);
           const companyEmail = task.entity.emailOptions?.[0]?.value ?? registeredOffice?.addresses?.[0]?.communications?.find((c) => c.type === "Business Email")?.value ?? task.entity.communications?.find((c) => c.type === "Business Email")?.value ?? // Email only: the entity may carry its Business Email on another address (e.g. Head
           // Office) when no Registered Office shared address exists.
           task.entity.addresses?.flatMap((a) => a.communications ?? []).find((c) => c.type === "Business Email")?.value ?? "";
@@ -84618,19 +84639,19 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           config2[BCFormationFormGroups.CorporationDetails] = this.generateCorporationDetailsFormGroup(task, delta?.entityDetails, companyEmail);
           config2[BCFormationFormGroups.RegisteredOfficeAddress] = new FormGroup({
             [BCFormationFormControls.MailingAddress]: new FormControl({
-              value: this.formatFullAddress(this.pickAddress(registeredOffice?.addresses, "Mailing", true)),
+              value: this.formatFullAddress(this.pickAddress(registeredOfficeAddresses, "Mailing", true)),
               disabled: true
             }),
             [BCFormationFormControls.DeliveryAddress]: new FormControl({
-              value: this.formatFullAddress(this.pickAddress(registeredOffice?.addresses, "Delivery", true)),
+              value: this.formatFullAddress(this.pickAddress(registeredOfficeAddresses, "Delivery", true)),
               disabled: true
             }),
             [BCFormationFormControls.RecordsOfficeMailingAddress]: new FormControl({
-              value: this.formatFullAddress(this.pickAddress(recordsOffice?.addresses, "Mailing", true)),
+              value: this.formatFullAddress(this.pickAddress(recordsOfficeAddresses, "Mailing", true)),
               disabled: true
             }),
             [BCFormationFormControls.RecordsOfficeDeliveryAddress]: new FormControl({
-              value: this.formatFullAddress(this.pickAddress(recordsOffice?.addresses, "Delivery", true)),
+              value: this.formatFullAddress(this.pickAddress(recordsOfficeAddresses, "Delivery", true)),
               disabled: true
             })
           });
@@ -96574,7 +96595,10 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
               const signature = this._signature();
               if (signature) {
                 const requestBody = buildBCFormationValidateRequest(signature.task, deltaData);
-                const issues = findBCRequestIssues(requestBody);
+                const issues = [
+                  ...findBCOfficeAddressIssues(signature.task),
+                  ...findBCRequestIssues(requestBody)
+                ];
                 if (issues.length) {
                   this.errors.set(issues);
                   return;

package/package.json

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