@dyedurham/search-and-file-widget 1.6.15 → 1.6.16

package/dnd-filing-shell.js

@@ -59131,9 +59131,21 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           config2[InitialReturnFillingFormGroups.RegisteredOfficeAddress] = new FormGroup(this.generateAddressFormConfig(address, addressDelta));
           const directorDeltaData = deltaData?.directors ?? {};
           config2[InitialReturnFillingFormGroups.Directors] = new FormArray([
-            ...addedDirectors.map((admin) => _OntarioUpdateMaintainFormHelper.generateAffiliationForm(admin, IRAffiliationType.Add, directorDeltaData[admin._id])),
-            ...ceasedDirectors.map((admin) => _OntarioUpdateMaintainFormHelper.generateAffiliationForm(admin, IRAffiliationType.Ceased, directorDeltaData[admin._id])),
-            ...editedDirectors.map((admin) => _OntarioUpdateMaintainFormHelper.generateAffiliationForm(admin, IRAffiliationType.Update, directorDeltaData[admin._id]))
+            ...addedDirectors.map((admin) => {
+              const form = _OntarioUpdateMaintainFormHelper.generateAffiliationForm(admin, IRAffiliationType.Add, 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, directorDeltaData[admin._id]);
+              form.addControl(IRFormControls.IsCanadianResident, new FormControl(directorDeltaData[admin._id]?.residentCanadian ?? false));
+              return form;
+            }),
+            ...editedDirectors.map((admin) => {
+              const form = _OntarioUpdateMaintainFormHelper.generateAffiliationForm(admin, IRAffiliationType.Update, 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([
@@ -59236,7 +59248,6 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           const form = new FormGroup(__spreadValues(__spreadValues({}, config2), this.generateAddressFormConfig(address, _OntarioUpdateMaintainFormHelper.mapAddressDelta(deltaData?.address))));
           const affiliationAddressType = form.get(IRFormControls.AffiliationAddressType)?.value;
           updateFormControlsEnableState(form, addressEnabledFieldsMap[affiliationAddressType]);
-          form.addControl(IRFormControls.IsCanadianResident, new FormControl(deltaData?.residentCanadian ?? false));
           return form;
         }
         static mapAddressDelta(addr) {
@@ -80980,7 +80991,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
   });
 
   // src/app/constants/initial-return-form.constants.ts
-  var directorFullAddressFormField, fullAddressFormField, certifiedByAddressFormField, ONTARIO_DELTA_CARD_FORM_AFFILIATION_FIELDS_CANADIAN_NO_SUIT, ONTARIO_DELTA_CARD_FORM_AFFILIATION_FIELDS_CANADIAN_SUIT, ONTARIO_INITIAL_RETURN_FORM_GENERAL_FIELDS, ONTARIO_INITIAL_RETURN_CARD_FORM_ADDRESS_FIELDS_MAP, generateDirectorFields, ONTARIO_INITIAL_RETURN_FORM_ADDRESS_FIELDS_MAP, generateCertifiedByFields, ONTARIO_INITIAL_RETURN_FORM_CERTIFIED_BY_FIELDS_MAP;
+  var personFullAddressFormField, fullAddressFormField, certifiedByAddressFormField, checkboxFormField, ONTARIO_DELTA_CARD_FORM_AFFILIATION_FIELDS_CANADIAN_NO_SUIT, ONTARIO_DELTA_CARD_FORM_AFFILIATION_FIELDS_CANADIAN_SUIT, ONTARIO_INITIAL_RETURN_FORM_GENERAL_FIELDS, ONTARIO_INITIAL_RETURN_CARD_FORM_ADDRESS_FIELDS_MAP, generatePersonFields, ONTARIO_INITIAL_RETURN_FORM_DIRECTORS_FIELDS_MAP, ONTARIO_INITIAL_RETURN_FORM_OFFICER_FIELDS_MAP, generateCertifiedByFields, ONTARIO_INITIAL_RETURN_FORM_CERTIFIED_BY_FIELDS_MAP;
   var init_initial_return_form_constants = __esm({
     "src/app/constants/initial-return-form.constants.ts"() {
       init_form_enums();
@@ -80988,7 +80999,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       init_app_constants();
       init_initial_return_enums();
       init_common_utils();
-      directorFullAddressFormField = {
+      personFullAddressFormField = {
         type: FormType.Text,
         label: "",
         formControlName: "",
@@ -81058,6 +81069,12 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         },
         class: "span-12"
       };
+      checkboxFormField = {
+        type: FormType.Checkbox,
+        label: "Resident Canadian",
+        class: "span-12",
+        formControlName: IRFormControls.IsCanadianResident
+      };
       ONTARIO_DELTA_CARD_FORM_AFFILIATION_FIELDS_CANADIAN_NO_SUIT = [
         {
           type: FormType.Text,
@@ -81233,7 +81250,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         [AffiliationAddressType.InternationalNoSuite]: [fullAddressFormField],
         [AffiliationAddressType.InternationalSuite]: [fullAddressFormField]
       };
-      generateDirectorFields = (fields) => [
+      generatePersonFields = (fields) => [
         {
           type: FormType.Text,
           dynamicLabel: (form, t, prevValueMap) => {
@@ -81288,19 +81305,19 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             }
             return baseResult + `<span class="grey-mid"><br/><span class="body-1-semibold">${t("Previous Email")}:</span> ${prevEmail}</span>`;
           }
-        },
-        {
-          type: FormType.Checkbox,
-          label: "Resident Canadian",
-          class: "span-12",
-          formControlName: IRFormControls.IsCanadianResident
         }
       ];
-      ONTARIO_INITIAL_RETURN_FORM_ADDRESS_FIELDS_MAP = {
-        [AffiliationAddressType.CanadianNoSuite]: generateDirectorFields([...ONTARIO_DELTA_CARD_FORM_AFFILIATION_FIELDS_CANADIAN_NO_SUIT, directorFullAddressFormField]),
-        [AffiliationAddressType.CanadianSuite]: generateDirectorFields([...ONTARIO_DELTA_CARD_FORM_AFFILIATION_FIELDS_CANADIAN_SUIT, directorFullAddressFormField]),
-        [AffiliationAddressType.InternationalNoSuite]: generateDirectorFields([directorFullAddressFormField]),
-        [AffiliationAddressType.InternationalSuite]: generateDirectorFields([directorFullAddressFormField])
+      ONTARIO_INITIAL_RETURN_FORM_DIRECTORS_FIELDS_MAP = {
+        [AffiliationAddressType.CanadianNoSuite]: generatePersonFields([...ONTARIO_DELTA_CARD_FORM_AFFILIATION_FIELDS_CANADIAN_NO_SUIT, checkboxFormField, personFullAddressFormField]),
+        [AffiliationAddressType.CanadianSuite]: generatePersonFields([...ONTARIO_DELTA_CARD_FORM_AFFILIATION_FIELDS_CANADIAN_SUIT, checkboxFormField, personFullAddressFormField]),
+        [AffiliationAddressType.InternationalNoSuite]: generatePersonFields([checkboxFormField, personFullAddressFormField]),
+        [AffiliationAddressType.InternationalSuite]: generatePersonFields([checkboxFormField, personFullAddressFormField])
+      };
+      ONTARIO_INITIAL_RETURN_FORM_OFFICER_FIELDS_MAP = {
+        [AffiliationAddressType.CanadianNoSuite]: generatePersonFields([...ONTARIO_DELTA_CARD_FORM_AFFILIATION_FIELDS_CANADIAN_NO_SUIT, personFullAddressFormField]),
+        [AffiliationAddressType.CanadianSuite]: generatePersonFields([...ONTARIO_DELTA_CARD_FORM_AFFILIATION_FIELDS_CANADIAN_SUIT, personFullAddressFormField]),
+        [AffiliationAddressType.InternationalNoSuite]: generatePersonFields([personFullAddressFormField]),
+        [AffiliationAddressType.InternationalSuite]: generatePersonFields([personFullAddressFormField])
       };
       generateCertifiedByFields = (fields) => [
         {
@@ -81435,7 +81452,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       const officersArray_r10 = \u0275\u0275readContextLet(11);
       const isOpen_r11 = ((tmp_6_0 = officersArray_r10 == null ? null : officersArray_r10.length) !== null && tmp_6_0 !== void 0 ? tmp_6_0 : 0) <= ctx_r0.initiallyOpenCardsCount;
       \u0275\u0275advance();
-      \u0275\u0275property("prevData", (tmp_7_0 = ctx_r0.prevData()) == null ? null : tmp_7_0.officers)("isSubmitted", ctx_r0.isSubmitted())("areItemsOpen", isOpen_r11)("isStatusIcon", !ctx_r0.readonly())("config", ctx_r0.directorsFieldsMap)("configKey", ctx_r0.controls.AffiliationAddressType)("formArray", officersArray_r10)("title", ctx_r0.groups.Officers)("isValid", ctx_r0.sectionValidity["officers"]);
+      \u0275\u0275property("prevData", (tmp_7_0 = ctx_r0.prevData()) == null ? null : tmp_7_0.officers)("isSubmitted", ctx_r0.isSubmitted())("areItemsOpen", isOpen_r11)("isStatusIcon", !ctx_r0.readonly())("config", ctx_r0.officersFieldsMap)("configKey", ctx_r0.controls.AffiliationAddressType)("formArray", officersArray_r10)("title", ctx_r0.groups.Officers)("isValid", ctx_r0.sectionValidity["officers"]);
     }
   }
   function OntarioUpdateMaintainFormComponent_Conditional_13_Template(rf, ctx) {
@@ -81508,7 +81525,8 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         groups = InitialReturnFillingFormGroups;
         generalCardFields = ONTARIO_INITIAL_RETURN_FORM_GENERAL_FIELDS;
         addressFieldsMap = ONTARIO_INITIAL_RETURN_CARD_FORM_ADDRESS_FIELDS_MAP;
-        directorsFieldsMap = ONTARIO_INITIAL_RETURN_FORM_ADDRESS_FIELDS_MAP;
+        directorsFieldsMap = ONTARIO_INITIAL_RETURN_FORM_DIRECTORS_FIELDS_MAP;
+        officersFieldsMap = ONTARIO_INITIAL_RETURN_FORM_OFFICER_FIELDS_MAP;
         certifiedByFieldsMap = ONTARIO_INITIAL_RETURN_FORM_CERTIFIED_BY_FIELDS_MAP;
         alertType = AlertType;
         controls = InitialReturnFormControls;
@@ -81687,7 +81705,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         [isSubmitted]="isSubmitted()"\r
         [areItemsOpen]="isOpen"\r
         [isStatusIcon]="!readonly()"\r
-        [config]="directorsFieldsMap"\r
+        [config]="officersFieldsMap"\r
         [configKey]="controls.AffiliationAddressType"\r
         [formArray]="officersArray"\r
         [title]="groups.Officers"\r
@@ -81729,7 +81747,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         }], null, null);
       })();
       (() => {
-        (typeof ngDevMode === "undefined" || ngDevMode) && \u0275setClassDebugInfo(OntarioUpdateMaintainFormComponent, { className: "OntarioUpdateMaintainFormComponent", filePath: "src/app/components/ontario/update-maintain/update-maintain-form/update-maintain-form.component.ts", lineNumber: 39 });
+        (typeof ngDevMode === "undefined" || ngDevMode) && \u0275setClassDebugInfo(OntarioUpdateMaintainFormComponent, { className: "OntarioUpdateMaintainFormComponent", filePath: "src/app/components/ontario/update-maintain/update-maintain-form/update-maintain-form.component.ts", lineNumber: 41 });
       })();
     }
   });
@@ -86863,7 +86881,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             const fetchFn = opts?.fetchImpl ?? fetch;
             const url = signature.proxyApiUrl;
             const resp = yield fetchFn(url, {
-              method: "POST",
+              method: "GET",
               headers: __spreadValues({
                 "Content-Type": "application/json",
                 // 'ApiKey': 'a759101c-aeac-4fa6-90dc-8b56f01b2939',
@@ -86904,20 +86922,6 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
               throw new Error(`eCore returned ${resp.status} ${resp.statusText}: ${raw || "(empty body)"}`);
             }
             const result = parsed.value;
-            if (result?.Draft) {
-              const searchOrFilingType = getSearchOrFilingType(signature.task);
-              if (searchOrFilingType) {
-                signature.filingValidateSuccess?.({
-                  searchOrFilingType,
-                  serviceOrderId: requestBody.CurrentDataServiceOrderId,
-                  validatedOn: /* @__PURE__ */ new Date(),
-                  provider: "obr",
-                  draftPdf: result.Draft,
-                  documentName: opts?.documentName ?? "Initial Return Draft",
-                  documentType: "pdf"
-                });
-              }
-            }
             if (parsed.ok) {
               return result;
             }
@@ -88612,7 +88616,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
                     validatedOn: /* @__PURE__ */ new Date(),
                     provider: "obr",
                     draftPdf,
-                    documentName: this.validateOptions()?.documentName ?? "Federal Draft",
+                    documentName: this.validateOptions()?.documentName ?? "Initial Return Draft",
                     documentType: "pdf"
                   });
                 }
@@ -93493,7 +93497,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         "The following issues need to be resolved before proceeding:": "Les probl\xE8mes suivants doivent \xEAtre r\xE9solus avant de poursuivre :",
         "All addresses must have a street type and direction specified.": "Toutes les adresses doivent inclure un type de rue et une direction.",
         "Validate & Generate Draft": "Valider et g\xE9n\xE9rer le brouillon",
-        File: "Fichier",
+        File: "D\xE9poser",
         Edit: "Modifier",
         "Cancel Edits": "Annuler les modifications",
         Cancel: "Annuler",

package/package.json

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