@hmcts/ccd-case-ui-toolkit 7.4.24 → 7.4.25-exui-5450-rc2

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

@@ -4053,6 +4053,7 @@ class CaseTab {
     order;
     fields;
     show_condition;
+    defaultFocus;
 }
 __decorate([
     Type(() => CaseField),
@@ -10818,6 +10819,62 @@ class ValidPageListCaseFieldsService {
         type: Injectable
     }], () => [{ type: FieldsUtils }], null); })();
 
+/** Uses current form-control visibility and the configured retention policy. */
+class HiddenFieldValues {
+    static clearHiddenValues(data, control, parentHidden = false, collectionItem = false) {
+        if (!control || data === null || data === undefined) {
+            return data;
+        }
+        const field = control.caseField;
+        const displayContext = field?.display_context?.toUpperCase();
+        if (displayContext === 'READONLY' || displayContext === 'HIDDEN' ||
+            displayContext === 'HIDDEN_TEMP' || field?.id === 'caseLinks') {
+            return data;
+        }
+        const hidden = parentHidden || field?.hidden === true;
+        if (hidden && field && !collectionItem) {
+            if (!field.retain_hidden_value) {
+                return control instanceof FormArray ? [] : null;
+            }
+            const hasComplexChildren = field.field_type?.type === 'Complex' ||
+                (field.field_type?.type === 'Collection' && field.field_type.collection_field_type?.type === 'Complex');
+            if (!hasComplexChildren) {
+                // Documents, lists and other composite controls retain their whole value.
+                return data;
+            }
+            // Complex children have their own retention settings; they do not inherit Yes.
+        }
+        if (control instanceof FormArray) {
+            return this.clearCollectionValues(data, control, hidden);
+        }
+        if (control instanceof FormGroup) {
+            const result = { ...data };
+            Object.keys(result).forEach((key) => {
+                result[key] = this.clearHiddenValues(result[key], control.controls[key], hidden);
+            });
+            return result;
+        }
+        return data;
+    }
+    static clearCollectionValues(data, control, hidden) {
+        if (!Array.isArray(data)) {
+            return data;
+        }
+        return data.map((item, index) => {
+            const row = control.at(index);
+            const valueControl = row instanceof FormGroup ? row.controls.value : undefined;
+            if (valueControl && item && typeof item === 'object' && Object.hasOwn(item, 'value')) {
+                return {
+                    ...item,
+                    // The value group is a collection-item container, not another configurable case field.
+                    value: this.clearHiddenValues(item.value, valueControl, hidden, valueControl instanceof FormGroup)
+                };
+            }
+            return this.clearHiddenValues(item, row, hidden);
+        });
+    }
+}
+
 function CaseEditComponent_div_1_Template(rf, ctx) { if (rf & 1) {
     const _r1 = i0.ɵɵgetCurrentView();
     i0.ɵɵelementStart(0, "div", 1)(1, "div", 2)(2, "h2", 3);
@@ -11079,8 +11136,11 @@ class CaseEditComponent {
         return form.value.event.id;
     }
     generateCaseEventData({ eventTrigger, form }) {
-        const formData = this.replaceHiddenFormValuesWithOriginalCaseData(form.get('data'), eventTrigger.case_fields);
+        let formData = this.replaceHiddenFormValuesWithOriginalCaseData(form.get('data'), eventTrigger.case_fields);
         this.formValueService.sanitiseDynamicLists(eventTrigger.case_fields, { data: formData });
+        if (!this.isCaseFlagSubmission) {
+            formData = HiddenFieldValues.clearHiddenValues(formData, form.get('data'));
+        }
         const caseEventData = {
             data: this.replaceEmptyComplexFieldValues(this.formValueService.sanitise(formData, this.isCaseFlagSubmission)),
             event: form.value.event
@@ -11406,7 +11466,7 @@ class CaseEditComponent {
         }], submitted: [{
             type: Output
         }] }); })();
-(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(CaseEditComponent, { className: "CaseEditComponent", filePath: "lib/shared/components/case-editor/case-edit/case-edit.component.ts", lineNumber: 39 }); })();
+(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(CaseEditComponent, { className: "CaseEditComponent", filePath: "lib/shared/components/case-editor/case-edit/case-edit.component.ts", lineNumber: 40 }); })();
 
 const EVENT_START_FIRST_PAGE_REDIRECT = 'eventStartFirstPageRedirect';
 function convertNonASCIICharacter(character) {
@@ -13300,6 +13360,9 @@ class CaseEditPageComponent {
         const formFields = this.formValueService.filterCurrentPageFields(caseFields, formValue);
         // Sort out the dynamic lists.
         this.formValueService.sanitiseDynamicLists(caseFields, formFields);
+        if (!this.caseEdit.isCaseFlagSubmission) {
+            formFields.data = HiddenFieldValues.clearHiddenValues(formFields.data, this.editForm.get('data'));
+        }
         // Get hold of the CaseEventData.
         const caseEventData = this.formValueService.sanitise(formFields);
         // delete fields which are not part of the case event journey wizard pages case fields
@@ -13403,7 +13466,7 @@ class CaseEditPageComponent {
             type: ViewChildren,
             args: [CaseEditFormComponent]
         }] }); })();
-(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(CaseEditPageComponent, { className: "CaseEditPageComponent", filePath: "lib/shared/components/case-editor/case-edit-page/case-edit-page.component.ts", lineNumber: 38 }); })();
+(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(CaseEditPageComponent, { className: "CaseEditPageComponent", filePath: "lib/shared/components/case-editor/case-edit-page/case-edit-page.component.ts", lineNumber: 39 }); })();
 
 class CallbackErrorsContext {
     triggerText;
@@ -41714,7 +41777,7 @@ class CaseFullAccessViewComponent {
         if (!hasHash && !isSpecialTabPath) {
             const paths = url.split('/');
             const lastPath = decodeURIComponent(paths[paths.length - 1]);
-            let foundTab = null;
+            let foundTab;
             if (!this.prependedTabs) {
                 this.prependedTabs = [];
             }
@@ -41735,10 +41798,13 @@ class CaseFullAccessViewComponent {
                 });
             }
             else {
-                this.caseDetails.tabs.sort((aTab, bTab) => aTab.order > bTab.order ? 1 : (bTab.order > aTab.order ? -1 : 0));
+                this.caseDetails.tabs = this.orderService.sort(this.caseDetails.tabs);
+                // Presuming default focus only set for one tab here - multiple tabs with default focus are not handled as is a contradiction
+                let preSelectTab = this.caseDetails.tabs.find((tab) => tab.defaultFocus === true) ?? null;
+                // Attempt to pre-select the tab based on the preferred label for the current case type
                 const preferredLabel = FieldsUtils.defaultTabList?.[this.caseDetails?.case_type?.id];
-                let preSelectTab = null;
-                if (preferredLabel) {
+                // If no tab has default focus, attempt to use the preferred label for the current case type
+                if (!preSelectTab && preferredLabel) {
                     preSelectTab = this.caseDetails.tabs.find((tab) => (tab.label === preferredLabel) || (tab.id === preferredLabel)) ?? null;
                 }
                 if (!preSelectTab) {