@dyedurham/search-and-file-widget 2.0.99 → 2.1.1

package/dnd-filing-shell.js

@@ -85111,7 +85111,8 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           const pick = BritishColumbiaFormationFormHelper.pickAddress;
           const registeredOffice = BritishColumbiaFormationFormHelper.findSharedAddressAffiliation(affiliations, AddressTitle2.REGISTERED_OFFICE);
           const recordsOffice = BritishColumbiaFormationFormHelper.findSharedAddressAffiliation(affiliations, AddressTitle2.RECORDS_OFFICE);
-          const seed = delta?.registeredOffice ? delta : this.seedFromIncomingAffiliations(task);
+          const incoming = this.incomingOfficeAddresses(task);
+          const seed = delta?.registeredOffice ? this.fillEmptyAddresses(delta, incoming) : this.seedFromIncomingAffiliations(task);
           const config2 = {};
           config2[BCChangeOfOfficeAddressesFormGroups.ReferenceNumbers] = this.generateReferenceNumbersFormGroup(delta?.referenceNumbers, task.entity._profile.client_matter_number);
           config2[BCChangeOfOfficeAddressesFormGroups.CorporationDetails] = new FormGroup({
@@ -85122,7 +85123,6 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           config2[BCChangeOfOfficeAddressesFormGroups.AnnualReportReminder] = new FormGroup({
             [Controls2.AnnualReportReminder]: new FormControl(delta?.annualReportReminder ?? BCAnnualReportReminder.Yes, Validators.required)
           });
-          const incoming = this.incomingOfficeAddresses(task);
           const regDeliverySame = seed.registeredOffice?.deliverySameAsMailing ?? true;
           config2[BCChangeOfOfficeAddressesFormGroups.RegisteredOfficeAddress] = new FormGroup({
             [Controls2.CurrentMailingAddress]: this.readOnly(format(pick(registeredOffice?.addresses, "Mailing"))),
@@ -85184,14 +85184,29 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             }
           };
         }
+        /** Keeps the saved flags and addresses, but fills an address the draft left empty from `incoming`. */
+        static fillEmptyAddresses(saved, incoming) {
+          const hasValues = (address) => EDITABLE_ADDRESS_CONTROLS.some((name) => Boolean(address?.[name]));
+          const pick = (savedAddress, incomingAddress) => hasValues(savedAddress) ? savedAddress : incomingAddress ?? savedAddress;
+          return {
+            registeredOffice: __spreadProps(__spreadValues({}, saved.registeredOffice), {
+              mailingAddress: pick(saved.registeredOffice?.mailingAddress, incoming.regMailing),
+              deliveryAddress: pick(saved.registeredOffice?.deliveryAddress, incoming.regDelivery)
+            }),
+            recordsOffice: __spreadProps(__spreadValues({}, saved.recordsOffice), {
+              mailingAddress: pick(saved.recordsOffice?.mailingAddress, incoming.recMailing),
+              deliveryAddress: pick(saved.recordsOffice?.deliveryAddress, incoming.recDelivery)
+            })
+          };
+        }
         /** The four office addresses of the task's incoming Shared Address, as form values. */
         static incomingOfficeAddresses(task) {
           const incoming = task.incomingAffiliations ?? [];
           const pickBy = (title, locationType) => {
-            const affiliation = BritishColumbiaFormationFormHelper.findSharedAddressAffiliation(incoming, title);
-            const pool = affiliation?.addresses?.length ? affiliation.addresses : affiliation?.parent_affiliation?.addresses;
-            const address = pool?.find((a) => (a.computed_location_type ?? a.location_type)?.toLowerCase() === locationType.toLowerCase());
-            return address ? this.toOfficeAddressDelta(address) : void 0;
+            const pool = incoming.filter((a) => a.role?.role_name === AddressRole2.SHARED_ADDRESS && a.role?.static_title === title).flatMap((a) => a.addresses?.length ? a.addresses : a.parent_affiliation?.addresses ?? []);
+            const wanted = locationType.toLowerCase();
+            const address = pool.find((a) => (a.computed_location_type ?? "").toLowerCase() === wanted || (a.location_type ?? "").toLowerCase() === wanted);
+            return address && this.isBritishColumbia(address) ? this.toOfficeAddressDelta(address) : void 0;
           };
           return {
             regMailing: pickBy(AddressTitle2.REGISTERED_OFFICE, "Mailing"),
@@ -85202,16 +85217,21 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         }
         /** Street = street number + street name; the suite goes to Address Line 2. */
         static toOfficeAddressDelta(address) {
-          const street = [getAddressComponent(address, "Street Number Only"), getAddressComponent(address, "Street Only")].filter(Boolean).join(" ") || address.street || "";
+          const street = [getAddressComponent(address, "Street Number Only"), getAddressComponent(address, "Street Only")].filter(Boolean).join(" ") || getAddressComponent(address, "Street Address") || address.street || "";
           return {
             addressLine1: street,
-            addressLine2: getAddressComponent(address, "Suite/Apartment"),
+            addressLine2: getAddressComponent(address, "Suite/Apartment") || address.address2 || "",
             city: address.city ?? "",
             postalCode: address.postal_zip ?? "",
             province: BC_DEFAULT_PROVINCE_STATE,
             country: BC_DEFAULT_COUNTRY
           };
         }
+        /** An address with no province is accepted; the form only ever deals in British Columbia. */
+        static isBritishColumbia(address) {
+          const province = (address.province_state ?? "").trim().toLowerCase();
+          return !province || ["bc", "b.c.", "british columbia"].includes(province);
+        }
         static isSameOfficeAddress(a, b) {
           const key = (x) => [x?.addressLine1, x?.addressLine2, x?.city, x?.postalCode].map((v) => (v ?? "").trim().toLowerCase().replace(/\s+/g, " ")).join("|");
           return key(a) === key(b);
@@ -88174,7 +88194,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           FormGroupDirective,
           FormControlName,
           TranslatePipe
-        ], styles: ["\n\n[_nghost-%COMP%] {\n  display: flex;\n  flex-direction: column;\n  flex: 1;\n  min-height: 0;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form[_ngcontent-%COMP%] {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  height: 100%;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form-content[_ngcontent-%COMP%] {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  flex: 1;\n  overflow-y: auto;\n  min-height: 0;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form[_ngcontent-%COMP%]   .annual-reminder[_ngcontent-%COMP%] {\n  display: flex;\n  flex-direction: column;\n  gap: 24px;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form[_ngcontent-%COMP%]   .annual-reminder[_ngcontent-%COMP%]   p[_ngcontent-%COMP%] {\n  color: #6b7280;\n  font-size: 14px;\n  line-height: 1.5;\n  margin: 0;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form[_ngcontent-%COMP%]   .annual-reminder[_ngcontent-%COMP%]   mat-radio-group[_ngcontent-%COMP%] {\n  align-items: flex-start;\n  display: flex;\n  flex-direction: column;\n  gap: 14px;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form[_ngcontent-%COMP%]   .annual-reminder[_ngcontent-%COMP%]     .mat-mdc-radio-button .mdc-label {\n  color: #4b5563;\n  font-size: 14px;\n  line-height: 1.45;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form[_ngcontent-%COMP%]   .annual-reminder[_ngcontent-%COMP%]     .mat-mdc-radio-button {\n  --mdc-radio-state-layer-size: 40px;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form-item[_ngcontent-%COMP%] {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form-item-title[_ngcontent-%COMP%] {\n  color: var(--filing-modal-color-dark-blue);\n}\n/*# sourceMappingURL=change-of-office-addresses-form.component.css.map */"], changeDetection: 0 });
+        ], styles: ["\n\n[_nghost-%COMP%] {\n  display: flex;\n  flex-direction: column;\n  flex: 1;\n  min-height: 0;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form[_ngcontent-%COMP%] {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  height: 100%;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form-content[_ngcontent-%COMP%] {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  flex: 1;\n  overflow-y: auto;\n  min-height: 0;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form[_ngcontent-%COMP%]   .annual-reminder[_ngcontent-%COMP%] {\n  display: flex;\n  flex-direction: column;\n  gap: 24px;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form[_ngcontent-%COMP%]   .annual-reminder[_ngcontent-%COMP%]   p[_ngcontent-%COMP%] {\n  color: #6b7280;\n  font-size: 14px;\n  line-height: 1.5;\n  margin: 0;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form[_ngcontent-%COMP%]   .annual-reminder[_ngcontent-%COMP%]   mat-radio-group[_ngcontent-%COMP%] {\n  align-items: flex-start;\n  display: flex;\n  flex-direction: column;\n  gap: 14px;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form[_ngcontent-%COMP%]   .annual-reminder[_ngcontent-%COMP%]     .mat-mdc-radio-button .mdc-label {\n  color: #4b5563 !important;\n  font-size: 14px !important;\n  line-height: 1.45;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form[_ngcontent-%COMP%]   .annual-reminder[_ngcontent-%COMP%]     .mat-mdc-radio-button {\n  --mdc-radio-state-layer-size: 40px;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form-item[_ngcontent-%COMP%] {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form-item-title[_ngcontent-%COMP%] {\n  color: var(--filing-modal-color-dark-blue);\n}\n/*# sourceMappingURL=change-of-office-addresses-form.component.css.map */"], changeDetection: 0 });
       };
       (() => {
         (typeof ngDevMode === "undefined" || ngDevMode) && setClassMetadata(BritishColumbiaChangeOfOfficeAddressesFormComponent, [{
@@ -88377,7 +88397,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     }\r
   </div>\r
 </div>\r
-`, styles: ["/* src/app/components/british-columbia/change-of-office-addresses/change-of-office-addresses-form/change-of-office-addresses-form.component.scss */\n:host {\n  display: flex;\n  flex-direction: column;\n  flex: 1;\n  min-height: 0;\n}\n:host .change-of-office-addresses-form {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  height: 100%;\n}\n:host .change-of-office-addresses-form-content {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  flex: 1;\n  overflow-y: auto;\n  min-height: 0;\n}\n:host .change-of-office-addresses-form .annual-reminder {\n  display: flex;\n  flex-direction: column;\n  gap: 24px;\n}\n:host .change-of-office-addresses-form .annual-reminder p {\n  color: #6b7280;\n  font-size: 14px;\n  line-height: 1.5;\n  margin: 0;\n}\n:host .change-of-office-addresses-form .annual-reminder mat-radio-group {\n  align-items: flex-start;\n  display: flex;\n  flex-direction: column;\n  gap: 14px;\n}\n:host .change-of-office-addresses-form .annual-reminder ::ng-deep .mat-mdc-radio-button .mdc-label {\n  color: #4b5563;\n  font-size: 14px;\n  line-height: 1.45;\n}\n:host .change-of-office-addresses-form .annual-reminder ::ng-deep .mat-mdc-radio-button {\n  --mdc-radio-state-layer-size: 40px;\n}\n:host .change-of-office-addresses-form-item {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n}\n:host .change-of-office-addresses-form-item-title {\n  color: var(--filing-modal-color-dark-blue);\n}\n/*# sourceMappingURL=change-of-office-addresses-form.component.css.map */\n"] }]
+`, styles: ["/* src/app/components/british-columbia/change-of-office-addresses/change-of-office-addresses-form/change-of-office-addresses-form.component.scss */\n:host {\n  display: flex;\n  flex-direction: column;\n  flex: 1;\n  min-height: 0;\n}\n:host .change-of-office-addresses-form {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  height: 100%;\n}\n:host .change-of-office-addresses-form-content {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  flex: 1;\n  overflow-y: auto;\n  min-height: 0;\n}\n:host .change-of-office-addresses-form .annual-reminder {\n  display: flex;\n  flex-direction: column;\n  gap: 24px;\n}\n:host .change-of-office-addresses-form .annual-reminder p {\n  color: #6b7280;\n  font-size: 14px;\n  line-height: 1.5;\n  margin: 0;\n}\n:host .change-of-office-addresses-form .annual-reminder mat-radio-group {\n  align-items: flex-start;\n  display: flex;\n  flex-direction: column;\n  gap: 14px;\n}\n:host .change-of-office-addresses-form .annual-reminder ::ng-deep .mat-mdc-radio-button .mdc-label {\n  color: #4b5563 !important;\n  font-size: 14px !important;\n  line-height: 1.45;\n}\n:host .change-of-office-addresses-form .annual-reminder ::ng-deep .mat-mdc-radio-button {\n  --mdc-radio-state-layer-size: 40px;\n}\n:host .change-of-office-addresses-form-item {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n}\n:host .change-of-office-addresses-form-item-title {\n  color: var(--filing-modal-color-dark-blue);\n}\n/*# sourceMappingURL=change-of-office-addresses-form.component.css.map */\n"] }]
         }], null, null);
       })();
       (() => {
@@ -95791,7 +95811,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             const { ecoreClientId, ecoreUserId } = this.config ?? {};
             const headers = __spreadValues(__spreadValues(__spreadValues({
               "x-target-url": targetUrl
-            }, ecoreClientId ? { "x-ecore-client-id": String(ecoreClientId) } : {}), ecoreUserId ? { "x-ecore-user-id": String(ecoreUserId) } : {}), opts.headers ?? {});
+            }, ecoreClientId ? { ClientId: String(ecoreClientId) } : {}), ecoreUserId ? { UserId: String(ecoreUserId) } : {}), opts.headers ?? {});
             const resp = yield fetchWithJwtRetry(signature, () => method === "POST" && payload !== void 0 ? postJson(fetchFn, signature.proxyApiUrl, signature.jwtToken, payload, headers) : fetchFn(signature.proxyApiUrl, {
               method,
               headers: __spreadValues({ Authorization: `Bearer ${signature.jwtToken}` }, headers)

package/package.json

@@ -1,11 +1,11 @@
-{
-  "name": "@dyedurham/search-and-file-widget",
-  "version": "2.0.99",
-  "description": "",
-  "main": "dnd-filing-shell.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "",
-  "license": "ISC"
-}
+{
+  "name": "@dyedurham/search-and-file-widget",
+  "version": "2.1.1",
+  "description": "",
+  "main": "dnd-filing-shell.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "ISC"
+}