exui-2536-to update-nested-dynamice-list

hmcts · Nov 20, 2024 · 5d071f3 · 5d071f3
1 parent 3913532
commit 5d071f3
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 8 deletions.
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -1,5 +1,8 @@
 ## RELEASE NOTES 
 
+### Version 7.0.75-exui-2536-rc-1
+**EXUI-2536** issue with DynamicMultiSelectList
+
 ### Version 7.0.75-exui-2462-rc1
 **EXUI-2462** DynamicRadioList incorrectly selects the wrong radio button
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hmcts/ccd-case-ui-toolkit",
-  "version": "7.0.75-exui-2462-rc",
+  "version": "7.0.75-exui-2536-rc-1",
   "engines": {
     "node": ">=18.19.0"
   },

diff --git a/projects/ccd-case-ui-toolkit/package.json b/projects/ccd-case-ui-toolkit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hmcts/ccd-case-ui-toolkit",
-  "version": "7.0.75-exui-2462-rc",
+  "version": "7.0.75-exui-2536-rc-1",
   "engines": {
     "node": ">=18.19.0"
   },

diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/services/form/field-type-sanitiser.spec.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/services/form/field-type-sanitiser.spec.ts
@@ -216,6 +216,36 @@ describe('FieldTypeSanitiser', () => {
               display_context: 'MANDATORY'
             }]
           }
+        },
+        {
+          id: 'field1',
+          field_type: {
+            type: 'Complex',
+            complex_fields: [
+              {
+                id: 'subfield1',
+                field_type: {
+                  type: 'Complex',
+                  complex_fields: [
+                    {
+                      id: 'subsubfield1',
+                      field_type: {
+                        type: 'DynamicMultiSelectList',
+                      },
+                      display_context: 'MANDATORY',
+                    },
+                  ],
+                },
+              },
+            ],
+          },
+          _value: {
+            subfield1: {
+              subsubfield1: {
+                list_items: ['nestedItem1', 'nestedItem2'],
+              },
+            },
+          },
         }
       ] as unknown as CaseField[];
     });
@@ -274,5 +304,10 @@ describe('FieldTypeSanitiser', () => {
         { code: '192', label: 'Peter Pan' }
       ]);
     });
+
+    it('should add list_items to type DynamicMultiSelectList in deeply nested field', () => {
+      const result = fieldTypeSanitiser.ensureDynamicMultiSelectListPopulated(mockCaseFields);
+      expect(result[2].field_type.complex_fields[0].field_type.complex_fields[0].list_items).toEqual(['nestedItem1', 'nestedItem2']);
+    });
   });
 });
diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/services/form/field-type-sanitiser.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/services/form/field-type-sanitiser.ts
@@ -59,17 +59,39 @@ export class FieldTypeSanitiser {
       if (field.field_type.type !== 'Complex') {
         return field;
       }
-      const complexFieldsUpdated = field.field_type.complex_fields.map((complexField) =>
-        complexField.field_type.type === FieldTypeSanitiser.FIELD_TYPE_DYNAMIC_MULTISELECT_LIST && complexField.display_context !== 'HIDDEN' && field._value?.[complexField.id]
-          ? { ...complexField, list_items: field._value[complexField.id]?.list_items } : complexField
-      );
-      return { ...field, field_type: { ...field.field_type, complex_fields: complexFieldsUpdated } } as CaseField;
+      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 (
+          complexField.field_type.type === FieldTypeSanitiser.FIELD_TYPE_DYNAMIC_MULTISELECT_LIST &&
+          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 } } as CaseField;
+    });
+  }
+  private checkNestedDynamicList(caseField: CaseField, fieldData: any = null): void {
+    caseField.field_type.complex_fields.forEach((complexField) => {
+      if (complexField.field_type.type === FieldTypeSanitiser.FIELD_TYPE_COMPLEX) {
+        this.checkNestedDynamicList(complexField, fieldData?.[complexField.id]);
+      } else if (
+        complexField.field_type.type === FieldTypeSanitiser.FIELD_TYPE_DYNAMIC_MULTISELECT_LIST &&
+        complexField.display_context !== 'HIDDEN' &&
+        fieldData?.[complexField.id]
+      ) {
+        complexField.list_items = fieldData?.[complexField.id]?.list_items;
+      }
     });
   }
 
   private convertArrayToDynamicListOutput(field: CaseField, data: any): void {
     const values = data[field.id];
-
     if (Array.isArray(values)) {
       const listItems = this.getListItems(field);
       const matches = listItems.filter(item => values.map(v => v.code).indexOf(item.code) !== -1);