@dyedurham/search-and-file-widget 2.1.17 → 2.1.18

package/dnd-filing-shell.js

@@ -85138,8 +85138,8 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           const recordsOffice = BritishColumbiaFormationFormHelper.findSharedAddressAffiliation(affiliations, AddressTitle2.RECORDS_OFFICE);
           const incoming = this.incomingOfficeAddresses(task);
           const extract = this.officeExtract(currentDataExtract);
-          const incomingSeed = delta?.registeredOffice ? this.fillEmptyAddresses(delta, incoming) : this.seedFromIncomingAffiliations(task);
-          const seed = this.withCurrentAddresses(incomingSeed, incoming, delta, registeredOffice, recordsOffice, extract);
+          const incomingSeed = this.seedFromIncomingAffiliations(task);
+          const seed = this.withCurrentAddresses(incomingSeed, incoming, registeredOffice, recordsOffice, extract);
           const config2 = {};
           config2[BCChangeOfOfficeAddressesFormGroups.ReferenceNumbers] = this.generateReferenceNumbersFormGroup(delta?.referenceNumbers, task.entity._profile.client_matter_number);
           config2[BCChangeOfOfficeAddressesFormGroups.CorporationDetails] = new FormGroup({
@@ -85212,11 +85212,11 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           };
         }
         /**
-         * For an office with neither an incoming address nor a saved draft, the new address is its
+         * For an office without an incoming address, the new address is its
          * current address on the register (so the filing leaves it unchanged). A current address outside
          * British Columbia is not used: the office is then reported as missing.
          */
-        static withCurrentAddresses(seed, incoming, delta, registeredOffice, recordsOffice, extract) {
+        static withCurrentAddresses(seed, incoming, registeredOffice, recordsOffice, extract) {
           const pickBy = BritishColumbiaFormationFormHelper.pickAddress;
           const current = (office, type, key) => {
             if (extract) {
@@ -85227,7 +85227,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             return address && this.isBritishColumbia(address) ? this.toOfficeAddressDelta(address) : void 0;
           };
           const result = __spreadValues({}, seed);
-          if (!delta?.registeredOffice && !incoming.regMailing) {
+          if (!incoming.regMailing) {
             const mailing = current(registeredOffice, "Mailing", "regMailing");
             const delivery = current(registeredOffice, "Delivery", "regDelivery");
             if (mailing) {
@@ -85239,7 +85239,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
               };
             }
           }
-          if (!delta?.recordsOffice && !incoming.recMailing) {
+          if (!incoming.recMailing) {
             const mailing = current(recordsOffice, "Mailing", "recMailing");
             const delivery = current(recordsOffice, "Delivery", "recDelivery");
             if (mailing) {
@@ -85303,21 +85303,6 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             country: BC_DEFAULT_COUNTRY
           };
         }
-        /** 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 ?? [];
@@ -88829,6 +88814,8 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         actionsDisabled = input(false);
         errors = input([]);
         currentDataExtract = input();
+        /** False while the registry's current data is being loaded, so the forms are not built too early. */
+        extractReady = input(true);
         close = output();
         codValidate = output();
         saveCodDeltaData = output();
@@ -88863,7 +88850,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
               this.deltaForm.set(new FormGroup(BritishColumbiaFormationFormHelper.generateConfig(task, (key) => this.translate.instant(key), untracked2(() => this.currentUser()))));
               this.deltaState.setBCFormationInitialDelta(this.generateFormationDeltaData());
             }
-            if (task && isChangeOfAddressTask(task)) {
+            if (task && isChangeOfAddressTask(task) && this.extractReady()) {
               this.deltaForm.set(new FormGroup(BritishColumbiaChangeOfOfficeAddressesFormHelper.generateConfig(task, (key) => this.translate.instant(key), this.currentDataExtract())));
               this.deltaState.setBCChangeOfOfficeAddressesInitialDelta(this.generateChangeOfOfficeAddressesDeltaData());
             }
@@ -88890,7 +88877,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
                 this.nextStep.emit();
               }
             }
-            if (task && isChangeOfAddressTask(task) && deltaData) {
+            if (task && isChangeOfAddressTask(task) && deltaData && this.extractReady()) {
               const form = new FormGroup(BritishColumbiaChangeOfOfficeAddressesFormHelper.generateConfig(task, (key) => this.translate.instant(key), this.currentDataExtract()));
               form.disable();
               this.previewForm.set(form);
@@ -89084,7 +89071,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         static \u0275fac = function BritishColumbiaComponent_Factory(__ngFactoryType__) {
           return new (__ngFactoryType__ || _BritishColumbiaComponent)();
         };
-        static \u0275cmp = /* @__PURE__ */ \u0275\u0275defineComponent({ type: _BritishColumbiaComponent, selectors: [["british-columbia"]], inputs: { task: [1, "task"], currentUser: [1, "currentUser"], activeStep: [1, "activeStep"], isNote: [1, "isNote"], actionsDisabled: [1, "actionsDisabled"], errors: [1, "errors"], currentDataExtract: [1, "currentDataExtract"] }, outputs: { close: "close", codValidate: "codValidate", saveCodDeltaData: "saveCodDeltaData", codSubmit: "codSubmit", formationValidate: "formationValidate", formationSubmit: "formationSubmit", saveFormationDeltaData: "saveFormationDeltaData", nextStep: "nextStep", recheckStep: "recheckStep", prevStep: "prevStep", coaValidate: "coaValidate", saveCoaDeltaData: "saveCoaDeltaData", coaSubmit: "coaSubmit" }, decls: 4, vars: 4, consts: [[3, "task", "form", "actionsDisabled", "errors", "isNote"], [3, "task", "form", "actionsDisabled", "errors"], [3, "validate", "close", "save", "task", "form", "actionsDisabled", "errors", "isNote"], [3, "close", "file", "task", "form", "actionsDisabled", "errors"], [3, "task", "errors", "isNote", "actionsDisabled", "form"], [3, "task", "form", "errors", "actionsDisabled"], [3, "validate", "close", "save", "task", "errors", "isNote", "actionsDisabled", "form"], [3, "next", "close", "task", "form", "errors", "actionsDisabled"]], template: function BritishColumbiaComponent_Template(rf, ctx) {
+        static \u0275cmp = /* @__PURE__ */ \u0275\u0275defineComponent({ type: _BritishColumbiaComponent, selectors: [["british-columbia"]], inputs: { task: [1, "task"], currentUser: [1, "currentUser"], activeStep: [1, "activeStep"], isNote: [1, "isNote"], actionsDisabled: [1, "actionsDisabled"], errors: [1, "errors"], currentDataExtract: [1, "currentDataExtract"], extractReady: [1, "extractReady"] }, outputs: { close: "close", codValidate: "codValidate", saveCodDeltaData: "saveCodDeltaData", codSubmit: "codSubmit", formationValidate: "formationValidate", formationSubmit: "formationSubmit", saveFormationDeltaData: "saveFormationDeltaData", nextStep: "nextStep", recheckStep: "recheckStep", prevStep: "prevStep", coaValidate: "coaValidate", saveCoaDeltaData: "saveCoaDeltaData", coaSubmit: "coaSubmit" }, decls: 4, vars: 4, consts: [[3, "task", "form", "actionsDisabled", "errors", "isNote"], [3, "task", "form", "actionsDisabled", "errors"], [3, "validate", "close", "save", "task", "form", "actionsDisabled", "errors", "isNote"], [3, "close", "file", "task", "form", "actionsDisabled", "errors"], [3, "task", "errors", "isNote", "actionsDisabled", "form"], [3, "task", "form", "errors", "actionsDisabled"], [3, "validate", "close", "save", "task", "errors", "isNote", "actionsDisabled", "form"], [3, "next", "close", "task", "form", "errors", "actionsDisabled"]], template: function BritishColumbiaComponent_Template(rf, ctx) {
           if (rf & 1) {
             \u0275\u0275declareLet(0);
             \u0275\u0275template(1, BritishColumbiaComponent_Conditional_1_Template, 2, 2)(2, BritishColumbiaComponent_Conditional_2_Template, 2, 2)(3, BritishColumbiaComponent_Conditional_3_Template, 2, 2);
@@ -96080,7 +96067,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     if (rf & 2) {
       const ctx_r2 = \u0275\u0275nextContext(2);
       const currentTask_r5 = \u0275\u0275readContextLet(9);
-      \u0275\u0275property("task", currentTask_r5)("currentUser", ctx_r2.currentUser())("activeStep", ctx_r2.activeStep())("isNote", ctx_r2.dataWasChanged())("actionsDisabled", ctx_r2.isLoading())("errors", ctx_r2.errors())("currentDataExtract", ctx_r2.currentDataExtract());
+      \u0275\u0275property("task", currentTask_r5)("currentUser", ctx_r2.currentUser())("activeStep", ctx_r2.activeStep())("isNote", ctx_r2.dataWasChanged())("actionsDisabled", ctx_r2.isLoading())("errors", ctx_r2.errors())("currentDataExtract", ctx_r2.currentDataExtract())("extractReady", ctx_r2.bcCoaExtractReady());
     }
   }
   function FilingComponent_Conditional_10_Conditional_2_Template(rf, ctx) {
@@ -96130,7 +96117,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
   }
   function FilingComponent_Conditional_10_Template(rf, ctx) {
     if (rf & 1) {
-      \u0275\u0275template(0, FilingComponent_Conditional_10_Conditional_0_Template, 1, 7, "ontario", 8)(1, FilingComponent_Conditional_10_Conditional_1_Template, 1, 7, "british-columbia", 9)(2, FilingComponent_Conditional_10_Conditional_2_Template, 1, 5, "federal", 10);
+      \u0275\u0275template(0, FilingComponent_Conditional_10_Conditional_0_Template, 1, 7, "ontario", 8)(1, FilingComponent_Conditional_10_Conditional_1_Template, 1, 8, "british-columbia", 9)(2, FilingComponent_Conditional_10_Conditional_2_Template, 1, 5, "federal", 10);
     }
     if (rf & 2) {
       const ctx_r2 = \u0275\u0275nextContext();
@@ -96254,6 +96241,8 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         bcCurrentDataServiceOrderId = "";
         /** The registry's current data ordered for the Change of Office Addresses; reused by Validate. */
         bcCoaExtractId = "";
+        /** False while the registry's current office addresses are loading. */
+        bcCoaExtractReady = signal(true);
         currentDataExtract = signal(void 0);
         bcDataExtractTaskId = "";
         activeStep = signal(Step.Validate);
@@ -96349,10 +96338,6 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
               }
             }
             if (isChangeOfAddressTask(task) && isBritishColumbiaTask(task) && this.bcDataExtractTaskId !== task._id) {
-              if (task.deltaData?.validatedData) {
-                this.bcDataExtractTaskId = task._id;
-                return;
-              }
               this.bcDataExtractTaskId = task._id;
               yield this.loadBritishColumbiaOfficeAddressExtract(task);
             }
@@ -96370,6 +96355,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
               return;
             }
             this.isLoading.set(true);
+            this.bcCoaExtractReady.set(false);
             try {
               const opts = this.validateOptions() ?? {};
               const context2 = this.getBritishColumbiaOfficeAddressContext(task, signature);
@@ -96380,6 +96366,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
               this.currentDataExtract.set(void 0);
               console.warn("The registry's current office addresses could not be loaded.", error);
             } finally {
+              this.bcCoaExtractReady.set(true);
               this.isLoading.set(false);
             }
           });
@@ -97203,7 +97190,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           if (rf & 2) {
             \u0275\u0275styleProp("height", ctx.modalHeight());
           }
-        }, inputs: { env: [1, "env"], config: [1, "config"], language: [1, "language"], proxyApiUrl: [1, "proxyApiUrl"], jwtToken: [1, "jwtToken"], task: [1, "task"], currentUser: [1, "currentUser"], height: [1, "height"], validateOptions: [1, "validateOptions"], getDocumentBytes: [1, "getDocumentBytes"] }, outputs: { deltaDataChange: "deltaDataChange", filingValidateSuccess: "filingValidateSuccess", filingSubmitSuccess: "filingSubmitSuccess", close: "close" }, decls: 12, vars: 9, consts: [[1, "filing"], [1, "filing-title"], [1, "filing-title-text"], [1, "filing-title-action", 3, "click"], [1, "filing-header"], [1, "filing-content"], [1, "filing-content-loading"], ["mat-stroked-button", "", 3, "click", "disabled"], [3, "task", "activeStep", "isNote", "actionsDisabled", "errors", "prevData", "irValidationConfig"], [3, "task", "currentUser", "activeStep", "isNote", "actionsDisabled", "errors", "currentDataExtract"], [3, "actionsDisabled", "isNote", "activeStep", "task", "errors"], [3, "close", "formationValidate", "saveFormationDeltaData", "formationSubmit", "nextStep", "prevStep", "irValidate", "saveIrDeltaData", "irSubmit", "task", "activeStep", "isNote", "actionsDisabled", "errors", "prevData", "irValidationConfig"], [3, "close", "nextStep", "recheckStep", "prevStep", "codValidate", "saveCodDeltaData", "codSubmit", "coaValidate", "saveCoaDeltaData", "coaSubmit", "formationValidate", "saveFormationDeltaData", "formationSubmit", "task", "currentUser", "activeStep", "isNote", "actionsDisabled", "errors", "currentDataExtract"], [3, "close", "deltaDataChange", "file", "validate", "umSave", "umValidate", "umSubmit", "nextStep", "actionsDisabled", "isNote", "activeStep", "task", "errors"], [3, "diameter"]], template: function FilingComponent_Template(rf, ctx) {
+        }, inputs: { env: [1, "env"], config: [1, "config"], language: [1, "language"], proxyApiUrl: [1, "proxyApiUrl"], jwtToken: [1, "jwtToken"], task: [1, "task"], currentUser: [1, "currentUser"], height: [1, "height"], validateOptions: [1, "validateOptions"], getDocumentBytes: [1, "getDocumentBytes"] }, outputs: { deltaDataChange: "deltaDataChange", filingValidateSuccess: "filingValidateSuccess", filingSubmitSuccess: "filingSubmitSuccess", close: "close" }, decls: 12, vars: 9, consts: [[1, "filing"], [1, "filing-title"], [1, "filing-title-text"], [1, "filing-title-action", 3, "click"], [1, "filing-header"], [1, "filing-content"], [1, "filing-content-loading"], ["mat-stroked-button", "", 3, "click", "disabled"], [3, "task", "activeStep", "isNote", "actionsDisabled", "errors", "prevData", "irValidationConfig"], [3, "task", "currentUser", "activeStep", "isNote", "actionsDisabled", "errors", "currentDataExtract", "extractReady"], [3, "actionsDisabled", "isNote", "activeStep", "task", "errors"], [3, "close", "formationValidate", "saveFormationDeltaData", "formationSubmit", "nextStep", "prevStep", "irValidate", "saveIrDeltaData", "irSubmit", "task", "activeStep", "isNote", "actionsDisabled", "errors", "prevData", "irValidationConfig"], [3, "close", "nextStep", "recheckStep", "prevStep", "codValidate", "saveCodDeltaData", "codSubmit", "coaValidate", "saveCoaDeltaData", "coaSubmit", "formationValidate", "saveFormationDeltaData", "formationSubmit", "task", "currentUser", "activeStep", "isNote", "actionsDisabled", "errors", "currentDataExtract", "extractReady"], [3, "close", "deltaDataChange", "file", "validate", "umSave", "umValidate", "umSubmit", "nextStep", "actionsDisabled", "isNote", "activeStep", "task", "errors"], [3, "diameter"]], template: function FilingComponent_Template(rf, ctx) {
           if (rf & 1) {
             const _r1 = \u0275\u0275getCurrentView();
             \u0275\u0275elementStart(0, "div", 0)(1, "div", 1)(2, "h1", 2);
@@ -97307,6 +97294,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           [actionsDisabled]="isLoading()"\r
           [errors]="errors()"\r
           [currentDataExtract]="currentDataExtract()"\r
+          [extractReady]="bcCoaExtractReady()"\r
           (close)="close.emit()"\r
           (nextStep)="onNextStepClick()"\r
           (recheckStep)="defineInitialStep()"\r

package/package.json

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