@hmcts/ccd-case-ui-toolkit 7.3.54-exui-4309 → 7.3.54-exui-2837

package/fesm2022/hmcts-ccd-case-ui-toolkit.mjs

@@ -3985,6 +3985,7 @@ class WorkbasketInputModel {
     label;
     order;
     field;
+    dataType;
     metadata;
     display_context_parameter;
 }
@@ -11398,7 +11399,6 @@ class CaseEditPageComponent {
     }
     ngOnInit() {
         initDialog();
-        this.clearValidationErrors();
         this.eventTrigger = this.caseEdit.eventTrigger;
         this.editForm = this.caseEdit.form;
         this.wizard = this.caseEdit.wizard;
@@ -11454,7 +11454,6 @@ class CaseEditPageComponent {
         this.dialogRefAfterClosedSub?.unsubscribe();
         this.saveDraftSub?.unsubscribe();
         this.caseFormValidationErrorsSub?.unsubscribe();
-        this.clearValidationErrors();
         this.multipageComponentStateService.reset();
     }
     applyValuesChanged(valuesChanged) {
@@ -11478,7 +11477,7 @@ class CaseEditPageComponent {
      * EUI-3732 - Breathing space data not persisted on Previous button click with ExpUI Demo
      */
     toPreviousPage() {
-        this.clearValidationErrors();
+        this.caseEditDataService.clearFormValidationErrors();
         const caseEventData = this.buildCaseEventData(true);
         caseEventData.data = caseEventData.event_data;
         this.updateFormData(caseEventData);
@@ -11651,7 +11650,7 @@ class CaseEditPageComponent {
                 this.editForm.controls['data'].removeControl('caseLinksFlag');
             }
         }
-        this.clearValidationErrors();
+        this.caseEditDataService.clearFormValidationErrors();
         this.checkForStagesCompleted();
         if (this.currentPageIsNotValid()) {
             // The generateErrorMessage method filters out the hidden fields.
@@ -11815,7 +11814,7 @@ class CaseEditPageComponent {
         else {
             this.caseEdit.cancelled.emit();
         }
-        this.clearValidationErrors();
+        this.caseEditDataService.clearFormValidationErrors();
         this.multipageComponentStateService.reset();
     }
     resetLinkedCaseJourney() {
@@ -11883,7 +11882,6 @@ class CaseEditPageComponent {
         console.log('handleError ', error);
     }
     resetErrors() {
-        this.clearValidationErrors();
         this.caseEdit.error = null;
         this.caseEdit.ignoreWarning = false;
         this.triggerText = this.getTriggerText();
@@ -11891,10 +11889,6 @@ class CaseEditPageComponent {
             this.caseEdit.callbackErrorsSubject.next(null);
         }
     }
-    clearValidationErrors() {
-        this.validationErrors = [];
-        this.caseEditDataService?.clearFormValidationErrors?.();
-    }
     saveDraft() {
         if (this.eventTrigger.can_save_draft) {
             const draftCaseEventData = this.formValueService.sanitise(this.editForm.value);
@@ -34503,9 +34497,7 @@ class WorkbasketFiltersComponent {
                         .sort(this.orderService.sortAsc);
                     const formValue = this.windowService.getLocalStorage(FORM_GROUP_VAL_LOC_STORAGE);
                     workbasketInputs.forEach(item => {
-                        if (item.field.elementPath) {
-                            item.field.id = `${item.field.id}.${item.field.elementPath}`;
-                        }
+                        item.field.id = this.buildFieldId(item.field.id, item.field.elementPath, item.dataType);
                         item.field.label = item.label;
                         if (formValue) {
                             const searchFormValueObject = JSON.parse(formValue);
@@ -34654,6 +34646,16 @@ class WorkbasketFiltersComponent {
             this.caseFields = this.workbasketInputs.map(item => FieldsUtils.convertToCaseField(item.field));
         }
     }
+    buildFieldId(fieldId, elementPath, dataType) {
+        if (!fieldId || !elementPath) {
+            return fieldId;
+        }
+        const normalizedType = typeof dataType === 'string' ? dataType.toLowerCase() : '';
+        if (normalizedType === 'collection') {
+            return `${fieldId}.value.${elementPath}`;
+        }
+        return `${fieldId}.${elementPath}`;
+    }
     static ɵfac = function WorkbasketFiltersComponent_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || WorkbasketFiltersComponent)(i0.ɵɵdirectiveInject(i1$1.ActivatedRoute), i0.ɵɵdirectiveInject(WorkbasketInputFilterService), i0.ɵɵdirectiveInject(OrderService), i0.ɵɵdirectiveInject(JurisdictionService), i0.ɵɵdirectiveInject(AlertService), i0.ɵɵdirectiveInject(WindowService)); };
     static ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: WorkbasketFiltersComponent, selectors: [["ccd-workbasket-filters"]], inputs: { jurisdictions: "jurisdictions", defaults: "defaults" }, outputs: { onApply: "onApply", onReset: "onReset" }, standalone: false, decls: 45, vars: 55, consts: [["id", "filters", 1, "global-display"], [1, "form-group", "flex"], ["aria-label", "Filters", 1, "heading-h2"], ["type", "button", 1, "button", "workbasket-filters-apply", 3, "click", "disabled", "title"], ["type", "button", 1, "button", "button-secondary", 3, "click", "title"], [1, "form-group"], ["for", "wb-jurisdiction", 1, "form-label"], ["id", "wb-jurisdiction", "name", "jurisdiction", "aria-controls", "search-result", 1, "form-control", "form-control-3-4", "ccd-dropdown", 3, "ngModelChange", "change", "ngModel"], [3, "ngValue", 4, "ngIf"], [3, "ngValue", 4, "ngFor", "ngForOf"], ["for", "wb-case-type", 1, "form-label"], ["id", "wb-case-type", "name", "case-type", "aria-controls", "search-result", 1, "form-control", "form-control-3-4", "ccd-dropdown", 3, "ngModelChange", "change", "ngModel", "disabled"], ["for", "wb-case-state", 1, "form-label"], ["id", "wb-case-state", "name", "state", "aria-controls", "search-result", 1, "form-control", "form-control-3-4", "ccd-dropdown", 3, "ngModelChange", "ngModel", "disabled"], [3, "ngValue"], ["ccdConditionalShowForm", "", 3, "formGroup", "contextFields", 4, "ngIf"], ["type", "button", 1, "button", 3, "click", "title"], ["ccdConditionalShowForm", "", 3, "formGroup", "contextFields"], ["id", "dynamicFilters"], ["class", "form-group", 4, "ngFor", "ngForOf"], [3, "keyup.enter", "caseField", "formGroup", "isExpanded", "isInSearchBlock"]], template: function WorkbasketFiltersComponent_Template(rf, ctx) { if (rf & 1) {
             i0.ɵɵelementStart(0, "form", 0)(1, "div", 1)(2, "fieldset", 2);
@@ -40068,12 +40070,14 @@ class SearchInput {
     field;
     metadata;
     display_context_parameter;
-    constructor(label, order, field, metadata, display_context_parameter) {
+    dataType;
+    constructor(label, order, field, metadata, display_context_parameter, dataType) {
         this.label = label;
         this.order = order;
         this.field = field;
         this.metadata = metadata;
         this.display_context_parameter = display_context_parameter;
+        this.dataType = dataType;
     }
 }
 
@@ -40271,9 +40275,7 @@ class SearchFiltersComponent {
                 formValueObject = JSON.parse(formValue);
             }
             searchInputs.forEach(item => {
-                if (item.field.elementPath) {
-                    item.field.id = `${item.field.id}.${item.field.elementPath}`;
-                }
+                item.field.id = this.buildFieldId(item.field.id, item.field.elementPath, item.dataType);
                 item.field.label = item.label;
                 if (formValueObject) {
                     item.field.value = formValueObject[item.field.id];
@@ -40335,6 +40337,16 @@ class SearchFiltersComponent {
             this.caseFields = this.searchInputs.map(item => FieldsUtils.convertToCaseField(item.field));
         }
     }
+    buildFieldId(fieldId, elementPath, dataType) {
+        if (!fieldId || !elementPath) {
+            return fieldId;
+        }
+        const normalizedType = typeof dataType === 'string' ? dataType.toLowerCase() : '';
+        if (normalizedType === 'collection') {
+            return `${fieldId}.value.${elementPath}`;
+        }
+        return `${fieldId}.${elementPath}`;
+    }
     static ɵfac = function SearchFiltersComponent_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || SearchFiltersComponent)(i0.ɵɵdirectiveInject(SearchService), i0.ɵɵdirectiveInject(OrderService), i0.ɵɵdirectiveInject(JurisdictionService), i0.ɵɵdirectiveInject(WindowService)); };
     static ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: SearchFiltersComponent, selectors: [["ccd-search-filters"]], inputs: { jurisdictions: "jurisdictions", autoApply: "autoApply" }, outputs: { onApply: "onApply", onReset: "onReset", onJurisdiction: "onJurisdiction" }, standalone: false, decls: 28, vars: 34, consts: [["aria-label", "Filters", 1, "heading-h2"], [1, "global-display"], [1, "form-group", 2, "margin-top", "13px"], ["for", "s-jurisdiction", 1, "form-label"], ["id", "s-jurisdiction", "name", "jurisdiction", "aria-controls", "search-result", 1, "form-control", "form-control-3-4", "ccd-dropdown", 3, "ngModelChange", "change", "ngModel"], [3, "ngValue", 4, "ngFor", "ngForOf"], [1, "form-group"], ["for", "s-case-type", 1, "form-label"], ["id", "s-case-type", "name", "case-type", "aria-controls", "search-result", 1, "form-control", "form-control-3-4", "ccd-dropdown", 3, "ngModelChange", "change", "disabled", "ngModel"], ["ccdConditionalShowForm", "", 3, "formGroup", "contextFields", 4, "ngIf"], ["type", "button", 1, "button", 3, "click", "keyup.enter", "disabled", "title"], ["id", "reset", "type", "button", 1, "button", "button-secondary", 3, "click", "title"], [3, "ngValue"], ["ccdConditionalShowForm", "", 3, "formGroup", "contextFields"], ["id", "dynamicFilters"], ["class", "form-group", 4, "ngFor", "ngForOf"], [3, "keyup.enter", "caseField", "formGroup", "isExpanded"]], template: function SearchFiltersComponent_Template(rf, ctx) { if (rf & 1) {
             i0.ɵɵelementStart(0, "h2", 0);