@hmcts/ccd-case-ui-toolkit 7.3.54-exui-3740 → 7.3.54-exui-4666-rc-1

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

@@ -4258,11 +4258,7 @@ class FieldsUtils {
             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 === 'DynamicMultiSelectList';
-                    if (isDynamicMultiSelectField) {
-                        this.setDynamicMultiSelectListDefinition(field, rootCaseField);
-                    }
-                    else if (isDynamicField) {
+                    if (isDynamicField) {
                         const dynamicListValue = this.getDynamicListValue(rootCaseField.value, field.id);
                         if (dynamicListValue) {
                             const list_items = dynamicListValue[0].list_items;
@@ -4295,29 +4291,6 @@ class FieldsUtils {
             }
         }
     }
-    static setDynamicMultiSelectListDefinition(field, rootCaseField) {
-        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 (rootCaseField.field_type.type !== FieldsUtils.SERVER_RESPONSE_FIELD_TYPE_COLLECTION) {
-                const value = dynamicListValue[0]?.value;
-                if (value !== undefined) {
-                    field.value = value;
-                    field.formatted_value = {
-                        ...field.formatted_value,
-                        value
-                    };
-                }
-            }
-        }
-    }
     static getDynamicListValue(jsonBlock, key) {
         const data = jsonBlock ? this.getNestedFieldValues(jsonBlock, key, []) : [];
         return data.length > 0 ? data : null;
@@ -4672,7 +4645,7 @@ const conditionSource = `{
     / OpenFormula
 
   EnclosedFormula
-    = bracket formula:OpenFormula bracket join:(JoinComparator)*
+    = openBracket formula:OpenFormula closeBracket join:(JoinComparator)*
       { return flat([ [formula], join[0] ], 1) }
 
   OpenFormula
@@ -4685,7 +4658,7 @@ const conditionSource = `{
       / CompoundJoinComparator
 
   CompoundJoinComparator
-    = comp:Comparator bracket f:OpenFormula bracket
+    = comp:Comparator openBracket f:OpenFormula closeBracket
       { return [comp, f ] }
 
   OpenEqualityCheck
@@ -4734,8 +4707,11 @@ const conditionSource = `{
    = '"'val:[A-Za-z0-9.,* _&()/-]*'"'
    { return val.join(""); }
 
-  bracket
-   = (_? "("+ _? / _? ")"+ _? )
+  openBracket
+   = _? "("+ _?
+
+  closeBracket
+   = _? ")" _?
 
   operator
    = "=" / "!=" / "CONTAINS"
@@ -5968,12 +5944,8 @@ class FieldTypeSanitiser {
                     break;
                 case FieldTypeSanitiser.FIELD_TYPE_COLLECTION:
                     if (Array.isArray(data[caseField.id])) {
-                        data[caseField.id].forEach((formElement, index) => {
-                            const matchingItem = Array.isArray(caseField.value) && formElement?.id !== undefined
-                                ? caseField.value.find((item) => item?.id === formElement.id)
-                                : null;
-                            const collectionItem = matchingItem || (Array.isArray(caseField.value) ? caseField.value[index] : null);
-                            this.sanitiseLists(this.copyCaseFieldsWithCollectionData(caseField.field_type.collection_field_type.complex_fields, collectionItem?.value || collectionItem), formElement.value);
+                        data[caseField.id].forEach((formElement) => {
+                            this.sanitiseLists(caseField.field_type.collection_field_type.complex_fields, formElement.value);
                         });
                     }
                     break;
@@ -6013,25 +5985,6 @@ class FieldTypeSanitiser {
             }
         });
     }
-    copyCaseFieldsWithCollectionData(caseFields, collectionItemData) {
-        return caseFields.map((field) => {
-            const fieldData = collectionItemData?.[field.id];
-            if (field.field_type.type === FieldTypeSanitiser.FIELD_TYPE_COMPLEX) {
-                return {
-                    ...field,
-                    field_type: {
-                        ...field.field_type,
-                        complex_fields: this.copyCaseFieldsWithCollectionData(field.field_type.complex_fields, fieldData)
-                    }
-                };
-            }
-            return this.isDynamicList(field.field_type.type) &&
-                field.display_context !== 'HIDDEN' &&
-                fieldData?.list_items !== undefined
-                ? { ...field, list_items: fieldData.list_items }
-                : field;
-        });
-    }
     isDynamicList(fieldType) {
         return FieldTypeSanitiser.DYNAMIC_LIST_TYPE.indexOf(fieldType) !== -1;
     }
@@ -9824,10 +9777,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);