@hmcts/ccd-case-ui-toolkit 6.19.10-doc-upload → 6.19.11-exui-848

package/fesm2015/hmcts-ccd-case-ui-toolkit.js

@@ -142,13 +142,13 @@ function FooterComponent_div_3_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵadvance(4);
     i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(18, 13, ctx_r1.workhours));
 } }
-const _c0$$ = [[["", "footerSolsNavLinks", ""]], [["", "footerCaseWorkerNavLinks", ""]]];
+const _c0$10 = [[["", "footerSolsNavLinks", ""]], [["", "footerCaseWorkerNavLinks", ""]]];
 const _c1$t = ["[footerSolsNavLinks]", "[footerCaseWorkerNavLinks]"];
 class FooterComponent {
 }
 FooterComponent.ɵfac = function FooterComponent_Factory(t) { return new (t || FooterComponent)(); };
 FooterComponent.ɵcmp = i0.ɵɵdefineComponent({ type: FooterComponent, selectors: [["cut-footer-bar"]], inputs: { email: "email", isSolicitor: "isSolicitor", phone: "phone", workhours: "workhours" }, ngContentSelectors: _c1$t, decls: 4, vars: 4, consts: [["id", "footer", "role", "footer", 1, "group", "js-footer"], [1, "footer-wrapper"], ["class", "footer-meta", 4, "ngIf"], [1, "footer-meta"], [1, "footer-meta-inner"], [1, "open-government-licence"], [1, "logo"], ["href", "https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/", "rel", "license"], [1, "copyright"], ["href", "https://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/copyright-and-re-use/crown-copyright/"], [1, "title"], [1, "footer-text"], [1, "email"], [3, "href"], [1, "phone"], [1, "work-hours"]], template: function FooterComponent_Template(rf, ctx) { if (rf & 1) {
-        i0.ɵɵprojectionDef(_c0$$);
+        i0.ɵɵprojectionDef(_c0$10);
         i0.ɵɵelementStart(0, "footer", 0);
         i0.ɵɵelementStart(1, "div", 1);
         i0.ɵɵtemplate(2, FooterComponent_div_2_Template, 20, 15, "div", 2);
@@ -221,7 +221,7 @@ function HeaderBarComponent_div_10_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵadvance(3);
     i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(4, 1, ctx_r2.title));
 } }
-const _c0$_ = [[["", "headerNavigation", ""]]];
+const _c0$$ = [[["", "headerNavigation", ""]]];
 const _c1$s = ["[headerNavigation]"];
 class HeaderBarComponent {
     constructor() {
@@ -233,7 +233,7 @@ class HeaderBarComponent {
 }
 HeaderBarComponent.ɵfac = function HeaderBarComponent_Factory(t) { return new (t || HeaderBarComponent)(); };
 HeaderBarComponent.ɵcmp = i0.ɵɵdefineComponent({ type: HeaderBarComponent, selectors: [["cut-header-bar"]], inputs: { title: "title", isSolicitor: "isSolicitor", username: "username" }, outputs: { signOutRequest: "signOutRequest" }, ngContentSelectors: _c1$s, decls: 17, vars: 14, consts: [["role", "banner", "id", "global-header", 1, "with-proposition"], [1, "header-wrapper"], [1, "header-global"], [4, "ngIf"], ["class", "global-header", 4, "ngIf"], [1, "header-proposition"], [1, "content"], ["href", "#proposition-links", 1, "js-header-toggle", "menu"], ["id", "proposition-menu", 4, "ngIf"], [1, "proposition-right"], ["id", "user-name"], ["id", "sign-out", "href", "javascript:void(0)", 3, "click"], ["href", "https://www.gov.uk", "title", "Go to the GOV.UK homepage", "id", "logo", 1, "content", 2, "margin-left", "0px"], ["src", "/img/gov.uk_logotype_crown_invert_trans.png?0.23.0", "width", "36", "height", "32", "alt", ""], [1, "global-header"], [1, "title"], ["id", "proposition-menu"], [1, "title-solicitor"], ["id", "proposition-name"]], template: function HeaderBarComponent_Template(rf, ctx) { if (rf & 1) {
-        i0.ɵɵprojectionDef(_c0$_);
+        i0.ɵɵprojectionDef(_c0$$);
         i0.ɵɵelementStart(0, "header", 0);
         i0.ɵɵelementStart(1, "div", 1);
         i0.ɵɵelementStart(2, "div", 2);
@@ -296,13 +296,13 @@ HeaderBarComponent.ɵcmp = i0.ɵɵdefineComponent({ type: HeaderBarComponent, se
             type: Output
         }] }); })();
 
-const _c0$Z = [[["", "leftNavLinks", ""]], [["", "rightNavLinks", ""]]];
+const _c0$_ = [[["", "leftNavLinks", ""]], [["", "rightNavLinks", ""]]];
 const _c1$r = ["[leftNavLinks]", "[rightNavLinks]"];
 class NavigationComponent {
 }
 NavigationComponent.ɵfac = function NavigationComponent_Factory(t) { return new (t || NavigationComponent)(); };
 NavigationComponent.ɵcmp = i0.ɵɵdefineComponent({ type: NavigationComponent, selectors: [["cut-nav-bar"]], inputs: { isSolicitor: "isSolicitor" }, ngContentSelectors: _c1$r, decls: 4, vars: 2, consts: [[1, "cut-nav-bar"]], template: function NavigationComponent_Template(rf, ctx) { if (rf & 1) {
-        i0.ɵɵprojectionDef(_c0$Z);
+        i0.ɵɵprojectionDef(_c0$_);
         i0.ɵɵelementStart(0, "div");
         i0.ɵɵelementStart(1, "nav", 0);
         i0.ɵɵprojection(2);
@@ -430,13 +430,13 @@ HeadersModule.ɵinj = i0.ɵɵdefineInjector({ imports: [[CommonModule, RouterMod
             }]
     }], null, null); })();
 
-const _c0$Y = [[["", "topBody", ""]], [["", "leftBody", ""]], [["", "rightBody", ""]]];
+const _c0$Z = [[["", "topBody", ""]], [["", "leftBody", ""]], [["", "rightBody", ""]]];
 const _c1$q = ["[topBody]", "[leftBody]", "[rightBody]"];
 class BodyComponent {
 }
 BodyComponent.ɵfac = function BodyComponent_Factory(t) { return new (t || BodyComponent)(); };
 BodyComponent.ɵcmp = i0.ɵɵdefineComponent({ type: BodyComponent, selectors: [["cut-body"]], ngContentSelectors: _c1$q, decls: 4, vars: 0, consts: [[1, "global-display"]], template: function BodyComponent_Template(rf, ctx) { if (rf & 1) {
-        i0.ɵɵprojectionDef(_c0$Y);
+        i0.ɵɵprojectionDef(_c0$Z);
         i0.ɵɵelementStart(0, "div", 0);
         i0.ɵɵprojection(1);
         i0.ɵɵprojection(2, 1);
@@ -453,7 +453,7 @@ BodyComponent.ɵcmp = i0.ɵɵdefineComponent({ type: BodyComponent, selectors: [
             }]
     }], null, null); })();
 
-const _c0$X = function (a0) { return { "govuk-input--error": a0 }; };
+const _c0$Y = function (a0) { return { "govuk-input--error": a0 }; };
 function DateInputComponent_div_19_Template(rf, ctx) { if (rf & 1) {
     const _r8 = i0.ɵɵgetCurrentView();
     i0.ɵɵelementStart(0, "div", 12);
@@ -472,7 +472,7 @@ function DateInputComponent_div_19_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵadvance(1);
     i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(3, 6, "Hour"));
     i0.ɵɵadvance(2);
-    i0.ɵɵproperty("id", ctx_r3.hourId())("name", ctx_r3.hourId())("value", ctx_r3.displayHour)("ngClass", i0.ɵɵpureFunction1(8, _c0$X, ctx_r3.isInvalid));
+    i0.ɵɵproperty("id", ctx_r3.hourId())("name", ctx_r3.hourId())("value", ctx_r3.displayHour)("ngClass", i0.ɵɵpureFunction1(8, _c0$Y, ctx_r3.isInvalid));
 } }
 function DateInputComponent_div_20_Template(rf, ctx) { if (rf & 1) {
     const _r13 = i0.ɵɵgetCurrentView();
@@ -492,7 +492,7 @@ function DateInputComponent_div_20_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵadvance(1);
     i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(3, 6, "Minute"));
     i0.ɵɵadvance(2);
-    i0.ɵɵproperty("id", ctx_r4.minuteId())("name", ctx_r4.minuteId())("value", ctx_r4.displayMinute)("ngClass", i0.ɵɵpureFunction1(8, _c0$X, ctx_r4.isInvalid));
+    i0.ɵɵproperty("id", ctx_r4.minuteId())("name", ctx_r4.minuteId())("value", ctx_r4.displayMinute)("ngClass", i0.ɵɵpureFunction1(8, _c0$Y, ctx_r4.isInvalid));
 } }
 function DateInputComponent_div_21_Template(rf, ctx) { if (rf & 1) {
     const _r18 = i0.ɵɵgetCurrentView();
@@ -512,7 +512,7 @@ function DateInputComponent_div_21_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵadvance(1);
     i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(3, 6, "Second"));
     i0.ɵɵadvance(2);
-    i0.ɵɵproperty("id", ctx_r5.secondId())("name", ctx_r5.secondId())("value", ctx_r5.displaySecond)("ngClass", i0.ɵɵpureFunction1(8, _c0$X, ctx_r5.isInvalid));
+    i0.ɵɵproperty("id", ctx_r5.secondId())("name", ctx_r5.secondId())("value", ctx_r5.displaySecond)("ngClass", i0.ɵɵpureFunction1(8, _c0$Y, ctx_r5.isInvalid));
 } }
 class DateInputComponent {
     constructor() {
@@ -746,19 +746,19 @@ DateInputComponent.ɵcmp = i0.ɵɵdefineComponent({ type: DateInputComponent, se
         i0.ɵɵadvance(1);
         i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(4, 21, "Day"));
         i0.ɵɵadvance(2);
-        i0.ɵɵproperty("id", ctx.dayId())("name", ctx.dayId())("value", ctx.displayDay)("ngClass", i0.ɵɵpureFunction1(27, _c0$X, ctx.isInvalid));
+        i0.ɵɵproperty("id", ctx.dayId())("name", ctx.dayId())("value", ctx.displayDay)("ngClass", i0.ɵɵpureFunction1(27, _c0$Y, ctx.isInvalid));
         i0.ɵɵadvance(3);
         i0.ɵɵproperty("for", ctx.monthId());
         i0.ɵɵadvance(1);
         i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(10, 23, "Month"));
         i0.ɵɵadvance(2);
-        i0.ɵɵproperty("id", ctx.monthId())("name", ctx.monthId())("value", ctx.displayMonth)("ngClass", i0.ɵɵpureFunction1(29, _c0$X, ctx.isInvalid));
+        i0.ɵɵproperty("id", ctx.monthId())("name", ctx.monthId())("value", ctx.displayMonth)("ngClass", i0.ɵɵpureFunction1(29, _c0$Y, ctx.isInvalid));
         i0.ɵɵadvance(3);
         i0.ɵɵproperty("for", ctx.yearId());
         i0.ɵɵadvance(1);
         i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(16, 25, "Year"));
         i0.ɵɵadvance(2);
-        i0.ɵɵproperty("id", ctx.yearId())("name", ctx.yearId())("value", ctx.displayYear)("ngClass", i0.ɵɵpureFunction1(31, _c0$X, ctx.isInvalid));
+        i0.ɵɵproperty("id", ctx.yearId())("name", ctx.yearId())("value", ctx.displayYear)("ngClass", i0.ɵɵpureFunction1(31, _c0$Y, ctx.isInvalid));
         i0.ɵɵadvance(2);
         i0.ɵɵproperty("ngIf", ctx.isDateTime);
         i0.ɵɵadvance(1);
@@ -828,7 +828,7 @@ function AlertComponent_ng_container_5_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementEnd();
     i0.ɵɵelementContainerEnd();
 } }
-const _c0$W = ["*"];
+const _c0$X = ["*"];
 var AlertMessageType;
 (function (AlertMessageType) {
     AlertMessageType["WARNING"] = "warning";
@@ -848,7 +848,7 @@ AlertComponent.TYPE_SUCCESS = 'success';
 AlertComponent.TYPE_ERROR = 'error';
 AlertComponent.TYPE_INFORMATION = 'information';
 AlertComponent.ɵfac = function AlertComponent_Factory(t) { return new (t || AlertComponent)(); };
-AlertComponent.ɵcmp = i0.ɵɵdefineComponent({ type: AlertComponent, selectors: [["cut-alert"]], inputs: { type: "type", showIcon: "showIcon" }, ngContentSelectors: _c0$W, decls: 11, vars: 12, consts: [[1, "hmcts-banner"], [3, "ngSwitch"], [4, "ngSwitchCase"], [1, "hmcts-banner__message"], [1, "hmcts-banner__assistive"], ["fill", "currentColor", "role", "presentation", "focusable", "false", "xmlns", "http://www.w3.org/2000/svg", "viewBox", "0 0 25 25", "height", "25", "width", "25", 1, "hmcts-banner__icon"], ["d", "M13.6,15.4h-2.3v-4.5h2.3V15.4z M13.6,19.8h-2.3v-2.2h2.3V19.8z M0,23.2h25L12.5,2L0,23.2z"], ["d", "M25,6.2L8.7,23.2L0,14.1l4-4.2l4.7,4.9L21,2L25,6.2z"], ["d", "M13.7,18.5h-2.4v-2.4h2.4V18.5z M12.5,13.7c-0.7,0-1.2-0.5-1.2-1.2V7.7c0-0.7,0.5-1.2,1.2-1.2s1.2,0.5,1.2,1.2v4.8\n      C13.7,13.2,13.2,13.7,12.5,13.7z M12.5,0.5c-6.6,0-12,5.4-12,12s5.4,12,12,12s12-5.4,12-12S19.1,0.5,12.5,0.5z"]], template: function AlertComponent_Template(rf, ctx) { if (rf & 1) {
+AlertComponent.ɵcmp = i0.ɵɵdefineComponent({ type: AlertComponent, selectors: [["cut-alert"]], inputs: { type: "type", showIcon: "showIcon" }, ngContentSelectors: _c0$X, decls: 11, vars: 12, consts: [[1, "hmcts-banner"], [3, "ngSwitch"], [4, "ngSwitchCase"], [1, "hmcts-banner__message"], [1, "hmcts-banner__assistive"], ["fill", "currentColor", "role", "presentation", "focusable", "false", "xmlns", "http://www.w3.org/2000/svg", "viewBox", "0 0 25 25", "height", "25", "width", "25", 1, "hmcts-banner__icon"], ["d", "M13.6,15.4h-2.3v-4.5h2.3V15.4z M13.6,19.8h-2.3v-2.2h2.3V19.8z M0,23.2h25L12.5,2L0,23.2z"], ["d", "M25,6.2L8.7,23.2L0,14.1l4-4.2l4.7,4.9L21,2L25,6.2z"], ["d", "M13.7,18.5h-2.4v-2.4h2.4V18.5z M12.5,13.7c-0.7,0-1.2-0.5-1.2-1.2V7.7c0-0.7,0.5-1.2,1.2-1.2s1.2,0.5,1.2,1.2v4.8\n      C13.7,13.2,13.2,13.7,12.5,13.7z M12.5,0.5c-6.6,0-12,5.4-12,12s5.4,12,12,12s12-5.4,12-12S19.1,0.5,12.5,0.5z"]], template: function AlertComponent_Template(rf, ctx) { if (rf & 1) {
         i0.ɵɵprojectionDef();
         i0.ɵɵelementStart(0, "div", 0);
         i0.ɵɵelementContainerStart(1, 1);
@@ -1086,7 +1086,7 @@ NotificationBannerComponent.ɵcmp = i0.ɵɵdefineComponent({ type: NotificationB
             type: Output
         }] }); })();
 
-const _c0$V = function (a0) { return { "js-hidden": a0 }; };
+const _c0$W = function (a0) { return { "js-hidden": a0 }; };
 const _c1$p = ["*"];
 class TabComponent {
 }
@@ -1097,7 +1097,7 @@ TabComponent.ɵcmp = i0.ɵɵdefineComponent({ type: TabComponent, selectors: [["
         i0.ɵɵprojection(1);
         i0.ɵɵelementEnd();
     } if (rf & 2) {
-        i0.ɵɵproperty("id", ctx.id)("ngClass", i0.ɵɵpureFunction1(3, _c0$V, !ctx.selected));
+        i0.ɵɵproperty("id", ctx.id)("ngClass", i0.ɵɵpureFunction1(3, _c0$W, !ctx.selected));
         i0.ɵɵattribute("aria-hidden", !ctx.selected);
     } }, directives: [i2.NgClass], styles: [".tabs-toggle[_ngcontent-%COMP%]{display:block;padding:10px 15px 3px;margin-bottom:8px}.tabs-toggle[aria-selected=true][_ngcontent-%COMP%]{color:#0b0c0c;text-decoration:none;border-bottom:none}.tabs-toggle[_ngcontent-%COMP%]   a[_ngcontent-%COMP%]{color:#005ea5}@media (max-width:640px){.tabs-list[_ngcontent-%COMP%]{border-bottom:1px solid #bfc1c3;margin-left:-15px;margin-right:-15px}.tabs-toggle[_ngcontent-%COMP%]{border-top:1px solid #bfc1c3}.tabs-toggle[_ngcontent-%COMP%]:focus{color:#0b0c0c;outline:none}}@media (min-width:641px){.tabs-panel[_ngcontent-%COMP%]{border-top:1px solid #bfc1c3;clear:both;overflow:hidden}.tabs-list[_ngcontent-%COMP%]{float:left}.tabs-list-item[_ngcontent-%COMP%]{float:left;position:relative;bottom:-1px;padding-top:10px}.tabs-toggle[_ngcontent-%COMP%]{background-color:#dee0e2;border:1px solid transparent;float:left;margin:0 6px 0 0;text-decoration:none}.tabs-toggle[_ngcontent-%COMP%]:visited{color:#005ea5}.tabs-toggle-selected[_ngcontent-%COMP%], .tabs-toggle[aria-selected=true][_ngcontent-%COMP%]{background-color:#fff;border-bottom:0;border-color:#bfc1c3;padding-bottom:11px;margin-bottom:0;color:#0b0c0c}}"] });
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(TabComponent, [{
@@ -1117,7 +1117,7 @@ TabComponent.ɵcmp = i0.ɵɵdefineComponent({ type: TabComponent, selectors: [["
             type: Input
         }] }); })();
 
-const _c0$U = ["tab"];
+const _c0$V = ["tab"];
 const _c1$o = function () { return ["."]; };
 const _c2$3 = function (a0) { return { "tabs-toggle-selected": a0 }; };
 function TabsComponent_li_2_Template(rf, ctx) { if (rf & 1) {
@@ -1164,7 +1164,7 @@ TabsComponent.ɵcmp = i0.ɵɵdefineComponent({ type: TabsComponent, selectors: [
         let _t;
         i0.ɵɵqueryRefresh(_t = i0.ɵɵloadQuery()) && (ctx.panels = _t);
     } }, viewQuery: function TabsComponent_Query(rf, ctx) { if (rf & 1) {
-        i0.ɵɵviewQuery(_c0$U, 1);
+        i0.ɵɵviewQuery(_c0$V, 1);
     } if (rf & 2) {
         let _t;
         i0.ɵɵqueryRefresh(_t = i0.ɵɵloadQuery()) && (ctx.tabs = _t);
@@ -1231,7 +1231,7 @@ TabsModule.ɵinj = i0.ɵɵdefineInjector({ imports: [[
             }]
     }], null, null); })();
 
-const _c0$T = function (a0, a1) { return { caseLocked: a0, someoneViewing: a1 }; };
+const _c0$U = function (a0, a1) { return { caseLocked: a0, someoneViewing: a1 }; };
 class ActivityBannerComponent {
     constructor() { }
     ngOnInit() {
@@ -1250,7 +1250,7 @@ ActivityBannerComponent.ɵcmp = i0.ɵɵdefineComponent({ type: ActivityBannerCom
         i0.ɵɵelementEnd();
         i0.ɵɵelementEnd();
     } if (rf & 2) {
-        i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction2(8, _c0$T, ctx.bannerType === "editor", ctx.bannerType === "viewer"));
+        i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction2(8, _c0$U, ctx.bannerType === "editor", ctx.bannerType === "viewer"));
         i0.ɵɵadvance(2);
         i0.ɵɵpropertyInterpolate("alt", i0.ɵɵpipeBind1(3, 4, ctx.description));
         i0.ɵɵpropertyInterpolate("src", ctx.imageLink, i0.ɵɵsanitizeUrl);
@@ -4225,7 +4225,7 @@ class ConditionParser {
     }
     static findValueForComplexConditionInArray(fields, head, tail, path) {
         // use the path to resolve which array element we refer to
-        if (path.startsWith(head)) {
+        if (path && path.startsWith(head)) {
             const [_, ...pathTail] = path.split(/[_]+/g);
             if (pathTail.length > 0) {
                 try {
@@ -7400,6 +7400,7 @@ class WizardPageFieldToCaseFieldMapper {
         childrenCaseFields.forEach(e => this.hideParentIfAllChildrenHidden(e));
         if (childrenCaseFields.length > 0 && this.allCaseFieldsHidden(childrenCaseFields)) {
             caseField.hidden = true;
+            caseField.display_context = 'HIDDEN';
         }
     }
     getCaseFieldChildren(caseField) {
@@ -8514,25 +8515,29 @@ class ValidPageListCaseFieldsService {
     constructor(fieldsUtils) {
         this.fieldsUtils = fieldsUtils;
     }
-    isShown(page, eventTriggerFields, data) {
+    isShown(page, eventTriggerFields, formFields) {
         const fields = this.fieldsUtils
-            .mergeCaseFieldsAndFormFields(eventTriggerFields, data);
+            .mergeCaseFieldsAndFormFields(eventTriggerFields, formFields);
         return page.parsedShowCondition.match(fields);
     }
-    deleteNonValidatedFields(validPageList, data, eventTriggerFields, fromPreviousPage = false) {
+    deleteNonValidatedFields(validPageList, caseEventDatadata, eventTriggerFields, fromPreviousPage, formFields) {
+        const pageListCaseFields = this.validPageListCaseFields(validPageList, eventTriggerFields, formFields);
+        if (!fromPreviousPage && pageListCaseFields.length > 0) {
+            Object.keys(caseEventDatadata).forEach(key => {
+                if (pageListCaseFields.findIndex((element) => element.id === key) < 0) {
+                    delete caseEventDatadata[key];
+                }
+            });
+        }
+    }
+    validPageListCaseFields(validPageList, eventTriggerFields, formFields) {
         const validPageListCaseFields = [];
         validPageList.forEach(page => {
-            if (this.isShown(page, eventTriggerFields, data)) {
+            if (this.isShown(page, eventTriggerFields, formFields)) {
                 page.case_fields.forEach(field => validPageListCaseFields.push(field));
             }
         });
-        if (!fromPreviousPage && validPageListCaseFields.length > 0) {
-            Object.keys(data).forEach(key => {
-                if (validPageListCaseFields.findIndex((element) => element.id === key) < 0) {
-                    delete data[key];
-                }
-            });
-        }
+        return validPageListCaseFields;
     }
 }
 ValidPageListCaseFieldsService.ɵfac = function ValidPageListCaseFieldsService_Factory(t) { return new (t || ValidPageListCaseFieldsService)(i0.ɵɵinject(FieldsUtils)); };
@@ -8726,7 +8731,12 @@ class CaseEditComponent {
         // Remove "Launcher"-type fields (these have no values and are not intended to be persisted)
         this.formValueService.removeCaseFieldsOfType(caseEventData.data, eventTrigger.case_fields, ['FlagLauncher', 'ComponentLauncher']);
         // delete fields which are not part of the case event journey wizard pages case fields
-        this.validPageListCaseFieldsService.deleteNonValidatedFields(this.validPageList, caseEventData.data, eventTrigger.case_fields, false);
+        this.validPageListCaseFieldsService.deleteNonValidatedFields(this.validPageList, caseEventData.data, eventTrigger.case_fields, false, form.controls['data'].value);
+        const pageListCaseFields = this.validPageListCaseFieldsService.validPageListCaseFields(this.validPageList, eventTrigger.case_fields, form.controls['data'].value);
+        // Remove unnecessary case fields which are hidden, only if the submission is *not* for Case Flags
+        if (!this.isCaseFlagSubmission) {
+            this.formValueService.removeUnnecessaryFields(caseEventData.data, pageListCaseFields, true, true);
+        }
         caseEventData.event_token = eventTrigger.event_token;
         caseEventData.ignore_warning = this.ignoreWarning;
         if (this.confirmation) {
@@ -9973,7 +9983,7 @@ class CaseEditPageComponent {
         // 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
-        this.validPageListCaseFieldsService.deleteNonValidatedFields(this.caseEdit.validPageList, caseEventData.data, this.eventTrigger.case_fields, fromPreviousPage);
+        this.validPageListCaseFieldsService.deleteNonValidatedFields(this.caseEdit.validPageList, caseEventData.data, this.eventTrigger.case_fields, fromPreviousPage, this.editForm.controls['data'].value);
         // Tidy it up before we return it.
         this.formValueService.removeUnnecessaryFields(caseEventData.data, caseFields, clearEmpty, clearNonCase, fromPreviousPage, this.currentPage.case_fields);
         return caseEventData;
@@ -10489,7 +10499,7 @@ WriteComplexFieldComponent.ɵcmp = i0.ɵɵdefineComponent({ type: WriteComplexFi
             type: Input
         }] }); })();
 
-const _c0$S = ["writeComplexFieldComponent"];
+const _c0$T = ["writeComplexFieldComponent"];
 function WriteAddressFieldComponent_div_1_div_5_span_5_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementStart(0, "span", 14);
     i0.ɵɵtext(1);
@@ -10701,7 +10711,7 @@ class WriteAddressFieldComponent extends AbstractFieldWriteComponent {
 }
 WriteAddressFieldComponent.ɵfac = function WriteAddressFieldComponent_Factory(t) { return new (t || WriteAddressFieldComponent)(i0.ɵɵdirectiveInject(AddressesService), i0.ɵɵdirectiveInject(IsCompoundPipe)); };
 WriteAddressFieldComponent.ɵcmp = i0.ɵɵdefineComponent({ type: WriteAddressFieldComponent, selectors: [["ccd-write-address-field"]], viewQuery: function WriteAddressFieldComponent_Query(rf, ctx) { if (rf & 1) {
-        i0.ɵɵviewQuery(_c0$S, 1);
+        i0.ɵɵviewQuery(_c0$T, 1);
         i0.ɵɵviewQuery(FocusElementDirective, 1);
     } if (rf & 2) {
         let _t;
@@ -11279,7 +11289,7 @@ function WriteCaseFlagFieldComponent_div_1_ng_container_8_Template(rf, ctx) { if
     i0.ɵɵadvance(1);
     i0.ɵɵproperty("formGroup", ctx_r10.caseFlagParentFormGroup)("optional", ctx_r10.flagCommentsOptional);
 } }
-const _c0$R = function (a0) { return { "form-group-error": a0 }; };
+const _c0$S = function (a0) { return { "form-group-error": a0 }; };
 function WriteCaseFlagFieldComponent_div_1_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementStart(0, "div", 8);
     i0.ɵɵelementStart(1, "div", 9);
@@ -11299,7 +11309,7 @@ function WriteCaseFlagFieldComponent_div_1_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵadvance(1);
     i0.ɵɵproperty("ngSwitch", ctx_r1.fieldState);
     i0.ɵɵadvance(1);
-    i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(10, _c0$R, ctx_r1.errorMessages.length > 0));
+    i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(10, _c0$S, ctx_r1.errorMessages.length > 0));
     i0.ɵɵadvance(1);
     i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(4, 8, ctx_r1.createFlagCaption), " ");
     i0.ɵɵadvance(2);
@@ -11736,7 +11746,7 @@ const ɵReadCaseLinkFieldComponent_BaseFactory = /*@__PURE__*/ i0.ɵɵgetInherit
             }]
     }], null, null); })();
 
-const _c0$Q = ["writeComplexFieldComponent"];
+const _c0$R = ["writeComplexFieldComponent"];
 function WriteCaseLinkFieldComponent_span_2_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementStart(0, "span", 6);
     i0.ɵɵtext(1);
@@ -11817,7 +11827,7 @@ class WriteCaseLinkFieldComponent extends AbstractFieldWriteComponent {
 }
 WriteCaseLinkFieldComponent.ɵfac = function WriteCaseLinkFieldComponent_Factory(t) { return ɵWriteCaseLinkFieldComponent_BaseFactory(t || WriteCaseLinkFieldComponent); };
 WriteCaseLinkFieldComponent.ɵcmp = i0.ɵɵdefineComponent({ type: WriteCaseLinkFieldComponent, selectors: [["ccd-write-case-link-field"]], viewQuery: function WriteCaseLinkFieldComponent_Query(rf, ctx) { if (rf & 1) {
-        i0.ɵɵviewQuery(_c0$Q, 1);
+        i0.ɵɵviewQuery(_c0$R, 1);
     } if (rf & 2) {
         let _t;
         i0.ɵɵqueryRefresh(_t = i0.ɵɵloadQuery()) && (ctx.writeComplexFieldComponent = _t.first);
@@ -11855,7 +11865,7 @@ const ɵWriteCaseLinkFieldComponent_BaseFactory = /*@__PURE__*/ i0.ɵɵgetInheri
             args: ['writeComplexFieldComponent']
         }] }); })();
 
-const _c0$P = function (a0, a1, a2, a3, a4, a5) { return { id: a0, label: a1, field_type: a2, display_context_parameter: a3, value: a4, hidden: a5 }; };
+const _c0$Q = function (a0, a1, a2, a3, a4, a5) { return { id: a0, label: a1, field_type: a2, display_context_parameter: a3, value: a4, hidden: a5 }; };
 function ReadCollectionFieldComponent_table_0_tbody_2_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementStart(0, "tbody");
     i0.ɵɵelementStart(1, "tr");
@@ -11868,7 +11878,7 @@ function ReadCollectionFieldComponent_table_0_tbody_2_Template(rf, ctx) { if (rf
 } if (rf & 2) {
     const ctx_r1 = i0.ɵɵnextContext(2);
     i0.ɵɵadvance(4);
-    i0.ɵɵproperty("caseField", i0.ɵɵpureFunction6(3, _c0$P, ctx_r1.caseField.label, ctx_r1.caseField.label, ctx_r1.caseField.field_type.collection_field_type, ctx_r1.caseField.display_context_parameter, ctx_r1.caseField.value, ctx_r1.caseField.hidden))("context", ctx_r1.context)("topLevelFormGroup", ctx_r1.topLevelFormGroup);
+    i0.ɵɵproperty("caseField", i0.ɵɵpureFunction6(3, _c0$Q, ctx_r1.caseField.label, ctx_r1.caseField.label, ctx_r1.caseField.field_type.collection_field_type, ctx_r1.caseField.display_context_parameter, ctx_r1.caseField.value, ctx_r1.caseField.hidden))("context", ctx_r1.context)("topLevelFormGroup", ctx_r1.topLevelFormGroup);
 } }
 const _c1$l = function (a0, a1, a2, a3, a4) { return { id: a0, label: a1, field_type: a2, value: a3, hidden: a4 }; };
 function ReadCollectionFieldComponent_table_0_tbody_3_tr_1_Template(rf, ctx) { if (rf & 1) {
@@ -12009,7 +12019,7 @@ RemoveDialogComponent.ɵcmp = i0.ɵɵdefineComponent({ type: RemoveDialogCompone
             }]
     }], function () { return [{ type: i1$3.MatDialogRef }]; }, null); })();
 
-const _c0$O = ["collectionItem"];
+const _c0$P = ["collectionItem"];
 function WriteCollectionFieldComponent_h2_9_span_1_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementStart(0, "span", 9);
     i0.ɵɵtext(1);
@@ -12403,7 +12413,7 @@ class WriteCollectionFieldComponent extends AbstractFieldWriteComponent {
 }
 WriteCollectionFieldComponent.ɵfac = function WriteCollectionFieldComponent_Factory(t) { return new (t || WriteCollectionFieldComponent)(i0.ɵɵdirectiveInject(i1$3.MatDialog), i0.ɵɵdirectiveInject(i2$2.ScrollToService), i0.ɵɵdirectiveInject(ProfileNotifier)); };
 WriteCollectionFieldComponent.ɵcmp = i0.ɵɵdefineComponent({ type: WriteCollectionFieldComponent, selectors: [["ccd-write-collection-field"]], viewQuery: function WriteCollectionFieldComponent_Query(rf, ctx) { if (rf & 1) {
-        i0.ɵɵviewQuery(_c0$O, 1);
+        i0.ɵɵviewQuery(_c0$P, 1);
     } if (rf & 2) {
         let _t;
         i0.ɵɵqueryRefresh(_t = i0.ɵɵloadQuery()) && (ctx.items = _t);
@@ -12740,7 +12750,7 @@ FileUploadStateService.ɵprov = i0.ɵɵdefineInjectable({ token: FileUploadState
         type: Injectable
     }], null, null); })();
 
-const _c0$N = ["fileInput"];
+const _c0$O = ["fileInput"];
 function WriteDocumentFieldComponent_span_7_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementStart(0, "span", 12);
     i0.ɵɵtext(1);
@@ -12779,6 +12789,15 @@ class WriteDocumentFieldComponent extends AbstractFieldWriteComponent {
         this.jurisdictionService = jurisdictionService;
         this.valid = true;
     }
+    clickout(event) {
+        // Capturing the event of the associated  ElementRef <input type="file" #fileInpu
+        if (this.fileInput.nativeElement.contains(event.target)) {
+            this.clickInsideTheDocument = true;
+        }
+        else {
+            this.fileValidations();
+        }
+    }
     ngOnInit() {
         this.secureModeOn = this.appConfig.getDocumentSecureMode();
         if (this.secureModeOn) {
@@ -13029,10 +13048,12 @@ WriteDocumentFieldComponent.UPLOAD_ERROR_NOT_AVAILABLE = 'Document upload facili
 WriteDocumentFieldComponent.UPLOAD_WAITING_FILE_STATUS = 'Uploading...';
 WriteDocumentFieldComponent.ɵfac = function WriteDocumentFieldComponent_Factory(t) { return new (t || WriteDocumentFieldComponent)(i0.ɵɵdirectiveInject(AbstractAppConfig), i0.ɵɵdirectiveInject(CaseNotifier), i0.ɵɵdirectiveInject(DocumentManagementService), i0.ɵɵdirectiveInject(i1$3.MatDialog), i0.ɵɵdirectiveInject(FileUploadStateService), i0.ɵɵdirectiveInject(JurisdictionService)); };
 WriteDocumentFieldComponent.ɵcmp = i0.ɵɵdefineComponent({ type: WriteDocumentFieldComponent, selectors: [["ccd-write-document-field"]], viewQuery: function WriteDocumentFieldComponent_Query(rf, ctx) { if (rf & 1) {
-        i0.ɵɵviewQuery(_c0$N, 1);
+        i0.ɵɵviewQuery(_c0$O, 1);
     } if (rf & 2) {
         let _t;
         i0.ɵɵqueryRefresh(_t = i0.ɵɵloadQuery()) && (ctx.fileInput = _t.first);
+    } }, hostBindings: function WriteDocumentFieldComponent_HostBindings(rf, ctx) { if (rf & 1) {
+        i0.ɵɵlistener("click", function WriteDocumentFieldComponent_click_HostBindingHandler($event) { return ctx.clickout($event); }, false, i0.ɵɵresolveDocument);
     } }, features: [i0.ɵɵInheritDefinitionFeature], decls: 19, vars: 22, consts: [[1, "form-group", 3, "ngClass"], [3, "for"], [1, "form-label"], ["class", "form-hint", 4, "ngIf"], ["class", "error-message", 4, "ngIf"], [3, "caseField", 4, "ngIf"], [2, "position", "relative"], [3, "id", "click"], ["type", "file", 1, "form-control", "bottom-30", 3, "id", "accept", "keydown.Tab", "change"], ["fileInput", ""], [1, "form-group", "bottom-30"], ["type", "button", "aria-label", "Cancel upload", 1, "button", "button-secondary", 3, "disabled", "click"], [1, "form-hint"], [1, "error-message"], [3, "caseField"]], template: function WriteDocumentFieldComponent_Template(rf, ctx) { if (rf & 1) {
         i0.ɵɵelementStart(0, "div", 0);
         i0.ɵɵelementStart(1, "label", 1);
@@ -13097,6 +13118,9 @@ WriteDocumentFieldComponent.ɵcmp = i0.ɵɵdefineComponent({ type: WriteDocument
     }], function () { return [{ type: AbstractAppConfig }, { type: CaseNotifier }, { type: DocumentManagementService }, { type: i1$3.MatDialog }, { type: FileUploadStateService }, { type: JurisdictionService }]; }, { fileInput: [{
             type: ViewChild,
             args: ['fileInput', { static: false }]
+        }], clickout: [{
+            type: HostListener,
+            args: ['document:click', ['$event']]
         }] }); })();
 
 class DynamicListPipe {
@@ -13199,7 +13223,7 @@ function WriteDynamicListFieldComponent_option_10_Template(rf, ctx) { if (rf & 1
     i0.ɵɵadvance(1);
     i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(2, 2, type_r5.label));
 } }
-const _c0$M = function (a0) { return { "form-group-error": a0 }; };
+const _c0$N = function (a0) { return { "form-group-error": a0 }; };
 class WriteDynamicListFieldComponent extends AbstractFieldWriteComponent {
     ngOnInit() {
         /**
@@ -13242,7 +13266,7 @@ WriteDynamicListFieldComponent.ɵcmp = i0.ɵɵdefineComponent({ type: WriteDynam
         i0.ɵɵelementEnd();
         i0.ɵɵelementEnd();
     } if (rf & 2) {
-        i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(13, _c0$M, !ctx.dynamicListFormControl.valid && (ctx.dynamicListFormControl.dirty || ctx.dynamicListFormControl.touched)));
+        i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(13, _c0$N, !ctx.dynamicListFormControl.valid && (ctx.dynamicListFormControl.dirty || ctx.dynamicListFormControl.touched)));
         i0.ɵɵadvance(1);
         i0.ɵɵproperty("for", ctx.id());
         i0.ɵɵadvance(1);
@@ -13427,7 +13451,7 @@ function WriteDynamicMultiSelectListFieldComponent_ng_container_6_Template(rf, c
     i0.ɵɵadvance(1);
     i0.ɵɵproperty("content", checkbox_r4.label);
 } }
-const _c0$L = function (a0) { return { "error": a0 }; };
+const _c0$M = function (a0) { return { "error": a0 }; };
 class WriteDynamicMultiSelectListFieldComponent extends AbstractFieldWriteComponent {
     ngOnInit() {
         this.checkboxes = new FormArray([]);
@@ -13501,7 +13525,7 @@ WriteDynamicMultiSelectListFieldComponent.ɵcmp = i0.ɵɵdefineComponent({ type:
         i0.ɵɵelementEnd();
         i0.ɵɵelementEnd();
     } if (rf & 2) {
-        i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(6, _c0$L, !ctx.checkboxes.valid && ctx.checkboxes.touched))("id", ctx.id());
+        i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(6, _c0$M, !ctx.checkboxes.valid && ctx.checkboxes.touched))("id", ctx.id());
         i0.ɵɵadvance(3);
         i0.ɵɵproperty("ngIf", ctx.caseField.label);
         i0.ɵɵadvance(1);
@@ -13623,7 +13647,7 @@ function WriteDynamicRadioListFieldComponent_span_7_Template(rf, ctx) { if (rf &
     i0.ɵɵadvance(1);
     i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(2, 1, i0.ɵɵpipeBind1(3, 3, ctx_r3.dynamicRadioListControl.errors)));
 } }
-const _c0$K = function (a0) { return { selected: a0 }; };
+const _c0$L = function (a0) { return { selected: a0 }; };
 function WriteDynamicRadioListFieldComponent_div_9_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementStart(0, "div", 10);
     i0.ɵɵelement(1, "input", 11);
@@ -13635,7 +13659,7 @@ function WriteDynamicRadioListFieldComponent_div_9_Template(rf, ctx) { if (rf &
 } if (rf & 2) {
     const radioButton_r5 = ctx.$implicit;
     const ctx_r4 = i0.ɵɵnextContext();
-    i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(9, _c0$K, ctx_r4.dynamicRadioListControl.value === radioButton_r5.code));
+    i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(9, _c0$L, ctx_r4.dynamicRadioListControl.value === radioButton_r5.code));
     i0.ɵɵadvance(1);
     i0.ɵɵproperty("id", ctx_r4.createElementId(radioButton_r5.code))("name", ctx_r4.id())("formControl", ctx_r4.dynamicRadioListControl)("value", radioButton_r5.code);
     i0.ɵɵadvance(1);
@@ -13770,7 +13794,7 @@ function WriteEmailFieldComponent_span_4_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵadvance(1);
     i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(2, 1, i0.ɵɵpipeBind2(3, 3, ctx_r2.emailControl.errors, ctx_r2.caseField.label)));
 } }
-const _c0$J = function (a0) { return { "form-group-error": a0 }; };
+const _c0$K = function (a0) { return { "form-group-error": a0 }; };
 const _c1$i = function (a0) { return { "govuk-input--error": a0 }; };
 class WriteEmailFieldComponent extends AbstractFieldWriteComponent {
     ngOnInit() {
@@ -13788,7 +13812,7 @@ WriteEmailFieldComponent.ɵcmp = i0.ɵɵdefineComponent({ type: WriteEmailFieldC
         i0.ɵɵelement(5, "input", 5);
         i0.ɵɵelementEnd();
     } if (rf & 2) {
-        i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(8, _c0$J, !ctx.emailControl.valid && (ctx.emailControl.dirty || ctx.emailControl.touched)));
+        i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(8, _c0$K, !ctx.emailControl.valid && (ctx.emailControl.dirty || ctx.emailControl.touched)));
         i0.ɵɵadvance(1);
         i0.ɵɵproperty("for", ctx.id());
         i0.ɵɵadvance(1);
@@ -13874,7 +13898,7 @@ function WriteFixedListFieldComponent_option_8_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵadvance(1);
     i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(2, 2, type_r4.label));
 } }
-const _c0$I = function (a0) { return { "form-group-error": a0 }; };
+const _c0$J = function (a0) { return { "form-group-error": a0 }; };
 class WriteFixedListFieldComponent extends AbstractFieldWriteComponent {
     get listItems() {
         if (this.caseField) {
@@ -13912,7 +13936,7 @@ WriteFixedListFieldComponent.ɵcmp = i0.ɵɵdefineComponent({ type: WriteFixedLi
         i0.ɵɵelementEnd();
         i0.ɵɵelementEnd();
     } if (rf & 2) {
-        i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(9, _c0$I, !ctx.fixedListFormControl.valid && (ctx.fixedListFormControl.dirty || ctx.fixedListFormControl.touched)));
+        i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(9, _c0$J, !ctx.fixedListFormControl.valid && (ctx.fixedListFormControl.dirty || ctx.fixedListFormControl.touched)));
         i0.ɵɵadvance(1);
         i0.ɵɵproperty("for", ctx.id());
         i0.ɵɵadvance(1);
@@ -14007,7 +14031,7 @@ function WriteFixedRadioListFieldComponent_span_6_Template(rf, ctx) { if (rf & 1
     i0.ɵɵadvance(1);
     i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(2, 1, i0.ɵɵpipeBind2(3, 3, ctx_r2.fixedRadioListControl.errors, ctx_r2.caseField.label)));
 } }
-const _c0$H = function (a0) { return { selected: a0 }; };
+const _c0$I = function (a0) { return { selected: a0 }; };
 function WriteFixedRadioListFieldComponent_div_8_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementStart(0, "div", 9);
     i0.ɵɵelement(1, "input", 10);
@@ -14019,7 +14043,7 @@ function WriteFixedRadioListFieldComponent_div_8_Template(rf, ctx) { if (rf & 1)
 } if (rf & 2) {
     const radioButton_r4 = ctx.$implicit;
     const ctx_r3 = i0.ɵɵnextContext();
-    i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(9, _c0$H, ctx_r3.fixedRadioListControl.value === radioButton_r4.code));
+    i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(9, _c0$I, ctx_r3.fixedRadioListControl.value === radioButton_r4.code));
     i0.ɵɵadvance(1);
     i0.ɵɵproperty("id", ctx_r3.id() + "-" + radioButton_r4.code)("name", ctx_r3.id())("formControl", ctx_r3.fixedRadioListControl)("value", radioButton_r4.code);
     i0.ɵɵadvance(1);
@@ -14160,7 +14184,7 @@ function WriteJudicialUserFieldComponent_span_4_Template(rf, ctx) { if (rf & 1)
     i0.ɵɵadvance(1);
     i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind2(2, 1, ctx_r2.errors, ctx_r2.caseField.label), " ");
 } }
-const _c0$G = function (a0) { return { "hide-autocomplete": a0 }; };
+const _c0$H = function (a0) { return { "hide-autocomplete": a0 }; };
 function WriteJudicialUserFieldComponent_mat_option_8_Template(rf, ctx) { if (rf & 1) {
     const _r9 = i0.ɵɵgetCurrentView();
     i0.ɵɵelementStart(0, "mat-option", 13);
@@ -14170,7 +14194,7 @@ function WriteJudicialUserFieldComponent_mat_option_8_Template(rf, ctx) { if (rf
 } if (rf & 2) {
     const judicialUser_r7 = ctx.$implicit;
     const ctx_r4 = i0.ɵɵnextContext();
-    i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(4, _c0$G, !ctx_r4.showAutocomplete))("value", judicialUser_r7);
+    i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(4, _c0$H, !ctx_r4.showAutocomplete))("value", judicialUser_r7);
     i0.ɵɵadvance(1);
     i0.ɵɵtextInterpolate2(" ", (judicialUser_r7 == null ? null : judicialUser_r7.fullName) ? judicialUser_r7.fullName : "", "", (judicialUser_r7 == null ? null : judicialUser_r7.emailId) ? " (" + judicialUser_r7.emailId + ")" : "", " ");
 } }
@@ -14994,7 +15018,7 @@ function LinkCasesComponent_div_8_div_14_span_3_Template(rf, ctx) { if (rf & 1)
     i0.ɵɵadvance(3);
     i0.ɵɵtextInterpolate1(" ", ctx_r13.caseReasonCommentsError, " ");
 } }
-const _c0$F = function (a0) { return { "govuk-form-group--error": a0 }; };
+const _c0$G = function (a0) { return { "govuk-form-group--error": a0 }; };
 function LinkCasesComponent_div_8_div_14_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementStart(0, "div", 35);
     i0.ɵɵelementStart(1, "h3", 22);
@@ -15010,7 +15034,7 @@ function LinkCasesComponent_div_8_div_14_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementEnd();
 } if (rf & 2) {
     const ctx_r7 = i0.ɵɵnextContext(2);
-    i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(2, _c0$F, !!ctx_r7.caseReasonCommentsError));
+    i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(2, _c0$G, !!ctx_r7.caseReasonCommentsError));
     i0.ɵɵadvance(3);
     i0.ɵɵproperty("ngIf", ctx_r7.caseReasonCommentsError);
 } }
@@ -15061,11 +15085,11 @@ function LinkCasesComponent_div_8_Template(rf, ctx) { if (rf & 1) {
     const ctx_r0 = i0.ɵɵnextContext();
     i0.ɵɵproperty("formGroup", ctx_r0.linkCaseForm);
     i0.ɵɵadvance(1);
-    i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(8, _c0$F, !!ctx_r0.caseNumberError));
+    i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(8, _c0$G, !!ctx_r0.caseNumberError));
     i0.ɵɵadvance(3);
     i0.ɵɵproperty("ngIf", ctx_r0.caseNumberError);
     i0.ɵɵadvance(2);
-    i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(10, _c0$F, !!ctx_r0.caseReasonError));
+    i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(10, _c0$G, !!ctx_r0.caseReasonError));
     i0.ɵɵadvance(5);
     i0.ɵɵproperty("ngIf", ctx_r0.caseReasonError);
     i0.ɵɵadvance(2);
@@ -15476,7 +15500,7 @@ LinkCasesComponent.ɵcmp = i0.ɵɵdefineComponent({ type: LinkCasesComponent, se
         i0.ɵɵadvance(4);
         i0.ɵɵproperty("ngIf", ctx.linkCaseForm);
         i0.ɵɵadvance(4);
-        i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(9, _c0$F, !!ctx.noSelectedCaseError));
+        i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(9, _c0$G, !!ctx.noSelectedCaseError));
         i0.ɵɵadvance(1);
         i0.ɵɵproperty("ngIf", ctx.noSelectedCaseError);
         i0.ɵɵadvance(18);
@@ -16107,7 +16131,7 @@ function UnLinkCasesComponent_div_0_div_4_div_3_Template(rf, ctx) { if (rf & 1)
     i0.ɵɵadvance(1);
     i0.ɵɵtextInterpolate2(" ", case_r4.caseName, " ", i0.ɵɵpipeBind1(4, 6, case_r4.caseReference), " ");
 } }
-const _c0$E = function (a0) { return { "govuk-form-group--error": a0 }; };
+const _c0$F = function (a0) { return { "govuk-form-group--error": a0 }; };
 function UnLinkCasesComponent_div_0_div_4_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementStart(0, "div", 7);
     i0.ɵɵtemplate(1, UnLinkCasesComponent_div_0_div_4_p_1_Template, 4, 1, "p", 8);
@@ -16117,7 +16141,7 @@ function UnLinkCasesComponent_div_0_div_4_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementEnd();
 } if (rf & 2) {
     const ctx_r1 = i0.ɵɵnextContext(2);
-    i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(4, _c0$E, ctx_r1.unlinkErrorMessage))("formGroup", ctx_r1.unlinkCaseForm);
+    i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(4, _c0$F, ctx_r1.unlinkErrorMessage))("formGroup", ctx_r1.unlinkCaseForm);
     i0.ɵɵadvance(1);
     i0.ɵɵproperty("ngIf", ctx_r1.unlinkErrorMessage);
     i0.ɵɵadvance(2);
@@ -16887,7 +16911,7 @@ function WriteMoneyGbpFieldComponent_span_4_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵadvance(1);
     i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(2, 1, i0.ɵɵpipeBind2(3, 3, ctx_r2.moneyGbpControl.errors, ctx_r2.caseField.label)));
 } }
-const _c0$D = function (a0) { return { "form-group-error": a0 }; };
+const _c0$E = function (a0) { return { "form-group-error": a0 }; };
 class WriteMoneyGbpFieldComponent extends AbstractFieldWriteComponent {
     ngOnInit() {
         this.moneyGbpControl = this.registerControl(new FormControl(this.caseField.value));
@@ -16910,7 +16934,7 @@ WriteMoneyGbpFieldComponent.ɵcmp = i0.ɵɵdefineComponent({ type: WriteMoneyGbp
         i0.ɵɵelementEnd();
         i0.ɵɵelementEnd();
     } if (rf & 2) {
-        i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(11, _c0$D, !ctx.moneyGbpControl.valid && (ctx.moneyGbpControl.dirty || ctx.moneyGbpControl.touched)));
+        i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(11, _c0$E, !ctx.moneyGbpControl.valid && (ctx.moneyGbpControl.dirty || ctx.moneyGbpControl.touched)));
         i0.ɵɵadvance(1);
         i0.ɵɵproperty("for", ctx.id());
         i0.ɵɵadvance(1);
@@ -17034,7 +17058,7 @@ function WriteMultiSelectListFieldComponent_ng_container_6_Template(rf, ctx) { i
     i0.ɵɵadvance(1);
     i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(5, 6, checkbox_r4.label));
 } }
-const _c0$C = function (a0) { return { "error": a0 }; };
+const _c0$D = function (a0) { return { "error": a0 }; };
 class WriteMultiSelectListFieldComponent extends AbstractFieldWriteComponent {
     ngOnInit() {
         this.checkboxes = new FormArray([]);
@@ -17089,7 +17113,7 @@ WriteMultiSelectListFieldComponent.ɵcmp = i0.ɵɵdefineComponent({ type: WriteM
         i0.ɵɵelementEnd();
         i0.ɵɵelementEnd();
     } if (rf & 2) {
-        i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(6, _c0$C, !ctx.checkboxes.valid && (ctx.checkboxes.dirty || ctx.checkboxes.touched)))("id", ctx.id());
+        i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(6, _c0$D, !ctx.checkboxes.valid && (ctx.checkboxes.dirty || ctx.checkboxes.touched)))("id", ctx.id());
         i0.ɵɵadvance(3);
         i0.ɵɵproperty("ngIf", ctx.caseField.label);
         i0.ɵɵadvance(1);
@@ -17161,7 +17185,7 @@ function WriteNumberFieldComponent_span_4_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵadvance(1);
     i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(2, 1, i0.ɵɵpipeBind2(3, 3, ctx_r2.numberControl.errors, ctx_r2.caseField.label)), " ");
 } }
-const _c0$B = function (a0) { return { "form-group-error": a0 }; };
+const _c0$C = function (a0) { return { "form-group-error": a0 }; };
 const _c1$e = function (a0) { return { "govuk-input--error": a0 }; };
 class WriteNumberFieldComponent extends AbstractFieldWriteComponent {
     ngOnInit() {
@@ -17179,7 +17203,7 @@ WriteNumberFieldComponent.ɵcmp = i0.ɵɵdefineComponent({ type: WriteNumberFiel
         i0.ɵɵelement(5, "input", 5);
         i0.ɵɵelementEnd();
     } if (rf & 2) {
-        i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(8, _c0$B, !ctx.numberControl.valid && ctx.numberControl.dirty));
+        i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(8, _c0$C, !ctx.numberControl.valid && ctx.numberControl.dirty));
         i0.ɵɵadvance(1);
         i0.ɵɵproperty("for", ctx.id());
         i0.ɵɵadvance(1);
@@ -17465,7 +17489,7 @@ function WriteOrganisationFieldComponent_fieldset_3_div_17_div_4_Template(rf, ct
     i0.ɵɵadvance(2);
     i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(3, 1, "No results found."), " ");
 } }
-const _c0$A = function (a0) { return { "scroll-container ": a0 }; };
+const _c0$B = function (a0) { return { "scroll-container ": a0 }; };
 function WriteOrganisationFieldComponent_fieldset_3_div_17_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementStart(0, "div", 26);
     i0.ɵɵpipe(1, "async");
@@ -17479,7 +17503,7 @@ function WriteOrganisationFieldComponent_fieldset_3_div_17_Template(rf, ctx) { i
     const ctx_r2 = i0.ɵɵnextContext(2);
     let tmp_0_0 = null;
     let tmp_2_0 = null;
-    i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(11, _c0$A, ((tmp_0_0 = i0.ɵɵpipeBind1(1, 3, ctx_r2.simpleOrganisations$)) == null ? null : tmp_0_0.length) > 10));
+    i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(11, _c0$B, ((tmp_0_0 = i0.ɵɵpipeBind1(1, 3, ctx_r2.simpleOrganisations$)) == null ? null : tmp_0_0.length) > 10));
     i0.ɵɵadvance(2);
     i0.ɵɵproperty("ngForOf", i0.ɵɵpipeBind1(3, 5, ctx_r2.simpleOrganisations$));
     i0.ɵɵadvance(2);
@@ -17904,7 +17928,7 @@ function WritePhoneUKFieldComponent_span_4_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵadvance(1);
     i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(2, 1, i0.ɵɵpipeBind2(3, 3, ctx_r2.phoneUkControl.errors, ctx_r2.caseField.label)), " ");
 } }
-const _c0$z = function (a0) { return { "form-group-error": a0 }; };
+const _c0$A = function (a0) { return { "form-group-error": a0 }; };
 const _c1$d = function (a0) { return { "govuk-input--error": a0 }; };
 class WritePhoneUKFieldComponent extends AbstractFieldWriteComponent {
     ngOnInit() {
@@ -17922,7 +17946,7 @@ WritePhoneUKFieldComponent.ɵcmp = i0.ɵɵdefineComponent({ type: WritePhoneUKFi
         i0.ɵɵelement(5, "input", 5);
         i0.ɵɵelementEnd();
     } if (rf & 2) {
-        i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(8, _c0$z, !ctx.phoneUkControl.valid && (ctx.phoneUkControl.dirty || ctx.phoneUkControl.touched)));
+        i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(8, _c0$A, !ctx.phoneUkControl.valid && (ctx.phoneUkControl.dirty || ctx.phoneUkControl.touched)));
         i0.ɵɵadvance(1);
         i0.ɵɵproperty("for", ctx.id());
         i0.ɵɵadvance(1);
@@ -17996,7 +18020,7 @@ function WriteTextAreaFieldComponent_span_4_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵadvance(1);
     i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(2, 1, i0.ɵɵpipeBind2(3, 3, ctx_r2.textareaControl.errors, ctx_r2.caseField.label)), " ");
 } }
-const _c0$y = function (a0) { return { "form-group-error": a0 }; };
+const _c0$z = function (a0) { return { "form-group-error": a0 }; };
 const _c1$c = function (a0) { return { "govuk-textarea--error": a0 }; };
 class WriteTextAreaFieldComponent extends AbstractFieldWriteComponent {
     constructor(browserService) {
@@ -18027,7 +18051,7 @@ WriteTextAreaFieldComponent.ɵcmp = i0.ɵɵdefineComponent({ type: WriteTextArea
         i0.ɵɵelementEnd();
         i0.ɵɵelementEnd();
     } if (rf & 2) {
-        i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(8, _c0$y, !ctx.textareaControl.valid && ctx.textareaControl.dirty));
+        i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(8, _c0$z, !ctx.textareaControl.valid && ctx.textareaControl.dirty));
         i0.ɵɵadvance(1);
         i0.ɵɵproperty("for", ctx.id());
         i0.ɵɵadvance(1);
@@ -18101,7 +18125,7 @@ function WriteTextFieldComponent_span_4_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵadvance(1);
     i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(2, 1, i0.ɵɵpipeBind2(3, 3, ctx_r2.textControl.errors, ctx_r2.caseField.label)), " ");
 } }
-const _c0$x = function (a0) { return { "form-group-error": a0 }; };
+const _c0$y = function (a0) { return { "form-group-error": a0 }; };
 const _c1$b = function (a0) { return { "govuk-input--error": a0 }; };
 class WriteTextFieldComponent extends AbstractFieldWriteComponent {
     ngOnInit() {
@@ -18124,7 +18148,7 @@ WriteTextFieldComponent.ɵcmp = i0.ɵɵdefineComponent({ type: WriteTextFieldCom
         i0.ɵɵelementEnd();
         i0.ɵɵelementEnd();
     } if (rf & 2) {
-        i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(8, _c0$x, !!ctx.textControl && !ctx.textControl.valid && (ctx.textControl.dirty || ctx.textControl.touched)));
+        i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(8, _c0$y, !!ctx.textControl && !ctx.textControl.valid && (ctx.textControl.dirty || ctx.textControl.touched)));
         i0.ɵɵadvance(1);
         i0.ɵɵproperty("for", ctx.id());
         i0.ɵɵadvance(1);
@@ -18295,7 +18319,7 @@ function WriteYesNoFieldComponent_span_5_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵadvance(1);
     i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(2, 1, i0.ɵɵpipeBind2(3, 3, ctx_r2.yesNoControl.errors, ctx_r2.caseField.label)), " ");
 } }
-const _c0$w = function (a0) { return { selected: a0 }; };
+const _c0$x = function (a0) { return { selected: a0 }; };
 function WriteYesNoFieldComponent_div_7_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementStart(0, "div", 10);
     i0.ɵɵelement(1, "input", 11);
@@ -18306,7 +18330,7 @@ function WriteYesNoFieldComponent_div_7_Template(rf, ctx) { if (rf & 1) {
 } if (rf & 2) {
     const value_r4 = ctx.$implicit;
     const ctx_r3 = i0.ɵɵnextContext();
-    i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(8, _c0$w, ctx_r3.yesNoControl.value === value_r4));
+    i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(8, _c0$x, ctx_r3.yesNoControl.value === value_r4));
     i0.ɵɵadvance(1);
     i0.ɵɵproperty("id", ctx_r3.createElementId(value_r4))("name", ctx_r3.id())("formControl", ctx_r3.yesNoControl)("value", value_r4);
     i0.ɵɵattribute("name", ctx_r3.id());
@@ -18461,7 +18485,7 @@ PaletteService.ɵprov = i0.ɵɵdefineInjectable({ token: PaletteService, factory
         type: Injectable
     }], null, null); })();
 
-const _c0$v = ["fieldContainer"];
+const _c0$w = ["fieldContainer"];
 const FIX_CASEFIELD_FOR$1 = ['FixedList', 'DynamicList', 'DynamicMultiSelectList'];
 class FieldReadComponent extends AbstractFieldReadComponent {
     constructor(resolver, paletteService) {
@@ -18509,7 +18533,7 @@ class FieldReadComponent extends AbstractFieldReadComponent {
 }
 FieldReadComponent.ɵfac = function FieldReadComponent_Factory(t) { return new (t || FieldReadComponent)(i0.ɵɵdirectiveInject(i0.ComponentFactoryResolver), i0.ɵɵdirectiveInject(PaletteService)); };
 FieldReadComponent.ɵcmp = i0.ɵɵdefineComponent({ type: FieldReadComponent, selectors: [["ccd-field-read"]], viewQuery: function FieldReadComponent_Query(rf, ctx) { if (rf & 1) {
-        i0.ɵɵviewQuery(_c0$v, 1, ViewContainerRef);
+        i0.ɵɵviewQuery(_c0$w, 1, ViewContainerRef);
     } if (rf & 2) {
         let _t;
         i0.ɵɵqueryRefresh(_t = i0.ɵɵloadQuery()) && (ctx.fieldContainer = _t.first);
@@ -18543,7 +18567,7 @@ FieldReadComponent.ɵcmp = i0.ɵɵdefineComponent({ type: FieldReadComponent, se
             args: ['fieldContainer', { static: false, read: ViewContainerRef }]
         }] }); })();
 
-const _c0$u = ["fieldContainer"];
+const _c0$v = ["fieldContainer"];
 const FIX_CASEFIELD_FOR = ['FixedList', 'DynamicList', 'DynamicMultiSelectList'];
 class FieldWriteComponent extends AbstractFieldWriteComponent {
     constructor(resolver, paletteService) {
@@ -18587,7 +18611,7 @@ class FieldWriteComponent extends AbstractFieldWriteComponent {
 }
 FieldWriteComponent.ɵfac = function FieldWriteComponent_Factory(t) { return new (t || FieldWriteComponent)(i0.ɵɵdirectiveInject(i0.ComponentFactoryResolver), i0.ɵɵdirectiveInject(PaletteService)); };
 FieldWriteComponent.ɵcmp = i0.ɵɵdefineComponent({ type: FieldWriteComponent, selectors: [["ccd-field-write"]], viewQuery: function FieldWriteComponent_Query(rf, ctx) { if (rf & 1) {
-        i0.ɵɵviewQuery(_c0$u, 3, ViewContainerRef);
+        i0.ɵɵviewQuery(_c0$v, 3, ViewContainerRef);
     } if (rf & 2) {
         let _t;
         i0.ɵɵqueryRefresh(_t = i0.ɵɵloadQuery()) && (ctx.fieldContainer = _t.first);
@@ -18637,7 +18661,7 @@ function FieldReadLabelComponent_dl_1_Template(rf, ctx) { if (rf & 1) {
 function FieldReadLabelComponent_ng_template_2_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵprojection(0);
 } }
-const _c0$t = ["*"];
+const _c0$u = ["*"];
 class FieldReadLabelComponent extends AbstractFieldReadComponent {
     constructor() {
         super(...arguments);
@@ -18672,7 +18696,7 @@ class FieldReadLabelComponent extends AbstractFieldReadComponent {
     }
 }
 FieldReadLabelComponent.ɵfac = function FieldReadLabelComponent_Factory(t) { return ɵFieldReadLabelComponent_BaseFactory(t || FieldReadLabelComponent); };
-FieldReadLabelComponent.ɵcmp = i0.ɵɵdefineComponent({ type: FieldReadLabelComponent, selectors: [["ccd-field-read-label"]], inputs: { withLabel: "withLabel", markdownUseHrefAsRouterLink: "markdownUseHrefAsRouterLink" }, features: [i0.ɵɵInheritDefinitionFeature, i0.ɵɵNgOnChangesFeature], ngContentSelectors: _c0$t, decls: 4, vars: 5, consts: [[3, "hidden"], ["class", "case-field", 4, "ngIf", "ngIfElse"], ["caseFieldValue", ""], [1, "case-field"], [1, "case-field__label"], [1, "case-field__value"], [4, "ngTemplateOutlet"]], template: function FieldReadLabelComponent_Template(rf, ctx) { if (rf & 1) {
+FieldReadLabelComponent.ɵcmp = i0.ɵɵdefineComponent({ type: FieldReadLabelComponent, selectors: [["ccd-field-read-label"]], inputs: { withLabel: "withLabel", markdownUseHrefAsRouterLink: "markdownUseHrefAsRouterLink" }, features: [i0.ɵɵInheritDefinitionFeature, i0.ɵɵNgOnChangesFeature], ngContentSelectors: _c0$u, decls: 4, vars: 5, consts: [[3, "hidden"], ["class", "case-field", 4, "ngIf", "ngIfElse"], ["caseFieldValue", ""], [1, "case-field"], [1, "case-field__label"], [1, "case-field__value"], [4, "ngTemplateOutlet"]], template: function FieldReadLabelComponent_Template(rf, ctx) { if (rf & 1) {
         i0.ɵɵprojectionDef();
         i0.ɵɵelementStart(0, "div", 0);
         i0.ɵɵtemplate(1, FieldReadLabelComponent_dl_1_Template, 6, 4, "dl", 1);
@@ -18704,7 +18728,7 @@ const ɵFieldReadLabelComponent_BaseFactory = /*@__PURE__*/ i0.ɵɵgetInheritedF
 function CaseFileViewFolderSelectorComponent_ng_container_6_ng_container_1_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementContainer(0);
 } }
-const _c0$s = function (a0) { return { cat: a0, level: 1 }; };
+const _c0$t = function (a0) { return { cat: a0, level: 1 }; };
 function CaseFileViewFolderSelectorComponent_ng_container_6_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementContainerStart(0);
     i0.ɵɵtemplate(1, CaseFileViewFolderSelectorComponent_ng_container_6_ng_container_1_Template, 1, 0, "ng-container", 8);
@@ -18714,7 +18738,7 @@ function CaseFileViewFolderSelectorComponent_ng_container_6_Template(rf, ctx) {
     i0.ɵɵnextContext();
     const _r1 = i0.ɵɵreference(13);
     i0.ɵɵadvance(1);
-    i0.ɵɵproperty("ngTemplateOutlet", _r1)("ngTemplateOutletContext", i0.ɵɵpureFunction1(2, _c0$s, cat_r3));
+    i0.ɵɵproperty("ngTemplateOutlet", _r1)("ngTemplateOutletContext", i0.ɵɵpureFunction1(2, _c0$t, cat_r3));
 } }
 function CaseFileViewFolderSelectorComponent_ng_template_12_ng_container_5_ng_container_1_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementContainer(0);
@@ -18905,7 +18929,7 @@ function CaseFileViewOverlayMenuComponent_ng_template_4_Template(rf, ctx) { if (
     i0.ɵɵadvance(1);
     i0.ɵɵproperty("ngForOf", ctx_r1.menuItems);
 } }
-const _c0$r = [[["", "trigger", ""]]];
+const _c0$s = [[["", "trigger", ""]]];
 const _c1$8 = ["[trigger]"];
 class CaseFileViewOverlayMenuComponent {
     constructor() {
@@ -18921,7 +18945,7 @@ class CaseFileViewOverlayMenuComponent {
 }
 CaseFileViewOverlayMenuComponent.ɵfac = function CaseFileViewOverlayMenuComponent_Factory(t) { return new (t || CaseFileViewOverlayMenuComponent)(); };
 CaseFileViewOverlayMenuComponent.ɵcmp = i0.ɵɵdefineComponent({ type: CaseFileViewOverlayMenuComponent, selectors: [["ccd-case-file-view-overlay-menu"]], inputs: { title: "title", menuItems: "menuItems", isOpen: "isOpen" }, outputs: { isOpenChange: "isOpenChange" }, ngContentSelectors: _c1$8, decls: 5, vars: 4, consts: [["type", "button", "cdkOverlayOrigin", "", 1, "overlay-toggle", 3, "click"], ["trigger", "cdkOverlayOrigin"], ["cdkConnectedOverlay", "", 3, "cdkConnectedOverlayOrigin", "cdkConnectedOverlayOpen", "cdkConnectedOverlayHasBackdrop", "cdkConnectedOverlayBackdropClass", "backdropClick"], [1, "overlay-menu"], [4, "ngIf"], [4, "ngFor", "ngForOf"], [1, "overlay-menu__title"], [1, "overlay-menu__item", 3, "click"], ["class", "overlay-menu__itemIcon", 3, "src", "alt", 4, "ngIf"], [1, "overlay-menu__actionText"], [1, "overlay-menu__itemIcon", 3, "src", "alt"]], template: function CaseFileViewOverlayMenuComponent_Template(rf, ctx) { if (rf & 1) {
-        i0.ɵɵprojectionDef(_c0$r);
+        i0.ɵɵprojectionDef(_c0$s);
         i0.ɵɵelementStart(0, "div");
         i0.ɵɵelementStart(1, "button", 0, 1);
         i0.ɵɵlistener("click", function CaseFileViewOverlayMenuComponent_Template_button_click_1_listener($event) { $event.stopPropagation(); return ctx.isOpen = !ctx.isOpen; });
@@ -19520,7 +19544,7 @@ function AddCommentsComponent_div_12_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵadvance(2);
     i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(5, 4, ctx_r2.flagCommentsCharLimitErrorMessage), " ");
 } }
-const _c0$q = function (a0) { return { "form-group-error": a0 }; };
+const _c0$r = function (a0) { return { "form-group-error": a0 }; };
 class AddCommentsComponent {
     constructor() {
         this.optional = false;
@@ -19602,7 +19626,7 @@ AddCommentsComponent.ɵcmp = i0.ɵɵdefineComponent({ type: AddCommentsComponent
     } if (rf & 2) {
         i0.ɵɵproperty("formGroup", ctx.formGroup);
         i0.ɵɵadvance(2);
-        i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(21, _c0$q, ctx.errorMessages.length > 0));
+        i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(21, _c0$r, ctx.errorMessages.length > 0));
         i0.ɵɵadvance(2);
         i0.ɵɵproperty("for", ctx.flagCommentsControlName);
         i0.ɵɵadvance(1);
@@ -19923,7 +19947,7 @@ function ManageCaseFlagsComponent_div_10_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵadvance(2);
     i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(3, 1, "Next"));
 } }
-const _c0$p = function (a0) { return { "form-group-error": a0 }; };
+const _c0$q = function (a0) { return { "form-group-error": a0 }; };
 class ManageCaseFlagsComponent {
     constructor() {
         this.caseFlagStateEmitter = new EventEmitter();
@@ -20083,7 +20107,7 @@ ManageCaseFlagsComponent.ɵcmp = i0.ɵɵdefineComponent({ type: ManageCaseFlagsC
     } if (rf & 2) {
         i0.ɵɵproperty("formGroup", ctx.formGroup);
         i0.ɵɵadvance(1);
-        i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(8, _c0$p, ctx.errorMessages.length > 0));
+        i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(8, _c0$q, ctx.errorMessages.length > 0));
         i0.ɵɵadvance(4);
         i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(6, 6, ctx.manageCaseFlagTitle), " ");
         i0.ɵɵadvance(2);
@@ -20174,7 +20198,7 @@ function SearchLanguageInterpreterComponent_div_21_div_5_Template(rf, ctx) { if
     i0.ɵɵadvance(3);
     i0.ɵɵtextInterpolate1(" ", ctx_r8.languageCharLimitErrorMessage, " ");
 } }
-const _c0$o = function (a0) { return { "form-group-error": a0 }; };
+const _c0$p = function (a0) { return { "form-group-error": a0 }; };
 function SearchLanguageInterpreterComponent_div_21_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementStart(0, "div", 25);
     i0.ɵɵelementStart(1, "div", 1);
@@ -20189,7 +20213,7 @@ function SearchLanguageInterpreterComponent_div_21_Template(rf, ctx) { if (rf &
 } if (rf & 2) {
     const ctx_r5 = i0.ɵɵnextContext();
     i0.ɵɵadvance(1);
-    i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(6, _c0$o, ctx_r5.languageNotEnteredErrorMessage || ctx_r5.languageCharLimitErrorMessage));
+    i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(6, _c0$p, ctx_r5.languageNotEnteredErrorMessage || ctx_r5.languageCharLimitErrorMessage));
     i0.ɵɵadvance(2);
     i0.ɵɵtextInterpolate(ctx_r5.searchLanguageInterpreterStep.INPUT_LABEL);
     i0.ɵɵadvance(1);
@@ -20355,7 +20379,7 @@ SearchLanguageInterpreterComponent.ɵcmp = i0.ɵɵdefineComponent({ type: Search
         const _r2 = i0.ɵɵreference(12);
         i0.ɵɵproperty("formGroup", ctx.formGroup);
         i0.ɵɵadvance(1);
-        i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(16, _c0$o, ctx.languageNotSelectedErrorMessage || ctx.languageEnteredInBothFieldsErrorMessage));
+        i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(16, _c0$p, ctx.languageNotSelectedErrorMessage || ctx.languageEnteredInBothFieldsErrorMessage));
         i0.ɵɵadvance(2);
         i0.ɵɵproperty("for", ctx.languageSearchTermControlName);
         i0.ɵɵadvance(1);
@@ -20479,7 +20503,7 @@ function SelectFlagLocationComponent_div_10_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵadvance(2);
     i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(3, 1, "Next"));
 } }
-const _c0$n = function (a0) { return { "form-group-error": a0 }; };
+const _c0$o = function (a0) { return { "form-group-error": a0 }; };
 class SelectFlagLocationComponent {
     constructor() {
         this.caseFlagStateEmitter = new EventEmitter();
@@ -20565,7 +20589,7 @@ SelectFlagLocationComponent.ɵcmp = i0.ɵɵdefineComponent({ type: SelectFlagLoc
     } if (rf & 2) {
         i0.ɵɵproperty("formGroup", ctx.formGroup);
         i0.ɵɵadvance(1);
-        i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(8, _c0$n, ctx.errorMessages.length > 0));
+        i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(8, _c0$o, ctx.errorMessages.length > 0));
         i0.ɵɵadvance(4);
         i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(6, 6, ctx.flagLocationTitle), " ");
         i0.ɵɵadvance(2);
@@ -20635,7 +20659,7 @@ function SelectFlagTypeComponent_div_9_div_4_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵadvance(3);
     i0.ɵɵtextInterpolate1(" ", ctx_r8.flagTypeErrorMessage, " ");
 } }
-const _c0$m = function (a0) { return { "form-group-error": a0 }; };
+const _c0$n = function (a0) { return { "form-group-error": a0 }; };
 const _c1$7 = function (a0) { return { "govuk-input--error": a0 }; };
 function SelectFlagTypeComponent_div_9_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementStart(0, "div", 15);
@@ -20650,7 +20674,7 @@ function SelectFlagTypeComponent_div_9_Template(rf, ctx) { if (rf & 1) {
 } if (rf & 2) {
     const ctx_r2 = i0.ɵɵnextContext();
     i0.ɵɵadvance(1);
-    i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(5, _c0$m, ctx_r2.flagTypeErrorMessage.length > 0));
+    i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(5, _c0$n, ctx_r2.flagTypeErrorMessage.length > 0));
     i0.ɵɵadvance(3);
     i0.ɵɵproperty("ngIf", ctx_r2.flagTypeErrorMessage.length > 0);
     i0.ɵɵadvance(1);
@@ -20808,7 +20832,7 @@ SelectFlagTypeComponent.ɵcmp = i0.ɵɵdefineComponent({ type: SelectFlagTypeCom
     } if (rf & 2) {
         i0.ɵɵproperty("formGroup", ctx.formGroup);
         i0.ɵɵadvance(1);
-        i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(7, _c0$m, ctx.flagTypeNotSelectedErrorMessage.length > 0));
+        i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(7, _c0$n, ctx.flagTypeNotSelectedErrorMessage.length > 0));
         i0.ɵɵadvance(4);
         i0.ɵɵtextInterpolate1(" ", ctx.caseFlagWizardStepTitle.SELECT_CASE_FLAG, " ");
         i0.ɵɵadvance(1);
@@ -20872,7 +20896,7 @@ function UpdateFlagComponent_button_22_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵtext(1, " Make inactive ");
     i0.ɵɵelementEnd();
 } }
-const _c0$l = function (a0) { return { "form-group-error": a0 }; };
+const _c0$m = function (a0) { return { "form-group-error": a0 }; };
 const _c1$6 = function (a0) { return { "govuk-tag--grey": a0 }; };
 class UpdateFlagComponent {
     constructor() {
@@ -20991,7 +21015,7 @@ UpdateFlagComponent.ɵcmp = i0.ɵɵdefineComponent({ type: UpdateFlagComponent,
     } if (rf & 2) {
         i0.ɵɵproperty("formGroup", ctx.formGroup);
         i0.ɵɵadvance(2);
-        i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(14, _c0$l, ctx.errorMessages.length > 0));
+        i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(14, _c0$m, ctx.errorMessages.length > 0));
         i0.ɵɵadvance(2);
         i0.ɵɵproperty("for", ctx.updateFlagControlName);
         i0.ɵɵadvance(1);
@@ -21051,7 +21075,7 @@ function ReadComplexFieldRawComponent_ng_container_1_Template(rf, ctx) { if (rf
     i0.ɵɵadvance(1);
     i0.ɵɵproperty("caseField", field_r1)("context", ctx_r0.context)("caseFields", ctx_r0.caseFields)("topLevelFormGroup", ctx_r0.topLevelFormGroup)("idPrefix", ctx_r0.idPrefix);
 } }
-const _c0$k = function (a0, a4, a5) { return [a0, false, undefined, true, a4, a5]; };
+const _c0$l = function (a0, a4, a5) { return [a0, false, undefined, true, a4, a5]; };
 /**
  * Display a complex type fields as a list of values without labels.
  * This is intended for rendering of Check Your Answer page.
@@ -21070,7 +21094,7 @@ ReadComplexFieldRawComponent.ɵcmp = i0.ɵɵdefineComponent({ type: ReadComplexF
         i0.ɵɵelementEnd();
     } if (rf & 2) {
         i0.ɵɵadvance(1);
-        i0.ɵɵproperty("ngForOf", i0.ɵɵpipeBindV(2, 1, i0.ɵɵpureFunction3(8, _c0$k, ctx.caseField, ctx.topLevelFormGroup, ctx.id())));
+        i0.ɵɵproperty("ngForOf", i0.ɵɵpipeBindV(2, 1, i0.ɵɵpureFunction3(8, _c0$l, ctx.caseField, ctx.topLevelFormGroup, ctx.id())));
     } }, styles: ["dl.complex-raw[_ngcontent-%COMP%]{list-style-type:none;margin:5px 0 10px}dl.complex-raw[_ngcontent-%COMP%]   dl.complex-raw[_ngcontent-%COMP%]{padding-left:2ch}dl.complex-raw[_ngcontent-%COMP%]   dt[_ngcontent-%COMP%]{font-weight:700}"] });
 const ɵReadComplexFieldRawComponent_BaseFactory = /*@__PURE__*/ i0.ɵɵgetInheritedFactory(ReadComplexFieldRawComponent);
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(ReadComplexFieldRawComponent, [{
@@ -21139,6 +21163,7 @@ function ReadComplexFieldTableComponent_ng_container_9_Template(rf, ctx) { if (r
     i0.ɵɵadvance(1);
     i0.ɵɵproperty("ngIf", i0.ɵɵpipeBind1(2, 2, field_r1))("ngIfElse", _r3);
 } }
+const _c0$k = function (a0, a4, a6) { return [a0, false, undefined, true, a4, undefined, a6]; };
 class ReadComplexFieldTableComponent extends AbstractFieldReadComponent {
     constructor() {
         super(...arguments);
@@ -21146,7 +21171,7 @@ class ReadComplexFieldTableComponent extends AbstractFieldReadComponent {
     }
 }
 ReadComplexFieldTableComponent.ɵfac = function ReadComplexFieldTableComponent_Factory(t) { return ɵReadComplexFieldTableComponent_BaseFactory(t || ReadComplexFieldTableComponent); };
-ReadComplexFieldTableComponent.ɵcmp = i0.ɵɵdefineComponent({ type: ReadComplexFieldTableComponent, selectors: [["ccd-read-complex-field-table"]], inputs: { caseFields: "caseFields" }, features: [i0.ɵɵInheritDefinitionFeature], decls: 11, vars: 9, consts: [[1, "complex-panel"], [1, "complex-panel-title"], [1, "text-16"], ["aria-describedby", "complex field table", 1, "complex-panel-table"], [4, "ngFor", "ngForOf"], [4, "ngIf", "ngIfElse"], ["SimpleRow", ""], [1, "complex-panel-compound-field", 3, "hidden"], ["colspan", "2"], [3, "topLevelFormGroup", "caseField", "context"], [1, "complex-panel-simple-field", 3, "hidden"], ["id", "complex-panel-simple-field-label"]], template: function ReadComplexFieldTableComponent_Template(rf, ctx) { if (rf & 1) {
+ReadComplexFieldTableComponent.ɵcmp = i0.ɵɵdefineComponent({ type: ReadComplexFieldTableComponent, selectors: [["ccd-read-complex-field-table"]], inputs: { caseFields: "caseFields" }, features: [i0.ɵɵInheritDefinitionFeature], decls: 11, vars: 16, consts: [[1, "complex-panel"], [1, "complex-panel-title"], [1, "text-16"], ["aria-describedby", "complex field table", 1, "complex-panel-table"], [4, "ngFor", "ngForOf"], [4, "ngIf", "ngIfElse"], ["SimpleRow", ""], [1, "complex-panel-compound-field", 3, "hidden"], ["colspan", "2"], [3, "topLevelFormGroup", "caseField", "context"], [1, "complex-panel-simple-field", 3, "hidden"], ["id", "complex-panel-simple-field-label"]], template: function ReadComplexFieldTableComponent_Template(rf, ctx) { if (rf & 1) {
         i0.ɵɵelementStart(0, "div", 0);
         i0.ɵɵelementStart(1, "dl", 1);
         i0.ɵɵelementStart(2, "dt");
@@ -21168,7 +21193,7 @@ ReadComplexFieldTableComponent.ɵcmp = i0.ɵɵdefineComponent({ type: ReadComple
         i0.ɵɵadvance(4);
         i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(5, 2, ctx.caseField.label));
         i0.ɵɵadvance(5);
-        i0.ɵɵproperty("ngForOf", i0.ɵɵpipeBind4(10, 4, ctx.caseField, false, undefined, true));
+        i0.ɵɵproperty("ngForOf", i0.ɵɵpipeBindV(10, 4, i0.ɵɵpureFunction3(12, _c0$k, ctx.caseField, ctx.topLevelFormGroup, ctx.idPrefix)));
     } }, styles: [".complex-panel[_ngcontent-%COMP%]{margin:13px 0;border:1px solid #bfc1c3}.complex-panel[_ngcontent-%COMP%]   .complex-panel-title[_ngcontent-%COMP%]{background-color:#dee0e2;border-bottom:1px solid #bfc1c3;display:block;color:#0b0c0c;padding:5px 5px 2px;font-family:nta,Arial,sans-serif;font-weight:700;text-transform:none;font-size:16px;line-height:1.25}@media (min-width:641px){.complex-panel[_ngcontent-%COMP%]   .complex-panel-title[_ngcontent-%COMP%]{font-size:19px;line-height:1.3157894737}}.complex-panel[_ngcontent-%COMP%]   .complex-panel-table[_ngcontent-%COMP%] > tbody[_ngcontent-%COMP%] > tr[_ngcontent-%COMP%] > th[_ngcontent-%COMP%]{vertical-align:top}.complex-panel[_ngcontent-%COMP%]   .complex-panel-table[_ngcontent-%COMP%] > tbody[_ngcontent-%COMP%] > tr[_ngcontent-%COMP%]:last-child > td[_ngcontent-%COMP%], .complex-panel[_ngcontent-%COMP%]   .complex-panel-table[_ngcontent-%COMP%] > tbody[_ngcontent-%COMP%] > tr[_ngcontent-%COMP%]:last-child > th[_ngcontent-%COMP%]{border-bottom:none}.complex-panel[_ngcontent-%COMP%]   .complex-panel-simple-field[_ngcontent-%COMP%]   th[_ngcontent-%COMP%]{padding-left:5px;width:295px}.complex-panel[_ngcontent-%COMP%]   .complex-panel-compound-field[_ngcontent-%COMP%]   td[_ngcontent-%COMP%]{padding:5px}"] });
 const ɵReadComplexFieldTableComponent_BaseFactory = /*@__PURE__*/ i0.ɵɵgetInheritedFactory(ReadComplexFieldTableComponent);
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(ReadComplexFieldTableComponent, [{
@@ -22926,17 +22951,17 @@ class ReadFieldsFilterPipe {
     /**
      * Complex type should have at least on simple field descendant with a value.
      */
-    static isValidComplex(field, values) {
+    static isValidComplex(field, values, checkConditionalShowAgainst) {
         values = values || {};
         const type = field.field_type;
         const value = ReadFieldsFilterPipe.getValue(field, values);
         const hasChildrenWithValue = type.complex_fields.find(f => {
-            const willKeep = ReadFieldsFilterPipe.keepField(f, value, true);
-            return willKeep && ReadFieldsFilterPipe.evaluateConditionalShow(f, value).hidden !== true;
+            const willKeep = ReadFieldsFilterPipe.keepField(f, value, true, checkConditionalShowAgainst);
+            return willKeep && ReadFieldsFilterPipe.evaluateConditionalShow(f, checkConditionalShowAgainst).hidden !== true;
         });
         return !!hasChildrenWithValue;
     }
-    static isValidCollection(field, values) {
+    static isValidCollection(field, values, checkConditionalShowAgainst) {
         // if field is collection and it has complex/collection child field; parent field doesnt have value defined
         if (!Array.isArray(field.value) && values && values.hasOwnProperty(field.id)) {
             return true;
@@ -22950,7 +22975,7 @@ class ReadFieldsFilterPipe {
                     value: item.value,
                     label: null,
                 });
-                return ReadFieldsFilterPipe.isValidComplex(complexField);
+                return ReadFieldsFilterPipe.isValidComplex(complexField, undefined, checkConditionalShowAgainst);
             });
         }
         return isNotEmpty;
@@ -22962,11 +22987,11 @@ class ReadFieldsFilterPipe {
     static isCompound(field) {
         return ReadFieldsFilterPipe.NESTED_TYPES[field.field_type.type];
     }
-    static isValidCompound(field, value) {
+    static isValidCompound(field, value, checkConditionalShowAgainst) {
         return ReadFieldsFilterPipe.isCompound(field)
-            && ReadFieldsFilterPipe.NESTED_TYPES[field.field_type.type](field, value);
+            && ReadFieldsFilterPipe.NESTED_TYPES[field.field_type.type](field, value, checkConditionalShowAgainst);
     }
-    static keepField(field, value, ignoreLabels = false) {
+    static keepField(field, value, ignoreLabels = false, checkConditionalShowAgainst) {
         // We shouldn't ditch labels.
         if (!ignoreLabels && field.field_type.type === 'Label' && (field.label || '').length > 0) {
             return true;
@@ -22977,7 +23002,7 @@ class ReadFieldsFilterPipe {
         }
         value = value || {};
         if (ReadFieldsFilterPipe.isCompound(field)) {
-            return ReadFieldsFilterPipe.isValidCompound(field, value);
+            return ReadFieldsFilterPipe.isValidCompound(field, value, checkConditionalShowAgainst);
         }
         return !ReadFieldsFilterPipe.isEmpty(field.value)
             || !ReadFieldsFilterPipe.isEmpty(value[field.id]);
@@ -23020,7 +23045,7 @@ class ReadFieldsFilterPipe {
     /**
      * Filter out fields having no data to display and harmonise field values coming parent's value.
      */
-    transform(complexField, keepEmpty, index, setupHidden = false, formGroup, path) {
+    transform(complexField, keepEmpty, index, setupHidden = false, formGroup, path, idPrefix) {
         if (!complexField || !complexField.field_type) {
             return [];
         }
@@ -23029,8 +23054,21 @@ class ReadFieldsFilterPipe {
         let checkConditionalShowAgainst = values;
         let formGroupAvailable = false;
         if (formGroup) {
-            checkConditionalShowAgainst = formGroup.value;
+            checkConditionalShowAgainst = formGroup.parent.getRawValue().data;
             formGroupAvailable = true;
+            if (idPrefix !== undefined) {
+                if (idPrefix !== '') {
+                    const fieldId = idPrefix.substring(0, idPrefix.indexOf('_'));
+                    if (checkConditionalShowAgainst[fieldId]) {
+                        checkConditionalShowAgainst = values;
+                        formGroupAvailable = false;
+                    }
+                }
+                else {
+                    checkConditionalShowAgainst = Object.assign(checkConditionalShowAgainst, values);
+                    formGroupAvailable = false;
+                }
+            }
         }
         return fields
             .map(f => {
@@ -23050,7 +23088,7 @@ class ReadFieldsFilterPipe {
             }
             return f;
         })
-            .filter(f => keepEmpty || ReadFieldsFilterPipe.keepField(f));
+            .filter(f => keepEmpty || ReadFieldsFilterPipe.keepField(f, undefined, false, checkConditionalShowAgainst));
     }
 }
 ReadFieldsFilterPipe.EMPTY_VALUES = [