@hmcts/ccd-case-ui-toolkit 7.1.35-qm-callbackerror → 7.1.37-qm-wa

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

@@ -59,7 +59,7 @@ import { MatLegacyTabsModule } from '@angular/material/legacy-tabs';
 import { decompressFromUTF16, compressToUTF16 } from 'lz-string';
 
 const _c0$14 = [[["", "footerSolsNavLinks", ""]], [["", "footerCaseWorkerNavLinks", ""]]];
-const _c1$v = ["[footerSolsNavLinks]", "[footerCaseWorkerNavLinks]"];
+const _c1$u = ["[footerSolsNavLinks]", "[footerCaseWorkerNavLinks]"];
 function FooterComponent_div_2_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementStart(0, "div", 3)(1, "div", 4);
     i0.ɵɵprojection(2);
@@ -135,7 +135,7 @@ class FooterComponent {
     phone;
     workhours;
     static ɵfac = function FooterComponent_Factory(t) { return new (t || FooterComponent)(); };
-    static ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: FooterComponent, selectors: [["cut-footer-bar"]], inputs: { email: "email", isSolicitor: "isSolicitor", phone: "phone", workhours: "workhours" }, ngContentSelectors: _c1$v, 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) {
+    static ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: FooterComponent, selectors: [["cut-footer-bar"]], inputs: { email: "email", isSolicitor: "isSolicitor", phone: "phone", workhours: "workhours" }, ngContentSelectors: _c1$u, decls: 4, vars: 4, consts: [["id", "footer", "role", "footer", 1, "group", "js-footer"], [1, "footer-wrapper"], ["class", "footer-meta", 4, "ngIf"], [1, "footer-meta"], [1, "footer-meta-inner"], [1, "open-government-licence"], [1, "logo"], ["href", "https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/", "rel", "license"], [1, "copyright"], ["href", "https://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/copyright-and-re-use/crown-copyright/"], [1, "title"], [1, "footer-text"], [1, "email"], [3, "href"], [1, "phone"], [1, "work-hours"]], template: function FooterComponent_Template(rf, ctx) { if (rf & 1) {
             i0.ɵɵprojectionDef(_c0$14);
             i0.ɵɵelementStart(0, "footer", 0)(1, "div", 1);
             i0.ɵɵtemplate(2, FooterComponent_div_2_Template, 20, 15, "div", 2)(3, FooterComponent_div_3_Template, 20, 16, "div", 2);
@@ -164,7 +164,7 @@ class FooterComponent {
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(FooterComponent, { className: "FooterComponent", filePath: "lib/components/footer/footer.component.ts", lineNumber: 8 }); })();
 
 const _c0$13 = [[["", "headerNavigation", ""]]];
-const _c1$u = ["[headerNavigation]"];
+const _c1$t = ["[headerNavigation]"];
 function HeaderBarComponent_div_3_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementStart(0, "div")(1, "a", 12);
     i0.ɵɵelement(2, "img", 13);
@@ -206,7 +206,7 @@ class HeaderBarComponent {
         this.signOutRequest.emit();
     }
     static ɵfac = function HeaderBarComponent_Factory(t) { return new (t || HeaderBarComponent)(); };
-    static ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: HeaderBarComponent, selectors: [["cut-header-bar"]], inputs: { title: "title", isSolicitor: "isSolicitor", username: "username" }, outputs: { signOutRequest: "signOutRequest" }, ngContentSelectors: _c1$u, 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) {
+    static ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: HeaderBarComponent, selectors: [["cut-header-bar"]], inputs: { title: "title", isSolicitor: "isSolicitor", username: "username" }, outputs: { signOutRequest: "signOutRequest" }, ngContentSelectors: _c1$t, decls: 17, vars: 14, consts: [["role", "banner", "id", "global-header", 1, "with-proposition"], [1, "header-wrapper"], [1, "header-global"], [4, "ngIf"], ["class", "global-header", 4, "ngIf"], [1, "header-proposition"], [1, "content"], ["href", "#proposition-links", 1, "js-header-toggle", "menu"], ["id", "proposition-menu", 4, "ngIf"], [1, "proposition-right"], ["id", "user-name"], ["id", "sign-out", "href", "javascript:void(0)", 3, "click"], ["href", "https://www.gov.uk", "title", "Go to the GOV.UK homepage", "id", "logo", 1, "content", 2, "margin-left", "0px"], ["src", "/img/gov.uk_logotype_crown_invert_trans.png?0.23.0", "width", "36", "height", "32", "alt", ""], [1, "global-header"], [1, "title"], ["id", "proposition-menu"], [1, "title-solicitor"], ["id", "proposition-name"]], template: function HeaderBarComponent_Template(rf, ctx) { if (rf & 1) {
             i0.ɵɵprojectionDef(_c0$13);
             i0.ɵɵelementStart(0, "header", 0)(1, "div", 1)(2, "div", 2);
             i0.ɵɵtemplate(3, HeaderBarComponent_div_3_Template, 5, 3, "div", 3)(4, HeaderBarComponent_div_4_Template, 5, 3, "div", 4);
@@ -258,11 +258,11 @@ class HeaderBarComponent {
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(HeaderBarComponent, { className: "HeaderBarComponent", filePath: "lib/components/header/header-bar/header-bar.component.ts", lineNumber: 8 }); })();
 
 const _c0$12 = [[["", "leftNavLinks", ""]], [["", "rightNavLinks", ""]]];
-const _c1$t = ["[leftNavLinks]", "[rightNavLinks]"];
+const _c1$s = ["[leftNavLinks]", "[rightNavLinks]"];
 class NavigationComponent {
     isSolicitor;
     static ɵfac = function NavigationComponent_Factory(t) { return new (t || NavigationComponent)(); };
-    static ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: NavigationComponent, selectors: [["cut-nav-bar"]], inputs: { isSolicitor: "isSolicitor" }, ngContentSelectors: _c1$t, decls: 4, vars: 2, consts: [[1, "cut-nav-bar"]], template: function NavigationComponent_Template(rf, ctx) { if (rf & 1) {
+    static ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: NavigationComponent, selectors: [["cut-nav-bar"]], inputs: { isSolicitor: "isSolicitor" }, ngContentSelectors: _c1$s, decls: 4, vars: 2, consts: [[1, "cut-nav-bar"]], template: function NavigationComponent_Template(rf, ctx) { if (rf & 1) {
             i0.ɵɵprojectionDef(_c0$12);
             i0.ɵɵelementStart(0, "div")(1, "nav", 0);
             i0.ɵɵprojection(2);
@@ -383,10 +383,10 @@ class HeadersModule {
 (function () { (typeof ngJitMode === "undefined" || ngJitMode) && i0.ɵɵsetNgModuleScope(HeadersModule, { declarations: [PhaseComponent, HeaderBarComponent, NavigationComponent, NavigationItemComponent], imports: [CommonModule, RouterModule, i1.RpxTranslationModule], exports: [PhaseComponent, HeaderBarComponent, NavigationComponent, NavigationItemComponent] }); })();
 
 const _c0$11 = [[["", "topBody", ""]], [["", "leftBody", ""]], [["", "rightBody", ""]]];
-const _c1$s = ["[topBody]", "[leftBody]", "[rightBody]"];
+const _c1$r = ["[topBody]", "[leftBody]", "[rightBody]"];
 class BodyComponent {
     static ɵfac = function BodyComponent_Factory(t) { return new (t || BodyComponent)(); };
-    static ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: BodyComponent, selectors: [["cut-body"]], ngContentSelectors: _c1$s, decls: 4, vars: 0, consts: [[1, "global-display"]], template: function BodyComponent_Template(rf, ctx) { if (rf & 1) {
+    static ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: BodyComponent, selectors: [["cut-body"]], ngContentSelectors: _c1$r, decls: 4, vars: 0, consts: [[1, "global-display"]], template: function BodyComponent_Template(rf, ctx) { if (rf & 1) {
             i0.ɵɵprojectionDef(_c0$11);
             i0.ɵɵelementStart(0, "div", 0);
             i0.ɵɵprojection(1);
@@ -1001,7 +1001,7 @@ class NotificationBannerComponent {
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(NotificationBannerComponent, { className: "NotificationBannerComponent", filePath: "lib/components/banners/notification-banner/notification-banner.component.ts", lineNumber: 10 }); })();
 
 const _c0$_ = ["*"];
-const _c1$r = a0 => ({ "js-hidden": a0 });
+const _c1$q = a0 => ({ "js-hidden": a0 });
 class TabComponent {
     id;
     title;
@@ -1013,7 +1013,7 @@ class TabComponent {
             i0.ɵɵprojection(1);
             i0.ɵɵelementEnd();
         } if (rf & 2) {
-            i0.ɵɵproperty("id", ctx.id)("ngClass", i0.ɵɵpureFunction1(3, _c1$r, !ctx.selected));
+            i0.ɵɵproperty("id", ctx.id)("ngClass", i0.ɵɵpureFunction1(3, _c1$q, !ctx.selected));
             i0.ɵɵattribute("aria-hidden", !ctx.selected);
         } }, dependencies: [i5.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:0px;border-color:#bfc1c3;padding-bottom:11px;margin-bottom:0;color:#0b0c0c}}"] });
 }
@@ -1030,7 +1030,7 @@ class TabComponent {
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(TabComponent, { className: "TabComponent", filePath: "lib/components/tabs/tab.component.ts", lineNumber: 10 }); })();
 
 const _c0$Z = ["tab"];
-const _c1$q = ["*"];
+const _c1$p = ["*"];
 const _c2$4 = () => ["."];
 const _c3 = a0 => ({ "tabs-toggle-selected": a0 });
 function TabsComponent_li_2_Template(rf, ctx) { if (rf & 1) {
@@ -1080,7 +1080,7 @@ class TabsComponent {
         } if (rf & 2) {
             let _t;
             i0.ɵɵqueryRefresh(_t = i0.ɵɵloadQuery()) && (ctx.tabs = _t);
-        } }, ngContentSelectors: _c1$q, decls: 5, vars: 1, consts: [["tab", ""], [1, "tabs"], ["role", "list", 1, "tabs-list"], ["class", "tabs-list-item", 4, "ngFor", "ngForOf"], [1, "tabs-content"], [1, "tabs-list-item"], ["role", "tab", "tabindex", "0", 1, "tabs-toggle", 3, "click", "routerLink", "fragment", "ngClass"]], template: function TabsComponent_Template(rf, ctx) { if (rf & 1) {
+        } }, ngContentSelectors: _c1$p, decls: 5, vars: 1, consts: [["tab", ""], [1, "tabs"], ["role", "list", 1, "tabs-list"], ["class", "tabs-list-item", 4, "ngFor", "ngForOf"], [1, "tabs-content"], [1, "tabs-list-item"], ["role", "tab", "tabindex", "0", 1, "tabs-toggle", 3, "click", "routerLink", "fragment", "ngClass"]], template: function TabsComponent_Template(rf, ctx) { if (rf & 1) {
             i0.ɵɵprojectionDef();
             i0.ɵɵelementStart(0, "div", 1)(1, "ul", 2);
             i0.ɵɵtemplate(2, TabsComponent_li_2_Template, 5, 11, "li", 3);
@@ -11774,7 +11774,7 @@ class WriteComplexFieldComponent extends AbstractFieldWriteComponent {
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(WriteComplexFieldComponent, { className: "WriteComplexFieldComponent", filePath: "lib/shared/components/palette/complex/write-complex-field.component.ts", lineNumber: 21 }); })();
 
 const _c0$V = ["writeComplexFieldComponent"];
-const _c1$p = a0 => ({ "form-group-error": a0 });
+const _c1$o = a0 => ({ "form-group-error": a0 });
 const _c2$3 = a0 => ({ "govuk-input--error": a0 });
 function WriteAddressFieldComponent_div_1_div_4_span_5_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementStart(0, "span", 14);
@@ -11801,7 +11801,7 @@ function WriteAddressFieldComponent_div_1_div_4_Template(rf, ctx) { if (rf & 1)
     i0.ɵɵelementEnd()();
 } if (rf & 2) {
     const ctx_r1 = i0.ɵɵnextContext(2);
-    i0.ɵɵproperty("id", ctx_r1.createElementId("postcodeLookup"))("ngClass", i0.ɵɵpureFunction1(13, _c1$p, ctx_r1.missingPostcode));
+    i0.ɵɵproperty("id", ctx_r1.createElementId("postcodeLookup"))("ngClass", i0.ɵɵpureFunction1(13, _c1$o, ctx_r1.missingPostcode));
     i0.ɵɵadvance();
     i0.ɵɵproperty("for", ctx_r1.createElementId("postcodeInput"));
     i0.ɵɵadvance(2);
@@ -11847,7 +11847,7 @@ function WriteAddressFieldComponent_div_1_div_5_Template(rf, ctx) { if (rf & 1)
     i0.ɵɵelementEnd()();
 } if (rf & 2) {
     const ctx_r1 = i0.ɵɵnextContext(2);
-    i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(9, _c1$p, ctx_r1.noAddressSelected));
+    i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(9, _c1$o, ctx_r1.noAddressSelected));
     i0.ɵɵadvance();
     i0.ɵɵproperty("for", ctx_r1.createElementId("addressList"));
     i0.ɵɵadvance(2);
@@ -13280,7 +13280,7 @@ class ReadCaseLinkFieldComponent extends AbstractFieldReadComponent {
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(ReadCaseLinkFieldComponent, { className: "ReadCaseLinkFieldComponent", filePath: "lib/shared/components/palette/case-link/read-case-link-field.component.ts", lineNumber: 8 }); })();
 
 const _c0$U = ["writeComplexFieldComponent"];
-const _c1$o = a0 => ({ "form-group-error": a0 });
+const _c1$n = a0 => ({ "form-group-error": a0 });
 function WriteCaseLinkFieldComponent_span_2_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementStart(0, "span", 6);
     i0.ɵɵtext(1);
@@ -13372,7 +13372,7 @@ class WriteCaseLinkFieldComponent extends AbstractFieldWriteComponent {
             i0.ɵɵelement(5, "input", 5);
             i0.ɵɵelementEnd();
         } if (rf & 2) {
-            i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(7, _c1$o, !ctx.caseReferenceControl.valid && (ctx.caseReferenceControl.dirty || ctx.caseReferenceControl.touched)));
+            i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(7, _c1$n, !ctx.caseReferenceControl.valid && (ctx.caseReferenceControl.dirty || ctx.caseReferenceControl.touched)));
             i0.ɵɵadvance();
             i0.ɵɵproperty("for", ctx.id());
             i0.ɵɵadvance();
@@ -13395,7 +13395,7 @@ class WriteCaseLinkFieldComponent extends AbstractFieldWriteComponent {
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(WriteCaseLinkFieldComponent, { className: "WriteCaseLinkFieldComponent", filePath: "lib/shared/components/palette/case-link/write-case-link-field.component.ts", lineNumber: 11 }); })();
 
 const _c0$T = (a0, a1, a2, a3, a4, a5) => ({ id: a0, label: a1, field_type: a2, display_context_parameter: a3, value: a4, hidden: a5 });
-const _c1$n = (a0, a1, a2, a3, a4) => ({ id: a0, label: a1, field_type: a2, value: a3, hidden: a4 });
+const _c1$m = (a0, a1, a2, a3, a4) => ({ id: a0, label: a1, field_type: a2, value: a3, hidden: a4 });
 function ReadCollectionFieldComponent_table_0_tbody_2_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementStart(0, "tbody")(1, "tr");
     i0.ɵɵelement(2, "th", 4);
@@ -13416,7 +13416,7 @@ function ReadCollectionFieldComponent_table_0_tbody_3_tr_1_Template(rf, ctx) { i
     const i_r3 = ctx.index;
     const ctx_r0 = i0.ɵɵnextContext(3);
     i0.ɵɵadvance(2);
-    i0.ɵɵproperty("caseField", i0.ɵɵpureFunction5(4, _c1$n, i_r3, ctx_r0.caseField.label + " " + (i_r3 + 1), ctx_r0.caseField.field_type.collection_field_type, item_r2.value, ctx_r0.caseField.hidden))("context", ctx_r0.context)("topLevelFormGroup", ctx_r0.topLevelFormGroup)("idPrefix", ctx_r0.buildIdPrefix(i_r3));
+    i0.ɵɵproperty("caseField", i0.ɵɵpureFunction5(4, _c1$m, i_r3, ctx_r0.caseField.label + " " + (i_r3 + 1), ctx_r0.caseField.field_type.collection_field_type, item_r2.value, ctx_r0.caseField.hidden))("context", ctx_r0.context)("topLevelFormGroup", ctx_r0.topLevelFormGroup)("idPrefix", ctx_r0.buildIdPrefix(i_r3));
 } }
 function ReadCollectionFieldComponent_table_0_tbody_3_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementStart(0, "tbody");
@@ -14222,7 +14222,7 @@ class FileUploadStateService {
     }], null, null); })();
 
 const _c0$R = ["fileInput"];
-const _c1$m = a0 => ({ "form-group-error bottom-30": a0 });
+const _c1$l = a0 => ({ "form-group-error bottom-30": a0 });
 function WriteDocumentFieldComponent_span_6_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementStart(0, "span", 12);
     i0.ɵɵtext(1);
@@ -14611,7 +14611,7 @@ class WriteDocumentFieldComponent extends AbstractFieldWriteComponent {
             i0.ɵɵpipe(17, "rpxTranslate");
             i0.ɵɵelementEnd()();
         } if (rf & 2) {
-            i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(18, _c1$m, !ctx.valid));
+            i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(18, _c1$l, !ctx.valid));
             i0.ɵɵadvance();
             i0.ɵɵproperty("for", ctx.id());
             i0.ɵɵadvance();
@@ -15139,7 +15139,7 @@ class ReadDynamicRadioListFieldComponent extends AbstractFieldReadComponent {
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(ReadDynamicRadioListFieldComponent, { className: "ReadDynamicRadioListFieldComponent", filePath: "lib/shared/components/palette/dynamic-radio-list/read-dynamic-radio-list-field.component.ts", lineNumber: 8 }); })();
 
 const _c0$O = a0 => ({ "form-group-error": a0 });
-const _c1$l = a0 => ({ selected: a0 });
+const _c1$k = a0 => ({ selected: a0 });
 function WriteDynamicRadioListFieldComponent_span_4_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementStart(0, "span", 7);
     i0.ɵɵtext(1);
@@ -15189,7 +15189,7 @@ function WriteDynamicRadioListFieldComponent_div_9_Template(rf, ctx) { if (rf &
 } if (rf & 2) {
     const radioButton_r2 = ctx.$implicit;
     const ctx_r0 = i0.ɵɵnextContext();
-    i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(9, _c1$l, ctx_r0.dynamicRadioListControl.value === radioButton_r2.code));
+    i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(9, _c1$k, ctx_r0.dynamicRadioListControl.value === radioButton_r2.code));
     i0.ɵɵadvance();
     i0.ɵɵproperty("id", ctx_r0.createElementId(radioButton_r2.code))("name", ctx_r0.id())("formControl", ctx_r0.dynamicRadioListControl)("value", radioButton_r2.code);
     i0.ɵɵadvance();
@@ -15287,7 +15287,7 @@ class ReadEmailFieldComponent extends AbstractFieldReadComponent {
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(ReadEmailFieldComponent, { className: "ReadEmailFieldComponent", filePath: "lib/shared/components/palette/email/read-email-field.component.ts", lineNumber: 10 }); })();
 
 const _c0$N = a0 => ({ "form-group-error": a0 });
-const _c1$k = a0 => ({ "govuk-input--error": a0 });
+const _c1$j = a0 => ({ "govuk-input--error": a0 });
 function WriteEmailFieldComponent_span_2_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementStart(0, "span", 6);
     i0.ɵɵtext(1);
@@ -15342,7 +15342,7 @@ class WriteEmailFieldComponent extends AbstractFieldWriteComponent {
             i0.ɵɵadvance();
             i0.ɵɵproperty("ngIf", ctx.emailControl.errors && (ctx.emailControl.dirty || ctx.emailControl.touched));
             i0.ɵɵadvance();
-            i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(10, _c1$k, ctx.emailControl.errors && (ctx.emailControl.dirty || ctx.emailControl.touched)))("id", ctx.id())("formControl", ctx.emailControl);
+            i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(10, _c1$j, ctx.emailControl.errors && (ctx.emailControl.dirty || ctx.emailControl.touched)))("id", ctx.id())("formControl", ctx.emailControl);
         } }, dependencies: [i5.NgClass, i5.NgIf, i4.DefaultValueAccessor, i4.NgControlStatus, i4.FormControlDirective, FieldLabelPipe, FirstErrorPipe, i1.RpxTranslatePipe], encapsulation: 2 });
 }
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(WriteEmailFieldComponent, [{
@@ -15510,7 +15510,7 @@ class ReadFixedRadioListFieldComponent extends AbstractFieldReadComponent {
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(ReadFixedRadioListFieldComponent, { className: "ReadFixedRadioListFieldComponent", filePath: "lib/shared/components/palette/fixed-radio-list/read-fixed-radio-list-field.component.ts", lineNumber: 8 }); })();
 
 const _c0$L = a0 => ({ "form-group-error": a0 });
-const _c1$j = a0 => ({ selected: a0 });
+const _c1$i = a0 => ({ selected: a0 });
 function WriteFixedRadioListFieldComponent_span_4_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementStart(0, "span", 6);
     i0.ɵɵtext(1);
@@ -15551,7 +15551,7 @@ function WriteFixedRadioListFieldComponent_div_8_Template(rf, ctx) { if (rf & 1)
 } if (rf & 2) {
     const radioButton_r2 = ctx.$implicit;
     const ctx_r0 = i0.ɵɵnextContext();
-    i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(9, _c1$j, ctx_r0.fixedRadioListControl.value === radioButton_r2.code));
+    i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(9, _c1$i, ctx_r0.fixedRadioListControl.value === radioButton_r2.code));
     i0.ɵɵadvance();
     i0.ɵɵproperty("id", ctx_r0.id() + "-" + radioButton_r2.code)("name", ctx_r0.id())("formControl", ctx_r0.fixedRadioListControl)("value", radioButton_r2.code);
     i0.ɵɵadvance();
@@ -15654,7 +15654,7 @@ class ReadJudicialUserFieldComponent extends AbstractFieldReadComponent {
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(ReadJudicialUserFieldComponent, { className: "ReadJudicialUserFieldComponent", filePath: "lib/shared/components/palette/judicial-user/read-judicial-user-field.component.ts", lineNumber: 11 }); })();
 
 const _c0$K = a0 => ({ "form-group-error": a0 });
-const _c1$i = a0 => ({ "hide-autocomplete": a0 });
+const _c1$h = a0 => ({ "hide-autocomplete": a0 });
 function WriteJudicialUserFieldComponent_span_2_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementStart(0, "span", 10);
     i0.ɵɵtext(1);
@@ -15693,7 +15693,7 @@ function WriteJudicialUserFieldComponent_mat_option_8_Template(rf, ctx) { if (rf
 } if (rf & 2) {
     const judicialUser_r4 = ctx.$implicit;
     const ctx_r1 = i0.ɵɵnextContext();
-    i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(4, _c1$i, !ctx_r1.showAutocomplete))("value", judicialUser_r4);
+    i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(4, _c1$h, !ctx_r1.showAutocomplete))("value", judicialUser_r4);
     i0.ɵɵadvance();
     i0.ɵɵtextInterpolate2(" ", (judicialUser_r4 == null ? null : judicialUser_r4.fullName) ? judicialUser_r4.fullName : "", "", (judicialUser_r4 == null ? null : judicialUser_r4.emailId) ? " (" + judicialUser_r4.emailId + ")" : "", " ");
 } }
@@ -16419,7 +16419,7 @@ class ValidatorsUtils {
     }], null, null); })();
 
 const _c0$J = a0 => ({ "govuk-form-group--error": a0 });
-const _c1$h = a0 => ({ "table-group-error": a0 });
+const _c1$g = a0 => ({ "table-group-error": a0 });
 function LinkCasesComponent_div_8_span_4_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementStart(0, "span", 30)(1, "span", 31);
     i0.ɵɵtext(2, "Error:");
@@ -16596,7 +16596,7 @@ function LinkCasesComponent_tr_31_Template(rf, ctx) { if (rf & 1) {
     const case_r9 = ctx.$implicit;
     const ctx_r1 = i0.ɵɵnextContext();
     i0.ɵɵadvance(2);
-    i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(12, _c1$h, ctx_r1.caseSelectionError && case_r9.caseReference === ctx_r1.linkCaseForm.value.caseNumber));
+    i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(12, _c1$g, ctx_r1.caseSelectionError && case_r9.caseReference === ctx_r1.linkCaseForm.value.caseNumber));
     i0.ɵɵadvance(2);
     i0.ɵɵtextInterpolate1("", case_r9.caseName, " ");
     i0.ɵɵadvance(2);
@@ -16679,8 +16679,8 @@ class LinkCasesComponent {
         })), this.validatorsUtils.formArraySelectedValidator());
     }
     toggleLinkCaseReasonOtherComments(event) {
-        this.linkCaseReasons.find(reason => reason.value_en === event.target.value).selected = event.target.checked;
-        this.showComments = this.linkCaseReasons.find(reason => reason.value_en === 'Other').selected;
+        this.linkCaseReasons.find((reason) => reason.value_en === event.target.value).selected = event.target.checked;
+        this.showComments = this.linkCaseReasons.find((reason) => reason.value_en === 'Other')?.selected;
     }
     submitCaseInfo() {
         this.errorMessages = [];
@@ -16719,7 +16719,7 @@ class LinkCasesComponent {
             this.errorMessages.push({
                 title: 'dummy-case-number',
                 description: LinkedCasesErrorMessages.CaseNumberError,
-                fieldId: 'caseNumber',
+                fieldId: 'caseNumber'
             });
         }
         if (this.linkCaseForm.controls.reasonType.invalid) {
@@ -16727,17 +16727,17 @@ class LinkCasesComponent {
             this.errorMessages.push({
                 title: 'dummy-case-reason',
                 description: LinkedCasesErrorMessages.ReasonSelectionError,
-                fieldId: 'caseReason',
+                fieldId: 'caseReason'
             });
         }
         if (this.linkCaseForm.controls.reasonType.valid
-            && this.linkCaseReasons.find(reason => reason.value_en === 'Other').selected) {
+            && this.linkCaseReasons.find((reason) => reason.value_en === 'Other').selected) {
             if (this.linkCaseForm.controls.otherDescription.value.trim().length === 0) {
                 this.caseReasonCommentsError = LinkedCasesErrorMessages.otherDescriptionError;
                 this.errorMessages.push({
                     title: 'dummy-case-reason-comments',
                     description: LinkedCasesErrorMessages.otherDescriptionError,
-                    fieldId: 'otherDescription',
+                    fieldId: 'otherDescription'
                 });
             }
             if (this.linkCaseForm.controls.otherDescription.value.trim().length > 100) {
@@ -16745,7 +16745,7 @@ class LinkCasesComponent {
                 this.errorMessages.push({
                     title: 'dummy-case-reason-comments',
                     description: LinkedCasesErrorMessages.otherDescriptionMaxLengthError,
-                    fieldId: 'otherDescription',
+                    fieldId: 'otherDescription'
                 });
             }
         }
@@ -16754,7 +16754,7 @@ class LinkCasesComponent {
             this.errorMessages.push({
                 title: 'dummy-case-number',
                 description: LinkedCasesErrorMessages.CaseProposedError,
-                fieldId: 'caseNumber',
+                fieldId: 'caseNumber'
             });
         }
         if (this.isCaseSelected(this.linkedCasesService.linkedCases)) {
@@ -16762,14 +16762,14 @@ class LinkCasesComponent {
             this.errorMessages.push({
                 title: 'dummy-case-number',
                 description: LinkedCasesErrorMessages.CasesLinkedError,
-                fieldId: 'caseNumber',
+                fieldId: 'caseNumber'
             });
         }
         if (this.linkCaseForm.value.caseNumber.split('-').join('') === this.linkedCasesService.caseId.split('-').join('')) {
             this.errorMessages.push({
                 title: 'dummy-case-number',
                 description: LinkedCasesErrorMessages.ProposedCaseWithIn,
-                fieldId: 'caseNumber',
+                fieldId: 'caseNumber'
             });
         }
         window.scrollTo(0, 0);
@@ -16790,7 +16790,7 @@ class LinkCasesComponent {
                 caseState: caseView.state.name || '',
                 caseStateDescription: caseView.state.description || '',
                 caseService: caseView.case_type && caseView.case_type.jurisdiction && caseView.case_type.jurisdiction.description || '',
-                caseName: this.linkedCasesService.getCaseName(caseView),
+                caseName: this.linkedCasesService.getCaseName(caseView)
             };
             const ccdApiCaseLinkData = {
                 CaseReference: caseView.case_id,
@@ -16803,7 +16803,7 @@ class LinkCasesComponent {
             }
             this.linkedCasesService.caseFieldValue.push({ id: caseView.case_id.toString(), value: ccdApiCaseLinkData });
             this.selectedCases.push(caseLink);
-            this.linkCaseReasons.forEach(reason => reason.selected = false);
+            this.linkCaseReasons.forEach((reason) => reason.selected = false);
             this.initForm();
             this.emitLinkedCasesState(false);
         }, (error) => {
@@ -16811,7 +16811,7 @@ class LinkCasesComponent {
             this.errorMessages.push({
                 title: 'dummy-case-number',
                 description: LinkedCasesErrorMessages.CaseCheckAgainError,
-                fieldId: 'caseNumber',
+                fieldId: 'caseNumber'
             });
             this.emitLinkedCasesState(false);
             window.scrollTo(0, 0);
@@ -16823,7 +16823,7 @@ class LinkCasesComponent {
         this.linkedCasesStateEmitter.emit({
             currentLinkedCasesPage: LinkedCasesPages.LINK_CASE,
             errorMessages: this.errorMessages,
-            navigateToNextPage: isNavigateToNextPage,
+            navigateToNextPage: isNavigateToNextPage
         });
     }
     getSelectedCaseReasons() {
@@ -16858,7 +16858,7 @@ class LinkCasesComponent {
     }
     onSelectedLinkedCaseRemove(pos, selectedCaseReference) {
         const caseFieldValue = this.linkedCasesService.caseFieldValue || [];
-        const updatedItems = caseFieldValue.filter(item => item.value && item.value.CaseReference !== selectedCaseReference);
+        const updatedItems = caseFieldValue.filter((item) => item.value && item.value.CaseReference !== selectedCaseReference);
         if (updatedItems) {
             this.linkedCasesService.caseFieldValue = updatedItems;
         }
@@ -16879,7 +16879,7 @@ class LinkCasesComponent {
             this.errorMessages.push({
                 title: 'dummy-case-selection',
                 description: LinkedCasesErrorMessages.CaseSelectionError,
-                fieldId: 'caseReason',
+                fieldId: 'caseReason'
             });
             navigateToNextPage = false;
         }
@@ -17614,7 +17614,7 @@ class UnLinkCasesComponent {
         }
         else {
             this.casesService.getCaseViewV2(this.caseId).subscribe((caseView) => {
-                const linkedCasesTab = caseView.tabs.find(tab => tab.id === UnLinkCasesComponent.LINKED_CASES_TAB_ID);
+                const linkedCasesTab = caseView.tabs.find((tab) => tab.id === UnLinkCasesComponent.LINKED_CASES_TAB_ID);
                 if (linkedCasesTab) {
                     const linkedCases = linkedCasesTab.fields[0].value;
                     this.linkedCases = linkedCases;
@@ -17626,22 +17626,22 @@ class UnLinkCasesComponent {
     }
     getAllLinkedCaseInformation() {
         const searchCasesResponse = [];
-        this.linkedCases.forEach(linkedCase => {
+        this.linkedCases.forEach((linkedCase) => {
             searchCasesResponse.push(this.casesService.getCaseViewV2(linkedCase.caseReference));
         });
         if (searchCasesResponse.length) {
             this.searchCasesByCaseIds(searchCasesResponse).subscribe((searchCases) => {
                 searchCases.forEach((response) => {
-                    const linkedCaseFromList = this.linkedCases.find(linkedCase => linkedCase.caseReference === response.case_id);
+                    const linkedCaseFromList = this.linkedCases.find((linkedCase) => linkedCase.caseReference === response.case_id);
                     if (linkedCaseFromList) {
                         const caseName = this.linkedCasesService.getCaseName(response);
-                        this.linkedCases.find(linkedCase => linkedCase.caseReference === response.case_id).caseName = caseName;
+                        this.linkedCases.find((linkedCase) => linkedCase.caseReference === response.case_id).caseName = caseName;
                     }
                 });
                 this.initForm();
                 this.linkedCasesService.linkedCases = this.linkedCases;
                 this.isServerError = false;
-            }, err => {
+            }, (err) => {
                 this.isServerError = true;
                 this.notifyAPIFailure.emit(true);
             });
@@ -17656,7 +17656,7 @@ class UnLinkCasesComponent {
         });
     }
     get getLinkedCasesFormArray() {
-        const formFieldArray = this.linkedCases.map(val => this.fb.group({
+        const formFieldArray = this.linkedCases.map((val) => this.fb.group({
             caseReference: val.caseReference,
             reasons: val.reasons,
             createdDateTime: val.createdDateTime,
@@ -17670,7 +17670,7 @@ class UnLinkCasesComponent {
     }
     onChange(caseSelected) {
         this.resetErrorMessages();
-        const selectedCase = this.linkedCases.find(linkedCase => linkedCase.caseReference === caseSelected.value);
+        const selectedCase = this.linkedCases.find((linkedCase) => linkedCase.caseReference === caseSelected.value);
         if (selectedCase) {
             selectedCase.unlink = caseSelected.checked ? true : false;
         }
@@ -17678,7 +17678,7 @@ class UnLinkCasesComponent {
     onNext() {
         this.resetErrorMessages();
         let navigateToNextPage = true;
-        const casesMarkedToUnlink = this.linkedCases.find(linkedCase => linkedCase.unlink && linkedCase.unlink === true);
+        const casesMarkedToUnlink = this.linkedCases.find((linkedCase) => linkedCase.unlink && linkedCase.unlink === true);
         if (!casesMarkedToUnlink) {
             this.errorMessages.push({
                 title: 'case-selection',
@@ -17696,7 +17696,7 @@ class UnLinkCasesComponent {
         this.linkedCasesStateEmitter.emit({
             currentLinkedCasesPage: LinkedCasesPages.UNLINK_CASE,
             errorMessages: this.errorMessages,
-            navigateToNextPage: isNavigateToNextPage,
+            navigateToNextPage: isNavigateToNextPage
         });
     }
     resetErrorMessages() {
@@ -18039,14 +18039,16 @@ class WriteLinkedCasesFieldComponent extends AbstractFieldWriteComponent {
         // Get linked case reasons from ref data
         this.linkedCasesService.editMode = false;
         this.subscriptions.add(this.caseEditDataService.caseDetails$.subscribe({
-            next: caseDetails => { this.initialiseCaseDetails(caseDetails); }
+            next: (caseDetails) => {
+                this.initialiseCaseDetails(caseDetails);
+            }
         }));
         this.getOrgService();
         this.subscriptions.add(this.caseEditDataService.caseEventTriggerName$.subscribe({
-            next: name => this.linkedCasesService.isLinkedCasesEventTrigger = (name === LinkedCasesEventTriggers.LINK_CASES)
+            next: (name) => this.linkedCasesService.isLinkedCasesEventTrigger = (name === LinkedCasesEventTriggers.LINK_CASES)
         }));
         this.subscriptions.add(this.caseEditDataService.caseEditForm$.subscribe({
-            next: editForm => this.caseEditForm = editForm
+            next: (editForm) => this.caseEditForm = editForm
         }));
     }
     initialiseCaseDetails(caseDetails) {
@@ -18122,13 +18124,28 @@ class WriteLinkedCasesFieldComponent extends AbstractFieldWriteComponent {
         }
     }
     submitLinkedCases() {
+        let caseFieldValue = [...(this.linkedCasesService.caseFieldValue || [])];
         if (!this.linkedCasesService.isLinkedCasesEventTrigger) {
-            const unlinkedCaseRefereneIds = this.linkedCasesService.linkedCases.filter(item => item.unlink).map(item => item.caseReference);
-            const caseFieldValue = this.linkedCasesService.caseFieldValue;
-            this.linkedCasesService.caseFieldValue = caseFieldValue.filter(item => unlinkedCaseRefereneIds.indexOf(item.id) === -1);
+            const unlinkedCaseReferenceIds = this.linkedCasesService.linkedCases
+                .filter((item) => item.unlink)
+                .map((item) => item.caseReference);
+            caseFieldValue = caseFieldValue.filter((item) => !unlinkedCaseReferenceIds.includes(item.id));
+        }
+        // Replace the caseLinks value in this.formGroup
+        this.formGroup.patchValue({
+            caseLinks: caseFieldValue
+        });
+        // Replace the caseLinks control in caseEditForm.controls.data
+        const dataFormGroup = this.caseEditForm.controls.data;
+        if (dataFormGroup) {
+            // Remove the existing caseLinks control (if it exists)
+            if (dataFormGroup.contains('caseLinks')) {
+                dataFormGroup.removeControl('caseLinks');
+            }
+            // Add the new control with the replacement value
+            dataFormGroup.addControl('caseLinks', new FormControl(caseFieldValue || []));
         }
-        this.formGroup.value.caseLinks = this.linkedCasesService.caseFieldValue;
-        this.caseEditForm.controls['data'] = new FormGroup({ caseLinks: new FormControl(this.linkedCasesService.caseFieldValue || []) });
+        // Set the updated form in the caseEditDataService
         this.caseEditDataService.setCaseEditForm(this.caseEditForm);
     }
     isAtFinalPage() {
@@ -18145,11 +18162,11 @@ class WriteLinkedCasesFieldComponent extends AbstractFieldWriteComponent {
     }
     getLinkedCases() {
         this.casesService.getCaseViewV2(this.linkedCasesService.caseId).subscribe((caseView) => {
-            const caseViewFiltered = caseView.tabs.filter(tab => {
+            const caseViewFiltered = caseView.tabs.filter((tab) => {
                 return tab.fields.some(({ field_type }) => field_type && field_type.collection_field_type && field_type.collection_field_type.id === 'CaseLink');
             });
             if (caseViewFiltered) {
-                const caseLinkFieldValue = caseViewFiltered.map(filtered => filtered.fields?.length > 0 && filtered.fields.filter(field => field.id === 'caseLinks')[0].value);
+                const caseLinkFieldValue = caseViewFiltered.map((filtered) => filtered.fields?.length > 0 && filtered.fields.filter((field) => field.id === 'caseLinks')[0].value);
                 this.linkedCasesService.caseFieldValue = caseLinkFieldValue.length ? caseLinkFieldValue[0] : [];
                 this.linkedCasesService.getAllLinkedCaseInformation();
             }
@@ -18189,7 +18206,7 @@ class WriteLinkedCasesFieldComponent extends AbstractFieldWriteComponent {
         type: Component,
         args: [{ selector: 'ccd-write-linked-cases-field', template: "<div class=\"form-group govuk-!-margin-bottom-2\" [formGroup]=\"formGroup\">\n  <div class=\"govuk-form-group\" [ngSwitch]=\"linkedCasesPage\">\n    <ng-container *ngSwitchCase=\"linkedCasesPages.BEFORE_YOU_START\">\n      <ccd-linked-cases-before-you-start\n        (linkedCasesStateEmitter)=\"onLinkedCasesStateEmitted($event)\"></ccd-linked-cases-before-you-start>\n    </ng-container>\n    <ng-container *ngSwitchCase=\"linkedCasesPages.NO_LINKED_CASES\">\n      <ccd-no-linked-cases\n        (linkedCasesStateEmitter)=\"onLinkedCasesStateEmitted($event)\"></ccd-no-linked-cases>\n    </ng-container>\n    <ng-container *ngSwitchCase=\"linkedCasesPages.LINK_CASE\">\n      <ccd-link-cases\n        (linkedCasesStateEmitter)=\"onLinkedCasesStateEmitted($event)\"></ccd-link-cases>\n    </ng-container>\n    <ng-container *ngSwitchCase=\"linkedCasesPages.UNLINK_CASE\">\n      <ccd-unlink-cases\n        (linkedCasesStateEmitter)=\"onLinkedCasesStateEmitted($event)\"></ccd-unlink-cases>\n    </ng-container>\n    <ng-container *ngSwitchCase=\"linkedCasesPages.CHECK_YOUR_ANSWERS\">\n      <ccd-linked-cases-check-your-answers\n        (linkedCasesStateEmitter)=\"onLinkedCasesStateEmitted($event)\"></ccd-linked-cases-check-your-answers>\n    </ng-container>\n  </div>\n</div>\n" }]
     }], () => [{ type: AbstractAppConfig }, { type: CommonDataService }, { type: CasesService }, { type: LinkedCasesService }, { type: CaseEditDataService }], null); })();
-(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(WriteLinkedCasesFieldComponent, { className: "WriteLinkedCasesFieldComponent", filePath: "lib/shared/components/palette/linked-cases/write-linked-cases-field.component.ts", lineNumber: 19 }); })();
+(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(WriteLinkedCasesFieldComponent, { className: "WriteLinkedCasesFieldComponent", filePath: "lib/shared/components/palette/linked-cases/write-linked-cases-field.component.ts", lineNumber: 18 }); })();
 
 function ReadMoneyGbpFieldComponent_ng_container_0_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementContainerStart(0);
@@ -18609,7 +18626,7 @@ class ReadNumberFieldComponent extends AbstractFieldReadComponent {
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(ReadNumberFieldComponent, { className: "ReadNumberFieldComponent", filePath: "lib/shared/components/palette/number/read-number-field.component.ts", lineNumber: 8 }); })();
 
 const _c0$F = a0 => ({ "form-group-error": a0 });
-const _c1$g = a0 => ({ "govuk-input--error": a0 });
+const _c1$f = a0 => ({ "govuk-input--error": a0 });
 function WriteNumberFieldComponent_span_2_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementStart(0, "span", 6);
     i0.ɵɵtext(1);
@@ -18664,7 +18681,7 @@ class WriteNumberFieldComponent extends AbstractFieldWriteComponent {
             i0.ɵɵadvance();
             i0.ɵɵproperty("ngIf", ctx.numberControl.errors && ctx.numberControl.dirty);
             i0.ɵɵadvance();
-            i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(10, _c1$g, ctx.numberControl.errors && ctx.numberControl.dirty))("id", ctx.id())("formControl", ctx.numberControl);
+            i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(10, _c1$f, ctx.numberControl.errors && ctx.numberControl.dirty))("id", ctx.id())("formControl", ctx.numberControl);
         } }, dependencies: [i5.NgClass, i5.NgIf, i4.DefaultValueAccessor, i4.NumberValueAccessor, i4.NgControlStatus, i4.FormControlDirective, FieldLabelPipe, FirstErrorPipe, i1.RpxTranslatePipe], encapsulation: 2 });
 }
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(WriteNumberFieldComponent, [{
@@ -19292,7 +19309,7 @@ class ReadPhoneUKFieldComponent extends AbstractFieldReadComponent {
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(ReadPhoneUKFieldComponent, { className: "ReadPhoneUKFieldComponent", filePath: "lib/shared/components/palette/phone-uk/read-phone-uk-field.component.ts", lineNumber: 8 }); })();
 
 const _c0$D = a0 => ({ "form-group-error": a0 });
-const _c1$f = a0 => ({ "govuk-input--error": a0 });
+const _c1$e = a0 => ({ "govuk-input--error": a0 });
 function WritePhoneUKFieldComponent_span_2_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementStart(0, "span", 6);
     i0.ɵɵtext(1);
@@ -19347,7 +19364,7 @@ class WritePhoneUKFieldComponent extends AbstractFieldWriteComponent {
             i0.ɵɵadvance();
             i0.ɵɵproperty("ngIf", ctx.phoneUkControl.errors && (ctx.phoneUkControl.dirty || ctx.phoneUkControl.touched));
             i0.ɵɵadvance();
-            i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(10, _c1$f, ctx.phoneUkControl.errors && ctx.phoneUkControl.dirty))("id", ctx.id())("formControl", ctx.phoneUkControl);
+            i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(10, _c1$e, ctx.phoneUkControl.errors && ctx.phoneUkControl.dirty))("id", ctx.id())("formControl", ctx.phoneUkControl);
         } }, dependencies: [i5.NgClass, i5.NgIf, i4.DefaultValueAccessor, i4.NgControlStatus, i4.FormControlDirective, FieldLabelPipe, FirstErrorPipe, i1.RpxTranslatePipe], encapsulation: 2 });
 }
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(WritePhoneUKFieldComponent, [{
@@ -20262,6 +20279,7 @@ class QueryCheckYourAnswersComponent {
     caseViewTrigger;
     caseDetails;
     queryId;
+    tid;
     createEventSubscription;
     searchTasksSubscription;
     queryCreateContextEnum = QueryCreateContext;
@@ -20270,6 +20288,7 @@ class QueryCheckYourAnswersComponent {
     fieldId;
     attachments;
     errorMessages = [];
+    filteredTask = [];
     constructor(route, router, casesService, caseNotifier, workAllocationService, sessionStorageService, qualifyingQuestionService) {
         this.route = route;
         this.router = router;
@@ -20281,6 +20300,7 @@ class QueryCheckYourAnswersComponent {
     }
     ngOnInit() {
         this.queryId = this.route.snapshot.params.qid;
+        this.tid = this.route.snapshot.queryParams?.tid;
         this.caseNotifier.caseView.pipe(take(1)).subscribe((caseDetails) => {
             this.caseDetails = caseDetails;
             // Find the appropriate event trigger based on the queryCreateContext
@@ -20293,6 +20313,23 @@ class QueryCheckYourAnswersComponent {
         // Get the document attachments
         this.getDocumentAttachments();
         this.setCaseQueriesCollectionData();
+        if (this.queryCreateContext === QueryCreateContext.RESPOND) {
+            this.searchTasksSubscription = this.workAllocationService.getTasksByCaseIdAndEventId(this.RESPOND_TO_QUERY_EVENT_TRIGGER_ID, this.caseDetails.case_id, this.caseDetails.case_type.id, this.caseDetails.case_type.jurisdiction.id)
+                .subscribe({
+                next: (response) => {
+                    // Filter task by query id
+                    if (response.tasks?.length > 1) {
+                        this.filteredTask = response.tasks?.find((task) => task.case_id === this.tid);
+                    }
+                    else {
+                        this.filteredTask = response.tasks;
+                    }
+                },
+                error: (error) => {
+                    console.error('Error in searchTasksSubscription:', error);
+                }
+            });
+        }
     }
     ngOnDestroy() {
         this.createEventSubscription?.unsubscribe();
@@ -20302,7 +20339,6 @@ class QueryCheckYourAnswersComponent {
         this.backClicked.emit(true);
     }
     submit() {
-        // Check if fieldId is null or undefined
         if (!this.fieldId) {
             console.error('Error: Field ID is missing. Cannot proceed with submission.');
             this.errorMessages = [
@@ -20315,7 +20351,25 @@ class QueryCheckYourAnswersComponent {
             return;
         }
         const data = this.generateCaseQueriesCollectionData();
-        this.createEventSubscription = this.casesService.createEvent(this.caseDetails, {
+        const createEvent$ = this.createEvent(data);
+        if (this.queryCreateContext === QueryCreateContext.RESPOND) {
+            const completeTask$ = this.workAllocationService.completeTask(this.filteredTask[0].id, this.caseViewTrigger.name);
+            this.createEventSubscription = forkJoin([createEvent$, completeTask$]).subscribe({
+                next: ([createEventResponse, tasksResponse]) => {
+                    this.finaliseSubmission();
+                },
+                error: (error) => this.handleError(error)
+            });
+        }
+        else {
+            this.createEventSubscription = createEvent$.subscribe({
+                next: () => this.finaliseSubmission(),
+                error: (error) => this.handleError(error)
+            });
+        }
+    }
+    createEvent(data) {
+        return this.casesService.createEvent(this.caseDetails, {
             data,
             event: {
                 id: this.caseViewTrigger?.id,
@@ -20324,34 +20378,16 @@ class QueryCheckYourAnswersComponent {
             },
             event_token: this.eventData?.event_token,
             ignore_warning: false
-        }).subscribe(() => {
-            // Search and complete task
-            this.searchAndCompleteTask();
-            // Emit query submitted event
-            this.querySubmitted.emit(true);
-            this.qualifyingQuestionService.clearQualifyingQuestionSelection();
-        }, 
-        // Error
-        () => this.router.navigate(['/', 'service-down']));
-    }
-    searchAndCompleteTask() {
-        // Search Task
-        const searchParameter = { ccdId: this.caseDetails.case_id };
-        this.searchTasksSubscription = this.workAllocationService.searchTasks(searchParameter)
-            .subscribe((response) => {
-            // Filter task by query id
-            const filteredTask = response.tasks?.find((task) => Object.values(task.additional_properties).some((value) => value === this.queryId));
-            // Trigger event completion
-            this.eventCompletionParams = {
-                caseId: this.caseDetails.case_id,
-                eventId: this.RESPOND_TO_QUERY_EVENT_TRIGGER_ID,
-                task: filteredTask
-            };
-        }, (error) => {
-            console.error('Error in searchTasksSubscription:', error);
-            // Handle error appropriately
         });
     }
+    finaliseSubmission() {
+        this.querySubmitted.emit(true);
+        this.qualifyingQuestionService.clearQualifyingQuestionSelection();
+    }
+    handleError(error) {
+        console.error('Error in API calls:', error);
+        this.router.navigate(['/', 'service-down']);
+    }
     generateCaseQueriesCollectionData() {
         const currentUserDetails = JSON.parse(this.sessionStorageService.getItem('userDetails'));
         const caseMessage = this.queryCreateContext === QueryCreateContext.NEW_QUERY
@@ -20560,10 +20596,32 @@ class QueryCheckYourAnswersComponent {
         }], querySubmitted: [{
             type: Output
         }] }); })();
-(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(QueryCheckYourAnswersComponent, { className: "QueryCheckYourAnswersComponent", filePath: "lib/shared/components/palette/query-management/components/query-check-your-answers/query-check-your-answers.component.ts", lineNumber: 27 }); })();
+(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(QueryCheckYourAnswersComponent, { className: "QueryCheckYourAnswersComponent", filePath: "lib/shared/components/palette/query-management/components/query-check-your-answers/query-check-your-answers.component.ts", lineNumber: 26 }); })();
 
-function QueryDetailsComponent_ng_container_0_tr_46_Template(rf, ctx) { if (rf & 1) {
-    i0.ɵɵelementStart(0, "tr", 11)(1, "th", 7);
+function QueryDetailsComponent_ng_container_0_cut_alert_1_Template(rf, ctx) { if (rf & 1) {
+    i0.ɵɵelementStart(0, "cut-alert", 11);
+    i0.ɵɵelementContainerStart(1);
+    i0.ɵɵtext(2);
+    i0.ɵɵelementContainerEnd();
+    i0.ɵɵelementEnd();
+} if (rf & 2) {
+    const ctx_r0 = i0.ɵɵnextContext(2);
+    i0.ɵɵadvance(2);
+    i0.ɵɵtextInterpolate(ctx_r0.message);
+} }
+function QueryDetailsComponent_ng_container_0_p_3_Template(rf, ctx) { if (rf & 1) {
+    const _r2 = i0.ɵɵgetCurrentView();
+    i0.ɵɵelementStart(0, "p")(1, "a", 12);
+    i0.ɵɵlistener("click", function QueryDetailsComponent_ng_container_0_p_3_Template_a_click_1_listener() { i0.ɵɵrestoreView(_r2); const ctx_r0 = i0.ɵɵnextContext(2); return i0.ɵɵresetView(ctx_r0.onBack()); });
+    i0.ɵɵtext(2);
+    i0.ɵɵpipe(3, "rpxTranslate");
+    i0.ɵɵelementEnd()();
+} if (rf & 2) {
+    i0.ɵɵadvance(2);
+    i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(3, 1, "Back to query list"));
+} }
+function QueryDetailsComponent_ng_container_0_tr_44_Template(rf, ctx) { if (rf & 1) {
+    i0.ɵɵelementStart(0, "tr", 13)(1, "th", 7);
     i0.ɵɵtext(2);
     i0.ɵɵpipe(3, "rpxTranslate");
     i0.ɵɵelementEnd();
@@ -20572,34 +20630,34 @@ function QueryDetailsComponent_ng_container_0_tr_46_Template(rf, ctx) { if (rf &
     i0.ɵɵpipe(6, "date");
     i0.ɵɵelementEnd()();
 } if (rf & 2) {
-    const ctx_r1 = i0.ɵɵnextContext(2);
+    const ctx_r0 = i0.ɵɵnextContext(2);
     i0.ɵɵadvance(2);
     i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(3, 2, "What is the date of the hearing?"));
     i0.ɵɵadvance(3);
-    i0.ɵɵtextInterpolate(i0.ɵɵpipeBind2(6, 4, ctx_r1.query.hearingDate, "dd MMM yyyy"));
+    i0.ɵɵtextInterpolate(i0.ɵɵpipeBind2(6, 4, ctx_r0.query.hearingDate, "dd MMM yyyy"));
 } }
-function QueryDetailsComponent_ng_container_0_tr_47_ccd_query_attachments_read_5_Template(rf, ctx) { if (rf & 1) {
-    i0.ɵɵelement(0, "ccd-query-attachments-read", 13);
+function QueryDetailsComponent_ng_container_0_tr_45_ccd_query_attachments_read_5_Template(rf, ctx) { if (rf & 1) {
+    i0.ɵɵelement(0, "ccd-query-attachments-read", 15);
 } if (rf & 2) {
-    const ctx_r1 = i0.ɵɵnextContext(3);
-    i0.ɵɵproperty("attachments", ctx_r1.query.attachments);
+    const ctx_r0 = i0.ɵɵnextContext(3);
+    i0.ɵɵproperty("attachments", ctx_r0.query.attachments);
 } }
-function QueryDetailsComponent_ng_container_0_tr_47_Template(rf, ctx) { if (rf & 1) {
+function QueryDetailsComponent_ng_container_0_tr_45_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementStart(0, "tr", 6)(1, "th", 7);
     i0.ɵɵtext(2);
     i0.ɵɵpipe(3, "rpxTranslate");
     i0.ɵɵelementEnd();
     i0.ɵɵelementStart(4, "td", 8);
-    i0.ɵɵtemplate(5, QueryDetailsComponent_ng_container_0_tr_47_ccd_query_attachments_read_5_Template, 1, 1, "ccd-query-attachments-read", 12);
+    i0.ɵɵtemplate(5, QueryDetailsComponent_ng_container_0_tr_45_ccd_query_attachments_read_5_Template, 1, 1, "ccd-query-attachments-read", 14);
     i0.ɵɵelementEnd()();
 } if (rf & 2) {
-    const ctx_r1 = i0.ɵɵnextContext(2);
+    const ctx_r0 = i0.ɵɵnextContext(2);
     i0.ɵɵadvance(2);
     i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(3, 2, "Attachments"));
     i0.ɵɵadvance(3);
-    i0.ɵɵproperty("ngIf", ctx_r1.query.attachments);
+    i0.ɵɵproperty("ngIf", ctx_r0.query.attachments);
 } }
-function QueryDetailsComponent_ng_container_0_ng_container_48_ng_container_1_ng_container_1_tr_15_Template(rf, ctx) { if (rf & 1) {
+function QueryDetailsComponent_ng_container_0_ng_container_46_ng_container_1_ng_container_1_tr_15_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementStart(0, "tr", 6)(1, "th", 7);
     i0.ɵɵtext(2);
     i0.ɵɵpipe(3, "rpxTranslate");
@@ -20614,19 +20672,19 @@ function QueryDetailsComponent_ng_container_0_ng_container_48_ng_container_1_ng_
     i0.ɵɵadvance(3);
     i0.ɵɵtextInterpolate(child_r3.name);
 } }
-function QueryDetailsComponent_ng_container_0_ng_container_48_ng_container_1_ng_container_1_tr_22_ccd_query_attachments_read_5_Template(rf, ctx) { if (rf & 1) {
-    i0.ɵɵelement(0, "ccd-query-attachments-read", 13);
+function QueryDetailsComponent_ng_container_0_ng_container_46_ng_container_1_ng_container_1_tr_22_ccd_query_attachments_read_5_Template(rf, ctx) { if (rf & 1) {
+    i0.ɵɵelement(0, "ccd-query-attachments-read", 15);
 } if (rf & 2) {
     const child_r3 = i0.ɵɵnextContext(3).$implicit;
     i0.ɵɵproperty("attachments", child_r3.attachments);
 } }
-function QueryDetailsComponent_ng_container_0_ng_container_48_ng_container_1_ng_container_1_tr_22_Template(rf, ctx) { if (rf & 1) {
+function QueryDetailsComponent_ng_container_0_ng_container_46_ng_container_1_ng_container_1_tr_22_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementStart(0, "tr", 6)(1, "th", 7);
     i0.ɵɵtext(2);
     i0.ɵɵpipe(3, "rpxTranslate");
     i0.ɵɵelementEnd();
     i0.ɵɵelementStart(4, "td", 8);
-    i0.ɵɵtemplate(5, QueryDetailsComponent_ng_container_0_ng_container_48_ng_container_1_ng_container_1_tr_22_ccd_query_attachments_read_5_Template, 1, 1, "ccd-query-attachments-read", 12);
+    i0.ɵɵtemplate(5, QueryDetailsComponent_ng_container_0_ng_container_46_ng_container_1_ng_container_1_tr_22_ccd_query_attachments_read_5_Template, 1, 1, "ccd-query-attachments-read", 14);
     i0.ɵɵelementEnd()();
 } if (rf & 2) {
     const child_r3 = i0.ɵɵnextContext(2).$implicit;
@@ -20635,7 +20693,7 @@ function QueryDetailsComponent_ng_container_0_ng_container_48_ng_container_1_ng_
     i0.ɵɵadvance(3);
     i0.ɵɵproperty("ngIf", child_r3.attachments);
 } }
-function QueryDetailsComponent_ng_container_0_ng_container_48_ng_container_1_ng_container_1_Template(rf, ctx) { if (rf & 1) {
+function QueryDetailsComponent_ng_container_0_ng_container_46_ng_container_1_ng_container_1_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementContainerStart(0);
     i0.ɵɵelementStart(1, "table", 3);
     i0.ɵɵpipe(2, "rpxTranslate");
@@ -20651,7 +20709,7 @@ function QueryDetailsComponent_ng_container_0_ng_container_48_ng_container_1_ng_
     i0.ɵɵtext(13);
     i0.ɵɵpipe(14, "date");
     i0.ɵɵelementEnd()();
-    i0.ɵɵtemplate(15, QueryDetailsComponent_ng_container_0_ng_container_48_ng_container_1_ng_container_1_tr_15_Template, 6, 4, "tr", 10);
+    i0.ɵɵtemplate(15, QueryDetailsComponent_ng_container_0_ng_container_46_ng_container_1_ng_container_1_tr_15_Template, 6, 4, "tr", 10);
     i0.ɵɵelementStart(16, "tr", 6)(17, "th", 7);
     i0.ɵɵtext(18);
     i0.ɵɵpipe(19, "rpxTranslate");
@@ -20659,12 +20717,12 @@ function QueryDetailsComponent_ng_container_0_ng_container_48_ng_container_1_ng_
     i0.ɵɵelementStart(20, "td", 8);
     i0.ɵɵtext(21);
     i0.ɵɵelementEnd()();
-    i0.ɵɵtemplate(22, QueryDetailsComponent_ng_container_0_ng_container_48_ng_container_1_ng_container_1_tr_22_Template, 6, 4, "tr", 10);
+    i0.ɵɵtemplate(22, QueryDetailsComponent_ng_container_0_ng_container_46_ng_container_1_ng_container_1_tr_22_Template, 6, 4, "tr", 10);
     i0.ɵɵelementEnd()();
     i0.ɵɵelementContainerEnd();
 } if (rf & 2) {
     const child_r3 = i0.ɵɵnextContext().$implicit;
-    const ctx_r1 = i0.ɵɵnextContext(3);
+    const ctx_r0 = i0.ɵɵnextContext(3);
     i0.ɵɵadvance();
     i0.ɵɵattribute("aria-describedby", i0.ɵɵpipeBind1(2, 8, "Response of the query"));
     i0.ɵɵadvance(4);
@@ -20674,7 +20732,7 @@ function QueryDetailsComponent_ng_container_0_ng_container_48_ng_container_1_ng_
     i0.ɵɵadvance(3);
     i0.ɵɵtextInterpolate(i0.ɵɵpipeBind2(14, 14, child_r3.createdOn, "dd MMM yyyy"));
     i0.ɵɵadvance(2);
-    i0.ɵɵproperty("ngIf", ctx_r1.isCaseworker());
+    i0.ɵɵproperty("ngIf", ctx_r0.isCaseworker());
     i0.ɵɵadvance(3);
     i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(19, 17, "Response detail"));
     i0.ɵɵadvance(3);
@@ -20682,19 +20740,19 @@ function QueryDetailsComponent_ng_container_0_ng_container_48_ng_container_1_ng_
     i0.ɵɵadvance();
     i0.ɵɵproperty("ngIf", child_r3.attachments.length > 0);
 } }
-function QueryDetailsComponent_ng_container_0_ng_container_48_ng_container_1_ng_template_2_tr_26_ccd_query_attachments_read_5_Template(rf, ctx) { if (rf & 1) {
-    i0.ɵɵelement(0, "ccd-query-attachments-read", 13);
+function QueryDetailsComponent_ng_container_0_ng_container_46_ng_container_1_ng_template_2_tr_26_ccd_query_attachments_read_5_Template(rf, ctx) { if (rf & 1) {
+    i0.ɵɵelement(0, "ccd-query-attachments-read", 15);
 } if (rf & 2) {
     const child_r3 = i0.ɵɵnextContext(3).$implicit;
     i0.ɵɵproperty("attachments", child_r3.attachments);
 } }
-function QueryDetailsComponent_ng_container_0_ng_container_48_ng_container_1_ng_template_2_tr_26_Template(rf, ctx) { if (rf & 1) {
+function QueryDetailsComponent_ng_container_0_ng_container_46_ng_container_1_ng_template_2_tr_26_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementStart(0, "tr", 6)(1, "th", 7);
     i0.ɵɵtext(2);
     i0.ɵɵpipe(3, "rpxTranslate");
     i0.ɵɵelementEnd();
     i0.ɵɵelementStart(4, "td", 8);
-    i0.ɵɵtemplate(5, QueryDetailsComponent_ng_container_0_ng_container_48_ng_container_1_ng_template_2_tr_26_ccd_query_attachments_read_5_Template, 1, 1, "ccd-query-attachments-read", 12);
+    i0.ɵɵtemplate(5, QueryDetailsComponent_ng_container_0_ng_container_46_ng_container_1_ng_template_2_tr_26_ccd_query_attachments_read_5_Template, 1, 1, "ccd-query-attachments-read", 14);
     i0.ɵɵelementEnd()();
 } if (rf & 2) {
     const child_r3 = i0.ɵɵnextContext(2).$implicit;
@@ -20703,7 +20761,7 @@ function QueryDetailsComponent_ng_container_0_ng_container_48_ng_container_1_ng_
     i0.ɵɵadvance(3);
     i0.ɵɵproperty("ngIf", child_r3.attachments);
 } }
-function QueryDetailsComponent_ng_container_0_ng_container_48_ng_container_1_ng_template_2_Template(rf, ctx) { if (rf & 1) {
+function QueryDetailsComponent_ng_container_0_ng_container_46_ng_container_1_ng_template_2_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementStart(0, "table", 3);
     i0.ɵɵpipe(1, "rpxTranslate");
     i0.ɵɵelementStart(2, "caption", 4)(3, "div");
@@ -20732,7 +20790,7 @@ function QueryDetailsComponent_ng_container_0_ng_container_48_ng_container_1_ng_
     i0.ɵɵelementStart(24, "td", 8);
     i0.ɵɵtext(25);
     i0.ɵɵelementEnd()();
-    i0.ɵɵtemplate(26, QueryDetailsComponent_ng_container_0_ng_container_48_ng_container_1_ng_template_2_tr_26_Template, 6, 4, "tr", 10);
+    i0.ɵɵtemplate(26, QueryDetailsComponent_ng_container_0_ng_container_46_ng_container_1_ng_template_2_tr_26_Template, 6, 4, "tr", 10);
     i0.ɵɵelementEnd()();
 } if (rf & 2) {
     const child_r3 = i0.ɵɵnextContext().$implicit;
@@ -20754,9 +20812,9 @@ function QueryDetailsComponent_ng_container_0_ng_container_48_ng_container_1_ng_
     i0.ɵɵadvance();
     i0.ɵɵproperty("ngIf", child_r3.attachments.length > 0);
 } }
-function QueryDetailsComponent_ng_container_0_ng_container_48_ng_container_1_Template(rf, ctx) { if (rf & 1) {
+function QueryDetailsComponent_ng_container_0_ng_container_46_ng_container_1_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementContainerStart(0);
-    i0.ɵɵtemplate(1, QueryDetailsComponent_ng_container_0_ng_container_48_ng_container_1_ng_container_1_Template, 23, 19, "ng-container", 15)(2, QueryDetailsComponent_ng_container_0_ng_container_48_ng_container_1_ng_template_2_Template, 27, 22, "ng-template", null, 0, i0.ɵɵtemplateRefExtractor);
+    i0.ɵɵtemplate(1, QueryDetailsComponent_ng_container_0_ng_container_46_ng_container_1_ng_container_1_Template, 23, 19, "ng-container", 17)(2, QueryDetailsComponent_ng_container_0_ng_container_46_ng_container_1_ng_template_2_Template, 27, 22, "ng-template", null, 0, i0.ɵɵtemplateRefExtractor);
     i0.ɵɵelementContainerEnd();
 } if (rf & 2) {
     const i_r4 = ctx.index;
@@ -20764,117 +20822,125 @@ function QueryDetailsComponent_ng_container_0_ng_container_48_ng_container_1_Tem
     i0.ɵɵadvance();
     i0.ɵɵproperty("ngIf", i_r4 % 2 === 0)("ngIfElse", followUpMessage_r5);
 } }
-function QueryDetailsComponent_ng_container_0_ng_container_48_Template(rf, ctx) { if (rf & 1) {
+function QueryDetailsComponent_ng_container_0_ng_container_46_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementContainerStart(0);
-    i0.ɵɵtemplate(1, QueryDetailsComponent_ng_container_0_ng_container_48_ng_container_1_Template, 4, 2, "ng-container", 14);
+    i0.ɵɵtemplate(1, QueryDetailsComponent_ng_container_0_ng_container_46_ng_container_1_Template, 4, 2, "ng-container", 16);
     i0.ɵɵelementContainerEnd();
 } if (rf & 2) {
-    const ctx_r1 = i0.ɵɵnextContext(2);
+    const ctx_r0 = i0.ɵɵnextContext(2);
     i0.ɵɵadvance();
-    i0.ɵɵproperty("ngForOf", ctx_r1.query.children);
+    i0.ɵɵproperty("ngForOf", ctx_r0.query.children);
 } }
 function QueryDetailsComponent_ng_container_0_Template(rf, ctx) { if (rf & 1) {
-    const _r1 = i0.ɵɵgetCurrentView();
     i0.ɵɵelementContainerStart(0);
-    i0.ɵɵelement(1, "br");
-    i0.ɵɵelementStart(2, "p")(3, "a", 2);
-    i0.ɵɵlistener("click", function QueryDetailsComponent_ng_container_0_Template_a_click_3_listener() { i0.ɵɵrestoreView(_r1); const ctx_r1 = i0.ɵɵnextContext(); return i0.ɵɵresetView(ctx_r1.onBack()); });
-    i0.ɵɵtext(4);
-    i0.ɵɵpipe(5, "rpxTranslate");
-    i0.ɵɵelementEnd()();
-    i0.ɵɵelementStart(6, "div")(7, "table", 3);
-    i0.ɵɵpipe(8, "rpxTranslate");
-    i0.ɵɵelementStart(9, "caption", 4)(10, "div");
-    i0.ɵɵtext(11);
-    i0.ɵɵpipe(12, "rpxTranslate");
+    i0.ɵɵtemplate(1, QueryDetailsComponent_ng_container_0_cut_alert_1_Template, 3, 1, "cut-alert", 2);
+    i0.ɵɵelement(2, "br");
+    i0.ɵɵtemplate(3, QueryDetailsComponent_ng_container_0_p_3_Template, 4, 3, "p", 1);
+    i0.ɵɵelementStart(4, "div")(5, "table", 3);
+    i0.ɵɵpipe(6, "rpxTranslate");
+    i0.ɵɵelementStart(7, "caption", 4)(8, "div");
+    i0.ɵɵtext(9);
+    i0.ɵɵpipe(10, "rpxTranslate");
     i0.ɵɵelementEnd()();
-    i0.ɵɵelementStart(13, "tbody", 5)(14, "tr", 6)(15, "th", 7);
-    i0.ɵɵtext(16);
-    i0.ɵɵpipe(17, "rpxTranslate");
+    i0.ɵɵelementStart(11, "tbody", 5)(12, "tr", 6)(13, "th", 7);
+    i0.ɵɵtext(14);
+    i0.ɵɵpipe(15, "rpxTranslate");
     i0.ɵɵelementEnd();
-    i0.ɵɵelementStart(18, "td", 8);
-    i0.ɵɵtext(19);
+    i0.ɵɵelementStart(16, "td", 8);
+    i0.ɵɵtext(17);
     i0.ɵɵelementEnd()();
-    i0.ɵɵelementStart(20, "tr", 6)(21, "th", 7);
-    i0.ɵɵtext(22);
-    i0.ɵɵpipe(23, "rpxTranslate");
+    i0.ɵɵelementStart(18, "tr", 6)(19, "th", 7);
+    i0.ɵɵtext(20);
+    i0.ɵɵpipe(21, "rpxTranslate");
     i0.ɵɵelementEnd();
-    i0.ɵɵelementStart(24, "td", 8);
-    i0.ɵɵtext(25);
-    i0.ɵɵpipe(26, "date");
+    i0.ɵɵelementStart(22, "td", 8);
+    i0.ɵɵtext(23);
+    i0.ɵɵpipe(24, "date");
     i0.ɵɵelementEnd()();
-    i0.ɵɵelementStart(27, "tr", 6)(28, "th", 7);
-    i0.ɵɵtext(29);
-    i0.ɵɵpipe(30, "rpxTranslate");
+    i0.ɵɵelementStart(25, "tr", 6)(26, "th", 7);
+    i0.ɵɵtext(27);
+    i0.ɵɵpipe(28, "rpxTranslate");
     i0.ɵɵelementEnd();
-    i0.ɵɵelementStart(31, "td", 8);
-    i0.ɵɵtext(32);
+    i0.ɵɵelementStart(29, "td", 8);
+    i0.ɵɵtext(30);
     i0.ɵɵelementEnd()();
-    i0.ɵɵelementStart(33, "tr", 6)(34, "th", 7);
-    i0.ɵɵtext(35);
-    i0.ɵɵpipe(36, "rpxTranslate");
+    i0.ɵɵelementStart(31, "tr", 6)(32, "th", 7);
+    i0.ɵɵtext(33);
+    i0.ɵɵpipe(34, "rpxTranslate");
     i0.ɵɵelementEnd();
-    i0.ɵɵelementStart(37, "td", 8);
-    i0.ɵɵtext(38);
+    i0.ɵɵelementStart(35, "td", 8);
+    i0.ɵɵtext(36);
     i0.ɵɵelementEnd()();
-    i0.ɵɵelementStart(39, "tr", 6)(40, "th", 7);
-    i0.ɵɵtext(41);
-    i0.ɵɵpipe(42, "rpxTranslate");
+    i0.ɵɵelementStart(37, "tr", 6)(38, "th", 7);
+    i0.ɵɵtext(39);
+    i0.ɵɵpipe(40, "rpxTranslate");
     i0.ɵɵelementEnd();
-    i0.ɵɵelementStart(43, "td", 8);
-    i0.ɵɵtext(44);
-    i0.ɵɵpipe(45, "rpxTranslate");
+    i0.ɵɵelementStart(41, "td", 8);
+    i0.ɵɵtext(42);
+    i0.ɵɵpipe(43, "rpxTranslate");
     i0.ɵɵelementEnd()();
-    i0.ɵɵtemplate(46, QueryDetailsComponent_ng_container_0_tr_46_Template, 7, 7, "tr", 9)(47, QueryDetailsComponent_ng_container_0_tr_47_Template, 6, 4, "tr", 10);
+    i0.ɵɵtemplate(44, QueryDetailsComponent_ng_container_0_tr_44_Template, 7, 7, "tr", 9)(45, QueryDetailsComponent_ng_container_0_tr_45_Template, 6, 4, "tr", 10);
     i0.ɵɵelementEnd()()();
-    i0.ɵɵtemplate(48, QueryDetailsComponent_ng_container_0_ng_container_48_Template, 2, 1, "ng-container", 1);
+    i0.ɵɵtemplate(46, QueryDetailsComponent_ng_container_0_ng_container_46_Template, 2, 1, "ng-container", 1);
     i0.ɵɵelementContainerEnd();
 } if (rf & 2) {
-    const ctx_r1 = i0.ɵɵnextContext();
-    i0.ɵɵadvance(4);
-    i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(5, 20, "Back to query list"));
-    i0.ɵɵadvance(3);
-    i0.ɵɵattribute("aria-describedby", i0.ɵɵpipeBind1(8, 22, "Details of the query"));
+    const ctx_r0 = i0.ɵɵnextContext();
+    i0.ɵɵadvance();
+    i0.ɵɵproperty("ngIf", ctx_r0.hasRespondedToQuery());
+    i0.ɵɵadvance(2);
+    i0.ɵɵproperty("ngIf", ctx_r0.showLink);
+    i0.ɵɵadvance(2);
+    i0.ɵɵattribute("aria-describedby", i0.ɵɵpipeBind1(6, 21, "Details of the query"));
     i0.ɵɵadvance(4);
-    i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(12, 24, "Query details"));
+    i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(10, 23, "Query details"));
     i0.ɵɵadvance(5);
-    i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(17, 26, "Last submitted by"));
+    i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(15, 25, "Last submitted by"));
     i0.ɵɵadvance(3);
-    i0.ɵɵtextInterpolate(ctx_r1.query.lastSubmittedBy);
+    i0.ɵɵtextInterpolate(ctx_r0.query.lastSubmittedBy);
     i0.ɵɵadvance(3);
-    i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(23, 28, "Submission date"));
+    i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(21, 27, "Submission date"));
     i0.ɵɵadvance(3);
-    i0.ɵɵtextInterpolate(i0.ɵɵpipeBind2(26, 30, ctx_r1.query.createdOn, "dd MMM yyyy"));
+    i0.ɵɵtextInterpolate(i0.ɵɵpipeBind2(24, 29, ctx_r0.query.createdOn, "dd MMM yyyy"));
     i0.ɵɵadvance(4);
-    i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(30, 33, "Query subject"));
+    i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(28, 32, "Query subject"));
     i0.ɵɵadvance(3);
-    i0.ɵɵtextInterpolate(ctx_r1.query.subject);
+    i0.ɵɵtextInterpolate(ctx_r0.query.subject);
     i0.ɵɵadvance(3);
-    i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(36, 35, "Query body"));
+    i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(34, 34, "Query body"));
     i0.ɵɵadvance(3);
-    i0.ɵɵtextInterpolate(ctx_r1.query.body);
+    i0.ɵɵtextInterpolate(ctx_r0.query.body);
     i0.ɵɵadvance(2);
-    i0.ɵɵclassProp("govuk-table__header--no-border", ctx_r1.query.isHearingRelated);
+    i0.ɵɵclassProp("govuk-table__header--no-border", ctx_r0.query.isHearingRelated);
     i0.ɵɵadvance();
-    i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(42, 37, "Is the query hearing related?"), " ");
+    i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(40, 36, "Is the query hearing related?"), " ");
     i0.ɵɵadvance(2);
-    i0.ɵɵclassProp("govuk-table__cell--no-border", ctx_r1.query.isHearingRelated);
+    i0.ɵɵclassProp("govuk-table__cell--no-border", ctx_r0.query.isHearingRelated);
     i0.ɵɵadvance();
-    i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind3(45, 39, "Is the query hearing related?", null, ctx_r1.query.isHearingRelated), "");
+    i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind3(43, 38, "Is the query hearing related?", null, ctx_r0.query.isHearingRelated), "");
     i0.ɵɵadvance(2);
-    i0.ɵɵproperty("ngIf", ctx_r1.query.isHearingRelated === "Yes");
+    i0.ɵɵproperty("ngIf", ctx_r0.query.isHearingRelated === "Yes");
     i0.ɵɵadvance();
-    i0.ɵɵproperty("ngIf", ctx_r1.query.attachments.length > 0);
+    i0.ɵɵproperty("ngIf", ctx_r0.query.attachments.length > 0);
     i0.ɵɵadvance();
-    i0.ɵɵproperty("ngIf", (ctx_r1.query.children == null ? null : ctx_r1.query.children.length) > 0);
+    i0.ɵɵproperty("ngIf", (ctx_r0.query.children == null ? null : ctx_r0.query.children.length) > 0);
 } }
 class QueryDetailsComponent {
     sessionStorageService;
+    route;
+    router;
     query;
     backClicked = new EventEmitter();
     caseId;
-    constructor(sessionStorageService) {
+    hasResponded = new EventEmitter();
+    totalNumberOfQueryChildren;
+    showLink = true;
+    static QUERY_ITEM_RESPOND = '3';
+    queryItemId;
+    message;
+    constructor(sessionStorageService, route, router) {
         this.sessionStorageService = sessionStorageService;
+        this.route = route;
+        this.router = router;
     }
     onBack() {
         this.backClicked.emit(true);
@@ -20885,24 +20951,45 @@ class QueryDetailsComponent {
             && !(userDetails.roles.includes('pui-case-manager')
                 || userDetails.roles.some((role) => role.toLowerCase().includes('judge')));
     }
-    static ɵfac = function QueryDetailsComponent_Factory(t) { return new (t || QueryDetailsComponent)(i0.ɵɵdirectiveInject(SessionStorageService)); };
-    static ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: QueryDetailsComponent, selectors: [["ccd-query-details"]], inputs: { query: "query", caseId: "caseId" }, outputs: { backClicked: "backClicked" }, decls: 1, vars: 1, consts: [["followUpMessage", ""], [4, "ngIf"], ["href", "javascript:void(0)", 1, "govuk-link", 3, "click"], [1, "govuk-table", "query-details-table"], [1, "govuk-table__caption", "govuk-table__caption--l"], [1, "govuk-table__body"], [1, "govuk-table__row"], ["scope", "row", 1, "govuk-table__header"], [1, "govuk-table__cell"], ["class", "govuk-table__row govuk-table__row--isHearingRelated", 4, "ngIf"], ["class", "govuk-table__row", 4, "ngIf"], [1, "govuk-table__row", "govuk-table__row--isHearingRelated"], [3, "attachments", 4, "ngIf"], [3, "attachments"], [4, "ngFor", "ngForOf"], [4, "ngIf", "ngIfElse"]], template: function QueryDetailsComponent_Template(rf, ctx) { if (rf & 1) {
-            i0.ɵɵtemplate(0, QueryDetailsComponent_ng_container_0_Template, 49, 43, "ng-container", 1);
+    ngOnChanges() {
+        this.toggleLinkVisibility();
+        this.hasRespondedToQuery();
+    }
+    toggleLinkVisibility() {
+        this.queryItemId = this.route.snapshot.params.qid;
+        this.showLink = this.queryItemId !== QueryDetailsComponent.QUERY_ITEM_RESPOND;
+    }
+    hasRespondedToQuery() {
+        if (this.totalNumberOfQueryChildren >= 0 && this.isCaseworker() && this.totalNumberOfQueryChildren % 2 !== 0) {
+            this.message = Constants.TASK_COMPLETION_ERROR;
+            this.hasResponded.emit(true);
+            return true;
+        }
+        this.hasResponded.emit(false);
+        return false;
+    }
+    static ɵfac = function QueryDetailsComponent_Factory(t) { return new (t || QueryDetailsComponent)(i0.ɵɵdirectiveInject(SessionStorageService), i0.ɵɵdirectiveInject(i1$1.ActivatedRoute), i0.ɵɵdirectiveInject(i1$1.Router)); };
+    static ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: QueryDetailsComponent, selectors: [["ccd-query-details"]], inputs: { query: "query", caseId: "caseId", totalNumberOfQueryChildren: "totalNumberOfQueryChildren" }, outputs: { backClicked: "backClicked", hasResponded: "hasResponded" }, features: [i0.ɵɵNgOnChangesFeature], decls: 1, vars: 1, consts: [["followUpMessage", ""], [4, "ngIf"], ["type", "error", 4, "ngIf"], [1, "govuk-table", "query-details-table"], [1, "govuk-table__caption", "govuk-table__caption--l"], [1, "govuk-table__body"], [1, "govuk-table__row"], ["scope", "row", 1, "govuk-table__header"], [1, "govuk-table__cell"], ["class", "govuk-table__row govuk-table__row--isHearingRelated", 4, "ngIf"], ["class", "govuk-table__row", 4, "ngIf"], ["type", "error"], ["href", "javascript:void(0)", 1, "govuk-link", 3, "click"], [1, "govuk-table__row", "govuk-table__row--isHearingRelated"], [3, "attachments", 4, "ngIf"], [3, "attachments"], [4, "ngFor", "ngForOf"], [4, "ngIf", "ngIfElse"]], template: function QueryDetailsComponent_Template(rf, ctx) { if (rf & 1) {
+            i0.ɵɵtemplate(0, QueryDetailsComponent_ng_container_0_Template, 47, 42, "ng-container", 1);
         } if (rf & 2) {
             i0.ɵɵproperty("ngIf", ctx.query);
         } }, styles: [".query-details-table[_ngcontent-%COMP%]   .govuk-table__header[_ngcontent-%COMP%]{width:330px}"] });
 }
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(QueryDetailsComponent, [{
         type: Component,
-        args: [{ selector: 'ccd-query-details', template: "<ng-container *ngIf=\"query\">\n  <br/>\n  <p>\n    <a class=\"govuk-link\" href=\"javascript:void(0)\" (click)=\"onBack()\">{{ 'Back to query list' | rpxTranslate }}</a>\n  </p>\n  <div>\n    <table class=\"govuk-table query-details-table\" [attr.aria-describedby]=\"'Details of the query' | rpxTranslate\">\n      <caption class=\"govuk-table__caption govuk-table__caption--l\">\n        <div>{{ 'Query details' | rpxTranslate }}</div>\n      </caption>\n      <tbody class=\"govuk-table__body\">\n      <tr class=\"govuk-table__row\">\n        <th scope=\"row\" class=\"govuk-table__header\">{{ 'Last submitted by' | rpxTranslate }}</th>\n        <td class=\"govuk-table__cell\">{{ query.lastSubmittedBy }}</td>\n      </tr>\n      <tr class=\"govuk-table__row\">\n        <th scope=\"row\" class=\"govuk-table__header\">{{ 'Submission date' | rpxTranslate }}</th>\n        <td class=\"govuk-table__cell\">{{ query.createdOn | date: 'dd MMM yyyy' }}</td>\n      </tr>\n      <tr class=\"govuk-table__row\">\n        <th scope=\"row\" class=\"govuk-table__header\">{{ 'Query subject' | rpxTranslate }}</th>\n        <td class=\"govuk-table__cell\">{{ query.subject }}</td>\n      </tr>\n      <tr class=\"govuk-table__row\">\n        <th scope=\"row\" class=\"govuk-table__header\">{{ 'Query body' | rpxTranslate }}</th>\n        <td class=\"govuk-table__cell\">{{ query.body }}</td>\n      </tr>\n      <tr class=\"govuk-table__row\">\n        <th scope=\"row\" class=\"govuk-table__header\" [class.govuk-table__header--no-border]=\"query.isHearingRelated\">\n          {{ 'Is the query hearing related?' | rpxTranslate }}\n        </th>\n        <td class=\"govuk-table__cell\" [class.govuk-table__cell--no-border]=\"query.isHearingRelated\">\n          {{ 'Is the query hearing related?' | rpxTranslate: null : (query.isHearingRelated) }}</td>\n      </tr>\n      <tr class=\"govuk-table__row govuk-table__row--isHearingRelated\" *ngIf=\"query.isHearingRelated === 'Yes'\">\n        <th scope=\"row\" class=\"govuk-table__header\">{{ 'What is the date of the hearing?' | rpxTranslate }}</th>\n        <td class=\"govuk-table__cell\">{{ query.hearingDate | date: 'dd MMM yyyy' }}</td>\n      </tr>\n      <tr class=\"govuk-table__row\" *ngIf=\"query.attachments.length > 0\">\n        <th scope=\"row\" class=\"govuk-table__header\">{{ 'Attachments' | rpxTranslate }}</th>\n        <td class=\"govuk-table__cell\">\n          <ccd-query-attachments-read\n            *ngIf=\"query.attachments\"\n            [attachments]=\"query.attachments\"\n          >\n          </ccd-query-attachments-read>\n        </td>\n      </tr>\n      </tbody>\n    </table>\n  </div>\n  <ng-container *ngIf=\"query.children?.length > 0\">\n    <ng-container *ngFor=\"let child of query.children; let i = index;\">\n      <ng-container *ngIf=\"i % 2 === 0; else followUpMessage\">\n        <table class=\"govuk-table query-details-table\" [attr.aria-describedby]=\"'Response of the query' | rpxTranslate\">\n          <caption class=\"govuk-table__caption govuk-table__caption--l\">\n            <div>{{ 'Response' | rpxTranslate }}</div>\n          </caption>\n          <tbody class=\"govuk-table__body\">\n          <tr class=\"govuk-table__row\">\n            <th scope=\"row\" class=\"govuk-table__header\">{{ 'Last response date' | rpxTranslate }}</th>\n            <td class=\"govuk-table__cell\">{{ child.createdOn | date: 'dd MMM yyyy' }}</td>\n          </tr>\n\n            <tr *ngIf=\"isCaseworker()\" class=\"govuk-table__row\">\n              <th scope=\"row\" class=\"govuk-table__header\">{{ 'Caseworker name' | rpxTranslate }}</th>\n              <td class=\"govuk-table__cell\">{{ child.name }}</td>\n            </tr>\n\n            <tr class=\"govuk-table__row\">\n              <th scope=\"row\" class=\"govuk-table__header\">{{ 'Response detail' | rpxTranslate }}</th>\n              <td class=\"govuk-table__cell\">{{ child.body }}</td>\n            </tr>\n\n          <tr class=\"govuk-table__row\" *ngIf=\"child.attachments.length > 0\">\n            <th scope=\"row\" class=\"govuk-table__header\">{{ 'Attachments' | rpxTranslate }}</th>\n            <td class=\"govuk-table__cell\">\n              <ccd-query-attachments-read\n                *ngIf=\"child.attachments\"\n                [attachments]=\"child.attachments\"\n              >\n              </ccd-query-attachments-read>\n            </td>\n          </tr>\n          </tbody>\n        </table>\n      </ng-container>\n\n      <ng-template #followUpMessage>\n        <!-- <div class=\"query_details_caption\">{{ 'Follow-up' | rpxTranslate }}</div> -->\n        <table class=\"govuk-table query-details-table\"\n               [attr.aria-describedby]=\"'Follow-up of the response' | rpxTranslate\">\n          <caption class=\"govuk-table__caption govuk-table__caption--l\">\n            <div>{{ 'Follow up query' | rpxTranslate }}</div>\n          </caption>\n          <tbody class=\"govuk-table__body\">\n          <tr class=\"govuk-table__row\">\n            <th scope=\"row\" class=\"govuk-table__header\">{{ 'Last submission date' | rpxTranslate }}</th>\n            <td class=\"govuk-table__cell\">{{ child.createdOn | date: 'dd MMM yyyy' }}</td>\n          </tr>\n\n          <tr class=\"govuk-table__row\">\n            <th scope=\"row\" class=\"govuk-table__header\">{{ 'Last submitted by' | rpxTranslate }}</th>\n            <td class=\"govuk-table__cell\">{{ child.name }}</td>\n          </tr>\n\n            <tr class=\"govuk-table__row\">\n              <th scope=\"row\" class=\"govuk-table__header\">{{ 'Query detail' | rpxTranslate }}</th>\n              <td class=\"govuk-table__cell\">{{ child.body }}</td>\n            </tr>\n\n            <tr class=\"govuk-table__row\" *ngIf=\"child.attachments.length > 0\">\n              <th scope=\"row\" class=\"govuk-table__header\">{{ 'Attachments' | rpxTranslate }}</th>\n              <td class=\"govuk-table__cell\">\n                <ccd-query-attachments-read\n                  *ngIf=\"child.attachments\"\n                  [attachments]=\"child.attachments\"\n                >\n                </ccd-query-attachments-read>\n              </td>\n            </tr>\n          </tbody>\n        </table>\n      </ng-template>\n    </ng-container>\n  </ng-container>\n</ng-container>\n", styles: [".query-details-table .govuk-table__header{width:330px}\n"] }]
-    }], () => [{ type: SessionStorageService }], { query: [{
+        args: [{ selector: 'ccd-query-details', template: "<ng-container *ngIf=\"query\">\n  <cut-alert type=\"error\" *ngIf=\"hasRespondedToQuery()\">\n    <ng-container>{{message}}</ng-container>\n  </cut-alert>\n\n  <br/>\n  <p *ngIf=\"showLink\">\n    <a class=\"govuk-link\" href=\"javascript:void(0)\" (click)=\"onBack()\">{{ 'Back to query list' | rpxTranslate }}</a>\n  </p>\n  <div>\n    <table class=\"govuk-table query-details-table\" [attr.aria-describedby]=\"'Details of the query' | rpxTranslate\">\n      <caption class=\"govuk-table__caption govuk-table__caption--l\">\n        <div>{{ 'Query details' | rpxTranslate }}</div>\n      </caption>\n      <tbody class=\"govuk-table__body\">\n      <tr class=\"govuk-table__row\">\n        <th scope=\"row\" class=\"govuk-table__header\">{{ 'Last submitted by' | rpxTranslate }}</th>\n        <td class=\"govuk-table__cell\">{{ query.lastSubmittedBy }}</td>\n      </tr>\n      <tr class=\"govuk-table__row\">\n        <th scope=\"row\" class=\"govuk-table__header\">{{ 'Submission date' | rpxTranslate }}</th>\n        <td class=\"govuk-table__cell\">{{ query.createdOn | date: 'dd MMM yyyy' }}</td>\n      </tr>\n      <tr class=\"govuk-table__row\">\n        <th scope=\"row\" class=\"govuk-table__header\">{{ 'Query subject' | rpxTranslate }}</th>\n        <td class=\"govuk-table__cell\">{{ query.subject }}</td>\n      </tr>\n      <tr class=\"govuk-table__row\">\n        <th scope=\"row\" class=\"govuk-table__header\">{{ 'Query body' | rpxTranslate }}</th>\n        <td class=\"govuk-table__cell\">{{ query.body }}</td>\n      </tr>\n      <tr class=\"govuk-table__row\">\n        <th scope=\"row\" class=\"govuk-table__header\" [class.govuk-table__header--no-border]=\"query.isHearingRelated\">\n          {{ 'Is the query hearing related?' | rpxTranslate }}\n        </th>\n        <td class=\"govuk-table__cell\" [class.govuk-table__cell--no-border]=\"query.isHearingRelated\">\n          {{ 'Is the query hearing related?' | rpxTranslate: null : (query.isHearingRelated) }}</td>\n      </tr>\n      <tr class=\"govuk-table__row govuk-table__row--isHearingRelated\" *ngIf=\"query.isHearingRelated === 'Yes'\">\n        <th scope=\"row\" class=\"govuk-table__header\">{{ 'What is the date of the hearing?' | rpxTranslate }}</th>\n        <td class=\"govuk-table__cell\">{{ query.hearingDate | date: 'dd MMM yyyy' }}</td>\n      </tr>\n      <tr class=\"govuk-table__row\" *ngIf=\"query.attachments.length > 0\">\n        <th scope=\"row\" class=\"govuk-table__header\">{{ 'Attachments' | rpxTranslate }}</th>\n        <td class=\"govuk-table__cell\">\n          <ccd-query-attachments-read\n            *ngIf=\"query.attachments\"\n            [attachments]=\"query.attachments\"\n          >\n          </ccd-query-attachments-read>\n        </td>\n      </tr>\n      </tbody>\n    </table>\n  </div>\n  <ng-container *ngIf=\"query.children?.length > 0\">\n    <ng-container *ngFor=\"let child of query.children; let i = index;\">\n      <ng-container *ngIf=\"i % 2 === 0; else followUpMessage\">\n        <table class=\"govuk-table query-details-table\" [attr.aria-describedby]=\"'Response of the query' | rpxTranslate\">\n          <caption class=\"govuk-table__caption govuk-table__caption--l\">\n            <div>{{ 'Response' | rpxTranslate }}</div>\n          </caption>\n          <tbody class=\"govuk-table__body\">\n          <tr class=\"govuk-table__row\">\n            <th scope=\"row\" class=\"govuk-table__header\">{{ 'Last response date' | rpxTranslate }}</th>\n            <td class=\"govuk-table__cell\">{{ child.createdOn | date: 'dd MMM yyyy' }}</td>\n          </tr>\n\n            <tr *ngIf=\"isCaseworker()\" class=\"govuk-table__row\">\n              <th scope=\"row\" class=\"govuk-table__header\">{{ 'Caseworker name' | rpxTranslate }}</th>\n              <td class=\"govuk-table__cell\">{{ child.name }}</td>\n            </tr>\n\n            <tr class=\"govuk-table__row\">\n              <th scope=\"row\" class=\"govuk-table__header\">{{ 'Response detail' | rpxTranslate }}</th>\n              <td class=\"govuk-table__cell\">{{ child.body }}</td>\n            </tr>\n\n          <tr class=\"govuk-table__row\" *ngIf=\"child.attachments.length > 0\">\n            <th scope=\"row\" class=\"govuk-table__header\">{{ 'Attachments' | rpxTranslate }}</th>\n            <td class=\"govuk-table__cell\">\n              <ccd-query-attachments-read\n                *ngIf=\"child.attachments\"\n                [attachments]=\"child.attachments\"\n              >\n              </ccd-query-attachments-read>\n            </td>\n          </tr>\n          </tbody>\n        </table>\n      </ng-container>\n\n      <ng-template #followUpMessage>\n        <!-- <div class=\"query_details_caption\">{{ 'Follow-up' | rpxTranslate }}</div> -->\n        <table class=\"govuk-table query-details-table\"\n               [attr.aria-describedby]=\"'Follow-up of the response' | rpxTranslate\">\n          <caption class=\"govuk-table__caption govuk-table__caption--l\">\n            <div>{{ 'Follow up query' | rpxTranslate }}</div>\n          </caption>\n          <tbody class=\"govuk-table__body\">\n          <tr class=\"govuk-table__row\">\n            <th scope=\"row\" class=\"govuk-table__header\">{{ 'Last submission date' | rpxTranslate }}</th>\n            <td class=\"govuk-table__cell\">{{ child.createdOn | date: 'dd MMM yyyy' }}</td>\n          </tr>\n\n          <tr class=\"govuk-table__row\">\n            <th scope=\"row\" class=\"govuk-table__header\">{{ 'Last submitted by' | rpxTranslate }}</th>\n            <td class=\"govuk-table__cell\">{{ child.name }}</td>\n          </tr>\n\n            <tr class=\"govuk-table__row\">\n              <th scope=\"row\" class=\"govuk-table__header\">{{ 'Query detail' | rpxTranslate }}</th>\n              <td class=\"govuk-table__cell\">{{ child.body }}</td>\n            </tr>\n\n            <tr class=\"govuk-table__row\" *ngIf=\"child.attachments.length > 0\">\n              <th scope=\"row\" class=\"govuk-table__header\">{{ 'Attachments' | rpxTranslate }}</th>\n              <td class=\"govuk-table__cell\">\n                <ccd-query-attachments-read\n                  *ngIf=\"child.attachments\"\n                  [attachments]=\"child.attachments\"\n                >\n                </ccd-query-attachments-read>\n              </td>\n            </tr>\n          </tbody>\n        </table>\n      </ng-template>\n    </ng-container>\n  </ng-container>\n</ng-container>\n", styles: [".query-details-table .govuk-table__header{width:330px}\n"] }]
+    }], () => [{ type: SessionStorageService }, { type: i1$1.ActivatedRoute }, { type: i1$1.Router }], { query: [{
             type: Input
         }], backClicked: [{
             type: Output
         }], caseId: [{
             type: Input
+        }], hasResponded: [{
+            type: Output
+        }], totalNumberOfQueryChildren: [{
+            type: Input
         }] }); })();
-(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(QueryDetailsComponent, { className: "QueryDetailsComponent", filePath: "lib/shared/components/palette/query-management/components/query-details/query-details.component.ts", lineNumber: 10 }); })();
+(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(QueryDetailsComponent, { className: "QueryDetailsComponent", filePath: "lib/shared/components/palette/query-management/components/query-details/query-details.component.ts", lineNumber: 11 }); })();
 
 class QueryEventCompletionComponent {
     eventCompletionParams;
@@ -21494,8 +21581,8 @@ class QueryWriteRaiseQueryComponent {
         }] }); })();
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(QueryWriteRaiseQueryComponent, { className: "QueryWriteRaiseQueryComponent", filePath: "lib/shared/components/palette/query-management/components/query-write/query-write-raise-query/query-write-raise-query.component.ts", lineNumber: 8 }); })();
 
-function QueryWriteRespondToQueryComponent_div_12_p_11_Template(rf, ctx) { if (rf & 1) {
-    i0.ɵɵelementStart(0, "p", 15)(1, "span", 16);
+function QueryWriteRespondToQueryComponent_div_12_div_1_p_10_Template(rf, ctx) { if (rf & 1) {
+    i0.ɵɵelementStart(0, "p", 16)(1, "span", 17);
     i0.ɵɵtext(2);
     i0.ɵɵpipe(3, "rpxTranslate");
     i0.ɵɵelementEnd();
@@ -21503,66 +21590,123 @@ function QueryWriteRespondToQueryComponent_div_12_p_11_Template(rf, ctx) { if (r
     i0.ɵɵpipe(5, "rpxTranslate");
     i0.ɵɵelementEnd();
 } if (rf & 2) {
-    const ctx_r0 = i0.ɵɵnextContext(2);
+    const ctx_r0 = i0.ɵɵnextContext(3);
     i0.ɵɵadvance(2);
     i0.ɵɵtextInterpolate1("", i0.ɵɵpipeBind1(3, 2, "Error:"), " ");
     i0.ɵɵadvance(2);
     i0.ɵɵtextInterpolate1("", ctx_r0.queryCreateContext === ctx_r0.queryCreateContextEnum.RESPOND ? ctx_r0.raiseQueryErrorMessages.RESPOND_QUERY_BODY : i0.ɵɵpipeBind1(5, 4, ctx_r0.raiseQueryErrorMessages.QUERY_BODY), " ");
 } }
-function QueryWriteRespondToQueryComponent_div_12_Template(rf, ctx) { if (rf & 1) {
-    i0.ɵɵelementStart(0, "div", 7)(1, "div")(2, "h1", 8);
-    i0.ɵɵtext(3);
-    i0.ɵɵpipe(4, "rpxTranslate");
+function QueryWriteRespondToQueryComponent_div_12_div_1_Template(rf, ctx) { if (rf & 1) {
+    i0.ɵɵelementStart(0, "div")(1, "h1", 9);
+    i0.ɵɵtext(2);
+    i0.ɵɵpipe(3, "rpxTranslate");
     i0.ɵɵelementEnd();
-    i0.ɵɵelementStart(5, "div", 9)(6, "div", 10)(7, "div", 11)(8, "label", 12);
-    i0.ɵɵtext(9);
-    i0.ɵɵpipe(10, "rpxTranslate");
+    i0.ɵɵelementStart(4, "div", 10)(5, "div", 11)(6, "div", 12)(7, "label", 13);
+    i0.ɵɵtext(8);
+    i0.ɵɵpipe(9, "rpxTranslate");
     i0.ɵɵelementEnd()();
-    i0.ɵɵtemplate(11, QueryWriteRespondToQueryComponent_div_12_p_11_Template, 6, 6, "p", 13);
-    i0.ɵɵelementStart(12, "textarea", 14);
-    i0.ɵɵtext(13, "      ");
-    i0.ɵɵelementEnd()()()()();
+    i0.ɵɵtemplate(10, QueryWriteRespondToQueryComponent_div_12_div_1_p_10_Template, 6, 6, "p", 14);
+    i0.ɵɵelementStart(11, "textarea", 15);
+    i0.ɵɵtext(12, "      ");
+    i0.ɵɵelementEnd()()()();
 } if (rf & 2) {
-    let tmp_3_0;
-    let tmp_5_0;
+    let tmp_4_0;
     let tmp_6_0;
-    const ctx_r0 = i0.ɵɵnextContext();
-    i0.ɵɵadvance(3);
-    i0.ɵɵtextInterpolate1(" ", ctx_r0.queryCreateContext === ctx_r0.queryCreateContextEnum.RESPOND ? "Respond to a query" : i0.ɵɵpipeBind1(4, 9, "Ask a follow-up question"), " ");
+    let tmp_7_0;
+    const ctx_r0 = i0.ɵɵnextContext(2);
+    i0.ɵɵadvance(2);
+    i0.ɵɵtextInterpolate1(" ", ctx_r0.queryCreateContext === ctx_r0.queryCreateContextEnum.RESPOND ? "Respond to a query" : i0.ɵɵpipeBind1(3, 9, "Ask a follow-up question"), " ");
     i0.ɵɵadvance(2);
     i0.ɵɵproperty("formGroup", ctx_r0.formGroup);
     i0.ɵɵadvance();
-    i0.ɵɵclassProp("govuk-form-group--error", ctx_r0.submitted && ((tmp_3_0 = ctx_r0.formGroup.get("body")) == null ? null : tmp_3_0.hasError("required")));
+    i0.ɵɵclassProp("govuk-form-group--error", ctx_r0.submitted && ((tmp_4_0 = ctx_r0.formGroup.get("body")) == null ? null : tmp_4_0.hasError("required")));
     i0.ɵɵadvance(3);
-    i0.ɵɵtextInterpolate1(" ", ctx_r0.queryCreateContext === ctx_r0.queryCreateContextEnum.RESPOND ? "Response detail" : i0.ɵɵpipeBind1(10, 11, "Query Body"), " ");
+    i0.ɵɵtextInterpolate1(" ", ctx_r0.queryCreateContext === ctx_r0.queryCreateContextEnum.RESPOND ? "Response detail" : i0.ɵɵpipeBind1(9, 11, "Query Body"), " ");
     i0.ɵɵadvance(2);
-    i0.ɵɵproperty("ngIf", ctx_r0.submitted && ((tmp_5_0 = ctx_r0.formGroup.get("body")) == null ? null : tmp_5_0.hasError("required")));
+    i0.ɵɵproperty("ngIf", ctx_r0.submitted && ((tmp_6_0 = ctx_r0.formGroup.get("body")) == null ? null : tmp_6_0.hasError("required")));
     i0.ɵɵadvance();
-    i0.ɵɵclassProp("govuk-textarea--error", ctx_r0.submitted && ((tmp_6_0 = ctx_r0.formGroup.get("body")) == null ? null : tmp_6_0.hasError("required")));
+    i0.ɵɵclassProp("govuk-textarea--error", ctx_r0.submitted && ((tmp_7_0 = ctx_r0.formGroup.get("body")) == null ? null : tmp_7_0.hasError("required")));
     i0.ɵɵproperty("formControlName", "body");
 } }
+function QueryWriteRespondToQueryComponent_div_12_Template(rf, ctx) { if (rf & 1) {
+    i0.ɵɵelementStart(0, "div", 7);
+    i0.ɵɵtemplate(1, QueryWriteRespondToQueryComponent_div_12_div_1_Template, 13, 13, "div", 8);
+    i0.ɵɵelementEnd();
+} if (rf & 2) {
+    const ctx_r0 = i0.ɵɵnextContext();
+    i0.ɵɵadvance();
+    i0.ɵɵproperty("ngIf", !ctx_r0.hasRespondedToQuery);
+} }
 class QueryWriteRespondToQueryComponent {
     caseNotifier;
+    route;
     queryItem;
     formGroup;
     queryCreateContext;
     submitted = false;
+    caseQueriesCollections;
+    hasRespondedToQueryTask = new EventEmitter();
     showForm;
     queryCreateContextEnum = QueryCreateContext;
     raiseQueryErrorMessages = RaiseQueryErrorMessage;
     caseId;
+    queryItemId;
     caseDetails;
-    constructor(caseNotifier) {
+    totalNumberOfQueryChildren;
+    queryItemDisplay;
+    hasRespondedToQuery = false;
+    static QUERY_ITEM_RESPOND = '3';
+    static QUERY_ITEM_FOLLOWUP = '4';
+    constructor(caseNotifier, route) {
         this.caseNotifier = caseNotifier;
+        this.route = route;
     }
     ngOnInit() {
-        this.caseNotifier.caseView.pipe(take(1)).subscribe(caseDetails => {
-            this.caseId = caseDetails.case_id;
-            this.caseDetails = caseDetails;
+        this.queryItemId = this.route.snapshot.params.qid;
+        this.caseNotifier.caseView.pipe(take(1)).subscribe({
+            next: (caseDetails) => {
+                this.caseId = caseDetails?.case_id ?? '';
+                this.caseDetails = caseDetails;
+            },
+            error: (err) => {
+                console.error('Error retrieving case details:', err);
+            }
         });
     }
-    static ɵfac = function QueryWriteRespondToQueryComponent_Factory(t) { return new (t || QueryWriteRespondToQueryComponent)(i0.ɵɵdirectiveInject(CaseNotifier)); };
-    static ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: QueryWriteRespondToQueryComponent, selectors: [["ccd-query-write-respond-to-query"]], inputs: { queryItem: "queryItem", formGroup: "formGroup", queryCreateContext: "queryCreateContext", submitted: "submitted", showForm: "showForm" }, decls: 13, vars: 9, consts: [[1, "govuk-!-margin-bottom-6"], [1, "govuk-caption-l"], [1, "govuk-heading-l", "govuk-!-margin-bottom-0"], [1, "govuk-!-margin-bottom-4"], [3, "caseDetails"], [3, "query"], ["class", "query-respond", 4, "ngIf"], [1, "query-respond"], [1, "govuk-heading-m"], [3, "formGroup"], [1, "govuk-form-group", "body-textarea"], [1, "govuk-label-wrapper"], ["for", "body", 1, "govuk-label", "govuk-label--m", "govuk-!-font-weight-bold"], ["id", "body-error", "class", "govuk-error-message", 4, "ngIf"], ["id", "body", "name", "body", "rows", "5", "aria-describedby", "body-hint body-error", 1, "govuk-textarea", 3, "formControlName"], ["id", "body-error", 1, "govuk-error-message"], [1, "govuk-visually-hidden"]], template: function QueryWriteRespondToQueryComponent_Template(rf, ctx) { if (rf & 1) {
+    ngOnChanges() {
+        if (this.queryItemId === QueryWriteRespondToQueryComponent.QUERY_ITEM_RESPOND
+            && this.caseQueriesCollections?.length > 0) {
+            if (!this.caseQueriesCollections[0]) {
+                console.error('caseQueriesCollections[0] is undefined!', this.caseQueriesCollections);
+                return;
+            }
+            const numberOfQueryChildren = new QueryListData(this.caseQueriesCollections[0]);
+            this.totalNumberOfQueryChildren = numberOfQueryChildren?.queries?.[0]?.children?.length || 0;
+            const messageId = this.route.snapshot.params.dataid;
+            if (!messageId) {
+                console.warn('No messageId found in route params:', this.route.snapshot.params);
+                return;
+            }
+            const filteredMessages = this.caseQueriesCollections
+                .map((caseData) => caseData?.caseMessages || []) // Ensure caseMessages is always an array
+                .flat() // Flatten into a single array of messages
+                .filter((message) => message?.value?.id === messageId); // Safe access
+            if (filteredMessages.length > 0) {
+                const matchingMessage = filteredMessages[0]?.value;
+                if (matchingMessage) {
+                    this.queryItemDisplay = new QueryListItem();
+                    Object.assign(this.queryItemDisplay, matchingMessage);
+                    this.queryItem = this.queryItemDisplay;
+                }
+            }
+        }
+    }
+    hasResponded(value) {
+        this.hasRespondedToQuery = value;
+        this.hasRespondedToQueryTask.emit(value);
+    }
+    static ɵfac = function QueryWriteRespondToQueryComponent_Factory(t) { return new (t || QueryWriteRespondToQueryComponent)(i0.ɵɵdirectiveInject(CaseNotifier), i0.ɵɵdirectiveInject(i1$1.ActivatedRoute)); };
+    static ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: QueryWriteRespondToQueryComponent, selectors: [["ccd-query-write-respond-to-query"]], inputs: { queryItem: "queryItem", formGroup: "formGroup", queryCreateContext: "queryCreateContext", submitted: "submitted", caseQueriesCollections: "caseQueriesCollections", showForm: "showForm" }, outputs: { hasRespondedToQueryTask: "hasRespondedToQueryTask" }, features: [i0.ɵɵNgOnChangesFeature], decls: 13, vars: 10, consts: [[1, "govuk-!-margin-bottom-6"], [1, "govuk-caption-l"], [1, "govuk-heading-l", "govuk-!-margin-bottom-0"], [1, "govuk-!-margin-bottom-4"], [3, "caseDetails"], [3, "hasResponded", "query", "totalNumberOfQueryChildren"], ["class", "query-respond", 4, "ngIf"], [1, "query-respond"], [4, "ngIf"], [1, "govuk-heading-m"], [3, "formGroup"], [1, "govuk-form-group", "body-textarea"], [1, "govuk-label-wrapper"], ["for", "body", 1, "govuk-label", "govuk-label--m", "govuk-!-font-weight-bold"], ["id", "body-error", "class", "govuk-error-message", 4, "ngIf"], ["id", "body", "name", "body", "rows", "5", "aria-describedby", "body-hint body-error", 1, "govuk-textarea", 3, "formControlName"], ["id", "body-error", 1, "govuk-error-message"], [1, "govuk-visually-hidden"]], template: function QueryWriteRespondToQueryComponent_Template(rf, ctx) { if (rf & 1) {
             i0.ɵɵelementStart(0, "div", 0)(1, "div", 0)(2, "div", 1);
             i0.ɵɵtext(3);
             i0.ɵɵpipe(4, "rpxTranslate");
@@ -21574,27 +21718,27 @@ class QueryWriteRespondToQueryComponent {
             i0.ɵɵelementStart(8, "div", 3);
             i0.ɵɵelement(9, "ccd-query-case-details-header", 4);
             i0.ɵɵelementEnd();
-            i0.ɵɵelementStart(10, "div");
-            i0.ɵɵelement(11, "ccd-query-details", 5);
-            i0.ɵɵelementEnd()();
-            i0.ɵɵtemplate(12, QueryWriteRespondToQueryComponent_div_12_Template, 14, 13, "div", 6);
+            i0.ɵɵelementStart(10, "div")(11, "ccd-query-details", 5);
+            i0.ɵɵlistener("hasResponded", function QueryWriteRespondToQueryComponent_Template_ccd_query_details_hasResponded_11_listener($event) { return ctx.hasResponded($event); });
+            i0.ɵɵelementEnd()()();
+            i0.ɵɵtemplate(12, QueryWriteRespondToQueryComponent_div_12_Template, 2, 1, "div", 6);
         } if (rf & 2) {
             i0.ɵɵadvance(3);
-            i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(4, 5, "Respond to a query"));
+            i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(4, 6, "Respond to a query"));
             i0.ɵɵadvance(3);
-            i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(7, 7, "Query details"));
+            i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(7, 8, "Query details"));
             i0.ɵɵadvance(3);
             i0.ɵɵproperty("caseDetails", ctx.caseDetails);
             i0.ɵɵadvance(2);
-            i0.ɵɵproperty("query", ctx.queryItem);
+            i0.ɵɵproperty("query", ctx.queryItem)("totalNumberOfQueryChildren", ctx.totalNumberOfQueryChildren);
             i0.ɵɵadvance();
             i0.ɵɵproperty("ngIf", ctx.showForm);
         } }, styles: [".query-respond[_ngcontent-%COMP%]{width:100%;max-width:720px}"] });
 }
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(QueryWriteRespondToQueryComponent, [{
         type: Component,
-        args: [{ selector: 'ccd-query-write-respond-to-query', template: "<div class=\"govuk-!-margin-bottom-6\">\n  <div class=\"govuk-!-margin-bottom-6\">\n    <div class=\"govuk-caption-l\">{{ 'Respond to a query' | rpxTranslate }}</div>\n    <h1 class=\"govuk-heading-l govuk-!-margin-bottom-0\">{{ 'Query details' | rpxTranslate }}</h1>\n  </div>\n\n  <div class=\"govuk-!-margin-bottom-4\">\n    <ccd-query-case-details-header [caseDetails]=\"caseDetails\"></ccd-query-case-details-header>\n  </div>\n\n  <div>\n    <ccd-query-details [query]=\"queryItem\"></ccd-query-details>\n  </div>\n</div>\n\n<div class=\"query-respond\" *ngIf=\"showForm\">\n  <div>\n    <h1 class=\"govuk-heading-m\">\n      {{ queryCreateContext === queryCreateContextEnum.RESPOND ? 'Respond to a query' : 'Ask a follow-up question' | rpxTranslate }}\n    </h1>\n\n    <div [formGroup]=\"formGroup\">\n      <div class=\"govuk-form-group body-textarea\"\n           [class.govuk-form-group--error]=\"submitted && formGroup.get('body')?.hasError('required')\">\n        <div class=\"govuk-label-wrapper\">\n          <label class=\"govuk-label govuk-label--m govuk-!-font-weight-bold\" for=\"body\">\n            {{ queryCreateContext === queryCreateContextEnum.RESPOND ? 'Response detail' : 'Query Body' | rpxTranslate }}\n          </label>\n        </div>\n        <p id=\"body-error\" class=\"govuk-error-message\"\n           *ngIf=\"submitted && formGroup.get('body')?.hasError('required')\">\n          <span class=\"govuk-visually-hidden\">{{ 'Error:' | rpxTranslate }} </span>{{ queryCreateContext === queryCreateContextEnum.RESPOND ? raiseQueryErrorMessages.RESPOND_QUERY_BODY : raiseQueryErrorMessages.QUERY_BODY | rpxTranslate }}\n        </p>\n        <textarea [formControlName]=\"'body'\" class=\"govuk-textarea\"\n                  [class.govuk-textarea--error]=\"submitted && formGroup.get('body')?.hasError('required')\" id=\"body\"\n                  name=\"body\" rows=\"5\" aria-describedby=\"body-hint body-error\">\n      </textarea>\n      </div>\n    </div>\n  </div>\n</div>\n", styles: [".query-respond{width:100%;max-width:720px}\n"] }]
-    }], () => [{ type: CaseNotifier }], { queryItem: [{
+        args: [{ selector: 'ccd-query-write-respond-to-query', template: "<div class=\"govuk-!-margin-bottom-6\">\n  <div class=\"govuk-!-margin-bottom-6\">\n    <div class=\"govuk-caption-l\">{{ 'Respond to a query' | rpxTranslate }}</div>\n    <h1 class=\"govuk-heading-l govuk-!-margin-bottom-0\">{{ 'Query details' | rpxTranslate }}</h1>\n  </div>\n\n  <div class=\"govuk-!-margin-bottom-4\">\n    <ccd-query-case-details-header [caseDetails]=\"caseDetails\"></ccd-query-case-details-header>\n  </div>\n\n  <div>\n    <ccd-query-details [query]=\"queryItem\"\n      [totalNumberOfQueryChildren]=\"totalNumberOfQueryChildren\"\n      (hasResponded)=\"hasResponded($event)\"></ccd-query-details>\n  </div>\n</div>\n<div class=\"query-respond\"  *ngIf=\"showForm\">\n  <div *ngIf=\"!hasRespondedToQuery\">\n    <h1 class=\"govuk-heading-m\">\n      {{ queryCreateContext === queryCreateContextEnum.RESPOND ? 'Respond to a query' : 'Ask a follow-up question' | rpxTranslate }}\n    </h1>\n\n    <div [formGroup]=\"formGroup\">\n      <div class=\"govuk-form-group body-textarea\"\n           [class.govuk-form-group--error]=\"submitted && formGroup.get('body')?.hasError('required')\">\n        <div class=\"govuk-label-wrapper\">\n          <label class=\"govuk-label govuk-label--m govuk-!-font-weight-bold\" for=\"body\">\n            {{ queryCreateContext === queryCreateContextEnum.RESPOND ? 'Response detail' : 'Query Body' | rpxTranslate }}\n          </label>\n        </div>\n        <p id=\"body-error\" class=\"govuk-error-message\"\n           *ngIf=\"submitted && formGroup.get('body')?.hasError('required')\">\n          <span class=\"govuk-visually-hidden\">{{ 'Error:' | rpxTranslate }} </span>{{ queryCreateContext === queryCreateContextEnum.RESPOND ? raiseQueryErrorMessages.RESPOND_QUERY_BODY : raiseQueryErrorMessages.QUERY_BODY | rpxTranslate }}\n        </p>\n        <textarea [formControlName]=\"'body'\" class=\"govuk-textarea\"\n                  [class.govuk-textarea--error]=\"submitted && formGroup.get('body')?.hasError('required')\" id=\"body\"\n                  name=\"body\" rows=\"5\" aria-describedby=\"body-hint body-error\">\n      </textarea>\n      </div>\n    </div>\n  </div>\n</div>\n", styles: [".query-respond{width:100%;max-width:720px}\n"] }]
+    }], () => [{ type: CaseNotifier }, { type: i1$1.ActivatedRoute }], { queryItem: [{
             type: Input
         }], formGroup: [{
             type: Input
@@ -21602,6 +21746,10 @@ class QueryWriteRespondToQueryComponent {
             type: Input
         }], submitted: [{
             type: Input
+        }], caseQueriesCollections: [{
+            type: Input
+        }], hasRespondedToQueryTask: [{
+            type: Output
         }], showForm: [{
             type: Input
         }] }); })();
@@ -21734,7 +21882,6 @@ class QueryConfirmationComponent {
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(QueryConfirmationComponent, { className: "QueryConfirmationComponent", filePath: "lib/shared/components/palette/query-management/components/query-confirmation/query-confirmation.component.ts", lineNumber: 9 }); })();
 
 const _c0$B = (a0, a1) => ["/query-management", "query", a0, "4", a1];
-const _c1$e = (a0, a1) => ["/query-management", "query", a0, "3", a1];
 function ReadQueryManagementFieldComponent_ng_container_0_ng_container_1_div_1_Template(rf, ctx) { if (rf & 1) {
     const _r1 = i0.ɵɵgetCurrentView();
     i0.ɵɵelementStart(0, "div", 5)(1, "ccd-query-list", 6);
@@ -21802,33 +21949,17 @@ function ReadQueryManagementFieldComponent_ng_template_1_ng_container_1_Template
     i0.ɵɵadvance();
     i0.ɵɵproperty("ngIf", (ctx_r1.query == null ? null : ctx_r1.query.children == null ? null : ctx_r1.query.children.length) > 0 && (ctx_r1.query == null ? null : ctx_r1.query.children == null ? null : ctx_r1.query.children.length) % 2 === 1)("ngIfElse", queryIsInReview_r5);
 } }
-function ReadQueryManagementFieldComponent_ng_template_1_ng_container_2_Template(rf, ctx) { if (rf & 1) {
-    i0.ɵɵelementContainerStart(0);
-    i0.ɵɵelementStart(1, "button", 9);
-    i0.ɵɵtext(2);
-    i0.ɵɵpipe(3, "rpxTranslate");
-    i0.ɵɵelementEnd();
-    i0.ɵɵelementContainerEnd();
-} if (rf & 2) {
-    const ctx_r1 = i0.ɵɵnextContext(2);
-    i0.ɵɵadvance();
-    i0.ɵɵproperty("routerLink", i0.ɵɵpureFunction2(4, _c1$e, ctx_r1.caseId, ctx_r1.query.id));
-    i0.ɵɵadvance();
-    i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(3, 2, "Respond to a query"), " ");
-} }
 function ReadQueryManagementFieldComponent_ng_template_1_Template(rf, ctx) { if (rf & 1) {
     const _r4 = i0.ɵɵgetCurrentView();
     i0.ɵɵelementStart(0, "ccd-query-details", 7);
     i0.ɵɵlistener("backClicked", function ReadQueryManagementFieldComponent_ng_template_1_Template_ccd_query_details_backClicked_0_listener() { i0.ɵɵrestoreView(_r4); const ctx_r1 = i0.ɵɵnextContext(); return i0.ɵɵresetView(ctx_r1.showQueryList = true); });
     i0.ɵɵelementEnd();
-    i0.ɵɵtemplate(1, ReadQueryManagementFieldComponent_ng_template_1_ng_container_1_Template, 4, 2, "ng-container", 8)(2, ReadQueryManagementFieldComponent_ng_template_1_ng_container_2_Template, 4, 7, "ng-container", 8);
+    i0.ɵɵtemplate(1, ReadQueryManagementFieldComponent_ng_template_1_ng_container_1_Template, 4, 2, "ng-container", 8);
 } if (rf & 2) {
     const ctx_r1 = i0.ɵɵnextContext();
     i0.ɵɵproperty("query", ctx_r1.query)("caseId", ctx_r1.caseId);
     i0.ɵɵadvance();
     i0.ɵɵproperty("ngIf", !ctx_r1.isCaseworker());
-    i0.ɵɵadvance();
-    i0.ɵɵproperty("ngIf", (ctx_r1.query == null ? null : ctx_r1.query.children == null ? null : ctx_r1.query.children.length) >= 0 && ctx_r1.isCaseworker() && (ctx_r1.query == null ? null : ctx_r1.query.children == null ? null : ctx_r1.query.children.length) % 2 === 0);
 } }
 class ReadQueryManagementFieldComponent extends AbstractFieldReadComponent {
     route;
@@ -21887,7 +22018,7 @@ class ReadQueryManagementFieldComponent extends AbstractFieldReadComponent {
     }
     static ɵfac = function ReadQueryManagementFieldComponent_Factory(t) { return new (t || ReadQueryManagementFieldComponent)(i0.ɵɵdirectiveInject(i1$1.ActivatedRoute), i0.ɵɵdirectiveInject(SessionStorageService), i0.ɵɵdirectiveInject(CaseNotifier)); };
     static ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: ReadQueryManagementFieldComponent, selectors: [["ccd-read-query-management-field"]], features: [i0.ɵɵInheritDefinitionFeature], decls: 3, vars: 2, consts: [["singleQueryDetails", ""], ["queryIsInReview", ""], [4, "ngIf", "ngIfElse"], [4, "ngFor", "ngForOf"], ["class", "govuk-!-margin-top-8 govuk-!-margin-bottom-8", 4, "ngIf"], [1, "govuk-!-margin-top-8", "govuk-!-margin-bottom-8"], [3, "selectedQuery", "caseQueriesCollection"], [3, "backClicked", "query", "caseId"], [4, "ngIf"], ["id", "ask-follow-up-question", "data-module", "govuk-button", 1, "govuk-button", 3, "routerLink"], [1, "govuk-!-font-weight-bold"]], template: function ReadQueryManagementFieldComponent_Template(rf, ctx) { if (rf & 1) {
-            i0.ɵɵtemplate(0, ReadQueryManagementFieldComponent_ng_container_0_Template, 2, 1, "ng-container", 2)(1, ReadQueryManagementFieldComponent_ng_template_1_Template, 3, 4, "ng-template", null, 0, i0.ɵɵtemplateRefExtractor);
+            i0.ɵɵtemplate(0, ReadQueryManagementFieldComponent_ng_container_0_Template, 2, 1, "ng-container", 2)(1, ReadQueryManagementFieldComponent_ng_template_1_Template, 2, 3, "ng-template", null, 0, i0.ɵɵtemplateRefExtractor);
         } if (rf & 2) {
             const singleQueryDetails_r6 = i0.ɵɵreference(2);
             i0.ɵɵproperty("ngIf", ctx.showQueryList)("ngIfElse", singleQueryDetails_r6);
@@ -21895,7 +22026,7 @@ class ReadQueryManagementFieldComponent extends AbstractFieldReadComponent {
 }
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(ReadQueryManagementFieldComponent, [{
         type: Component,
-        args: [{ selector: 'ccd-read-query-management-field', template: "<ng-container *ngIf=\"showQueryList; else singleQueryDetails\">\n  <ng-container *ngFor=\"let caseQueriesCollection of caseQueriesCollections\">\n    <div *ngIf=\"showQueryList\" class=\"govuk-!-margin-top-8 govuk-!-margin-bottom-8\">\n      <ccd-query-list (selectedQuery)=\"setQuery($event)\" [caseQueriesCollection]=\"caseQueriesCollection\"></ccd-query-list>\n    </div>\n  </ng-container>\n</ng-container>\n\n<ng-template #singleQueryDetails>\n  <ccd-query-details\n    [query]=\"query\"\n    (backClicked)=\"showQueryList = true\"\n    [caseId]=\"caseId\"\n  ></ccd-query-details>\n\n  <ng-container *ngIf=\"!isCaseworker()\">\n    <ng-container *ngIf=\"query?.children?.length > 0 && query?.children?.length % 2 === 1; else queryIsInReview\">\n      <button id=\"ask-follow-up-question\" class=\"govuk-button\" data-module=\"govuk-button\"\n              [routerLink]=\"['/query-management', 'query', caseId, '4', query.id]\">\n        {{ 'Ask a follow-up question' | rpxTranslate }}\n      </button>\n    </ng-container>\n\n    <ng-template #queryIsInReview>\n      <div>\n        <p class=\"govuk-!-font-weight-bold\">{{ 'Your query is under review' | rpxTranslate }}</p>\n        <p>{{ 'Our team will read your query and will respond. Do not submit the same query more than once.' | rpxTranslate }}</p>\n      </div>\n    </ng-template>\n  </ng-container>\n\n  <ng-container *ngIf=\"query?.children?.length >= 0 && isCaseworker() && query?.children?.length % 2 === 0\">\n    <button id=\"ask-follow-up-question\" class=\"govuk-button\" data-module=\"govuk-button\"\n    [routerLink]=\"['/query-management', 'query', caseId, '3', query.id]\"\n    >\n    {{ 'Respond to a query' | rpxTranslate }}\n    </button>\n  </ng-container>\n</ng-template>\n" }]
+        args: [{ selector: 'ccd-read-query-management-field', template: "<ng-container *ngIf=\"showQueryList; else singleQueryDetails\">\n  <ng-container *ngFor=\"let caseQueriesCollection of caseQueriesCollections\">\n    <div *ngIf=\"showQueryList\" class=\"govuk-!-margin-top-8 govuk-!-margin-bottom-8\">\n      <ccd-query-list (selectedQuery)=\"setQuery($event)\" [caseQueriesCollection]=\"caseQueriesCollection\"></ccd-query-list>\n    </div>\n  </ng-container>\n</ng-container>\n\n<ng-template #singleQueryDetails>\n  <ccd-query-details\n    [query]=\"query\"\n    (backClicked)=\"showQueryList = true\"\n    [caseId]=\"caseId\"\n  ></ccd-query-details>\n\n  <ng-container *ngIf=\"!isCaseworker()\">\n    <ng-container *ngIf=\"query?.children?.length > 0 && query?.children?.length % 2 === 1; else queryIsInReview\">\n      <button id=\"ask-follow-up-question\" class=\"govuk-button\" data-module=\"govuk-button\"\n              [routerLink]=\"['/query-management', 'query', caseId, '4', query.id]\">\n        {{ 'Ask a follow-up question' | rpxTranslate }}\n      </button>\n    </ng-container>\n\n    <ng-template #queryIsInReview>\n      <div>\n        <p class=\"govuk-!-font-weight-bold\">{{ 'Your query is under review' | rpxTranslate }}</p>\n        <p>{{ 'Our team will read your query and will respond. Do not submit the same query more than once.' | rpxTranslate }}</p>\n      </div>\n    </ng-template>\n  </ng-container>\n</ng-template>\n" }]
     }], () => [{ type: i1$1.ActivatedRoute }, { type: SessionStorageService }, { type: CaseNotifier }], null); })();
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(ReadQueryManagementFieldComponent, { className: "ReadQueryManagementFieldComponent", filePath: "lib/shared/components/palette/query-management/read-query-management-field.component.ts", lineNumber: 14 }); })();
 
@@ -29258,7 +29389,7 @@ i0.ɵɵsetComponentScope(
 // Components for Query Management
 ReadQueryManagementFieldComponent, function () { return [i5.NgForOf, i5.NgIf, i1$1.RouterLink, QueryDetailsComponent,
     QueryListComponent]; }, function () { return [i1.RpxTranslatePipe]; });
-i0.ɵɵsetComponentScope(QueryDetailsComponent, function () { return [i5.NgForOf, i5.NgIf, QueryAttachmentsReadComponent]; }, function () { return [i5.DatePipe, i1.RpxTranslatePipe]; });
+i0.ɵɵsetComponentScope(QueryDetailsComponent, function () { return [i5.NgForOf, i5.NgIf, AlertComponent, QueryAttachmentsReadComponent]; }, function () { return [i5.DatePipe, i1.RpxTranslatePipe]; });
 i0.ɵɵsetComponentScope(QueryWriteRespondToQueryComponent, function () { return [i5.NgIf, i4.DefaultValueAccessor, i4.NgControlStatus, i4.NgControlStatusGroup, i4.FormGroupDirective, i4.FormControlName, QueryDetailsComponent,
     QueryCaseDetailsHeaderComponent]; }, function () { return [i1.RpxTranslatePipe]; });
 i0.ɵɵsetComponentScope(QueryWriteRaiseQueryComponent, function () { return [i5.NgClass, i5.NgIf, i4.DefaultValueAccessor, i4.RadioControlValueAccessor, i4.NgControlStatus, i4.NgControlStatusGroup, i4.FormGroupDirective, i4.FormControlName, QueryCaseDetailsHeaderComponent,