@hmcts/ccd-case-ui-toolkit 6.16.0-query-details-navigation → 6.16.0-query-management-raise-query-function-v7

package/bundles/hmcts-ccd-case-ui-toolkit.umd.js

@@ -144,7 +144,7 @@
             i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(18, 13, ctx_r1.workhours));
         }
     }
-    var _c0$12 = [[["", "footerSolsNavLinks", ""]], [["", "footerCaseWorkerNavLinks", ""]]];
+    var _c0$11 = [[["", "footerSolsNavLinks", ""]], [["", "footerCaseWorkerNavLinks", ""]]];
     var _c1$s = ["[footerSolsNavLinks]", "[footerCaseWorkerNavLinks]"];
     var FooterComponent = /** @class */ (function () {
         function FooterComponent() {
@@ -154,7 +154,7 @@
     FooterComponent.ɵfac = function FooterComponent_Factory(t) { return new (t || FooterComponent)(); };
     FooterComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: FooterComponent, selectors: [["cut-footer-bar"]], inputs: { email: "email", isSolicitor: "isSolicitor", phone: "phone", workhours: "workhours" }, ngContentSelectors: _c1$s, 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__namespace.ɵɵprojectionDef(_c0$12);
+                i0__namespace.ɵɵprojectionDef(_c0$11);
                 i0__namespace.ɵɵelementStart(0, "footer", 0);
                 i0__namespace.ɵɵelementStart(1, "div", 1);
                 i0__namespace.ɵɵtemplate(2, FooterComponent_div_2_Template, 20, 15, "div", 2);
@@ -240,7 +240,7 @@
             i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(4, 1, ctx_r2.title));
         }
     }
-    var _c0$11 = [[["", "headerNavigation", ""]]];
+    var _c0$10 = [[["", "headerNavigation", ""]]];
     var _c1$r = ["[headerNavigation]"];
     var HeaderBarComponent = /** @class */ (function () {
         function HeaderBarComponent() {
@@ -254,7 +254,7 @@
     HeaderBarComponent.ɵfac = function HeaderBarComponent_Factory(t) { return new (t || HeaderBarComponent)(); };
     HeaderBarComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: HeaderBarComponent, selectors: [["cut-header-bar"]], inputs: { title: "title", isSolicitor: "isSolicitor", username: "username" }, outputs: { signOutRequest: "signOutRequest" }, ngContentSelectors: _c1$r, 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__namespace.ɵɵprojectionDef(_c0$11);
+                i0__namespace.ɵɵprojectionDef(_c0$10);
                 i0__namespace.ɵɵelementStart(0, "header", 0);
                 i0__namespace.ɵɵelementStart(1, "div", 1);
                 i0__namespace.ɵɵelementStart(2, "div", 2);
@@ -321,7 +321,7 @@
                 }] });
     })();
 
-    var _c0$10 = [[["", "leftNavLinks", ""]], [["", "rightNavLinks", ""]]];
+    var _c0$$ = [[["", "leftNavLinks", ""]], [["", "rightNavLinks", ""]]];
     var _c1$q = ["[leftNavLinks]", "[rightNavLinks]"];
     var NavigationComponent = /** @class */ (function () {
         function NavigationComponent() {
@@ -331,7 +331,7 @@
     NavigationComponent.ɵfac = function NavigationComponent_Factory(t) { return new (t || NavigationComponent)(); };
     NavigationComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: NavigationComponent, selectors: [["cut-nav-bar"]], inputs: { isSolicitor: "isSolicitor" }, ngContentSelectors: _c1$q, decls: 4, vars: 2, consts: [[1, "cut-nav-bar"]], template: function NavigationComponent_Template(rf, ctx) {
             if (rf & 1) {
-                i0__namespace.ɵɵprojectionDef(_c0$10);
+                i0__namespace.ɵɵprojectionDef(_c0$$);
                 i0__namespace.ɵɵelementStart(0, "div");
                 i0__namespace.ɵɵelementStart(1, "nav", 0);
                 i0__namespace.ɵɵprojection(2);
@@ -487,7 +487,7 @@
             }], null, null);
     })();
 
-    var _c0$$ = [[["", "topBody", ""]], [["", "leftBody", ""]], [["", "rightBody", ""]]];
+    var _c0$_ = [[["", "topBody", ""]], [["", "leftBody", ""]], [["", "rightBody", ""]]];
     var _c1$p = ["[topBody]", "[leftBody]", "[rightBody]"];
     var BodyComponent = /** @class */ (function () {
         function BodyComponent() {
@@ -497,7 +497,7 @@
     BodyComponent.ɵfac = function BodyComponent_Factory(t) { return new (t || BodyComponent)(); };
     BodyComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: BodyComponent, selectors: [["cut-body"]], ngContentSelectors: _c1$p, decls: 4, vars: 0, consts: [[1, "global-display"]], template: function BodyComponent_Template(rf, ctx) {
             if (rf & 1) {
-                i0__namespace.ɵɵprojectionDef(_c0$$);
+                i0__namespace.ɵɵprojectionDef(_c0$_);
                 i0__namespace.ɵɵelementStart(0, "div", 0);
                 i0__namespace.ɵɵprojection(1);
                 i0__namespace.ɵɵprojection(2, 1);
@@ -902,7 +902,7 @@
         return typeof state === "function" ? receiver === state : state.has(receiver);
     }
 
-    var _c0$_ = function (a0) { return { "govuk-input--error": a0 }; };
+    var _c0$Z = function (a0) { return { "govuk-input--error": a0 }; };
     function DateInputComponent_div_19_Template(rf, ctx) {
         if (rf & 1) {
             var _r8_1 = i0__namespace.ɵɵgetCurrentView();
@@ -923,7 +923,7 @@
             i0__namespace.ɵɵadvance(1);
             i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(3, 6, "Hour"));
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵproperty("id", ctx_r3.hourId())("name", ctx_r3.hourId())("value", ctx_r3.displayHour)("ngClass", i0__namespace.ɵɵpureFunction1(8, _c0$_, ctx_r3.isInvalid));
+            i0__namespace.ɵɵproperty("id", ctx_r3.hourId())("name", ctx_r3.hourId())("value", ctx_r3.displayHour)("ngClass", i0__namespace.ɵɵpureFunction1(8, _c0$Z, ctx_r3.isInvalid));
         }
     }
     function DateInputComponent_div_20_Template(rf, ctx) {
@@ -946,7 +946,7 @@
             i0__namespace.ɵɵadvance(1);
             i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(3, 6, "Minute"));
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵproperty("id", ctx_r4.minuteId())("name", ctx_r4.minuteId())("value", ctx_r4.displayMinute)("ngClass", i0__namespace.ɵɵpureFunction1(8, _c0$_, ctx_r4.isInvalid));
+            i0__namespace.ɵɵproperty("id", ctx_r4.minuteId())("name", ctx_r4.minuteId())("value", ctx_r4.displayMinute)("ngClass", i0__namespace.ɵɵpureFunction1(8, _c0$Z, ctx_r4.isInvalid));
         }
     }
     function DateInputComponent_div_21_Template(rf, ctx) {
@@ -969,7 +969,7 @@
             i0__namespace.ɵɵadvance(1);
             i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(3, 6, "Second"));
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵproperty("id", ctx_r5.secondId())("name", ctx_r5.secondId())("value", ctx_r5.displaySecond)("ngClass", i0__namespace.ɵɵpureFunction1(8, _c0$_, ctx_r5.isInvalid));
+            i0__namespace.ɵɵproperty("id", ctx_r5.secondId())("name", ctx_r5.secondId())("value", ctx_r5.displaySecond)("ngClass", i0__namespace.ɵɵpureFunction1(8, _c0$Z, ctx_r5.isInvalid));
         }
     }
     var DateInputComponent = /** @class */ (function () {
@@ -1208,19 +1208,19 @@
                 i0__namespace.ɵɵadvance(1);
                 i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(4, 21, "Day"));
                 i0__namespace.ɵɵadvance(2);
-                i0__namespace.ɵɵproperty("id", ctx.dayId())("name", ctx.dayId())("value", ctx.displayDay)("ngClass", i0__namespace.ɵɵpureFunction1(27, _c0$_, ctx.isInvalid));
+                i0__namespace.ɵɵproperty("id", ctx.dayId())("name", ctx.dayId())("value", ctx.displayDay)("ngClass", i0__namespace.ɵɵpureFunction1(27, _c0$Z, ctx.isInvalid));
                 i0__namespace.ɵɵadvance(3);
                 i0__namespace.ɵɵproperty("for", ctx.monthId());
                 i0__namespace.ɵɵadvance(1);
                 i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(10, 23, "Month"));
                 i0__namespace.ɵɵadvance(2);
-                i0__namespace.ɵɵproperty("id", ctx.monthId())("name", ctx.monthId())("value", ctx.displayMonth)("ngClass", i0__namespace.ɵɵpureFunction1(29, _c0$_, ctx.isInvalid));
+                i0__namespace.ɵɵproperty("id", ctx.monthId())("name", ctx.monthId())("value", ctx.displayMonth)("ngClass", i0__namespace.ɵɵpureFunction1(29, _c0$Z, ctx.isInvalid));
                 i0__namespace.ɵɵadvance(3);
                 i0__namespace.ɵɵproperty("for", ctx.yearId());
                 i0__namespace.ɵɵadvance(1);
                 i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(16, 25, "Year"));
                 i0__namespace.ɵɵadvance(2);
-                i0__namespace.ɵɵproperty("id", ctx.yearId())("name", ctx.yearId())("value", ctx.displayYear)("ngClass", i0__namespace.ɵɵpureFunction1(31, _c0$_, ctx.isInvalid));
+                i0__namespace.ɵɵproperty("id", ctx.yearId())("name", ctx.yearId())("value", ctx.displayYear)("ngClass", i0__namespace.ɵɵpureFunction1(31, _c0$Z, ctx.isInvalid));
                 i0__namespace.ɵɵadvance(2);
                 i0__namespace.ɵɵproperty("ngIf", ctx.isDateTime);
                 i0__namespace.ɵɵadvance(1);
@@ -1301,7 +1301,7 @@
             i0__namespace.ɵɵelementContainerEnd();
         }
     }
-    var _c0$Z = ["*"];
+    var _c0$Y = ["*"];
     exports.AlertMessageType = void 0;
     (function (AlertMessageType) {
         AlertMessageType["WARNING"] = "warning";
@@ -1322,7 +1322,7 @@
     AlertComponent.TYPE_ERROR = 'error';
     AlertComponent.TYPE_INFORMATION = 'information';
     AlertComponent.ɵfac = function AlertComponent_Factory(t) { return new (t || AlertComponent)(); };
-    AlertComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: AlertComponent, selectors: [["cut-alert"]], inputs: { type: "type", showIcon: "showIcon" }, ngContentSelectors: _c0$Z, 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) {
+    AlertComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: AlertComponent, selectors: [["cut-alert"]], inputs: { type: "type", showIcon: "showIcon" }, ngContentSelectors: _c0$Y, 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__namespace.ɵɵprojectionDef();
                 i0__namespace.ɵɵelementStart(0, "div", 0);
@@ -1604,7 +1604,7 @@
                 }] });
     })();
 
-    var _c0$Y = function (a0) { return { "js-hidden": a0 }; };
+    var _c0$X = function (a0) { return { "js-hidden": a0 }; };
     var _c1$o = ["*"];
     var TabComponent = /** @class */ (function () {
         function TabComponent() {
@@ -1620,7 +1620,7 @@
                 i0__namespace.ɵɵelementEnd();
             }
             if (rf & 2) {
-                i0__namespace.ɵɵproperty("id", ctx.id)("ngClass", i0__namespace.ɵɵpureFunction1(3, _c0$Y, !ctx.selected));
+                i0__namespace.ɵɵproperty("id", ctx.id)("ngClass", i0__namespace.ɵɵpureFunction1(3, _c0$X, !ctx.selected));
                 i0__namespace.ɵɵattribute("aria-hidden", !ctx.selected);
             }
         }, directives: [i5__namespace.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}}"] });
@@ -1643,7 +1643,7 @@
                 }] });
     })();
 
-    var _c0$X = ["tab"];
+    var _c0$W = ["tab"];
     var _c1$n = function () { return ["."]; };
     var _c2$3 = function (a0) { return { "tabs-toggle-selected": a0 }; };
     function TabsComponent_li_2_Template(rf, ctx) {
@@ -1699,7 +1699,7 @@
             }
         }, viewQuery: function TabsComponent_Query(rf, ctx) {
             if (rf & 1) {
-                i0__namespace.ɵɵviewQuery(_c0$X, 1);
+                i0__namespace.ɵɵviewQuery(_c0$W, 1);
             }
             if (rf & 2) {
                 var _t = void 0;
@@ -1780,7 +1780,7 @@
             }], null, null);
     })();
 
-    var _c0$W = function (a0, a1) { return { caseLocked: a0, someoneViewing: a1 }; };
+    var _c0$V = function (a0, a1) { return { caseLocked: a0, someoneViewing: a1 }; };
     var ActivityBannerComponent = /** @class */ (function () {
         function ActivityBannerComponent() {
         }
@@ -1803,7 +1803,7 @@
                 i0__namespace.ɵɵelementEnd();
             }
             if (rf & 2) {
-                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction2(8, _c0$W, ctx.bannerType === "editor", ctx.bannerType === "viewer"));
+                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction2(8, _c0$V, ctx.bannerType === "editor", ctx.bannerType === "viewer"));
                 i0__namespace.ɵɵadvance(2);
                 i0__namespace.ɵɵpropertyInterpolate("alt", i0__namespace.ɵɵpipeBind1(3, 4, ctx.description));
                 i0__namespace.ɵɵpropertyInterpolate("src", ctx.imageLink, i0__namespace.ɵɵsanitizeUrl);
@@ -11185,7 +11185,7 @@
         return AddressOption;
     }());
 
-    var _c0$V = ["writeComplexFieldComponent"];
+    var _c0$U = ["writeComplexFieldComponent"];
     function WriteAddressFieldComponent_div_1_div_5_span_5_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "span", 14);
@@ -11420,7 +11420,7 @@
     WriteAddressFieldComponent.ɵfac = function WriteAddressFieldComponent_Factory(t) { return new (t || WriteAddressFieldComponent)(i0__namespace.ɵɵdirectiveInject(AddressesService), i0__namespace.ɵɵdirectiveInject(IsCompoundPipe)); };
     WriteAddressFieldComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: WriteAddressFieldComponent, selectors: [["ccd-write-address-field"]], viewQuery: function WriteAddressFieldComponent_Query(rf, ctx) {
             if (rf & 1) {
-                i0__namespace.ɵɵviewQuery(_c0$V, 1);
+                i0__namespace.ɵɵviewQuery(_c0$U, 1);
                 i0__namespace.ɵɵviewQuery(FocusElementDirective, 1);
             }
             if (rf & 2) {
@@ -12194,7 +12194,7 @@
             i0__namespace.ɵɵproperty("formGroup", ctx_r11.caseFlagParentFormGroup)("defaultStatus", ctx_r11.flagType.defaultStatus);
         }
     }
-    var _c0$U = function (a0) { return { "form-group-error": a0 }; };
+    var _c0$T = function (a0) { return { "form-group-error": a0 }; };
     function WriteCaseFlagFieldComponent_div_1_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "div", 8);
@@ -12217,7 +12217,7 @@
             i0__namespace.ɵɵadvance(1);
             i0__namespace.ɵɵproperty("ngSwitch", ctx_r1.fieldState);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(11, _c0$U, ctx_r1.errorMessages.length > 0));
+            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(11, _c0$T, ctx_r1.errorMessages.length > 0));
             i0__namespace.ɵɵadvance(1);
             i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(4, 9, ctx_r1.createFlagCaption), " ");
             i0__namespace.ɵɵadvance(2);
@@ -12794,7 +12794,7 @@
             }], null, null);
     })();
 
-    var _c0$T = ["writeComplexFieldComponent"];
+    var _c0$S = ["writeComplexFieldComponent"];
     function WriteCaseLinkFieldComponent_span_2_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "span", 6);
@@ -12902,7 +12902,7 @@
     WriteCaseLinkFieldComponent.ɵfac = function WriteCaseLinkFieldComponent_Factory(t) { return ɵWriteCaseLinkFieldComponent_BaseFactory(t || WriteCaseLinkFieldComponent); };
     WriteCaseLinkFieldComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: WriteCaseLinkFieldComponent, selectors: [["ccd-write-case-link-field"]], viewQuery: function WriteCaseLinkFieldComponent_Query(rf, ctx) {
             if (rf & 1) {
-                i0__namespace.ɵɵviewQuery(_c0$T, 1);
+                i0__namespace.ɵɵviewQuery(_c0$S, 1);
             }
             if (rf & 2) {
                 var _t = void 0;
@@ -12947,7 +12947,7 @@
                 }] });
     })();
 
-    var _c0$S = function (a0, a1, a2, a3, a4, a5) { return { id: a0, label: a1, field_type: a2, display_context_parameter: a3, value: a4, hidden: a5 }; };
+    var _c0$R = 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__namespace.ɵɵelementStart(0, "tbody");
@@ -12962,7 +12962,7 @@
         if (rf & 2) {
             var ctx_r1 = i0__namespace.ɵɵnextContext(2);
             i0__namespace.ɵɵadvance(4);
-            i0__namespace.ɵɵproperty("caseField", i0__namespace.ɵɵpureFunction6(3, _c0$S, 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__namespace.ɵɵproperty("caseField", i0__namespace.ɵɵpureFunction6(3, _c0$R, 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);
         }
     }
     var _c1$k = function (a0, a1, a2, a3, a4) { return { id: a0, label: a1, field_type: a2, value: a3, hidden: a4 }; };
@@ -13127,7 +13127,7 @@
             }], function () { return [{ type: i1__namespace$3.MatDialogRef }]; }, null);
     })();
 
-    var _c0$R = ["collectionItem"];
+    var _c0$Q = ["collectionItem"];
     function WriteCollectionFieldComponent_h2_9_span_1_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "span", 9);
@@ -13558,7 +13558,7 @@
     WriteCollectionFieldComponent.ɵfac = function WriteCollectionFieldComponent_Factory(t) { return new (t || WriteCollectionFieldComponent)(i0__namespace.ɵɵdirectiveInject(i1__namespace$3.MatDialog), i0__namespace.ɵɵdirectiveInject(i2__namespace.ScrollToService), i0__namespace.ɵɵdirectiveInject(ProfileNotifier), i0__namespace.ɵɵdirectiveInject(i0__namespace.ChangeDetectorRef)); };
     WriteCollectionFieldComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: WriteCollectionFieldComponent, selectors: [["ccd-write-collection-field"]], viewQuery: function WriteCollectionFieldComponent_Query(rf, ctx) {
             if (rf & 1) {
-                i0__namespace.ɵɵviewQuery(_c0$R, 1);
+                i0__namespace.ɵɵviewQuery(_c0$Q, 1);
             }
             if (rf & 2) {
                 var _t = void 0;
@@ -14271,7 +14271,7 @@
             }], null, null);
     })();
 
-    var _c0$Q = ["fileInput"];
+    var _c0$P = ["fileInput"];
     function WriteDocumentFieldComponent_span_7_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "span", 12);
@@ -14567,7 +14567,7 @@
     WriteDocumentFieldComponent.ɵfac = function WriteDocumentFieldComponent_Factory(t) { return new (t || WriteDocumentFieldComponent)(i0__namespace.ɵɵdirectiveInject(AbstractAppConfig), i0__namespace.ɵɵdirectiveInject(CaseNotifier), i0__namespace.ɵɵdirectiveInject(DocumentManagementService), i0__namespace.ɵɵdirectiveInject(i1__namespace$3.MatDialog), i0__namespace.ɵɵdirectiveInject(FileUploadStateService)); };
     WriteDocumentFieldComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: WriteDocumentFieldComponent, selectors: [["ccd-write-document-field"]], viewQuery: function WriteDocumentFieldComponent_Query(rf, ctx) {
             if (rf & 1) {
-                i0__namespace.ɵɵviewQuery(_c0$Q, 1);
+                i0__namespace.ɵɵviewQuery(_c0$P, 1);
             }
             if (rf & 2) {
                 var _t = void 0;
@@ -14781,7 +14781,7 @@
             i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(2, 2, type_r5.label));
         }
     }
-    var _c0$P = function (a0) { return { "form-group-error": a0 }; };
+    var _c0$O = function (a0) { return { "form-group-error": a0 }; };
     var WriteDynamicListFieldComponent = /** @class */ (function (_super) {
         __extends(WriteDynamicListFieldComponent, _super);
         function WriteDynamicListFieldComponent() {
@@ -14831,7 +14831,7 @@
                 i0__namespace.ɵɵelementEnd();
             }
             if (rf & 2) {
-                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(13, _c0$P, !ctx.dynamicListFormControl.valid && (ctx.dynamicListFormControl.dirty || ctx.dynamicListFormControl.touched)));
+                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(13, _c0$O, !ctx.dynamicListFormControl.valid && (ctx.dynamicListFormControl.dirty || ctx.dynamicListFormControl.touched)));
                 i0__namespace.ɵɵadvance(1);
                 i0__namespace.ɵɵproperty("for", ctx.id());
                 i0__namespace.ɵɵadvance(1);
@@ -15009,7 +15009,7 @@
             i0__namespace.ɵɵtextInterpolate(checkbox_r4.label);
         }
     }
-    var _c0$O = function (a0) { return { "error": a0 }; };
+    var _c0$N = function (a0) { return { "error": a0 }; };
     var WriteDynamicMultiSelectListFieldComponent = /** @class */ (function (_super) {
         __extends(WriteDynamicMultiSelectListFieldComponent, _super);
         function WriteDynamicMultiSelectListFieldComponent() {
@@ -15092,7 +15092,7 @@
                 i0__namespace.ɵɵelementEnd();
             }
             if (rf & 2) {
-                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(6, _c0$O, !ctx.checkboxes.valid && ctx.checkboxes.touched))("id", ctx.id());
+                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(6, _c0$N, !ctx.checkboxes.valid && ctx.checkboxes.touched))("id", ctx.id());
                 i0__namespace.ɵɵadvance(3);
                 i0__namespace.ɵɵproperty("ngIf", ctx.caseField.label);
                 i0__namespace.ɵɵadvance(1);
@@ -15243,7 +15243,7 @@
             i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(2, 1, i0__namespace.ɵɵpipeBind1(3, 3, ctx_r3.dynamicRadioListControl.errors)));
         }
     }
-    var _c0$N = function (a0) { return { selected: a0 }; };
+    var _c0$M = function (a0) { return { selected: a0 }; };
     function WriteDynamicRadioListFieldComponent_div_9_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "div", 10);
@@ -15256,7 +15256,7 @@
         if (rf & 2) {
             var radioButton_r5 = ctx.$implicit;
             var ctx_r4 = i0__namespace.ɵɵnextContext();
-            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(7, _c0$N, ctx_r4.dynamicRadioListControl.value === radioButton_r5.code));
+            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(7, _c0$M, ctx_r4.dynamicRadioListControl.value === radioButton_r5.code));
             i0__namespace.ɵɵadvance(1);
             i0__namespace.ɵɵproperty("id", ctx_r4.createElementId(radioButton_r5.code))("name", ctx_r4.createElementId(radioButton_r5.code))("formControl", ctx_r4.dynamicRadioListControl)("value", radioButton_r5.code);
             i0__namespace.ɵɵadvance(1);
@@ -15423,7 +15423,7 @@
             i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(2, 1, i0__namespace.ɵɵpipeBind2(3, 3, ctx_r2.emailControl.errors, ctx_r2.caseField.label)));
         }
     }
-    var _c0$M = function (a0) { return { "form-group-error": a0 }; };
+    var _c0$L = function (a0) { return { "form-group-error": a0 }; };
     var _c1$h = function (a0) { return { "govuk-input--error": a0 }; };
     var WriteEmailFieldComponent = /** @class */ (function (_super) {
         __extends(WriteEmailFieldComponent, _super);
@@ -15448,7 +15448,7 @@
                 i0__namespace.ɵɵelementEnd();
             }
             if (rf & 2) {
-                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(8, _c0$M, !ctx.emailControl.valid && (ctx.emailControl.dirty || ctx.emailControl.touched)));
+                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(8, _c0$L, !ctx.emailControl.valid && (ctx.emailControl.dirty || ctx.emailControl.touched)));
                 i0__namespace.ɵɵadvance(1);
                 i0__namespace.ɵɵproperty("for", ctx.id());
                 i0__namespace.ɵɵadvance(1);
@@ -15559,7 +15559,7 @@
             i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(2, 2, type_r4.label));
         }
     }
-    var _c0$L = function (a0) { return { "form-group-error": a0 }; };
+    var _c0$K = function (a0) { return { "form-group-error": a0 }; };
     var WriteFixedListFieldComponent = /** @class */ (function (_super) {
         __extends(WriteFixedListFieldComponent, _super);
         function WriteFixedListFieldComponent() {
@@ -15608,7 +15608,7 @@
                 i0__namespace.ɵɵelementEnd();
             }
             if (rf & 2) {
-                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(9, _c0$L, !ctx.fixedListFormControl.valid && (ctx.fixedListFormControl.dirty || ctx.fixedListFormControl.touched)));
+                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(9, _c0$K, !ctx.fixedListFormControl.valid && (ctx.fixedListFormControl.dirty || ctx.fixedListFormControl.touched)));
                 i0__namespace.ɵɵadvance(1);
                 i0__namespace.ɵɵproperty("for", ctx.id());
                 i0__namespace.ɵɵadvance(1);
@@ -15730,7 +15730,7 @@
             i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(2, 1, i0__namespace.ɵɵpipeBind2(3, 3, ctx_r2.fixedRadioListControl.errors, ctx_r2.caseField.label)));
         }
     }
-    var _c0$K = function (a0) { return { selected: a0 }; };
+    var _c0$J = function (a0) { return { selected: a0 }; };
     function WriteFixedRadioListFieldComponent_div_8_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "div", 9);
@@ -15744,7 +15744,7 @@
         if (rf & 2) {
             var radioButton_r4 = ctx.$implicit;
             var ctx_r3 = i0__namespace.ɵɵnextContext();
-            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(9, _c0$K, ctx_r3.fixedRadioListControl.value === radioButton_r4.code));
+            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(9, _c0$J, ctx_r3.fixedRadioListControl.value === radioButton_r4.code));
             i0__namespace.ɵɵadvance(1);
             i0__namespace.ɵɵproperty("id", ctx_r3.id() + "-" + radioButton_r4.code)("name", ctx_r3.id())("formControl", ctx_r3.fixedRadioListControl)("value", radioButton_r4.code);
             i0__namespace.ɵɵadvance(1);
@@ -15914,7 +15914,7 @@
             i0__namespace.ɵɵtextInterpolate1(" ", ctx_r1.caseField.hint_text, " ");
         }
     }
-    var _c0$J = function (a0) { return { "hide-autocomplete": a0 }; };
+    var _c0$I = function (a0) { return { "hide-autocomplete": a0 }; };
     function WriteJudicialUserFieldComponent_mat_option_7_Template(rf, ctx) {
         if (rf & 1) {
             var _r7_1 = i0__namespace.ɵɵgetCurrentView();
@@ -15926,7 +15926,7 @@
         if (rf & 2) {
             var judicialUser_r5 = ctx.$implicit;
             var ctx_r3 = i0__namespace.ɵɵnextContext();
-            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(4, _c0$J, !ctx_r3.showAutocomplete))("value", judicialUser_r5.idamId);
+            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(4, _c0$I, !ctx_r3.showAutocomplete))("value", judicialUser_r5.idamId);
             i0__namespace.ɵɵadvance(1);
             i0__namespace.ɵɵtextInterpolate2(" ", judicialUser_r5.fullName, " (", judicialUser_r5.emailId, ") ");
         }
@@ -16740,7 +16740,7 @@
             i0__namespace.ɵɵtextInterpolate1(" ", ctx_r13.caseReasonCommentsError, " ");
         }
     }
-    var _c0$I = function (a0) { return { "govuk-form-group--error": a0 }; };
+    var _c0$H = function (a0) { return { "govuk-form-group--error": a0 }; };
     function LinkCasesComponent_div_8_div_14_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "div", 35);
@@ -16758,7 +16758,7 @@
         }
         if (rf & 2) {
             var ctx_r7 = i0__namespace.ɵɵnextContext(2);
-            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(2, _c0$I, !!ctx_r7.caseReasonCommentsError));
+            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(2, _c0$H, !!ctx_r7.caseReasonCommentsError));
             i0__namespace.ɵɵadvance(3);
             i0__namespace.ɵɵproperty("ngIf", ctx_r7.caseReasonCommentsError);
         }
@@ -16815,11 +16815,11 @@
             var ctx_r0 = i0__namespace.ɵɵnextContext();
             i0__namespace.ɵɵproperty("formGroup", ctx_r0.linkCaseForm);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(8, _c0$I, !!ctx_r0.caseNumberError));
+            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(8, _c0$H, !!ctx_r0.caseNumberError));
             i0__namespace.ɵɵadvance(3);
             i0__namespace.ɵɵproperty("ngIf", ctx_r0.caseNumberError);
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(10, _c0$I, !!ctx_r0.caseReasonError));
+            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(10, _c0$H, !!ctx_r0.caseReasonError));
             i0__namespace.ɵɵadvance(5);
             i0__namespace.ɵɵproperty("ngIf", ctx_r0.caseReasonError);
             i0__namespace.ɵɵadvance(2);
@@ -17253,7 +17253,7 @@
                 i0__namespace.ɵɵadvance(4);
                 i0__namespace.ɵɵproperty("ngIf", ctx.linkCaseForm);
                 i0__namespace.ɵɵadvance(4);
-                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(9, _c0$I, !!ctx.noSelectedCaseError));
+                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(9, _c0$H, !!ctx.noSelectedCaseError));
                 i0__namespace.ɵɵadvance(1);
                 i0__namespace.ɵɵproperty("ngIf", ctx.noSelectedCaseError);
                 i0__namespace.ɵɵadvance(18);
@@ -17962,7 +17962,7 @@
             i0__namespace.ɵɵtextInterpolate2(" ", case_r4.caseName, " ", i0__namespace.ɵɵpipeBind1(4, 6, case_r4.caseReference), " ");
         }
     }
-    var _c0$H = function (a0) { return { "govuk-form-group--error": a0 }; };
+    var _c0$G = function (a0) { return { "govuk-form-group--error": a0 }; };
     function UnLinkCasesComponent_div_0_div_4_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "div", 7);
@@ -17974,7 +17974,7 @@
         }
         if (rf & 2) {
             var ctx_r1 = i0__namespace.ɵɵnextContext(2);
-            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(4, _c0$H, ctx_r1.unlinkErrorMessage))("formGroup", ctx_r1.unlinkCaseForm);
+            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(4, _c0$G, ctx_r1.unlinkErrorMessage))("formGroup", ctx_r1.unlinkCaseForm);
             i0__namespace.ɵɵadvance(1);
             i0__namespace.ɵɵproperty("ngIf", ctx_r1.unlinkErrorMessage);
             i0__namespace.ɵɵadvance(2);
@@ -18863,7 +18863,7 @@
             i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(2, 1, i0__namespace.ɵɵpipeBind2(3, 3, ctx_r2.moneyGbpControl.errors, ctx_r2.caseField.label)));
         }
     }
-    var _c0$G = function (a0) { return { "form-group-error": a0 }; };
+    var _c0$F = function (a0) { return { "form-group-error": a0 }; };
     var WriteMoneyGbpFieldComponent = /** @class */ (function (_super) {
         __extends(WriteMoneyGbpFieldComponent, _super);
         function WriteMoneyGbpFieldComponent() {
@@ -18893,7 +18893,7 @@
                 i0__namespace.ɵɵelementEnd();
             }
             if (rf & 2) {
-                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(11, _c0$G, !ctx.moneyGbpControl.valid && (ctx.moneyGbpControl.dirty || ctx.moneyGbpControl.touched)));
+                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(11, _c0$F, !ctx.moneyGbpControl.valid && (ctx.moneyGbpControl.dirty || ctx.moneyGbpControl.touched)));
                 i0__namespace.ɵɵadvance(1);
                 i0__namespace.ɵɵproperty("for", ctx.id());
                 i0__namespace.ɵɵadvance(1);
@@ -19048,7 +19048,7 @@
             i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(5, 6, checkbox_r4.label));
         }
     }
-    var _c0$F = function (a0) { return { "error": a0 }; };
+    var _c0$E = function (a0) { return { "error": a0 }; };
     var WriteMultiSelectListFieldComponent = /** @class */ (function (_super) {
         __extends(WriteMultiSelectListFieldComponent, _super);
         function WriteMultiSelectListFieldComponent() {
@@ -19112,7 +19112,7 @@
                 i0__namespace.ɵɵelementEnd();
             }
             if (rf & 2) {
-                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(6, _c0$F, !ctx.checkboxes.valid && (ctx.checkboxes.dirty || ctx.checkboxes.touched)))("id", ctx.id());
+                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(6, _c0$E, !ctx.checkboxes.valid && (ctx.checkboxes.dirty || ctx.checkboxes.touched)))("id", ctx.id());
                 i0__namespace.ɵɵadvance(3);
                 i0__namespace.ɵɵproperty("ngIf", ctx.caseField.label);
                 i0__namespace.ɵɵadvance(1);
@@ -19206,7 +19206,7 @@
             i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(2, 1, i0__namespace.ɵɵpipeBind2(3, 3, ctx_r2.numberControl.errors, ctx_r2.caseField.label)));
         }
     }
-    var _c0$E = function (a0) { return { "form-group-error": a0 }; };
+    var _c0$D = function (a0) { return { "form-group-error": a0 }; };
     var _c1$e = function (a0) { return { "govuk-input--error": a0 }; };
     var WriteNumberFieldComponent = /** @class */ (function (_super) {
         __extends(WriteNumberFieldComponent, _super);
@@ -19231,7 +19231,7 @@
                 i0__namespace.ɵɵelementEnd();
             }
             if (rf & 2) {
-                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(8, _c0$E, !ctx.numberControl.valid && ctx.numberControl.dirty));
+                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(8, _c0$D, !ctx.numberControl.valid && ctx.numberControl.dirty));
                 i0__namespace.ɵɵadvance(1);
                 i0__namespace.ɵɵproperty("for", ctx.id());
                 i0__namespace.ɵɵadvance(1);
@@ -19570,7 +19570,7 @@
             i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(3, 1, "No results found."), " ");
         }
     }
-    var _c0$D = function (a0) { return { "scroll-container ": a0 }; };
+    var _c0$C = function (a0) { return { "scroll-container ": a0 }; };
     function WriteOrganisationFieldComponent_fieldset_3_div_17_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "div", 26);
@@ -19586,7 +19586,7 @@
             var ctx_r2 = i0__namespace.ɵɵnextContext(2);
             var tmp_0_0 = null;
             var tmp_2_0 = null;
-            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(11, _c0$D, ((tmp_0_0 = i0__namespace.ɵɵpipeBind1(1, 3, ctx_r2.simpleOrganisations$)) == null ? null : tmp_0_0.length) > 10));
+            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(11, _c0$C, ((tmp_0_0 = i0__namespace.ɵɵpipeBind1(1, 3, ctx_r2.simpleOrganisations$)) == null ? null : tmp_0_0.length) > 10));
             i0__namespace.ɵɵadvance(2);
             i0__namespace.ɵɵproperty("ngForOf", i0__namespace.ɵɵpipeBind1(3, 5, ctx_r2.simpleOrganisations$));
             i0__namespace.ɵɵadvance(2);
@@ -20084,7 +20084,7 @@
             i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(2, 1, i0__namespace.ɵɵpipeBind2(3, 3, ctx_r2.phoneUkControl.errors, ctx_r2.caseField.label)), " ");
         }
     }
-    var _c0$C = function (a0) { return { "form-group-error": a0 }; };
+    var _c0$B = function (a0) { return { "form-group-error": a0 }; };
     var _c1$d = function (a0) { return { "govuk-input--error": a0 }; };
     var WritePhoneUKFieldComponent = /** @class */ (function (_super) {
         __extends(WritePhoneUKFieldComponent, _super);
@@ -20109,7 +20109,7 @@
                 i0__namespace.ɵɵelementEnd();
             }
             if (rf & 2) {
-                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(8, _c0$C, !ctx.phoneUkControl.valid && (ctx.phoneUkControl.dirty || ctx.phoneUkControl.touched)));
+                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(8, _c0$B, !ctx.phoneUkControl.valid && (ctx.phoneUkControl.dirty || ctx.phoneUkControl.touched)));
                 i0__namespace.ɵɵadvance(1);
                 i0__namespace.ɵɵproperty("for", ctx.id());
                 i0__namespace.ɵɵadvance(1);
@@ -20252,49 +20252,99 @@
             ]
         }
     ];
-    var caseFieldMockData = Object.assign(new CaseField(), {
-        id: '',
-        label: '',
-        hint_text: '',
-        field_type: Object.assign(new FieldType(), {
-            id: 'QueryDocuments',
-            type: 'QueryDocuments',
-            min: null,
-            max: null,
-            regular_expression: null,
-            fixed_list_items: [],
-            complex_fields: [],
-            collection_field_type: Object.assign(new FieldType(), {
-                id: 'Document',
-                type: 'Document',
-                min: null,
-                max: null,
-                regular_expression: null,
-                fixed_list_items: [],
-                complex_fields: [],
-                collection_field_type: null
-            })
-        }),
-        display_context_parameter: '#COLLECTION(allowInsert,allowUpdate)',
-        value: [
-            {
-                id: '725bf4a7-9e4c-4132-b5c1-f8028cb83459',
-                value: {
-                    document_url: 'https://dm-store-aat.service.core-compute-aat.internal/documents/e5366837-b3f6-492d-acbf-548730625e8f',
-                    document_filename: 'Screenshot 2023-06-01 at 16.07.06.png',
-                    document_binary_url: 'https://dm-store-aat.service.core-compute-aat.internal/documents/e5366837-b3f6-492d-acbf-548730625e8f/binary'
-                }
+
+    var QueryListItem = /** @class */ (function () {
+        function QueryListItem() {
+            this.children = [];
+        }
+        Object.defineProperty(QueryListItem.prototype, "lastSubmittedMessage", {
+            get: function () {
+                var getLastSubmittedMessage = function (item) {
+                    var e_1, _b;
+                    var lastSubmittedMessage = item;
+                    if (item.children && item.children.length > 0) {
+                        try {
+                            for (var _c = __values(item.children), _d = _c.next(); !_d.done; _d = _c.next()) {
+                                var child = _d.value;
+                                var childLastSubmittedMessage = getLastSubmittedMessage(child);
+                                if (childLastSubmittedMessage.createdOn > lastSubmittedMessage.createdOn) {
+                                    lastSubmittedMessage = childLastSubmittedMessage;
+                                }
+                            }
+                        }
+                        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                        finally {
+                            try {
+                                if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
+                            }
+                            finally { if (e_1) throw e_1.error; }
+                        }
+                    }
+                    return lastSubmittedMessage;
+                };
+                return getLastSubmittedMessage(this);
             },
-            {
-                id: '725bf4a7-9e4c-4132-b5c1-f8028cb83459',
-                value: {
-                    document_url: 'https://dm-store-aat.service.core-compute-aat.internal/documents/f50ccd7a-7f28-40f3-b5f9-7ad2f6425506',
-                    document_filename: 'dummy.pdf',
-                    document_binary_url: 'https://dm-store-aat.service.core-compute-aat.internal/documents/f50ccd7a-7f28-40f3-b5f9-7ad2f6425506/binary'
-                }
-            }
-        ]
-    });
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(QueryListItem.prototype, "lastSubmittedBy", {
+            get: function () {
+                return this.lastSubmittedMessage.name;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(QueryListItem.prototype, "lastSubmittedDate", {
+            get: function () {
+                return new Date(this.lastSubmittedMessage.createdOn);
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(QueryListItem.prototype, "lastResponseBy", {
+            get: function () {
+                var _a;
+                return ((_a = this.children) === null || _a === void 0 ? void 0 : _a.length) > 0 ? this.lastSubmittedMessage.name : '';
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(QueryListItem.prototype, "lastResponseDate", {
+            get: function () {
+                var _a;
+                return ((_a = this.children) === null || _a === void 0 ? void 0 : _a.length) > 0 ? new Date(this.lastSubmittedMessage.createdOn) : null;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        return QueryListItem;
+    }());
+
+    var QueryListData = /** @class */ (function () {
+        function QueryListData(partyMessagesGroup) {
+            var _this = this;
+            this.partyName = partyMessagesGroup.partyName;
+            this.roleOnCase = partyMessagesGroup.roleOnCase;
+            // get the parent messages (messages without parentId) and add the children to them
+            var parentMessages = partyMessagesGroup.partyMessages.filter(function (message) { return !message.parentId; });
+            this.partyMessages = parentMessages.map(function (message) { return _this.buildQueryListItem(message, partyMessagesGroup.partyMessages); });
+        }
+        QueryListData.prototype.buildQueryListItem = function (message, allMessages) {
+            var _this = this;
+            var queryListItem = new QueryListItem();
+            Object.assign(queryListItem, Object.assign(Object.assign({}, message), { children: allMessages
+                    .filter(function (childMessage) { return childMessage.parentId === message.id; })
+                    .map(function (childMessage) { return _this.buildQueryListItem(childMessage, allMessages); }) }));
+            return queryListItem;
+        };
+        return QueryListData;
+    }());
+
+    exports.QueryListResponseStatus = void 0;
+    (function (QueryListResponseStatus) {
+        QueryListResponseStatus["NEW"] = "New";
+        QueryListResponseStatus["RESPONDED"] = "Responded";
+    })(exports.QueryListResponseStatus || (exports.QueryListResponseStatus = {}));
 
     var MarkdownComponent = /** @class */ (function () {
         function MarkdownComponent() {
@@ -20416,297 +20466,87 @@
             }], function () { return [{ type: i1__namespace$1.ActivatedRoute }]; }, null);
     })();
 
-    var QueryListItem = /** @class */ (function () {
-        function QueryListItem() {
-            this.children = [];
-        }
-        Object.defineProperty(QueryListItem.prototype, "lastSubmittedMessage", {
-            get: function () {
-                var getLastSubmittedMessage = function (item) {
-                    var e_1, _b;
-                    var lastSubmittedMessage = item;
-                    if (item.children && item.children.length > 0) {
-                        try {
-                            for (var _c = __values(item.children), _d = _c.next(); !_d.done; _d = _c.next()) {
-                                var child = _d.value;
-                                var childLastSubmittedMessage = getLastSubmittedMessage(child);
-                                if (childLastSubmittedMessage.createdOn > lastSubmittedMessage.createdOn) {
-                                    lastSubmittedMessage = childLastSubmittedMessage;
-                                }
-                            }
-                        }
-                        catch (e_1_1) { e_1 = { error: e_1_1 }; }
-                        finally {
-                            try {
-                                if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
-                            }
-                            finally { if (e_1) throw e_1.error; }
-                        }
-                    }
-                    return lastSubmittedMessage;
-                };
-                return getLastSubmittedMessage(this);
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Object.defineProperty(QueryListItem.prototype, "lastSubmittedBy", {
-            get: function () {
-                return this.lastSubmittedMessage.name;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Object.defineProperty(QueryListItem.prototype, "lastSubmittedDate", {
-            get: function () {
-                return new Date(this.lastSubmittedMessage.createdOn);
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Object.defineProperty(QueryListItem.prototype, "lastResponseBy", {
-            get: function () {
-                var _a;
-                return ((_a = this.children) === null || _a === void 0 ? void 0 : _a.length) > 0 ? this.lastSubmittedMessage.name : '';
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Object.defineProperty(QueryListItem.prototype, "lastResponseDate", {
-            get: function () {
-                var _a;
-                return ((_a = this.children) === null || _a === void 0 ? void 0 : _a.length) > 0 ? new Date(this.lastSubmittedMessage.createdOn) : null;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        return QueryListItem;
-    }());
-
-    var QueryListData = /** @class */ (function () {
-        function QueryListData(partyMessagesGroup) {
-            var _this = this;
-            this.partyName = partyMessagesGroup.partyName;
-            this.roleOnCase = partyMessagesGroup.roleOnCase;
-            // get the parent messages (messages without parentId) and add the children to them
-            var parentMessages = partyMessagesGroup.partyMessages.filter(function (message) { return !message.parentId; });
-            this.partyMessages = parentMessages.map(function (message) { return _this.buildQueryListItem(message, partyMessagesGroup.partyMessages); });
+    var QueryCreateComponent = /** @class */ (function () {
+        function QueryCreateComponent() {
         }
-        QueryListData.prototype.buildQueryListItem = function (message, allMessages) {
-            var _this = this;
-            var queryListItem = new QueryListItem();
-            Object.assign(queryListItem, Object.assign(Object.assign({}, message), { children: allMessages
-                    .filter(function (childMessage) { return childMessage.parentId === message.id; })
-                    .map(function (childMessage) { return _this.buildQueryListItem(childMessage, allMessages); }) }));
-            return queryListItem;
+        QueryCreateComponent.prototype.ngOnInit = function () {
         };
-        return QueryListData;
+        return QueryCreateComponent;
     }());
+    QueryCreateComponent.ɵfac = function QueryCreateComponent_Factory(t) { return new (t || QueryCreateComponent)(); };
+    QueryCreateComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: QueryCreateComponent, selectors: [["ccd-query-create"]], decls: 0, vars: 0, template: function QueryCreateComponent_Template(rf, ctx) { }, encapsulation: 2 });
+    (function () {
+        (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(QueryCreateComponent, [{
+                type: i0.Component,
+                args: [{
+                        selector: 'ccd-query-create',
+                        templateUrl: './query-create.component.html',
+                    }]
+            }], function () { return []; }, null);
+    })();
 
-    exports.QueryItemType = void 0;
-    (function (QueryItemType) {
-        QueryItemType["NEW"] = "New";
-        QueryItemType["RESPOND"] = "Respond";
-        QueryItemType["FOLLOWUP"] = "Followup";
-    })(exports.QueryItemType || (exports.QueryItemType = {}));
-
-    function QueryCheckYourAnswersComponent_dl_7_Template(rf, ctx) {
+    function QueryDetailsComponent_ng_container_0_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "dl", 5);
-            i0__namespace.ɵɵelementStart(1, "div", 6);
-            i0__namespace.ɵɵelementStart(2, "dt", 7);
-            i0__namespace.ɵɵtext(3);
-            i0__namespace.ɵɵpipe(4, "rpxTranslate");
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(5, "dd", 8);
-            i0__namespace.ɵɵtext(6);
+            var _r2_1 = i0__namespace.ɵɵgetCurrentView();
+            i0__namespace.ɵɵelementContainerStart(0);
+            i0__namespace.ɵɵelementStart(1, "p");
+            i0__namespace.ɵɵelement(2, "br");
+            i0__namespace.ɵɵelementStart(3, "a", 1);
+            i0__namespace.ɵɵlistener("click", function QueryDetailsComponent_ng_container_0_Template_a_click_3_listener() { i0__namespace.ɵɵrestoreView(_r2_1); var ctx_r1 = i0__namespace.ɵɵnextContext(); return ctx_r1.onBack(); });
+            i0__namespace.ɵɵtext(4);
+            i0__namespace.ɵɵpipe(5, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementStart(6, "div", 2);
+            i0__namespace.ɵɵtext(7);
+            i0__namespace.ɵɵpipe(8, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelement(9, "ccd-query-details-table", 3);
+            i0__namespace.ɵɵelementContainerEnd();
         }
         if (rf & 2) {
             var ctx_r0 = i0__namespace.ɵɵnextContext();
+            i0__namespace.ɵɵadvance(4);
+            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(5, 3, "Back to queries"));
             i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(4, 2, "Submitted query"), " ");
-            i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵtextInterpolate1(" ", ctx_r0.queryItem.subject, " ");
-        }
-    }
-    function QueryCheckYourAnswersComponent_ccd_read_collection_field_36_Template(rf, ctx) {
-        if (rf & 1) {
-            i0__namespace.ɵɵelement(0, "ccd-read-collection-field", 14);
-        }
-        if (rf & 2) {
-            var ctx_r1 = i0__namespace.ɵɵnextContext();
-            i0__namespace.ɵɵproperty("caseField", ctx_r1.caseField);
+            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(8, 5, "Query details"));
+            i0__namespace.ɵɵadvance(2);
+            i0__namespace.ɵɵproperty("queryItem", ctx_r0.query);
         }
     }
-    var QueryCheckYourAnswersComponent = /** @class */ (function () {
-        function QueryCheckYourAnswersComponent() {
+    var QueryDetailsComponent = /** @class */ (function () {
+        function QueryDetailsComponent() {
             this.backClicked = new i0.EventEmitter();
-            this.queryItemTypeEnum = exports.QueryItemType;
         }
-        QueryCheckYourAnswersComponent.prototype.ngOnInit = function () {
-            // Set default value as false for testing follow up EUI-8387
-            this.QueryCreateContext = exports.QueryItemType.FOLLOWUP;
-            // Mock object
-            this.caseField = caseFieldMockData;
-        };
-        QueryCheckYourAnswersComponent.prototype.goBack = function () {
+        QueryDetailsComponent.prototype.onBack = function () {
             this.backClicked.emit(true);
         };
-        return QueryCheckYourAnswersComponent;
+        return QueryDetailsComponent;
     }());
-    QueryCheckYourAnswersComponent.ɵfac = function QueryCheckYourAnswersComponent_Factory(t) { return new (t || QueryCheckYourAnswersComponent)(); };
-    QueryCheckYourAnswersComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: QueryCheckYourAnswersComponent, selectors: [["ccd-query-check-your-answers"]], inputs: { formGroup: "formGroup", queryItem: "queryItem", QueryCreateContext: "QueryCreateContext" }, outputs: { backClicked: "backClicked" }, decls: 49, vars: 31, consts: [[1, "govuk-grid-row"], [1, "govuk-grid-column-two-thirds-from-desktop"], [1, "govuk-heading-l"], [1, "govuk-!-margin-bottom-4"], ["class", "govuk-summary-list govuk-!-margin-bottom-0", 4, "ngIf"], [1, "govuk-summary-list", "govuk-!-margin-bottom-0"], [1, "govuk-summary-list__row"], [1, "govuk-summary-list__key"], [1, "govuk-summary-list__value"], [1, "govuk-summary-list__actions"], [1, "govuk-link", 3, "click"], [3, "caseField", 4, "ngIf"], ["data-module", "govuk-button", 1, "govuk-button", "govuk-button--secondary", "govuk-!-margin-right-3", 3, "click"], ["data-module", "govuk-button", 1, "govuk-button"], [3, "caseField"]], template: function QueryCheckYourAnswersComponent_Template(rf, ctx) {
+    QueryDetailsComponent.ɵfac = function QueryDetailsComponent_Factory(t) { return new (t || QueryDetailsComponent)(); };
+    QueryDetailsComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: QueryDetailsComponent, selectors: [["ccd-query-details"]], inputs: { query: "query" }, outputs: { backClicked: "backClicked" }, decls: 1, vars: 1, consts: [[4, "ngIf"], ["href", "javascript:void(0)", 1, "govuk-link", 3, "click"], [1, "query_details_caption"], [3, "queryItem"]], template: function QueryDetailsComponent_Template(rf, ctx) {
             if (rf & 1) {
-                i0__namespace.ɵɵelementStart(0, "div", 0);
-                i0__namespace.ɵɵelementStart(1, "div", 1);
-                i0__namespace.ɵɵelementStart(2, "h1", 2);
-                i0__namespace.ɵɵtext(3);
-                i0__namespace.ɵɵpipe(4, "rpxTranslate");
-                i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementStart(5, "div", 3);
-                i0__namespace.ɵɵelement(6, "ccd-query-case-details-header");
-                i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵtemplate(7, QueryCheckYourAnswersComponent_dl_7_Template, 7, 4, "dl", 4);
-                i0__namespace.ɵɵelementStart(8, "dl", 5);
-                i0__namespace.ɵɵelementStart(9, "div", 6);
-                i0__namespace.ɵɵelementStart(10, "dt", 7);
-                i0__namespace.ɵɵtext(11);
-                i0__namespace.ɵɵpipe(12, "rpxTranslate");
-                i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementStart(13, "dd", 8);
-                i0__namespace.ɵɵtext(14);
-                i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementStart(15, "dd", 9);
-                i0__namespace.ɵɵelementStart(16, "a", 10);
-                i0__namespace.ɵɵlistener("click", function QueryCheckYourAnswersComponent_Template_a_click_16_listener() { return ctx.goBack(); });
-                i0__namespace.ɵɵtext(17);
-                i0__namespace.ɵɵpipe(18, "rpxTranslate");
-                i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementStart(19, "dl", 5);
-                i0__namespace.ɵɵelementStart(20, "div", 6);
-                i0__namespace.ɵɵelementStart(21, "dt", 7);
-                i0__namespace.ɵɵtext(22);
-                i0__namespace.ɵɵpipe(23, "rpxTranslate");
-                i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementStart(24, "dd", 8);
-                i0__namespace.ɵɵtext(25);
-                i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementStart(26, "dd", 9);
-                i0__namespace.ɵɵelementStart(27, "a", 10);
-                i0__namespace.ɵɵlistener("click", function QueryCheckYourAnswersComponent_Template_a_click_27_listener() { return ctx.goBack(); });
-                i0__namespace.ɵɵtext(28);
-                i0__namespace.ɵɵpipe(29, "rpxTranslate");
-                i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementStart(30, "dl", 5);
-                i0__namespace.ɵɵelementStart(31, "div", 6);
-                i0__namespace.ɵɵelementStart(32, "dt", 7);
-                i0__namespace.ɵɵtext(33);
-                i0__namespace.ɵɵpipe(34, "rpxTranslate");
-                i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementStart(35, "dd", 8);
-                i0__namespace.ɵɵtemplate(36, QueryCheckYourAnswersComponent_ccd_read_collection_field_36_Template, 1, 1, "ccd-read-collection-field", 11);
-                i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementStart(37, "dd", 9);
-                i0__namespace.ɵɵelementStart(38, "a", 10);
-                i0__namespace.ɵɵlistener("click", function QueryCheckYourAnswersComponent_Template_a_click_38_listener() { return ctx.goBack(); });
-                i0__namespace.ɵɵtext(39);
-                i0__namespace.ɵɵpipe(40, "rpxTranslate");
-                i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelement(41, "br");
-                i0__namespace.ɵɵelementStart(42, "div");
-                i0__namespace.ɵɵelementStart(43, "button", 12);
-                i0__namespace.ɵɵlistener("click", function QueryCheckYourAnswersComponent_Template_button_click_43_listener() { return ctx.goBack(); });
-                i0__namespace.ɵɵtext(44);
-                i0__namespace.ɵɵpipe(45, "rpxTranslate");
-                i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementStart(46, "button", 13);
-                i0__namespace.ɵɵtext(47);
-                i0__namespace.ɵɵpipe(48, "rpxTranslate");
-                i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementEnd();
+                i0__namespace.ɵɵtemplate(0, QueryDetailsComponent_ng_container_0_Template, 10, 7, "ng-container", 0);
             }
             if (rf & 2) {
-                i0__namespace.ɵɵadvance(3);
-                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(4, 13, "Review query details"), " ");
-                i0__namespace.ɵɵadvance(4);
-                i0__namespace.ɵɵproperty("ngIf", ctx.QueryCreateContext === ctx.queryItemTypeEnum.RESPOND);
-                i0__namespace.ɵɵadvance(4);
-                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(12, 15, "Full name"), " ");
-                i0__namespace.ɵɵadvance(3);
-                i0__namespace.ɵɵtextInterpolate1(" ", ctx.formGroup.controls["fullName"].value, " ");
-                i0__namespace.ɵɵadvance(3);
-                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(18, 17, "Change"), " ");
-                i0__namespace.ɵɵadvance(5);
-                i0__namespace.ɵɵtextInterpolate1(" ", ctx.QueryCreateContext === ctx.queryItemTypeEnum.RESPOND ? "Response message" : i0__namespace.ɵɵpipeBind1(23, 19, "Query body"), " ");
-                i0__namespace.ɵɵadvance(3);
-                i0__namespace.ɵɵtextInterpolate1(" ", ctx.formGroup.controls["body"].value, " ");
-                i0__namespace.ɵɵadvance(3);
-                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(29, 21, "Change"), " ");
-                i0__namespace.ɵɵadvance(5);
-                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(34, 23, "Document attached"), " ");
-                i0__namespace.ɵɵadvance(3);
-                i0__namespace.ɵɵproperty("ngIf", ctx.caseField);
-                i0__namespace.ɵɵadvance(3);
-                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(40, 25, "Change"), " ");
-                i0__namespace.ɵɵadvance(5);
-                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(45, 27, "Previous"), " ");
-                i0__namespace.ɵɵadvance(3);
-                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(48, 29, "Submit"), " ");
+                i0__namespace.ɵɵproperty("ngIf", ctx.query);
             }
-        }, styles: [".collection-field-table tr>td{border-bottom:none}"], encapsulation: 2 });
+        }, styles: [".query_details_caption[_ngcontent-%COMP%]{background:#f3f2f1;padding:10px;font-size:x-large;font-weight:700}"] });
     (function () {
-        (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(QueryCheckYourAnswersComponent, [{
+        (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(QueryDetailsComponent, [{
                 type: i0.Component,
                 args: [{
-                        selector: 'ccd-query-check-your-answers',
-                        templateUrl: './query-check-your-answers.component.html',
-                        styleUrls: ['./query-check-your-answers.component.scss'],
-                        encapsulation: i0.ViewEncapsulation.None
+                        selector: 'ccd-query-details',
+                        templateUrl: './query-details.component.html',
+                        styleUrls: ['./query-details.component.scss']
                     }]
-            }], null, { formGroup: [{
-                    type: i0.Input
-                }], queryItem: [{
-                    type: i0.Input
-                }], QueryCreateContext: [{
+            }], null, { query: [{
                     type: i0.Input
                 }], backClicked: [{
                     type: i0.Output
                 }] });
     })();
 
-    var QueryCreateComponent = /** @class */ (function () {
-        function QueryCreateComponent() {
-        }
-        QueryCreateComponent.prototype.ngOnInit = function () {
-        };
-        return QueryCreateComponent;
-    }());
-    QueryCreateComponent.ɵfac = function QueryCreateComponent_Factory(t) { return new (t || QueryCreateComponent)(); };
-    QueryCreateComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: QueryCreateComponent, selectors: [["ccd-query-create"]], decls: 0, vars: 0, template: function QueryCreateComponent_Template(rf, ctx) { }, encapsulation: 2 });
-    (function () {
-        (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(QueryCreateComponent, [{
-                type: i0.Component,
-                args: [{
-                        selector: 'ccd-query-create',
-                        templateUrl: './query-create.component.html',
-                    }]
-            }], function () { return []; }, null);
-    })();
-
     function QueryDetailsTableComponent_ng_container_0_tr_35_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "tr", 3);
@@ -20728,13 +20568,20 @@
             i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind2(6, 4, ctx_r1.queryItem.hearingDate, "dd MMM yyyy"));
         }
     }
-    function QueryDetailsTableComponent_ng_container_0_ccd_read_collection_field_41_Template(rf, ctx) {
+    function QueryDetailsTableComponent_ng_container_0_div_41_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelement(0, "ccd-read-collection-field", 8);
+            i0__namespace.ɵɵelementStart(0, "div");
+            i0__namespace.ɵɵelementStart(1, "a", 8);
+            i0__namespace.ɵɵtext(2);
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
-            var ctx_r2 = i0__namespace.ɵɵnextContext(2);
-            i0__namespace.ɵɵproperty("caseField", ctx_r2.caseField);
+            var attachment_r3 = ctx.$implicit;
+            i0__namespace.ɵɵadvance(1);
+            i0__namespace.ɵɵproperty("href", attachment_r3._links.self.href, i0__namespace.ɵɵsanitizeUrl);
+            i0__namespace.ɵɵadvance(1);
+            i0__namespace.ɵɵtextInterpolate(attachment_r3.originalDocumentName);
         }
     }
     function QueryDetailsTableComponent_ng_container_0_Template(rf, ctx) {
@@ -20796,7 +20643,7 @@
             i0__namespace.ɵɵpipe(39, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementStart(40, "td", 5);
-            i0__namespace.ɵɵtemplate(41, QueryDetailsTableComponent_ng_container_0_ccd_read_collection_field_41_Template, 1, 1, "ccd-read-collection-field", 7);
+            i0__namespace.ɵɵtemplate(41, QueryDetailsTableComponent_ng_container_0_div_41_Template, 3, 2, "div", 7);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
@@ -20832,103 +20679,36 @@
             i0__namespace.ɵɵadvance(3);
             i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(39, 29, "Attachments"));
             i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵproperty("ngIf", ctx_r0.caseField);
+            i0__namespace.ɵɵproperty("ngForOf", ctx_r0.queryItem.attachments);
         }
     }
     var QueryDetailsTableComponent = /** @class */ (function () {
         function QueryDetailsTableComponent() {
         }
-        QueryDetailsTableComponent.prototype.ngOnInit = function () {
-            // Mock object
-            this.caseField = caseFieldMockData;
-        };
         return QueryDetailsTableComponent;
     }());
     QueryDetailsTableComponent.ɵfac = function QueryDetailsTableComponent_Factory(t) { return new (t || QueryDetailsTableComponent)(); };
-    QueryDetailsTableComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: QueryDetailsTableComponent, selectors: [["ccd-query-details-table"]], inputs: { queryItem: "queryItem" }, decls: 1, vars: 1, consts: [[4, "ngIf"], [1, "govuk-table", "query-details-table"], [1, "govuk-table__body"], [1, "govuk-table__row"], ["scope", "row", 1, "govuk-table__header"], [1, "govuk-table__cell"], ["class", "govuk-table__row", 4, "ngIf"], [3, "caseField", 4, "ngIf"], [3, "caseField"]], template: function QueryDetailsTableComponent_Template(rf, ctx) {
+    QueryDetailsTableComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: QueryDetailsTableComponent, selectors: [["ccd-query-details-table"]], inputs: { queryItem: "queryItem" }, decls: 1, vars: 1, consts: [[4, "ngIf"], [1, "govuk-table", "query-details-table"], [1, "govuk-table__body"], [1, "govuk-table__row"], ["scope", "row", 1, "govuk-table__header"], [1, "govuk-table__cell"], ["class", "govuk-table__row", 4, "ngIf"], [4, "ngFor", "ngForOf"], ["target", "_blank", 3, "href"]], template: function QueryDetailsTableComponent_Template(rf, ctx) {
             if (rf & 1) {
                 i0__namespace.ɵɵtemplate(0, QueryDetailsTableComponent_ng_container_0_Template, 42, 31, "ng-container", 0);
             }
             if (rf & 2) {
                 i0__namespace.ɵɵproperty("ngIf", ctx.queryItem);
             }
-        }, styles: [".query-details-table .govuk-table__header{width:330px}.query-details-table .collection-field-table tr>td{border-bottom:none}"], encapsulation: 2 });
+        }, directives: [i5__namespace.NgIf, i5__namespace.NgForOf], pipes: [i1__namespace.RpxTranslatePipe, i5__namespace.DatePipe], styles: [".query-details-table[_ngcontent-%COMP%]   .govuk-table__header[_ngcontent-%COMP%]{width:330px}"] });
     (function () {
         (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(QueryDetailsTableComponent, [{
                 type: i0.Component,
                 args: [{
                         selector: 'ccd-query-details-table',
                         templateUrl: './query-details-table.component.html',
-                        styleUrls: ['./query-details-table.component.scss'],
-                        encapsulation: i0.ViewEncapsulation.None
+                        styleUrls: ['./query-details-table.component.scss']
                     }]
             }], null, { queryItem: [{
                     type: i0.Input
                 }] });
     })();
 
-    function QueryDetailsComponent_ng_container_0_Template(rf, ctx) {
-        if (rf & 1) {
-            var _r2_1 = i0__namespace.ɵɵgetCurrentView();
-            i0__namespace.ɵɵelementContainerStart(0);
-            i0__namespace.ɵɵelementStart(1, "p");
-            i0__namespace.ɵɵelement(2, "br");
-            i0__namespace.ɵɵelementStart(3, "a", 1);
-            i0__namespace.ɵɵlistener("click", function QueryDetailsComponent_ng_container_0_Template_a_click_3_listener() { i0__namespace.ɵɵrestoreView(_r2_1); var ctx_r1 = i0__namespace.ɵɵnextContext(); return ctx_r1.onBack(); });
-            i0__namespace.ɵɵtext(4);
-            i0__namespace.ɵɵpipe(5, "rpxTranslate");
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(6, "div", 2);
-            i0__namespace.ɵɵtext(7);
-            i0__namespace.ɵɵpipe(8, "rpxTranslate");
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelement(9, "ccd-query-details-table", 3);
-            i0__namespace.ɵɵelementContainerEnd();
-        }
-        if (rf & 2) {
-            var ctx_r0 = i0__namespace.ɵɵnextContext();
-            i0__namespace.ɵɵadvance(4);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(5, 3, "Back to queries"));
-            i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(8, 5, "Query details"));
-            i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵproperty("queryItem", ctx_r0.query);
-        }
-    }
-    var QueryDetailsComponent = /** @class */ (function () {
-        function QueryDetailsComponent() {
-            this.backClicked = new i0.EventEmitter();
-        }
-        QueryDetailsComponent.prototype.onBack = function () {
-            this.backClicked.emit(true);
-        };
-        return QueryDetailsComponent;
-    }());
-    QueryDetailsComponent.ɵfac = function QueryDetailsComponent_Factory(t) { return new (t || QueryDetailsComponent)(); };
-    QueryDetailsComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: QueryDetailsComponent, selectors: [["ccd-query-details"]], inputs: { query: "query" }, outputs: { backClicked: "backClicked" }, decls: 1, vars: 1, consts: [[4, "ngIf"], ["href", "javascript:void(0)", 1, "govuk-link", 3, "click"], [1, "query_details_caption"], [3, "queryItem"]], template: function QueryDetailsComponent_Template(rf, ctx) {
-            if (rf & 1) {
-                i0__namespace.ɵɵtemplate(0, QueryDetailsComponent_ng_container_0_Template, 10, 7, "ng-container", 0);
-            }
-            if (rf & 2) {
-                i0__namespace.ɵɵproperty("ngIf", ctx.query);
-            }
-        }, styles: [".query_details_caption[_ngcontent-%COMP%]{background:#f3f2f1;padding:10px;font-size:x-large;font-weight:700}"] });
-    (function () {
-        (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(QueryDetailsComponent, [{
-                type: i0.Component,
-                args: [{
-                        selector: 'ccd-query-details',
-                        templateUrl: './query-details.component.html',
-                        styleUrls: ['./query-details.component.scss']
-                    }]
-            }], null, { query: [{
-                    type: i0.Input
-                }], backClicked: [{
-                    type: i0.Output
-                }] });
-    })();
-
     var SortOrder;
     (function (SortOrder) {
         SortOrder[SortOrder["ASCENDING"] = 0] = "ASCENDING";
@@ -21120,6 +20900,132 @@
                 }] });
     })();
 
+    var QueryWriteDateInputComponent = /** @class */ (function () {
+        function QueryWriteDateInputComponent() {
+            this.disabled = false;
+        }
+        QueryWriteDateInputComponent.prototype.writeValue = function (date) {
+            if (date instanceof Date && !isNaN(date.getTime())) {
+                this.day = date.getDate();
+                this.month = date.getMonth() + 1; // Months are zero-based
+                this.year = date.getFullYear();
+            }
+            else {
+                this.day = null;
+                this.month = null;
+                this.year = null;
+            }
+        };
+        QueryWriteDateInputComponent.prototype.registerOnChange = function (fn) {
+            this.onChange = fn;
+        };
+        QueryWriteDateInputComponent.prototype.registerOnTouched = function (fn) {
+            this.onTouched = fn;
+        };
+        QueryWriteDateInputComponent.prototype.setDisabledState = function (isDisabled) {
+            this.disabled = isDisabled;
+        };
+        QueryWriteDateInputComponent.prototype.updateDate = function () {
+            var updatedValue = this.onChange && this.isValidDateInput() ?
+                new Date(this.year, this.month - 1, this.day)
+                : null;
+            this.onChange(updatedValue);
+            this.onTouched();
+        };
+        QueryWriteDateInputComponent.prototype.isValidDateInput = function () {
+            var isValidDay = this.day >= 1 && this.day <= 31;
+            var isValidMonth = this.month >= 1 && this.month <= 12;
+            var isValidYear = this.year >= 0;
+            return isValidDay && isValidMonth && isValidYear;
+        };
+        return QueryWriteDateInputComponent;
+    }());
+    QueryWriteDateInputComponent.ɵfac = function QueryWriteDateInputComponent_Factory(t) { return new (t || QueryWriteDateInputComponent)(); };
+    QueryWriteDateInputComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: QueryWriteDateInputComponent, selectors: [["ccd-query-write-date-input"]], inputs: { formControlName: "formControlName" }, features: [i0__namespace.ɵɵProvidersFeature([
+                {
+                    provide: i3.NG_VALUE_ACCESSOR,
+                    useExisting: i0.forwardRef(function () { return QueryWriteDateInputComponent; }),
+                    multi: true
+                }
+            ])], decls: 19, vars: 24, consts: [[1, "govuk-date-input", 3, "id"], [1, "govuk-date-input__item"], [1, "govuk-form-group"], [1, "govuk-label", "govuk-date-input__label", 3, "for"], ["type", "text", "inputmode", "numeric", 1, "govuk-input", "govuk-date-input__input", "govuk-input--width-2", 3, "id", "name", "ngModel", "disabled", "ngModelChange", "input"], ["id", "formControlName + '-year'", "type", "text", "inputmode", "numeric", 1, "govuk-input", "govuk-date-input__input", "govuk-input--width-4", 3, "name", "ngModel", "disabled", "ngModelChange", "input"]], template: function QueryWriteDateInputComponent_Template(rf, ctx) {
+            if (rf & 1) {
+                i0__namespace.ɵɵelementStart(0, "div", 0);
+                i0__namespace.ɵɵelementStart(1, "div", 1);
+                i0__namespace.ɵɵelementStart(2, "div", 2);
+                i0__namespace.ɵɵelementStart(3, "label", 3);
+                i0__namespace.ɵɵtext(4);
+                i0__namespace.ɵɵpipe(5, "rpxTranslate");
+                i0__namespace.ɵɵelementEnd();
+                i0__namespace.ɵɵelementStart(6, "input", 4);
+                i0__namespace.ɵɵlistener("ngModelChange", function QueryWriteDateInputComponent_Template_input_ngModelChange_6_listener($event) { return ctx.day = $event; })("input", function QueryWriteDateInputComponent_Template_input_input_6_listener() { return ctx.updateDate(); });
+                i0__namespace.ɵɵelementEnd();
+                i0__namespace.ɵɵelementEnd();
+                i0__namespace.ɵɵelementEnd();
+                i0__namespace.ɵɵelementStart(7, "div", 1);
+                i0__namespace.ɵɵelementStart(8, "div", 2);
+                i0__namespace.ɵɵelementStart(9, "label", 3);
+                i0__namespace.ɵɵtext(10);
+                i0__namespace.ɵɵpipe(11, "rpxTranslate");
+                i0__namespace.ɵɵelementEnd();
+                i0__namespace.ɵɵelementStart(12, "input", 4);
+                i0__namespace.ɵɵlistener("ngModelChange", function QueryWriteDateInputComponent_Template_input_ngModelChange_12_listener($event) { return ctx.month = $event; })("input", function QueryWriteDateInputComponent_Template_input_input_12_listener() { return ctx.updateDate(); });
+                i0__namespace.ɵɵelementEnd();
+                i0__namespace.ɵɵelementEnd();
+                i0__namespace.ɵɵelementEnd();
+                i0__namespace.ɵɵelementStart(13, "div", 1);
+                i0__namespace.ɵɵelementStart(14, "div", 2);
+                i0__namespace.ɵɵelementStart(15, "label", 3);
+                i0__namespace.ɵɵtext(16);
+                i0__namespace.ɵɵpipe(17, "rpxTranslate");
+                i0__namespace.ɵɵelementEnd();
+                i0__namespace.ɵɵelementStart(18, "input", 5);
+                i0__namespace.ɵɵlistener("ngModelChange", function QueryWriteDateInputComponent_Template_input_ngModelChange_18_listener($event) { return ctx.year = $event; })("input", function QueryWriteDateInputComponent_Template_input_input_18_listener() { return ctx.updateDate(); });
+                i0__namespace.ɵɵelementEnd();
+                i0__namespace.ɵɵelementEnd();
+                i0__namespace.ɵɵelementEnd();
+                i0__namespace.ɵɵelementEnd();
+            }
+            if (rf & 2) {
+                i0__namespace.ɵɵproperty("id", ctx.formControlName);
+                i0__namespace.ɵɵadvance(3);
+                i0__namespace.ɵɵproperty("for", ctx.formControlName + "-day");
+                i0__namespace.ɵɵadvance(1);
+                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(5, 18, "Day"), " ");
+                i0__namespace.ɵɵadvance(2);
+                i0__namespace.ɵɵproperty("id", ctx.formControlName + "-day")("name", ctx.formControlName + "-day")("ngModel", ctx.day)("disabled", ctx.disabled);
+                i0__namespace.ɵɵadvance(3);
+                i0__namespace.ɵɵproperty("for", ctx.formControlName + "-month");
+                i0__namespace.ɵɵadvance(1);
+                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(11, 20, "Month"), " ");
+                i0__namespace.ɵɵadvance(2);
+                i0__namespace.ɵɵproperty("id", ctx.formControlName + "-month")("name", ctx.formControlName + "-month")("ngModel", ctx.month)("disabled", ctx.disabled);
+                i0__namespace.ɵɵadvance(3);
+                i0__namespace.ɵɵproperty("for", ctx.formControlName + "-year");
+                i0__namespace.ɵɵadvance(1);
+                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(17, 22, "Year"), " ");
+                i0__namespace.ɵɵadvance(2);
+                i0__namespace.ɵɵproperty("name", ctx.formControlName + "-year")("ngModel", ctx.year)("disabled", ctx.disabled);
+            }
+        }, directives: [i3__namespace.DefaultValueAccessor, i3__namespace.NgControlStatus, i3__namespace.NgModel], pipes: [i1__namespace.RpxTranslatePipe], encapsulation: 2 });
+    (function () {
+        (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(QueryWriteDateInputComponent, [{
+                type: i0.Component,
+                args: [{
+                        selector: 'ccd-query-write-date-input',
+                        templateUrl: './query-write-date-input.component.html',
+                        providers: [
+                            {
+                                provide: i3.NG_VALUE_ACCESSOR,
+                                useExisting: i0.forwardRef(function () { return QueryWriteDateInputComponent; }),
+                                multi: true
+                            }
+                        ]
+                    }]
+            }], null, { formControlName: [{
+                    type: i0.Input
+                }] });
+    })();
+
     var QueryWriteAddDocumentsComponent = /** @class */ (function () {
         function QueryWriteAddDocumentsComponent() {
             this.documentFormGroup = new i3.FormGroup({});
@@ -21127,8 +21033,9 @@
             // This field is mocked to allow the document component to be used in isolation
             this.mockDocumentCaseField = Object.assign(new CaseField(), {
                 id: QueryWriteAddDocumentsComponent.DOCUMENTS_FORM_CONTROL_NAME,
-                label: 'Add document (optional)',
+                label: 'Add document',
                 hint_text: 'Attach a document to this message',
+                display_context: 'OPTIONAL',
                 display_context_parameter: '#COLLECTION(allowInsert,allowUpdate)',
                 field_type: Object.assign(new FieldType(), {
                     id: 'queryDocuments',
@@ -21190,8 +21097,8 @@
 
     function QueryWriteRaiseQueryComponent_p_22_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "p", 27);
-            i0__namespace.ɵɵelementStart(1, "span", 28);
+            i0__namespace.ɵɵelementStart(0, "p", 28);
+            i0__namespace.ɵɵelementStart(1, "span", 29);
             i0__namespace.ɵɵtext(2);
             i0__namespace.ɵɵpipe(3, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
@@ -21208,8 +21115,8 @@
     }
     function QueryWriteRaiseQueryComponent_p_32_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "p", 29);
-            i0__namespace.ɵɵelementStart(1, "span", 28);
+            i0__namespace.ɵɵelementStart(0, "p", 30);
+            i0__namespace.ɵɵelementStart(1, "span", 29);
             i0__namespace.ɵɵtext(2);
             i0__namespace.ɵɵpipe(3, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
@@ -21226,8 +21133,8 @@
     }
     function QueryWriteRaiseQueryComponent_p_42_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "p", 30);
-            i0__namespace.ɵɵelementStart(1, "span", 28);
+            i0__namespace.ɵɵelementStart(0, "p", 31);
+            i0__namespace.ɵɵelementStart(1, "span", 29);
             i0__namespace.ɵɵtext(2);
             i0__namespace.ɵɵpipe(3, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
@@ -21239,7 +21146,28 @@
             i0__namespace.ɵɵadvance(2);
             i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(3, 2, "Error:"));
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(5, 4, "Enter a body"), " ");
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(5, 4, "Enter a query body"), " ");
+        }
+    }
+    function QueryWriteRaiseQueryComponent_ng_container_62_Template(rf, ctx) {
+        if (rf & 1) {
+            i0__namespace.ɵɵelementContainerStart(0);
+            i0__namespace.ɵɵelementStart(1, "div", 32);
+            i0__namespace.ɵɵelementStart(2, "fieldset", 33);
+            i0__namespace.ɵɵelementStart(3, "legend");
+            i0__namespace.ɵɵelementStart(4, "label", 34);
+            i0__namespace.ɵɵtext(5);
+            i0__namespace.ɵɵpipe(6, "rpxTranslate");
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelement(7, "ccd-query-write-date-input", 35);
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementContainerEnd();
+        }
+        if (rf & 2) {
+            i0__namespace.ɵɵadvance(5);
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(6, 1, "Hearing date"), " ");
         }
     }
     var QueryWriteRaiseQueryComponent = /** @class */ (function () {
@@ -21248,7 +21176,7 @@
         return QueryWriteRaiseQueryComponent;
     }());
     QueryWriteRaiseQueryComponent.ɵfac = function QueryWriteRaiseQueryComponent_Factory(t) { return new (t || QueryWriteRaiseQueryComponent)(); };
-    QueryWriteRaiseQueryComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: QueryWriteRaiseQueryComponent, selectors: [["ccd-query-write-raise-query"]], inputs: { formGroup: "formGroup" }, decls: 62, vars: 60, consts: [[1, "govuk-!-margin-bottom-6"], [1, "govuk-caption-l"], [1, "govuk-heading-l", "govuk-!-margin-bottom-4"], [1, "govuk-!-margin-bottom-4"], [3, "formGroup"], [1, "govuk-form-group"], [1, "govuk-label-wrapper"], ["for", "query-raise-fullName", 1, "govuk-label", "govuk-label--m", "govuk-!-font-weight-bold"], ["id", "query-raise-fullName-hint", 1, "govuk-hint"], ["id", "query-raise-fullName-error", "class", "govuk-error-message", 4, "ngIf"], ["id", "query-raise-fullName", "name", "query-raise-fullName", "type", "text", 1, "govuk-input", 3, "formControlName"], ["for", "query-raise-subject", 1, "govuk-label", "govuk-label--m", "govuk-!-font-weight-bold"], ["id", "query-raise-subject-hint", 1, "govuk-hint"], ["id", "query-raise-subject-error", "class", "govuk-error-message", 4, "ngIf"], ["id", "query-raise-subject", "name", "query-raise-subject", "type", "text", 1, "govuk-input", 3, "formControlName"], ["for", "query-raise-body", 1, "govuk-label", "govuk-label--m", "govuk-!-font-weight-bold"], ["id", "query-raise-body-hint", 1, "govuk-hint"], ["id", "query-raise-body-error", "class", "govuk-error-message", 4, "ngIf"], ["id", "query-raise-body", "name", "query-body", "rows", "5", "aria-describedby", "query-body-hint query-body-error", 1, "govuk-textarea", 3, "formControlName"], [1, "govuk-fieldset"], [1, "govuk-label", "govuk-label--m", "govuk-!-font-weight-bold"], ["data-module", "govuk-radios", 1, "govuk-radios", "govuk-radios--inline"], [1, "govuk-radios__item"], ["id", "query-raise-isHearingRelated-yes", "name", "query-raise-isHearingRelated-yes", "type", "radio", 1, "govuk-radios__input", 3, "checked", "value"], ["for", "query-raise-isHearingRelated-yes", 1, "govuk-label", "govuk-radios__label"], ["id", "query-raise-isHearingRelated-no", "name", "query-raise-isHearingRelated-no", "type", "radio", 1, "govuk-radios__input", 3, "checked", "value"], ["for", "query-raise-isHearingRelated-no", 1, "govuk-label", "govuk-radios__label"], ["id", "query-raise-fullName-error", 1, "govuk-error-message"], [1, "govuk-visually-hidden"], ["id", "query-raise-subject-error", 1, "govuk-error-message"], ["id", "query-raise-body-error", 1, "govuk-error-message"]], template: function QueryWriteRaiseQueryComponent_Template(rf, ctx) {
+    QueryWriteRaiseQueryComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: QueryWriteRaiseQueryComponent, selectors: [["ccd-query-write-raise-query"]], inputs: { formGroup: "formGroup" }, decls: 63, vars: 61, consts: [[1, "govuk-!-margin-bottom-6"], [1, "govuk-caption-l"], [1, "govuk-heading-l", "govuk-!-margin-bottom-4"], [1, "govuk-!-margin-bottom-4"], [3, "formGroup"], [1, "govuk-form-group"], [1, "govuk-label-wrapper"], ["for", "query-raise-fullName", 1, "govuk-label", "govuk-label--m", "govuk-!-font-weight-bold"], ["id", "query-raise-fullName-hint", 1, "govuk-hint"], ["id", "query-raise-fullName-error", "class", "govuk-error-message", 4, "ngIf"], ["id", "query-raise-fullName", "name", "query-raise-fullName", "type", "text", 1, "govuk-input", 3, "formControlName"], ["for", "query-raise-subject", 1, "govuk-label", "govuk-label--m", "govuk-!-font-weight-bold"], ["id", "query-raise-subject-hint", 1, "govuk-hint"], ["id", "query-raise-subject-error", "class", "govuk-error-message", 4, "ngIf"], ["id", "query-raise-subject", "name", "query-raise-subject", "type", "text", 1, "govuk-input", 3, "formControlName"], ["for", "query-raise-body", 1, "govuk-label", "govuk-label--m", "govuk-!-font-weight-bold"], ["id", "query-raise-body-hint", 1, "govuk-hint"], ["id", "query-raise-body-error", "class", "govuk-error-message", 4, "ngIf"], ["id", "query-raise-body", "name", "query-body", "rows", "5", "aria-describedby", "query-body-hint query-body-error", 1, "govuk-textarea", 3, "formControlName"], [1, "govuk-fieldset"], [1, "govuk-label", "govuk-label--m", "govuk-!-font-weight-bold"], ["data-module", "govuk-radios", 1, "govuk-radios", "govuk-radios--inline"], [1, "govuk-radios__item"], ["id", "query-raise-isHearingRelated-yes", "name", "query-raise-isHearingRelated-yes", "type", "radio", 1, "govuk-radios__input", 3, "checked", "value"], ["for", "query-raise-isHearingRelated-yes", 1, "govuk-label", "govuk-radios__label"], ["id", "query-raise-isHearingRelated-no", "name", "query-raise-isHearingRelated-no", "type", "radio", 1, "govuk-radios__input", 3, "checked", "value"], ["for", "query-raise-isHearingRelated-no", 1, "govuk-label", "govuk-radios__label"], [4, "ngIf"], ["id", "query-raise-fullName-error", 1, "govuk-error-message"], [1, "govuk-visually-hidden"], ["id", "query-raise-subject-error", 1, "govuk-error-message"], ["id", "query-raise-body-error", 1, "govuk-error-message"], [1, "govuk-!-margin-top-1"], ["role", "group", 1, "govuk-fieldset"], [1, "govuk-label", "govuk-label--s"], ["formControlName", "hearingDate"]], template: function QueryWriteRaiseQueryComponent_Template(rf, ctx) {
             if (rf & 1) {
                 i0__namespace.ɵɵelementStart(0, "div");
                 i0__namespace.ɵɵelementStart(1, "div", 0);
@@ -21337,6 +21265,7 @@
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementEnd();
+                i0__namespace.ɵɵtemplate(62, QueryWriteRaiseQueryComponent_ng_container_62_Template, 8, 3, "ng-container", 27);
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementEnd();
@@ -21354,17 +21283,17 @@
                 var tmp_18_0 = null;
                 var tmp_19_0 = null;
                 i0__namespace.ɵɵadvance(3);
-                i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(4, 34, "Raise a query"));
+                i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(4, 35, "Raise a query"));
                 i0__namespace.ɵɵadvance(3);
-                i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(7, 36, "Enter query details"));
+                i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(7, 37, "Enter query details"));
                 i0__namespace.ɵɵadvance(6);
                 i0__namespace.ɵɵproperty("formGroup", ctx.formGroup);
                 i0__namespace.ɵɵadvance(2);
                 i0__namespace.ɵɵclassProp("govuk-form-group--error", (tmp_3_0 = ctx.formGroup.get("fullName")) == null ? null : tmp_3_0.errors == null ? null : tmp_3_0.errors.length);
                 i0__namespace.ɵɵadvance(3);
-                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(18, 38, "Full name"), " ");
+                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(18, 39, "Full name"), " ");
                 i0__namespace.ɵɵadvance(3);
-                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(21, 40, "Your full name must be included here"), " ");
+                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(21, 41, "Your full name must be included here"), " ");
                 i0__namespace.ɵɵadvance(2);
                 i0__namespace.ɵɵproperty("ngIf", (tmp_6_0 = ctx.formGroup.get("body")) == null ? null : tmp_6_0.errors == null ? null : tmp_6_0.errors.length);
                 i0__namespace.ɵɵadvance(1);
@@ -21373,9 +21302,9 @@
                 i0__namespace.ɵɵadvance(1);
                 i0__namespace.ɵɵclassProp("govuk-form-group--error", (tmp_9_0 = ctx.formGroup.get("subject")) == null ? null : tmp_9_0.errors == null ? null : tmp_9_0.errors.length);
                 i0__namespace.ɵɵadvance(3);
-                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(28, 42, "Query subject"), " ");
+                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(28, 43, "Query subject"), " ");
                 i0__namespace.ɵɵadvance(3);
-                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(31, 44, "The subject should be a summary of your query"), " ");
+                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(31, 45, "The subject should be a summary of your query"), " ");
                 i0__namespace.ɵɵadvance(2);
                 i0__namespace.ɵɵproperty("ngIf", (tmp_12_0 = ctx.formGroup.get("body")) == null ? null : tmp_12_0.errors == null ? null : tmp_12_0.errors.length);
                 i0__namespace.ɵɵadvance(1);
@@ -21384,24 +21313,26 @@
                 i0__namespace.ɵɵadvance(1);
                 i0__namespace.ɵɵclassProp("govuk-form-group--error", (tmp_15_0 = ctx.formGroup.get("body")) == null ? null : tmp_15_0.errors == null ? null : tmp_15_0.errors.length);
                 i0__namespace.ɵɵadvance(3);
-                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(38, 46, "Query body"), " ");
+                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(38, 47, "Query body"), " ");
                 i0__namespace.ɵɵadvance(3);
-                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(41, 48, "Include as many details as possible so case workers can respond to your query"), " ");
+                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(41, 49, "Include as many details as possible so case workers can respond to your query"), " ");
                 i0__namespace.ɵɵadvance(2);
                 i0__namespace.ɵɵproperty("ngIf", (tmp_18_0 = ctx.formGroup.get("body")) == null ? null : tmp_18_0.errors == null ? null : tmp_18_0.errors.length);
                 i0__namespace.ɵɵadvance(1);
                 i0__namespace.ɵɵclassProp("govuk-textarea--error", (tmp_19_0 = ctx.formGroup.get("body")) == null ? null : tmp_19_0.errors == null ? null : tmp_19_0.errors.length);
                 i0__namespace.ɵɵproperty("formControlName", "body");
                 i0__namespace.ɵɵadvance(6);
-                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(50, 50, "Is the query hearing related?"), " ");
+                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(50, 51, "Is the query hearing related?"), " ");
                 i0__namespace.ɵɵadvance(4);
                 i0__namespace.ɵɵproperty("checked", ctx.formGroup.get("isHearingRelated").value === true)("value", true);
                 i0__namespace.ɵɵadvance(2);
-                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind3(56, 52, "Is the query hearing related?", null, "Yes"), " ");
+                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind3(56, 53, "Is the query hearing related?", null, "Yes"), " ");
                 i0__namespace.ɵɵadvance(3);
                 i0__namespace.ɵɵproperty("checked", ctx.formGroup.get("isHearingRelated").value === false)("value", false);
                 i0__namespace.ɵɵadvance(2);
-                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind3(61, 56, "Is the query hearing related?", null, "No"), " ");
+                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind3(61, 57, "Is the query hearing related?", null, "No"), " ");
+                i0__namespace.ɵɵadvance(2);
+                i0__namespace.ɵɵproperty("ngIf", ctx.formGroup.get("isHearingRelated").value);
             }
         }, encapsulation: 2 });
     (function () {
@@ -21416,28 +21347,10 @@
                 }] });
     })();
 
-    function QueryWriteRespondToQueryComponent_p_30_Template(rf, ctx) {
+    function QueryWriteRespondToQueryComponent_p_26_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "p", 20);
-            i0__namespace.ɵɵelementStart(1, "span", 21);
-            i0__namespace.ɵɵtext(2);
-            i0__namespace.ɵɵpipe(3, "rpxTranslate");
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵtext(4);
-            i0__namespace.ɵɵpipe(5, "rpxTranslate");
-            i0__namespace.ɵɵelementEnd();
-        }
-        if (rf & 2) {
-            i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(3, 2, "Error:"));
-            i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(5, 4, "Enter your full name"), " ");
-        }
-    }
-    function QueryWriteRespondToQueryComponent_p_37_Template(rf, ctx) {
-        if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "p", 22);
-            i0__namespace.ɵɵelementStart(1, "span", 21);
+            i0__namespace.ɵɵelementStart(0, "p", 15);
+            i0__namespace.ɵɵelementStart(1, "span", 16);
             i0__namespace.ɵɵtext(2);
             i0__namespace.ɵɵpipe(3, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
@@ -21452,21 +21365,13 @@
             i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(5, 4, "Enter a response message"), " ");
         }
     }
-    var _c0$B = function (a3) { return ["/", "cases", "case-details", a3, "tasks"]; };
     var QueryWriteRespondToQueryComponent = /** @class */ (function () {
-        function QueryWriteRespondToQueryComponent(route) {
-            this.route = route;
-            // Set default value as false for testing follow up EUI-8454
-            this.QueryCreateContext = exports.QueryItemType.FOLLOWUP;
-            this.queryItemTypeEnum = exports.QueryItemType;
+        function QueryWriteRespondToQueryComponent() {
         }
-        QueryWriteRespondToQueryComponent.prototype.ngOnInit = function () {
-            this.caseId = this.route.snapshot.params.cid;
-        };
         return QueryWriteRespondToQueryComponent;
     }());
-    QueryWriteRespondToQueryComponent.ɵfac = function QueryWriteRespondToQueryComponent_Factory(t) { return new (t || QueryWriteRespondToQueryComponent)(i0__namespace.ɵɵdirectiveInject(i1__namespace$1.ActivatedRoute)); };
-    QueryWriteRespondToQueryComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: QueryWriteRespondToQueryComponent, selectors: [["ccd-query-write-respond-to-query"]], inputs: { queryItem: "queryItem", formGroup: "formGroup", QueryCreateContext: "QueryCreateContext" }, decls: 40, vars: 38, consts: [[1, "govuk-!-margin-bottom-2"], ["href", "javascript:void(0)", 1, "govuk-back-link", "govuk-!-margin-top-0", 3, "routerLink"], [1, "govuk-!-margin-bottom-6"], [1, "govuk-caption-l"], [1, "govuk-heading-l", "govuk-!-margin-bottom-0"], [1, "govuk-!-margin-bottom-4"], [3, "queryItem"], [1, "query-respond"], [1, "govuk-heading-m"], [3, "formGroup"], [1, "govuk-form-group"], [1, "govuk-label-wrapper"], ["for", "query-respond-fullName", 1, "govuk-label", "govuk-label--m", "govuk-!-font-weight-bold"], ["id", "query-respond-fullName-hint", 1, "govuk-hint"], ["id", "query-respond-fullName-error", "class", "govuk-error-message", 4, "ngIf"], ["id", "query-respond-fullName", "name", "query-respond-fullName", "type", "text", 1, "govuk-input", 3, "formControlName"], [1, "govuk-form-group", "body-textarea"], ["for", "query-body", 1, "govuk-label", "govuk-!-font-weight-bold"], ["id", "query-body-error", "class", "govuk-error-message", 4, "ngIf"], ["id", "query-body", "name", "query-body", "rows", "5", "aria-describedby", "query-body-hint query-body-error", 1, "govuk-textarea", 3, "formControlName"], ["id", "query-respond-fullName-error", 1, "govuk-error-message"], [1, "govuk-visually-hidden"], ["id", "query-body-error", 1, "govuk-error-message"]], template: function QueryWriteRespondToQueryComponent_Template(rf, ctx) {
+    QueryWriteRespondToQueryComponent.ɵfac = function QueryWriteRespondToQueryComponent_Factory(t) { return new (t || QueryWriteRespondToQueryComponent)(); };
+    QueryWriteRespondToQueryComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: QueryWriteRespondToQueryComponent, selectors: [["ccd-query-write-respond-to-query"]], inputs: { queryItem: "queryItem", formGroup: "formGroup" }, decls: 29, vars: 23, consts: [[1, "govuk-!-margin-bottom-2"], ["href", "javascript:void(0)", 1, "govuk-back-link", "govuk-!-margin-top-0"], [1, "govuk-!-margin-bottom-6"], [1, "govuk-caption-l"], [1, "govuk-heading-l", "govuk-!-margin-bottom-0"], [1, "govuk-!-margin-bottom-4"], [3, "queryItem"], [1, "query-respond"], [1, "govuk-heading-m"], [3, "formGroup"], [1, "govuk-form-group", "body-textarea"], [1, "govuk-label-wrapper"], ["for", "query-body", 1, "govuk-label", "govuk-!-font-weight-bold"], ["id", "query-body-error", "class", "govuk-error-message", 4, "ngIf"], ["id", "query-body", "name", "query-body", "rows", "5", "aria-describedby", "query-body-hint query-body-error", 1, "govuk-textarea", 3, "formControlName"], ["id", "query-body-error", 1, "govuk-error-message"], [1, "govuk-visually-hidden"]], template: function QueryWriteRespondToQueryComponent_Template(rf, ctx) {
             if (rf & 1) {
                 i0__namespace.ɵɵelementStart(0, "div", 0);
                 i0__namespace.ɵɵelementStart(1, "a", 1);
@@ -21493,82 +21398,50 @@
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementStart(16, "div", 7);
-                i0__namespace.ɵɵelementStart(17, "div", 5);
-                i0__namespace.ɵɵelementStart(18, "h1", 8);
-                i0__namespace.ɵɵtext(19);
-                i0__namespace.ɵɵpipe(20, "rpxTranslate");
-                i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementStart(21, "div", 9);
-                i0__namespace.ɵɵelementStart(22, "div", 10);
-                i0__namespace.ɵɵelementStart(23, "div", 11);
-                i0__namespace.ɵɵelementStart(24, "label", 12);
-                i0__namespace.ɵɵtext(25);
-                i0__namespace.ɵɵpipe(26, "rpxTranslate");
-                i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementStart(27, "div", 13);
-                i0__namespace.ɵɵtext(28);
-                i0__namespace.ɵɵpipe(29, "rpxTranslate");
-                i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵtemplate(30, QueryWriteRespondToQueryComponent_p_30_Template, 6, 6, "p", 14);
-                i0__namespace.ɵɵelement(31, "input", 15);
-                i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementStart(32, "div", 16);
-                i0__namespace.ɵɵelementStart(33, "div", 11);
-                i0__namespace.ɵɵelementStart(34, "label", 17);
-                i0__namespace.ɵɵtext(35);
-                i0__namespace.ɵɵpipe(36, "rpxTranslate");
+                i0__namespace.ɵɵelementStart(17, "h1", 8);
+                i0__namespace.ɵɵtext(18);
+                i0__namespace.ɵɵpipe(19, "rpxTranslate");
                 i0__namespace.ɵɵelementEnd();
+                i0__namespace.ɵɵelementStart(20, "div", 9);
+                i0__namespace.ɵɵelementStart(21, "div", 10);
+                i0__namespace.ɵɵelementStart(22, "div", 11);
+                i0__namespace.ɵɵelementStart(23, "label", 12);
+                i0__namespace.ɵɵtext(24);
+                i0__namespace.ɵɵpipe(25, "rpxTranslate");
                 i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵtemplate(37, QueryWriteRespondToQueryComponent_p_37_Template, 6, 6, "p", 18);
-                i0__namespace.ɵɵelementStart(38, "textarea", 19);
-                i0__namespace.ɵɵtext(39, "      ");
                 i0__namespace.ɵɵelementEnd();
+                i0__namespace.ɵɵtemplate(26, QueryWriteRespondToQueryComponent_p_26_Template, 6, 6, "p", 13);
+                i0__namespace.ɵɵelementStart(27, "textarea", 14);
+                i0__namespace.ɵɵtext(28, "      ");
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementEnd();
             }
             if (rf & 2) {
-                var tmp_7_0 = null;
-                var tmp_10_0 = null;
-                var tmp_11_0 = null;
-                var tmp_13_0 = null;
-                var tmp_15_0 = null;
-                var tmp_16_0 = null;
-                i0__namespace.ɵɵadvance(1);
-                i0__namespace.ɵɵproperty("routerLink", i0__namespace.ɵɵpureFunction1(36, _c0$B, ctx.caseId));
-                i0__namespace.ɵɵadvance(1);
-                i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(3, 22, "Back to tasks"));
+                var tmp_6_0 = null;
+                var tmp_8_0 = null;
+                var tmp_9_0 = null;
+                i0__namespace.ɵɵadvance(2);
+                i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(3, 13, "Back to tasks"));
                 i0__namespace.ɵɵadvance(5);
-                i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(8, 24, "Respond to query"));
+                i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(8, 15, "Respond to query"));
                 i0__namespace.ɵɵadvance(3);
-                i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(11, 26, "Query details"));
+                i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(11, 17, "Query details"));
                 i0__namespace.ɵɵadvance(5);
                 i0__namespace.ɵɵproperty("queryItem", ctx.queryItem);
-                i0__namespace.ɵɵadvance(4);
-                i0__namespace.ɵɵtextInterpolate1(" ", ctx.QueryCreateContext === ctx.queryItemTypeEnum.RESPOND ? "Respond to a query" : i0__namespace.ɵɵpipeBind1(20, 28, "Ask a follow-up question"), " ");
-                i0__namespace.ɵɵadvance(2);
-                i0__namespace.ɵɵproperty("formGroup", ctx.formGroup);
-                i0__namespace.ɵɵadvance(1);
-                i0__namespace.ɵɵclassProp("govuk-form-group--error", (tmp_7_0 = ctx.formGroup.get("fullName")) == null ? null : tmp_7_0.errors == null ? null : tmp_7_0.errors.length);
-                i0__namespace.ɵɵadvance(3);
-                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(26, 30, "Full name"), " ");
                 i0__namespace.ɵɵadvance(3);
-                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(29, 32, "Your full name must be included here"), " ");
+                i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(19, 19, "Respond to a query"));
                 i0__namespace.ɵɵadvance(2);
-                i0__namespace.ɵɵproperty("ngIf", (tmp_10_0 = ctx.formGroup.get("fullName")) == null ? null : tmp_10_0.errors == null ? null : tmp_10_0.errors.length);
-                i0__namespace.ɵɵadvance(1);
-                i0__namespace.ɵɵclassProp("govuk-input--error", (tmp_11_0 = ctx.formGroup.get("fullName")) == null ? null : tmp_11_0.errors == null ? null : tmp_11_0.errors.length);
-                i0__namespace.ɵɵproperty("formControlName", "fullName");
+                i0__namespace.ɵɵproperty("formGroup", ctx.formGroup);
                 i0__namespace.ɵɵadvance(1);
-                i0__namespace.ɵɵclassProp("govuk-form-group--error", (tmp_13_0 = ctx.formGroup.get("body")) == null ? null : tmp_13_0.errors == null ? null : tmp_13_0.errors.length);
+                i0__namespace.ɵɵclassProp("govuk-form-group--error", (tmp_6_0 = ctx.formGroup.get("body")) == null ? null : tmp_6_0.errors == null ? null : tmp_6_0.errors.length);
                 i0__namespace.ɵɵadvance(3);
-                i0__namespace.ɵɵtextInterpolate1(" ", ctx.QueryCreateContext === ctx.queryItemTypeEnum.RESPOND ? "Response message" : i0__namespace.ɵɵpipeBind1(36, 34, "Query Body"), " ");
+                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(25, 21, "Response message"), " ");
                 i0__namespace.ɵɵadvance(2);
-                i0__namespace.ɵɵproperty("ngIf", (tmp_15_0 = ctx.formGroup.get("body")) == null ? null : tmp_15_0.errors == null ? null : tmp_15_0.errors.length);
+                i0__namespace.ɵɵproperty("ngIf", (tmp_8_0 = ctx.formGroup.get("body")) == null ? null : tmp_8_0.errors == null ? null : tmp_8_0.errors.length);
                 i0__namespace.ɵɵadvance(1);
-                i0__namespace.ɵɵclassProp("govuk-textarea--error", (tmp_16_0 = ctx.formGroup.get("body")) == null ? null : tmp_16_0.errors == null ? null : tmp_16_0.errors.length);
+                i0__namespace.ɵɵclassProp("govuk-textarea--error", (tmp_9_0 = ctx.formGroup.get("body")) == null ? null : tmp_9_0.errors == null ? null : tmp_9_0.errors.length);
                 i0__namespace.ɵɵproperty("formControlName", "body");
             }
         }, styles: [".query-respond[_ngcontent-%COMP%]{width:100%;max-width:720px}"] });
@@ -21580,12 +21453,10 @@
                         templateUrl: './query-write-respond-to-query.component.html',
                         styleUrls: ['./query-write-respond-to-query.component.scss']
                     }]
-            }], function () { return [{ type: i1__namespace$1.ActivatedRoute }]; }, { queryItem: [{
+            }], null, { queryItem: [{
                     type: i0.Input
                 }], formGroup: [{
                     type: i0.Input
-                }], QueryCreateContext: [{
-                    type: i0.Input
                 }] });
     })();
 
@@ -21721,24 +21592,9 @@
         __extends(WriteQueryManagementFieldComponent, _super);
         function WriteQueryManagementFieldComponent() {
             var _this = _super.call(this) || this;
-            _this.responseFormGroup = new i3.FormGroup({
-                response: new i3.FormControl('', [i3.Validators.required]),
-                documents: new i3.FormControl([])
-            });
-            _this.errorMessages = [];
-            _this.submitted = false;
+            _this.formGroup = new i3.FormGroup({});
             return _this;
         }
-        WriteQueryManagementFieldComponent.prototype.submitForm = function () {
-            this.submitted = true;
-            this.errorMessages = [];
-            window.scrollTo(0, 0);
-            if (!this.responseFormGroup.valid) {
-                if (this.responseFormGroup.controls.response.hasError('required')) {
-                    this.errorMessages.push({ controlName: 'response', message: 'Add a response before continue' });
-                }
-            }
-        };
         return WriteQueryManagementFieldComponent;
     }(AbstractFieldReadComponent));
     WriteQueryManagementFieldComponent.ɵfac = function WriteQueryManagementFieldComponent_Factory(t) { return new (t || WriteQueryManagementFieldComponent)(); };
@@ -29514,8 +29370,8 @@
         QueryWriteRespondToQueryComponent,
         QueryWriteRaiseQueryComponent,
         QueryCaseDetailsHeaderComponent,
-        QueryCheckYourAnswersComponent,
         QueryWriteAddDocumentsComponent,
+        QueryWriteDateInputComponent
     ];
     var PaletteModule = /** @class */ (function () {
         function PaletteModule() {
@@ -29701,8 +29557,8 @@
                 QueryWriteRespondToQueryComponent,
                 QueryWriteRaiseQueryComponent,
                 QueryCaseDetailsHeaderComponent,
-                QueryCheckYourAnswersComponent,
-                QueryWriteAddDocumentsComponent], imports: [i5.CommonModule,
+                QueryWriteAddDocumentsComponent,
+                QueryWriteDateInputComponent], imports: [i5.CommonModule,
                 i1$1.RouterModule,
                 i3.FormsModule,
                 i3.ReactiveFormsModule,
@@ -29849,8 +29705,8 @@
                 QueryWriteRespondToQueryComponent,
                 QueryWriteRaiseQueryComponent,
                 QueryCaseDetailsHeaderComponent,
-                QueryCheckYourAnswersComponent,
-                QueryWriteAddDocumentsComponent] });
+                QueryWriteAddDocumentsComponent,
+                QueryWriteDateInputComponent] });
     })();
     (function () {
         (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(PaletteModule, [{
@@ -29994,11 +29850,9 @@
         QueryDetailsComponent], []);
     i0__namespace.ɵɵsetComponentScope(WriteQueryManagementFieldComponent, [i5__namespace.NgIf, QueryWriteRespondToQueryComponent, i3__namespace.NgControlStatusGroup, i3__namespace.FormGroupDirective, QueryWriteRaiseQueryComponent], []);
     i0__namespace.ɵɵsetComponentScope(QueryDetailsComponent, [i5__namespace.NgIf, QueryDetailsTableComponent], [i1__namespace.RpxTranslatePipe]);
-    i0__namespace.ɵɵsetComponentScope(QueryDetailsTableComponent, [i5__namespace.NgIf, ReadCollectionFieldComponent], [i1__namespace.RpxTranslatePipe, i5__namespace.DatePipe]);
-    i0__namespace.ɵɵsetComponentScope(QueryWriteRespondToQueryComponent, [i1__namespace$1.RouterLinkWithHref, QueryCaseDetailsHeaderComponent,
+    i0__namespace.ɵɵsetComponentScope(QueryWriteRespondToQueryComponent, [QueryCaseDetailsHeaderComponent,
         QueryDetailsTableComponent, i3__namespace.NgControlStatusGroup, i3__namespace.FormGroupDirective, i5__namespace.NgIf, i3__namespace.DefaultValueAccessor, i3__namespace.NgControlStatus, i3__namespace.FormControlName], [i1__namespace.RpxTranslatePipe]);
-    i0__namespace.ɵɵsetComponentScope(QueryWriteRaiseQueryComponent, [QueryCaseDetailsHeaderComponent, i3__namespace.NgControlStatusGroup, i3__namespace.FormGroupDirective, i5__namespace.NgIf, i3__namespace.DefaultValueAccessor, i3__namespace.NgControlStatus, i3__namespace.FormControlName], [i1__namespace.RpxTranslatePipe]);
-    i0__namespace.ɵɵsetComponentScope(QueryCheckYourAnswersComponent, [QueryCaseDetailsHeaderComponent, i5__namespace.NgIf, ReadCollectionFieldComponent], [i1__namespace.RpxTranslatePipe]);
+    i0__namespace.ɵɵsetComponentScope(QueryWriteRaiseQueryComponent, [QueryCaseDetailsHeaderComponent, i3__namespace.NgControlStatusGroup, i3__namespace.FormGroupDirective, i5__namespace.NgIf, i3__namespace.DefaultValueAccessor, i3__namespace.NgControlStatus, i3__namespace.FormControlName, QueryWriteDateInputComponent], [i1__namespace.RpxTranslatePipe]);
     i0__namespace.ɵɵsetComponentScope(QueryWriteAddDocumentsComponent, [WriteCollectionFieldComponent, i3__namespace.NgControlStatusGroup, i3__namespace.FormGroupDirective], []);
 
     var Confirmation = /** @class */ (function () {
@@ -40616,7 +40470,6 @@
     exports.ProfileNotifier = ProfileNotifier;
     exports.ProfileService = ProfileService;
     exports.QueryCaseDetailsHeaderComponent = QueryCaseDetailsHeaderComponent;
-    exports.QueryCheckYourAnswersComponent = QueryCheckYourAnswersComponent;
     exports.QueryCreateComponent = QueryCreateComponent;
     exports.QueryDetailsComponent = QueryDetailsComponent;
     exports.QueryDetailsTableComponent = QueryDetailsTableComponent;
@@ -40624,6 +40477,7 @@
     exports.QueryListData = QueryListData;
     exports.QueryListItem = QueryListItem;
     exports.QueryWriteAddDocumentsComponent = QueryWriteAddDocumentsComponent;
+    exports.QueryWriteDateInputComponent = QueryWriteDateInputComponent;
     exports.QueryWriteRaiseQueryComponent = QueryWriteRaiseQueryComponent;
     exports.QueryWriteRespondToQueryComponent = QueryWriteRespondToQueryComponent;
     exports.ReadCaseFlagFieldComponent = ReadCaseFlagFieldComponent;
@@ -40736,7 +40590,6 @@
     exports.WriteYesNoFieldComponent = WriteYesNoFieldComponent;
     exports.YesNoService = YesNoService;
     exports.aCaseField = aCaseField;
-    exports.caseFieldMockData = caseFieldMockData;
     exports.createACL = createACL;
     exports.createCaseEventTrigger = createCaseEventTrigger;
     exports.createCaseField = createCaseField;