@hmcts/ccd-case-ui-toolkit 7.3.52-exui-3740 → 7.3.52-exui-4298

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

@@ -3934,7 +3934,6 @@ class FieldsUtils {
     static SERVER_RESPONSE_FIELD_TYPE_COLLECTION = 'Collection';
     static SERVER_RESPONSE_FIELD_TYPE_COMPLEX = 'Complex';
     static SERVER_RESPONSE_FIELD_TYPE_DYNAMIC_LIST_TYPE = ['DynamicList', 'DynamicRadioList'];
-    static SERVER_RESPONSE_FIELD_TYPE_DYNAMIC_MULTISELECT_LIST_TYPE = 'DynamicMultiSelectList';
     static defaultTabList = {
         "PRLAPPS": "Summary"
     };
@@ -4185,53 +4184,31 @@ class FieldsUtils {
     static textForInvalidField(type, invalidValue) {
         return `{ Invalid ${type}: ${invalidValue} }`;
     }
-    static setDynamicListDefinition(caseField, caseFieldType, rootCaseField, isWithinCollection = false) {
+    static setDynamicListDefinition(caseField, caseFieldType, rootCaseField) {
         if (caseFieldType.type === FieldsUtils.SERVER_RESPONSE_FIELD_TYPE_COMPLEX) {
             caseFieldType.complex_fields.forEach(field => {
                 try {
                     const isDynamicField = FieldsUtils.SERVER_RESPONSE_FIELD_TYPE_DYNAMIC_LIST_TYPE.indexOf(field.field_type.type) !== -1;
-                    const isDynamicMultiSelectField = field.field_type.type === FieldsUtils.SERVER_RESPONSE_FIELD_TYPE_DYNAMIC_MULTISELECT_LIST_TYPE;
-                    if (isDynamicField || isDynamicMultiSelectField) {
+                    if (isDynamicField) {
                         const dynamicListValue = this.getDynamicListValue(rootCaseField.value, field.id);
                         if (dynamicListValue) {
-                            const list_items = dynamicListValue.find(data => data?.list_items !== undefined)?.list_items;
-                            if (list_items !== undefined) {
-                                field.list_items = list_items;
-                                field.formatted_value = {
-                                    ...field.formatted_value,
-                                    list_items
-                                };
-                            }
-                            if (isDynamicMultiSelectField) {
-                                if (!isWithinCollection) {
-                                    const value = dynamicListValue[0]?.value;
-                                    if (value !== undefined) {
-                                        field.value = value;
-                                        field.formatted_value = {
-                                            ...field.formatted_value,
-                                            value
-                                        };
-                                    }
-                                }
-                            }
-                            else {
-                                const complexValue = dynamicListValue.map(data => data.value);
-                                const value = {
-                                    list_items,
-                                    value: complexValue.length > 0 ? complexValue : undefined
-                                };
-                                field.value = {
-                                    ...value
-                                };
-                                field.formatted_value = {
-                                    ...field.formatted_value,
-                                    ...value
-                                };
-                            }
+                            const list_items = dynamicListValue[0].list_items;
+                            const complexValue = dynamicListValue.map(data => data.value);
+                            const value = {
+                                list_items,
+                                value: complexValue.length > 0 ? complexValue : undefined
+                            };
+                            field.value = {
+                                ...value
+                            };
+                            field.formatted_value = {
+                                ...field.formatted_value,
+                                ...value
+                            };
                         }
                     }
                     else {
-                        this.setDynamicListDefinition(field, field.field_type, rootCaseField, isWithinCollection);
+                        this.setDynamicListDefinition(field, field.field_type, rootCaseField);
                     }
                 }
                 catch (error) {
@@ -4241,7 +4218,7 @@ class FieldsUtils {
         }
         else if (caseFieldType.type === FieldsUtils.SERVER_RESPONSE_FIELD_TYPE_COLLECTION) {
             if (caseFieldType.collection_field_type) {
-                this.setDynamicListDefinition(caseField, caseFieldType.collection_field_type, rootCaseField, true);
+                this.setDynamicListDefinition(caseField, caseFieldType.collection_field_type, rootCaseField);
             }
         }
     }
@@ -5904,55 +5881,37 @@ class FieldTypeSanitiser {
     }
     ensureDynamicMultiSelectListPopulated(caseFields) {
         return caseFields.map((field) => {
-            const fieldData = field._value || field.value;
-            if (field.field_type.type === FieldTypeSanitiser.FIELD_TYPE_COMPLEX) {
-                this.checkNestedDynamicList(field, fieldData);
-            }
-            else if (field.field_type.type === FieldTypeSanitiser.FIELD_TYPE_COLLECTION &&
-                field.field_type.collection_field_type?.type === FieldTypeSanitiser.FIELD_TYPE_COMPLEX) {
-                this.checkNestedDynamicList(field, fieldData, true);
-            }
-            else {
+            if (field.field_type.type !== 'Complex') {
                 return field;
             }
+            const caseFieldData = field._value;
+            // Process each complex field
+            field.field_type.complex_fields.forEach((complexField) => {
+                if (complexField.field_type.type === FieldTypeSanitiser.FIELD_TYPE_COMPLEX) {
+                    this.checkNestedDynamicList(complexField, caseFieldData?.[complexField.id]);
+                }
+                else if (this.isDynamicList(complexField.field_type.type) &&
+                    complexField.display_context !== 'HIDDEN' &&
+                    field._value?.[complexField.id]) {
+                    complexField.list_items = field._value[complexField.id]?.list_items;
+                }
+            });
             // Final transformation: construct updated field object
             return { ...field, field_type: { ...field?.field_type } };
         });
     }
-    checkNestedDynamicList(caseField, fieldData = null, isCollection = false) {
-        const complexFields = isCollection
-            ? caseField.field_type.collection_field_type?.complex_fields || []
-            : caseField.field_type.complex_fields;
-        complexFields.forEach((complexField) => {
-            const childData = isCollection
-                ? this.getFirstCollectionFieldData(fieldData, complexField.id)
-                : fieldData?.[complexField.id];
+    checkNestedDynamicList(caseField, fieldData = null) {
+        caseField.field_type.complex_fields.forEach((complexField) => {
             if (complexField.field_type.type === FieldTypeSanitiser.FIELD_TYPE_COMPLEX) {
-                this.checkNestedDynamicList(complexField, childData);
-            }
-            else if (complexField.field_type.type === FieldTypeSanitiser.FIELD_TYPE_COLLECTION &&
-                complexField.field_type.collection_field_type?.type === FieldTypeSanitiser.FIELD_TYPE_COMPLEX) {
-                this.checkNestedDynamicList(complexField, childData, true);
+                this.checkNestedDynamicList(complexField, fieldData?.[complexField.id]);
             }
             else if (this.isDynamicList(complexField.field_type.type) &&
                 complexField.display_context !== 'HIDDEN' &&
-                childData) {
-                complexField.list_items = childData.list_items;
+                fieldData?.[complexField.id]) {
+                complexField.list_items = fieldData?.[complexField.id]?.list_items;
             }
         });
     }
-    getFirstCollectionFieldData(collectionData, fieldId) {
-        if (!Array.isArray(collectionData)) {
-            return null;
-        }
-        for (const item of collectionData) {
-            const value = item?.value || item;
-            if (value?.[fieldId] !== undefined) {
-                return value[fieldId];
-            }
-        }
-        return null;
-    }
     isDynamicList(fieldType) {
         return FieldTypeSanitiser.DYNAMIC_LIST_TYPE.indexOf(fieldType) !== -1;
     }
@@ -6276,7 +6235,7 @@ class FormValueService {
      * @param clearEmpty Whether or not we should clear out empty, optional, complex objects.
      * @param clearNonCase Whether or not we should clear out non-case fields at the top level.
      */
-    removeUnnecessaryFields(data, caseFields, clearEmpty = false, clearNonCase = false, fromPreviousPage = false, currentPageCaseFields = [], isNested = false) {
+    removeUnnecessaryFields(data, caseFields, clearEmpty = false, clearNonCase = false, fromPreviousPage = false, currentPageCaseFields = []) {
         if (data && caseFields && caseFields.length > 0) {
             // check if there is any data at the top level of the form that's not in the caseFields
             if (clearNonCase) {
@@ -6287,9 +6246,9 @@ class FormValueService {
                     // Retain anything that is readonly and not a label.
                     continue;
                 }
-                if (this.shouldRemoveHiddenField(field, isNested)) {
+                if (field.hidden === true && field.display_context !== 'HIDDEN' && field.display_context !== 'HIDDEN_TEMP' && field.id !== 'caseLinks' && !field.retain_hidden_value) {
                     // Delete anything that is hidden (that is NOT readonly), and that
-                    // is not explicitly retained. Nested hidden fields should be dropped by default.
+                    // hasn't had its display_context overridden to make it hidden.
                     delete data[field.id];
                 }
                 else if (field.field_type) {
@@ -6304,7 +6263,7 @@ class FormValueService {
                             }
                             break;
                         case 'Complex':
-                            this.removeUnnecessaryFields(data[field.id], field.field_type.complex_fields, clearEmpty, false, false, [], true);
+                            this.removeUnnecessaryFields(data[field.id], field.field_type.complex_fields, clearEmpty);
                             // Also remove any optional complex objects that are completely empty.
                             // EUI-4244: Ritesh's fix, passing true instead of clearEmpty.
                             if (FormValueService.clearOptionalEmpty(true, data[field.id], field)) {
@@ -6327,8 +6286,8 @@ class FormValueService {
                                 if (field.field_type.collection_field_type.type === 'Complex') {
                                     // Iterate through the elements and remove any unnecessary fields within.
                                     for (const item of collection) {
-                                        this.removeUnnecessaryFields(item, field.field_type.collection_field_type.complex_fields, clearEmpty, false, false, [], true);
-                                        this.removeUnnecessaryFields(item.value, field.field_type.collection_field_type.complex_fields, false, false, false, [], true);
+                                        this.removeUnnecessaryFields(item, field.field_type.collection_field_type.complex_fields, clearEmpty);
+                                        this.removeUnnecessaryFields(item.value, field.field_type.collection_field_type.complex_fields, false);
                                     }
                                 }
                             }
@@ -6342,12 +6301,6 @@ class FormValueService {
         // Clear out any MultiSelect labels.
         FormValueService.removeMultiSelectLabels(data);
     }
-    shouldRemoveHiddenField(field, isNested) {
-        return field.hidden === true
-            && field.id !== 'caseLinks'
-            && !field.retain_hidden_value
-            && (isNested || (field.display_context !== 'HIDDEN' && field.display_context !== 'HIDDEN_TEMP'));
-    }
     removeInvalidCollectionData(data, field) {
         if (data[field.id] && data[field.id].length > 0) {
             for (const objCollection of data[field.id]) {
@@ -9756,10 +9709,8 @@ class CaseEditComponent {
         return form.value.event.id;
     }
     generateCaseEventData({ eventTrigger, form }) {
-        const formData = this.replaceHiddenFormValuesWithOriginalCaseData(form.get('data'), eventTrigger.case_fields);
-        this.formValueService.sanitiseDynamicLists(eventTrigger.case_fields, { data: formData });
         const caseEventData = {
-            data: this.replaceEmptyComplexFieldValues(this.formValueService.sanitise(formData, this.isCaseFlagSubmission)),
+            data: this.replaceEmptyComplexFieldValues(this.formValueService.sanitise(this.replaceHiddenFormValuesWithOriginalCaseData(form.get('data'), eventTrigger.case_fields), this.isCaseFlagSubmission)),
             event: form.value.event
         };
         this.formValueService.clearNonCaseFields(caseEventData.data, eventTrigger.case_fields);