@hmcts/ccd-case-ui-toolkit 7.0.30-prerelease-ccd-label → 7.0.31-dynamic-multi-list-fix

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

@@ -5216,7 +5216,8 @@ class FieldTypeSanitiser {
         if (!data || !caseFields) {
             return;
         }
-        caseFields.forEach(caseField => {
+        caseFields = this.ensureDynamicMultiSelectListPopulated(caseFields);
+        caseFields.forEach((caseField) => {
             // tslint:disable-next-line:switch-default
             switch (caseField.field_type.type) {
                 case FieldTypeSanitiser.FIELD_TYPE_DYNAMIC_MULTISELECT_LIST:
@@ -5239,6 +5240,16 @@ class FieldTypeSanitiser {
             }
         });
     }
+    ensureDynamicMultiSelectListPopulated(caseFields) {
+        return caseFields.map((field) => {
+            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 && field._value[complexField.id]
+                ? { ...complexField, list_items: field._value[complexField.id].list_items } : complexField);
+            return { ...field, field_type: { ...field.field_type, complex_fields: complexFieldsUpdated } };
+        });
+    }
     convertArrayToDynamicListOutput(field, data) {
         const values = data[field.id];
         if (Array.isArray(values)) {
@@ -20439,13 +20450,13 @@ ReadYesNoFieldComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: Rea
         i0.ɵɵelementEnd();
     } if (rf & 2) {
         i0.ɵɵadvance(1);
-        i0.ɵɵtextInterpolate(ctx.formattedValue ? i0.ɵɵpipeBind3(2, 1, ctx.formattedValue, null, ctx.formattedValue) : null);
+        i0.ɵɵtextInterpolate(ctx.formattedValue ? i0.ɵɵpipeBind3(2, 1, ctx.caseField.label, null, ctx.formattedValue) : null);
     } }, dependencies: [i1.RpxTranslatePipe], encapsulation: 2 });
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(ReadYesNoFieldComponent, [{
         type: Component,
         args: [{
                 selector: 'ccd-read-yes-no-field',
-                template: `<span class="text-16">{{formattedValue ? (formattedValue | rpxTranslate : null : formattedValue) : null}}</span>`
+                template: `<span class="text-16">{{formattedValue ? (caseField.label | rpxTranslate : null : formattedValue) : null}}</span>`
             }]
     }], function () { return [{ type: YesNoService }]; }, null); })();
 
@@ -20959,7 +20970,8 @@ class CaseFileViewFolderSelectorComponent {
         return [];
     }
     containsDocument(cat, document) {
-        if (cat.documents.findIndex((doc) => doc.document_binary_url === document.document_binary_url) > -1) {
+        if (cat.documents.findIndex((doc) => (doc.document_binary_url === document.document_binary_url)
+            && (doc.attribute_path === document.attribute_path)) > -1) {
             return [cat.category_id];
         }
         for (const c of cat.sub_categories) {