@hmcts/ccd-case-ui-toolkit 7.1.34-qm-wa → 7.1.34

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

@@ -8847,7 +8847,7 @@ class EventCompletionStateMachineService {
     entryActionForStateCheckTasksCanBeCompleted(state, context) {
         const assignNeeded = context.sessionStorageService.getItem('assignNeeded');
         context.workAllocationService.getTask(context.task.id).subscribe(taskResponse => {
-            if (taskResponse && taskResponse.task && taskResponse.task.task_state) {
+            if (taskResponse?.task?.task_state) {
                 switch (taskResponse.task.task_state.toUpperCase()) {
                     case TaskState.Unassigned:
                         // Task unassigned
@@ -8882,6 +8882,14 @@ class EventCompletionStateMachineService {
                         break;
                 }
             }
+            else if (!taskResponse?.task) {
+                context.alertService.setPreserveAlerts(true);
+                context.alertService.warning({ phrase: 'Task statecheck : no task available for completion', replacements: {} });
+            }
+            else {
+                context.alertService.setPreserveAlerts(true);
+                context.alertService.warning({ phrase: 'Task statecheck : no task state available for completion', replacements: {} });
+            }
         }, error => {
             context.alertService.error(error.message);
             return throwError(error);
@@ -8904,6 +8912,8 @@ class EventCompletionStateMachineService {
             context.component.eventCanBeCompleted.emit(true);
         }
         else {
+            context.alertService.setPreserveAlerts(true);
+            context.alertService.warning({ phrase: 'CompleteEventAndTask : no task available for completion', replacements: {} });
             // Emit event cannot be completed event
             context.component.eventCanBeCompleted.emit(false);
         }
@@ -8924,6 +8934,8 @@ class EventCompletionStateMachineService {
             context.component.eventCanBeCompleted.emit(true);
         }
         else {
+            context.alertService.setPreserveAlerts(true);
+            context.alertService.warning({ phrase: 'Unassigned task : no task available for completion', replacements: {} });
             // Emit event cannot be completed event
             context.component.eventCanBeCompleted.emit(false);
         }
@@ -9131,6 +9143,8 @@ class WorkAllocationService {
      */
     completeTask(taskId, eventName) {
         if (!this.isWAEnabled()) {
+            this.alertService.setPreserveAlerts(true);
+            this.alertService.warning({ phrase: 'completeTask: Work Allocation is not enabled, so the task could not be completed. Please complete the task associated with the case manually.' });
             return of(null);
         }
         this.appConfig.logMessage(`completeTask: completing ${taskId}`);
@@ -9152,6 +9166,8 @@ class WorkAllocationService {
      */
     assignAndCompleteTask(taskId, eventName) {
         if (!this.isWAEnabled()) {
+            this.alertService.setPreserveAlerts(true);
+            this.alertService.warning({ phrase: 'assignAndCompleteTask: Work Allocation is not enabled, so the task could not be completed. Please complete the task associated with the case manually.' });
             return of(null);
         }
         this.appConfig.logMessage(`assignAndCompleteTask: completing ${taskId}`);
@@ -9618,8 +9634,8 @@ class CaseEditComponent {
             const caseField = caseFieldsLookup[key];
             // If caseField.hidden is NOT truthy and also NOT equal to false, then it must be null/undefined (remember that
             // both null and undefined are equal to *neither false nor true*)
-            if (caseField && caseField.retain_hidden_value &&
-                (caseField.hidden || (caseField.hidden !== false && parentField && parentField.hidden))) {
+            if (caseField?.retain_hidden_value &&
+                (caseField?.hidden || (caseField?.hidden !== false && parentField?.hidden))) {
                 if (caseField.field_type.type === 'Complex') {
                     this.handleComplexField(caseField, formGroup, key, rawFormValueData);
                 }
@@ -14247,6 +14263,7 @@ class WriteDocumentFieldComponent extends AbstractFieldWriteComponent {
     static UPLOAD_TIMESTAMP = 'upload_timestamp';
     static UPLOAD_ERROR_FILE_REQUIRED = 'File required';
     static UPLOAD_ERROR_NOT_AVAILABLE = 'Document upload facility is not available at the moment';
+    static UPLOAD_ERROR_INVALID_FORMAT = 'Document format is not supported';
     static UPLOAD_WAITING_FILE_STATUS = 'Uploading...';
     static ERROR_UPLOADING_FILE = 'Error Uploading File';
     fileInput;
@@ -14324,8 +14341,15 @@ class WriteDocumentFieldComponent extends AbstractFieldWriteComponent {
             }
         }
     }
-    fileChangeEvent(fileInput) {
-        if (fileInput.target.files[0]) {
+    fileChangeEvent(fileInput, allowedRegex) {
+        let fileTypeRegex;
+        if (allowedRegex) {
+            fileTypeRegex = new RegExp(`(${allowedRegex.replace(/,/g, '|')})`);
+        }
+        if (fileInput.target?.files[0] && !fileInput.target?.files[0]?.name?.match(fileTypeRegex)) {
+            this.invalidFileFormat();
+        }
+        else if (fileInput.target.files[0]) {
             this.selectedFile = fileInput.target.files[0];
             this.displayFileUploadMessages(WriteDocumentFieldComponent.UPLOAD_WAITING_FILE_STATUS);
             const documentUpload = this.buildDocumentUploadData(this.selectedFile);
@@ -14358,6 +14382,10 @@ class WriteDocumentFieldComponent extends AbstractFieldWriteComponent {
         }
         return false;
     }
+    invalidFileFormat() {
+        this.updateDocumentForm(null, null, null);
+        this.displayFileUploadMessages(WriteDocumentFieldComponent.UPLOAD_ERROR_INVALID_FORMAT);
+    }
     getUploadedFileName() {
         if (this.uploadedDocument) {
             return this.uploadedDocument.get(WriteDocumentFieldComponent.DOCUMENT_FILENAME).value;
@@ -14575,7 +14603,7 @@ class WriteDocumentFieldComponent extends AbstractFieldWriteComponent {
             i0.ɵɵlistener("click", function WriteDocumentFieldComponent_Template_div_click_11_listener() { i0.ɵɵrestoreView(_r1); return i0.ɵɵresetView(ctx.fileSelectEvent()); })("keyup", function WriteDocumentFieldComponent_Template_div_keyup_11_listener() { i0.ɵɵrestoreView(_r1); return i0.ɵɵresetView(ctx.fileSelectEvent()); });
             i0.ɵɵelementEnd();
             i0.ɵɵelementStart(12, "input", 9, 0);
-            i0.ɵɵlistener("keydown.Tab", function WriteDocumentFieldComponent_Template_input_keydown_Tab_12_listener() { i0.ɵɵrestoreView(_r1); return i0.ɵɵresetView(ctx.fileValidationsOnTab()); })("change", function WriteDocumentFieldComponent_Template_input_change_12_listener($event) { i0.ɵɵrestoreView(_r1); return i0.ɵɵresetView(ctx.fileChangeEvent($event)); });
+            i0.ɵɵlistener("keydown.Tab", function WriteDocumentFieldComponent_Template_input_keydown_Tab_12_listener() { i0.ɵɵrestoreView(_r1); return i0.ɵɵresetView(ctx.fileValidationsOnTab()); })("change", function WriteDocumentFieldComponent_Template_input_change_12_listener($event) { i0.ɵɵrestoreView(_r1); return i0.ɵɵresetView(ctx.fileChangeEvent($event, ctx.caseField.field_type.regular_expression)); });
             i0.ɵɵelementEnd()()();
             i0.ɵɵelementStart(14, "div", 10)(15, "button", 11);
             i0.ɵɵlistener("click", function WriteDocumentFieldComponent_Template_button_click_15_listener() { i0.ɵɵrestoreView(_r1); return i0.ɵɵresetView(ctx.cancelUpload()); });
@@ -14609,7 +14637,7 @@ class WriteDocumentFieldComponent extends AbstractFieldWriteComponent {
 }
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(WriteDocumentFieldComponent, [{
         type: Component,
-        args: [{ selector: 'ccd-write-document-field', template: "<div class=\"form-group\" [ngClass]=\"{'form-group-error bottom-30': !valid}\">\n  <label [for]=\"id()\">\n    <span class=\"form-label\" attr.aria-label=\"{{caseField | ccdFieldLabel}}\">{{(caseField | ccdFieldLabel)}}</span>\n  </label>\n  <span class=\"form-hint\" *ngIf=\"caseField.hint_text\">{{caseField.hint_text | rpxTranslate}}</span>\n  <span class=\"error-message\" *ngIf=\"fileUploadMessages && !valid\">{{fileUploadMessages | rpxTranslate}}</span>\n\n  <div>\n    <!--<span *ngIf=\"getUploadedFileName()\" class=\"text-16\">File name: {{getUploadedFileName()}}</span>-->\n    <ccd-read-document-field *ngIf=\"caseField\" [caseField]=\"caseField\"></ccd-read-document-field>\n  </div>\n\n  <div style='position:relative'>\n    <div [id]=\"createElementId('fileInputWrapper')\" (click)=\"fileSelectEvent()\" (keyup)=\"fileSelectEvent()\"></div>\n    <input class=\"form-control bottom-30\" [id]=\"id()\" type=\"file\" (keydown.Tab)=\"fileValidationsOnTab()\" (change)=\"fileChangeEvent($event)\"\n           accept=\"{{caseField.field_type.regular_expression}}\" #fileInput/>\n  </div>\n</div>\n<div class=\"form-group bottom-30\">\n  <button class=\"button button-secondary\" type=\"button\" aria-label=\"Cancel upload\" (click)=\"cancelUpload()\" [disabled]=\"!isUploadInProgress()\">{{'Cancel upload' | rpxTranslate}}</button>\n</div>\n" }]
+        args: [{ selector: 'ccd-write-document-field', template: "<div class=\"form-group\" [ngClass]=\"{'form-group-error bottom-30': !valid}\">\n  <label [for]=\"id()\">\n    <span class=\"form-label\" attr.aria-label=\"{{caseField | ccdFieldLabel}}\">{{(caseField | ccdFieldLabel)}}</span>\n  </label>\n  <span class=\"form-hint\" *ngIf=\"caseField.hint_text\">{{caseField.hint_text | rpxTranslate}}</span>\n  <span class=\"error-message\" *ngIf=\"fileUploadMessages && !valid\">{{fileUploadMessages | rpxTranslate}}</span>\n\n  <div>\n    <!--<span *ngIf=\"getUploadedFileName()\" class=\"text-16\">File name: {{getUploadedFileName()}}</span>-->\n    <ccd-read-document-field *ngIf=\"caseField\" [caseField]=\"caseField\"></ccd-read-document-field>\n  </div>\n\n  <div style='position:relative'>\n    <div [id]=\"createElementId('fileInputWrapper')\" (click)=\"fileSelectEvent()\" (keyup)=\"fileSelectEvent()\"></div>\n    <input class=\"form-control bottom-30\" [id]=\"id()\" type=\"file\" (keydown.Tab)=\"fileValidationsOnTab()\" (change)=\"fileChangeEvent($event, caseField.field_type.regular_expression)\"\n           accept=\"{{caseField.field_type.regular_expression}}\" #fileInput/>\n  </div>\n</div>\n<div class=\"form-group bottom-30\">\n  <button class=\"button button-secondary\" type=\"button\" aria-label=\"Cancel upload\" (click)=\"cancelUpload()\" [disabled]=\"!isUploadInProgress()\">{{'Cancel upload' | rpxTranslate}}</button>\n</div>\n" }]
     }], () => [{ type: AbstractAppConfig }, { type: CaseNotifier }, { type: DocumentManagementService }, { type: i1$3.MatLegacyDialog }, { type: FileUploadStateService }, { type: JurisdictionService }], { fileInput: [{
             type: ViewChild,
             args: ['fileInput', { static: false }]
@@ -16651,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 = [];
@@ -16691,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) {
@@ -16699,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) {
@@ -16717,7 +16745,7 @@ class LinkCasesComponent {
                 this.errorMessages.push({
                     title: 'dummy-case-reason-comments',
                     description: LinkedCasesErrorMessages.otherDescriptionMaxLengthError,
-                    fieldId: 'otherDescription',
+                    fieldId: 'otherDescription'
                 });
             }
         }
@@ -16726,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)) {
@@ -16734,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);
@@ -16762,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,
@@ -16775,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) => {
@@ -16783,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);
@@ -16795,7 +16823,7 @@ class LinkCasesComponent {
         this.linkedCasesStateEmitter.emit({
             currentLinkedCasesPage: LinkedCasesPages.LINK_CASE,
             errorMessages: this.errorMessages,
-            navigateToNextPage: isNavigateToNextPage,
+            navigateToNextPage: isNavigateToNextPage
         });
     }
     getSelectedCaseReasons() {
@@ -16830,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;
         }
@@ -16851,7 +16879,7 @@ class LinkCasesComponent {
             this.errorMessages.push({
                 title: 'dummy-case-selection',
                 description: LinkedCasesErrorMessages.CaseSelectionError,
-                fieldId: 'caseReason',
+                fieldId: 'caseReason'
             });
             navigateToNextPage = false;
         }
@@ -17586,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;
@@ -17598,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);
             });
@@ -17628,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,
@@ -17642,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;
         }
@@ -17650,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',
@@ -17668,7 +17696,7 @@ class UnLinkCasesComponent {
         this.linkedCasesStateEmitter.emit({
             currentLinkedCasesPage: LinkedCasesPages.UNLINK_CASE,
             errorMessages: this.errorMessages,
-            navigateToNextPage: isNavigateToNextPage,
+            navigateToNextPage: isNavigateToNextPage
         });
     }
     resetErrorMessages() {
@@ -18011,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) {
@@ -18094,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() {
@@ -18117,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();
             }
@@ -18161,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);
@@ -19548,8 +19593,10 @@ function QualifyingQuestionDetailComponent_ng_container_0_Template(rf, ctx) { if
     i0.ɵɵtext(5);
     i0.ɵɵpipe(6, "rpxTranslate");
     i0.ɵɵelementEnd();
-    i0.ɵɵelement(7, "ccd-markdown", 3);
-    i0.ɵɵpipe(8, "rpxTranslate");
+    i0.ɵɵelementStart(7, "div", 3);
+    i0.ɵɵelement(8, "ccd-markdown", 4);
+    i0.ɵɵpipe(9, "rpxTranslate");
+    i0.ɵɵelementEnd();
     i0.ɵɵelementContainerEnd();
 } if (rf & 2) {
     const ctx_r0 = i0.ɵɵnextContext();
@@ -19557,25 +19604,25 @@ function QualifyingQuestionDetailComponent_ng_container_0_Template(rf, ctx) { if
     i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(3, 3, "Are you contacting us about any of the following:"), " ");
     i0.ɵɵadvance(3);
     i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(6, 5, ctx_r0.qualifyingQuestion.name), " ");
-    i0.ɵɵadvance(2);
-    i0.ɵɵproperty("content", i0.ɵɵpipeBind1(8, 7, ctx_r0.qualifyingQuestion.markdown));
+    i0.ɵɵadvance(3);
+    i0.ɵɵproperty("content", i0.ɵɵpipeBind1(9, 7, ctx_r0.qualifyingQuestion.markdown));
 } }
 class QualifyingQuestionDetailComponent {
     qualifyingQuestion;
     static ɵfac = function QualifyingQuestionDetailComponent_Factory(t) { return new (t || QualifyingQuestionDetailComponent)(); };
-    static ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: QualifyingQuestionDetailComponent, selectors: [["ccd-qualifying-question-detail"]], inputs: { qualifyingQuestion: "qualifyingQuestion" }, decls: 1, vars: 1, consts: [[4, "ngIf"], [1, "govuk-caption-l"], [1, "govuk-heading-l"], [3, "content"]], template: function QualifyingQuestionDetailComponent_Template(rf, ctx) { if (rf & 1) {
-            i0.ɵɵtemplate(0, QualifyingQuestionDetailComponent_ng_container_0_Template, 9, 9, "ng-container", 0);
+    static ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: QualifyingQuestionDetailComponent, selectors: [["ccd-qualifying-question-detail"]], inputs: { qualifyingQuestion: "qualifyingQuestion" }, decls: 1, vars: 1, consts: [[4, "ngIf"], [1, "govuk-caption-l"], [1, "govuk-heading-l"], [1, "qm-qualifying-question"], [3, "content"]], template: function QualifyingQuestionDetailComponent_Template(rf, ctx) { if (rf & 1) {
+            i0.ɵɵtemplate(0, QualifyingQuestionDetailComponent_ng_container_0_Template, 10, 9, "ng-container", 0);
         } if (rf & 2) {
             i0.ɵɵproperty("ngIf", ctx.qualifyingQuestion == null ? null : ctx.qualifyingQuestion.markdown);
-        } }, dependencies: [i5.NgIf, MarkdownComponent, i1.RpxTranslatePipe], encapsulation: 2 });
+        } }, dependencies: [i5.NgIf, MarkdownComponent, i1.RpxTranslatePipe], styles: [".qm-qualifying-question[_ngcontent-%COMP%]   .markdown[_ngcontent-%COMP%]{font-size:19px}"] });
 }
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(QualifyingQuestionDetailComponent, [{
         type: Component,
-        args: [{ selector: 'ccd-qualifying-question-detail', template: "<ng-container *ngIf=\"qualifyingQuestion?.markdown\">\n  <span class=\"govuk-caption-l\">\n    {{ 'Are you contacting us about any of the following:' | rpxTranslate }}\n  </span>\n  <h1 class=\"govuk-heading-l\">\n    {{ qualifyingQuestion.name | rpxTranslate }}\n  </h1>\n  <ccd-markdown\n    [content]=\"qualifyingQuestion.markdown | rpxTranslate\">\n  </ccd-markdown>\n</ng-container>\n" }]
+        args: [{ selector: 'ccd-qualifying-question-detail', template: "<ng-container *ngIf=\"qualifyingQuestion?.markdown\">\n  <span class=\"govuk-caption-l\">\n    {{ 'Are you contacting us about any of the following:' | rpxTranslate }}\n  </span>\n  <h1 class=\"govuk-heading-l\">\n    {{ qualifyingQuestion.name | rpxTranslate }}\n  </h1>\n  <div class=\"qm-qualifying-question\">\n    <ccd-markdown\n    [content]=\"qualifyingQuestion.markdown | rpxTranslate\">\n  </ccd-markdown>\n  </div>\n</ng-container>\n", styles: [".qm-qualifying-question .markdown{font-size:19px}\n"] }]
     }], null, { qualifyingQuestion: [{
             type: Input
         }] }); })();
-(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(QualifyingQuestionDetailComponent, { className: "QualifyingQuestionDetailComponent", filePath: "lib/shared/components/palette/query-management/components/qualifying-questions/qualifying-question-detail/qualifying-question-detail.component.ts", lineNumber: 8 }); })();
+(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(QualifyingQuestionDetailComponent, { className: "QualifyingQuestionDetailComponent", filePath: "lib/shared/components/palette/query-management/components/qualifying-questions/qualifying-question-detail/qualifying-question-detail.component.ts", lineNumber: 9 }); })();
 
 var RaiseQueryErrorMessage;
 (function (RaiseQueryErrorMessage) {
@@ -20234,7 +20281,6 @@ class QueryCheckYourAnswersComponent {
     caseViewTrigger;
     caseDetails;
     queryId;
-    tid;
     createEventSubscription;
     searchTasksSubscription;
     queryCreateContextEnum = QueryCreateContext;
@@ -20254,11 +20300,8 @@ class QueryCheckYourAnswersComponent {
     }
     ngOnInit() {
         this.queryId = this.route.snapshot.params.qid;
-        this.tid = this.route.snapshot.queryParams?.tid;
-        console.log('tid:', this.tid);
         this.caseNotifier.caseView.pipe(take(1)).subscribe((caseDetails) => {
             this.caseDetails = caseDetails;
-            console.log('caseDetails:', this.caseDetails.case_id, this.caseDetails);
             // Find the appropriate event trigger based on the queryCreateContext
             this.caseViewTrigger = this.caseDetails.triggers.find((trigger) => this.queryCreateContext !== QueryCreateContext.RESPOND
                 // If the context is not 'RESPOND', find the trigger with the ID for raising a query
@@ -20269,23 +20312,6 @@ class QueryCheckYourAnswersComponent {
         // Get the document attachments
         this.getDocumentAttachments();
         this.setCaseQueriesCollectionData();
-        this.workAllocationService.getTasksByCaseIdAndEventId('queryManagementRespondToQuery', this.caseDetails.case_id, this.caseDetails.case_type.id, this.caseDetails.case_type.jurisdiction.id)
-            .subscribe((response) => {
-            console.log('response:-queryManagementRespondToQ', response);
-        });
-        if (this.tid) {
-            this.workAllocationService.getTask(this.tid).subscribe((response) => {
-                console.log('response-tid------:', response);
-            }, (error) => {
-                console.error('Error in getTask:', error);
-                // Handle error appropriately
-            });
-        }
-        const searchParameter = { ccdId: this.caseDetails.case_id };
-        this.workAllocationService.searchTasks(searchParameter)
-            .subscribe((response) => {
-            console.log('response:searchTasks', response);
-        });
     }
     ngOnDestroy() {
         this.createEventSubscription?.unsubscribe();
@@ -20863,16 +20889,11 @@ function QueryDetailsComponent_ng_container_0_Template(rf, ctx) { if (rf & 1) {
 } }
 class QueryDetailsComponent {
     sessionStorageService;
-    route;
     query;
     backClicked = new EventEmitter();
     caseId;
-    showLink = true;
-    static QUERY_ITEM_RESPOND = '3';
-    queryItemId;
-    constructor(sessionStorageService, route) {
+    constructor(sessionStorageService) {
         this.sessionStorageService = sessionStorageService;
-        this.route = route;
     }
     onBack() {
         this.backClicked.emit(true);
@@ -20883,15 +20904,8 @@ class QueryDetailsComponent {
             && !(userDetails.roles.includes('pui-case-manager')
                 || userDetails.roles.some((role) => role.toLowerCase().includes('judge')));
     }
-    ngOnChanges() {
-        this.toggleLinkVisibility();
-    }
-    toggleLinkVisibility() {
-        this.queryItemId = this.route.snapshot.params.qid;
-        this.showLink = this.queryItemId !== QueryDetailsComponent.QUERY_ITEM_RESPOND;
-    }
-    static ɵfac = function QueryDetailsComponent_Factory(t) { return new (t || QueryDetailsComponent)(i0.ɵɵdirectiveInject(SessionStorageService), i0.ɵɵdirectiveInject(i1$1.ActivatedRoute)); };
-    static ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: QueryDetailsComponent, selectors: [["ccd-query-details"]], inputs: { query: "query", caseId: "caseId" }, outputs: { backClicked: "backClicked" }, features: [i0.ɵɵNgOnChangesFeature], 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) {
+    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);
         } if (rf & 2) {
             i0.ɵɵproperty("ngIf", ctx.query);
@@ -20900,7 +20914,7 @@ class QueryDetailsComponent {
 (() => { (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 }, { type: i1$1.ActivatedRoute }], { query: [{
+    }], () => [{ type: SessionStorageService }], { query: [{
             type: Input
         }], backClicked: [{
             type: Output
@@ -21286,8 +21300,8 @@ class QueryWriteDateInputComponent {
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(QueryWriteDateInputComponent, { className: "QueryWriteDateInputComponent", filePath: "lib/shared/components/palette/query-management/components/query-write/query-write-date-input/query-write-date-input.component.ts", lineNumber: 15 }); })();
 
 const _c0$C = a0 => ({ "govuk-form-group--error": a0 });
-function QueryWriteRaiseQueryComponent_p_22_Template(rf, ctx) { if (rf & 1) {
-    i0.ɵɵelementStart(0, "p", 26)(1, "span", 27);
+function QueryWriteRaiseQueryComponent_div_11_p_11_Template(rf, ctx) { if (rf & 1) {
+    i0.ɵɵelementStart(0, "p", 27)(1, "span", 28);
     i0.ɵɵtext(2);
     i0.ɵɵpipe(3, "rpxTranslate");
     i0.ɵɵelementEnd();
@@ -21295,14 +21309,14 @@ function QueryWriteRaiseQueryComponent_p_22_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵpipe(5, "rpxTranslate");
     i0.ɵɵelementEnd();
 } if (rf & 2) {
-    const ctx_r0 = i0.ɵɵnextContext();
+    const ctx_r0 = i0.ɵɵnextContext(2);
     i0.ɵɵadvance(2);
     i0.ɵɵtextInterpolate1("", i0.ɵɵpipeBind1(3, 2, "Error:"), " ");
     i0.ɵɵadvance(2);
     i0.ɵɵtextInterpolate1("", i0.ɵɵpipeBind1(5, 4, ctx_r0.raiseQueryErrorMessage.QUERY_SUBJECT), " ");
 } }
-function QueryWriteRaiseQueryComponent_p_32_Template(rf, ctx) { if (rf & 1) {
-    i0.ɵɵelementStart(0, "p", 28)(1, "span", 27);
+function QueryWriteRaiseQueryComponent_div_11_p_21_Template(rf, ctx) { if (rf & 1) {
+    i0.ɵɵelementStart(0, "p", 29)(1, "span", 28);
     i0.ɵɵtext(2);
     i0.ɵɵpipe(3, "rpxTranslate");
     i0.ɵɵelementEnd();
@@ -21310,14 +21324,14 @@ function QueryWriteRaiseQueryComponent_p_32_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵpipe(5, "rpxTranslate");
     i0.ɵɵelementEnd();
 } if (rf & 2) {
-    const ctx_r0 = i0.ɵɵnextContext();
+    const ctx_r0 = i0.ɵɵnextContext(2);
     i0.ɵɵadvance(2);
     i0.ɵɵtextInterpolate1("", i0.ɵɵpipeBind1(3, 2, "Error:"), " ");
     i0.ɵɵadvance(2);
     i0.ɵɵtextInterpolate1("", i0.ɵɵpipeBind1(5, 4, ctx_r0.raiseQueryErrorMessage.QUERY_BODY), " ");
 } }
-function QueryWriteRaiseQueryComponent_p_41_Template(rf, ctx) { if (rf & 1) {
-    i0.ɵɵelementStart(0, "p", 29)(1, "span", 27);
+function QueryWriteRaiseQueryComponent_div_11_p_30_Template(rf, ctx) { if (rf & 1) {
+    i0.ɵɵelementStart(0, "p", 30)(1, "span", 28);
     i0.ɵɵtext(2);
     i0.ɵɵpipe(3, "rpxTranslate");
     i0.ɵɵelementEnd();
@@ -21325,14 +21339,14 @@ function QueryWriteRaiseQueryComponent_p_41_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵpipe(5, "rpxTranslate");
     i0.ɵɵelementEnd();
 } if (rf & 2) {
-    const ctx_r0 = i0.ɵɵnextContext();
+    const ctx_r0 = i0.ɵɵnextContext(2);
     i0.ɵɵadvance(2);
     i0.ɵɵtextInterpolate1("", i0.ɵɵpipeBind1(3, 2, "Error:"), " ");
     i0.ɵɵadvance(2);
     i0.ɵɵtextInterpolate1("", i0.ɵɵpipeBind1(5, 4, ctx_r0.raiseQueryErrorMessage.QUERY_HEARING_RELATED), " ");
 } }
-function QueryWriteRaiseQueryComponent_ng_container_53_p_7_Template(rf, ctx) { if (rf & 1) {
-    i0.ɵɵelementStart(0, "p", 35)(1, "span", 27);
+function QueryWriteRaiseQueryComponent_div_11_ng_container_42_p_7_Template(rf, ctx) { if (rf & 1) {
+    i0.ɵɵelementStart(0, "p", 36)(1, "span", 28);
     i0.ɵɵtext(2);
     i0.ɵɵpipe(3, "rpxTranslate");
     i0.ɵɵelementEnd();
@@ -21340,24 +21354,24 @@ function QueryWriteRaiseQueryComponent_ng_container_53_p_7_Template(rf, ctx) { i
     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("", i0.ɵɵpipeBind1(5, 4, ctx_r0.raiseQueryErrorMessage.QUERY_HEARING_DATE), " ");
 } }
-function QueryWriteRaiseQueryComponent_ng_container_53_Template(rf, ctx) { if (rf & 1) {
+function QueryWriteRaiseQueryComponent_div_11_ng_container_42_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementContainerStart(0);
-    i0.ɵɵelementStart(1, "div", 30)(2, "fieldset", 31)(3, "legend")(4, "label", 32);
+    i0.ɵɵelementStart(1, "div", 31)(2, "fieldset", 32)(3, "legend")(4, "label", 33);
     i0.ɵɵtext(5);
     i0.ɵɵpipe(6, "rpxTranslate");
     i0.ɵɵelementEnd()();
-    i0.ɵɵtemplate(7, QueryWriteRaiseQueryComponent_ng_container_53_p_7_Template, 6, 6, "p", 33);
-    i0.ɵɵelement(8, "ccd-query-write-date-input", 34);
+    i0.ɵɵtemplate(7, QueryWriteRaiseQueryComponent_div_11_ng_container_42_p_7_Template, 6, 6, "p", 34);
+    i0.ɵɵelement(8, "ccd-query-write-date-input", 35);
     i0.ɵɵelementEnd()();
     i0.ɵɵelementContainerEnd();
 } if (rf & 2) {
-    const ctx_r0 = i0.ɵɵnextContext();
+    const ctx_r0 = i0.ɵɵnextContext(2);
     i0.ɵɵadvance();
     i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(5, _c0$C, ctx_r0.submitted && ctx_r0.formGroup.get("isHearingRelated").value === true && ctx_r0.formGroup.get("hearingDate").value === null));
     i0.ɵɵadvance(4);
@@ -21365,13 +21379,101 @@ function QueryWriteRaiseQueryComponent_ng_container_53_Template(rf, ctx) { if (r
     i0.ɵɵadvance(2);
     i0.ɵɵproperty("ngIf", ctx_r0.submitted && ctx_r0.formGroup.get("isHearingRelated").value === true && ctx_r0.formGroup.get("hearingDate").value === null);
 } }
+function QueryWriteRaiseQueryComponent_div_11_Template(rf, ctx) { if (rf & 1) {
+    i0.ɵɵelementStart(0, "div", 5)(1, "div", 6)(2, "div")(3, "div", 7)(4, "div", 8)(5, "label", 9);
+    i0.ɵɵtext(6);
+    i0.ɵɵpipe(7, "rpxTranslate");
+    i0.ɵɵelementEnd()();
+    i0.ɵɵelementStart(8, "div", 10);
+    i0.ɵɵtext(9);
+    i0.ɵɵpipe(10, "rpxTranslate");
+    i0.ɵɵelementEnd();
+    i0.ɵɵtemplate(11, QueryWriteRaiseQueryComponent_div_11_p_11_Template, 6, 6, "p", 11);
+    i0.ɵɵelement(12, "input", 12);
+    i0.ɵɵelementEnd()();
+    i0.ɵɵelementStart(13, "div", 7)(14, "div", 8)(15, "label", 13);
+    i0.ɵɵtext(16);
+    i0.ɵɵpipe(17, "rpxTranslate");
+    i0.ɵɵelementEnd()();
+    i0.ɵɵelementStart(18, "div", 14);
+    i0.ɵɵtext(19);
+    i0.ɵɵpipe(20, "rpxTranslate");
+    i0.ɵɵelementEnd();
+    i0.ɵɵtemplate(21, QueryWriteRaiseQueryComponent_div_11_p_21_Template, 6, 6, "p", 15);
+    i0.ɵɵelementStart(22, "textarea", 16);
+    i0.ɵɵtext(23, "          ");
+    i0.ɵɵelementEnd()();
+    i0.ɵɵelementStart(24, "div", 7)(25, "fieldset", 17)(26, "legend")(27, "label", 18);
+    i0.ɵɵtext(28);
+    i0.ɵɵpipe(29, "rpxTranslate");
+    i0.ɵɵelementEnd()();
+    i0.ɵɵtemplate(30, QueryWriteRaiseQueryComponent_div_11_p_30_Template, 6, 6, "p", 19);
+    i0.ɵɵelementStart(31, "div", 20)(32, "div", 21);
+    i0.ɵɵelement(33, "input", 22);
+    i0.ɵɵelementStart(34, "label", 23);
+    i0.ɵɵtext(35);
+    i0.ɵɵpipe(36, "rpxTranslate");
+    i0.ɵɵelementEnd()();
+    i0.ɵɵelementStart(37, "div", 21);
+    i0.ɵɵelement(38, "input", 24);
+    i0.ɵɵelementStart(39, "label", 25);
+    i0.ɵɵtext(40);
+    i0.ɵɵpipe(41, "rpxTranslate");
+    i0.ɵɵelementEnd()()()();
+    i0.ɵɵtemplate(42, QueryWriteRaiseQueryComponent_div_11_ng_container_42_Template, 9, 7, "ng-container", 26);
+    i0.ɵɵelementEnd()()();
+} if (rf & 2) {
+    let tmp_6_0;
+    const ctx_r0 = i0.ɵɵnextContext();
+    i0.ɵɵadvance();
+    i0.ɵɵproperty("formGroup", ctx_r0.formGroup);
+    i0.ɵɵadvance(2);
+    i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(43, _c0$C, ctx_r0.submitted && ctx_r0.formGroup.get("subject").hasError("required")));
+    i0.ɵɵadvance(3);
+    i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(7, 25, "Query subject"), " ");
+    i0.ɵɵadvance(3);
+    i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(10, 27, "The subject should be a summary of your query"), " ");
+    i0.ɵɵadvance(2);
+    i0.ɵɵproperty("ngIf", ctx_r0.submitted && ctx_r0.formGroup.get("subject").hasError("required"));
+    i0.ɵɵadvance();
+    i0.ɵɵclassProp("govuk-input--error", ctx_r0.submitted && ((tmp_6_0 = ctx_r0.formGroup.get("subject")) == null ? null : tmp_6_0.hasError("required")));
+    i0.ɵɵproperty("formControlName", "subject");
+    i0.ɵɵadvance();
+    i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(45, _c0$C, ctx_r0.submitted && ctx_r0.formGroup.get("body").hasError("required")));
+    i0.ɵɵadvance(3);
+    i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(17, 29, "Query detail"), " ");
+    i0.ɵɵadvance(3);
+    i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(20, 31, "Include as many details as possible so case workers can respond to your query"), " ");
+    i0.ɵɵadvance(2);
+    i0.ɵɵproperty("ngIf", ctx_r0.submitted && ctx_r0.formGroup.get("body").hasError("required"));
+    i0.ɵɵadvance();
+    i0.ɵɵclassProp("govuk-textarea--error", ctx_r0.submitted && ctx_r0.formGroup.get("body").hasError("required"));
+    i0.ɵɵproperty("formControlName", "body");
+    i0.ɵɵadvance(2);
+    i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(47, _c0$C, ctx_r0.submitted && ctx_r0.formGroup.get("isHearingRelated").hasError("required")));
+    i0.ɵɵadvance(4);
+    i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(29, 33, "Is the query hearing related?"), " ");
+    i0.ɵɵadvance(2);
+    i0.ɵɵproperty("ngIf", ctx_r0.submitted && ctx_r0.formGroup.get("isHearingRelated").hasError("required"));
+    i0.ɵɵadvance(3);
+    i0.ɵɵproperty("checked", ctx_r0.formGroup.get("isHearingRelated").value === true)("value", true);
+    i0.ɵɵadvance(2);
+    i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind3(36, 35, "Is the query hearing related?", null, "Yes"), " ");
+    i0.ɵɵadvance(3);
+    i0.ɵɵproperty("checked", ctx_r0.formGroup.get("isHearingRelated").value === false)("value", false);
+    i0.ɵɵadvance(2);
+    i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind3(41, 39, "Is the query hearing related?", null, "No"), " ");
+    i0.ɵɵadvance(2);
+    i0.ɵɵproperty("ngIf", ctx_r0.formGroup.get("isHearingRelated").value);
+} }
 class QueryWriteRaiseQueryComponent {
     formGroup;
     submitted;
     caseDetails;
+    showForm;
     raiseQueryErrorMessage = RaiseQueryErrorMessage;
     static ɵfac = function QueryWriteRaiseQueryComponent_Factory(t) { return new (t || QueryWriteRaiseQueryComponent)(); };
-    static ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: QueryWriteRaiseQueryComponent, selectors: [["ccd-query-write-raise-query"]], inputs: { formGroup: "formGroup", submitted: "submitted", caseDetails: "caseDetails" }, decls: 54, vars: 56, consts: [[1, "govuk-!-margin-bottom-6"], [1, "govuk-caption-l"], [1, "govuk-heading-l", "govuk-!-margin-bottom-4"], [3, "caseDetails"], [1, "govuk-!-margin-bottom-4"], [3, "formGroup"], [1, "govuk-form-group", 3, "ngClass"], [1, "govuk-label-wrapper"], ["for", "subject", 1, "govuk-label", "govuk-label--m", "govuk-!-font-weight-bold"], ["id", "subject-hint", 1, "govuk-hint"], ["id", "subject-error", "class", "govuk-error-message", 4, "ngIf"], ["type", "text", "name", "subject", "id", "subject", 1, "govuk-input", 3, "formControlName"], ["for", "body", 1, "govuk-label", "govuk-label--m", "govuk-!-font-weight-bold"], ["id", "body-hint", 1, "govuk-hint"], ["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"], [1, "govuk-fieldset"], [1, "govuk-label", "govuk-label--m", "govuk-!-font-weight-bold"], ["id", "isHearingRelated-error", "class", "govuk-error-message", 4, "ngIf"], ["data-module", "govuk-radios", 1, "govuk-radios", "govuk-radios--inline"], [1, "govuk-radios__item"], ["id", "isHearingRelated-yes", "name", "isHearingRelated", "type", "radio", "formControlName", "isHearingRelated", 1, "govuk-radios__input", 3, "checked", "value"], ["for", "isHearingRelated-yes", 1, "govuk-label", "govuk-radios__label"], ["id", "isHearingRelated-no", "name", "isHearingRelated", "type", "radio", "formControlName", "isHearingRelated", 1, "govuk-radios__input", 3, "checked", "value"], ["for", "isHearingRelated-no", 1, "govuk-label", "govuk-radios__label"], [4, "ngIf"], ["id", "subject-error", 1, "govuk-error-message"], [1, "govuk-visually-hidden"], ["id", "body-error", 1, "govuk-error-message"], ["id", "isHearingRelated-error", 1, "govuk-error-message"], [1, "govuk-radios__conditional", "govuk-!-margin-top-1", 3, "ngClass"], ["role", "group", 1, "govuk-fieldset"], [1, "govuk-label", "govuk-label--s"], ["id", "hearingDate-error", "class", "govuk-error-message", 4, "ngIf"], ["formControlName", "hearingDate"], ["id", "hearingDate-error", 1, "govuk-error-message"]], template: function QueryWriteRaiseQueryComponent_Template(rf, ctx) { if (rf & 1) {
+    static ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: QueryWriteRaiseQueryComponent, selectors: [["ccd-query-write-raise-query"]], inputs: { formGroup: "formGroup", submitted: "submitted", caseDetails: "caseDetails", showForm: "showForm" }, decls: 12, vars: 8, consts: [[1, "govuk-!-margin-bottom-6"], [1, "govuk-caption-l"], [1, "govuk-heading-l", "govuk-!-margin-bottom-4"], [3, "caseDetails"], ["class", "govuk-!-margin-bottom-4", 4, "ngIf"], [1, "govuk-!-margin-bottom-4"], [3, "formGroup"], [1, "govuk-form-group", 3, "ngClass"], [1, "govuk-label-wrapper"], ["for", "subject", 1, "govuk-label", "govuk-label--m", "govuk-!-font-weight-bold"], ["id", "subject-hint", 1, "govuk-hint"], ["id", "subject-error", "class", "govuk-error-message", 4, "ngIf"], ["type", "text", "name", "subject", "id", "subject", 1, "govuk-input", 3, "formControlName"], ["for", "body", 1, "govuk-label", "govuk-label--m", "govuk-!-font-weight-bold"], ["id", "body-hint", 1, "govuk-hint"], ["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"], [1, "govuk-fieldset"], [1, "govuk-label", "govuk-label--m", "govuk-!-font-weight-bold"], ["id", "isHearingRelated-error", "class", "govuk-error-message", 4, "ngIf"], ["data-module", "govuk-radios", 1, "govuk-radios", "govuk-radios--inline"], [1, "govuk-radios__item"], ["id", "isHearingRelated-yes", "name", "isHearingRelated", "type", "radio", "formControlName", "isHearingRelated", 1, "govuk-radios__input", 3, "checked", "value"], ["for", "isHearingRelated-yes", 1, "govuk-label", "govuk-radios__label"], ["id", "isHearingRelated-no", "name", "isHearingRelated", "type", "radio", "formControlName", "isHearingRelated", 1, "govuk-radios__input", 3, "checked", "value"], ["for", "isHearingRelated-no", 1, "govuk-label", "govuk-radios__label"], [4, "ngIf"], ["id", "subject-error", 1, "govuk-error-message"], [1, "govuk-visually-hidden"], ["id", "body-error", 1, "govuk-error-message"], ["id", "isHearingRelated-error", 1, "govuk-error-message"], [1, "govuk-radios__conditional", "govuk-!-margin-top-1", 3, "ngClass"], ["role", "group", 1, "govuk-fieldset"], [1, "govuk-label", "govuk-label--s"], ["id", "hearingDate-error", "class", "govuk-error-message", 4, "ngIf"], ["formControlName", "hearingDate"], ["id", "hearingDate-error", 1, "govuk-error-message"]], template: function QueryWriteRaiseQueryComponent_Template(rf, ctx) { if (rf & 1) {
             i0.ɵɵelementStart(0, "div")(1, "div", 0)(2, "div", 1);
             i0.ɵɵtext(3);
             i0.ɵɵpipe(4, "rpxTranslate");
@@ -21384,112 +21486,35 @@ class QueryWriteRaiseQueryComponent {
             i0.ɵɵelement(9, "ccd-query-case-details-header", 3);
             i0.ɵɵelementEnd();
             i0.ɵɵelement(10, "hr");
-            i0.ɵɵelementStart(11, "div", 4)(12, "div", 5)(13, "div")(14, "div", 6)(15, "div", 7)(16, "label", 8);
-            i0.ɵɵtext(17);
-            i0.ɵɵpipe(18, "rpxTranslate");
-            i0.ɵɵelementEnd()();
-            i0.ɵɵelementStart(19, "div", 9);
-            i0.ɵɵtext(20);
-            i0.ɵɵpipe(21, "rpxTranslate");
+            i0.ɵɵtemplate(11, QueryWriteRaiseQueryComponent_div_11_Template, 43, 49, "div", 4);
             i0.ɵɵelementEnd();
-            i0.ɵɵtemplate(22, QueryWriteRaiseQueryComponent_p_22_Template, 6, 6, "p", 10);
-            i0.ɵɵelement(23, "input", 11);
-            i0.ɵɵelementEnd()();
-            i0.ɵɵelementStart(24, "div", 6)(25, "div", 7)(26, "label", 12);
-            i0.ɵɵtext(27);
-            i0.ɵɵpipe(28, "rpxTranslate");
-            i0.ɵɵelementEnd()();
-            i0.ɵɵelementStart(29, "div", 13);
-            i0.ɵɵtext(30);
-            i0.ɵɵpipe(31, "rpxTranslate");
-            i0.ɵɵelementEnd();
-            i0.ɵɵtemplate(32, QueryWriteRaiseQueryComponent_p_32_Template, 6, 6, "p", 14);
-            i0.ɵɵelementStart(33, "textarea", 15);
-            i0.ɵɵtext(34, "          ");
-            i0.ɵɵelementEnd()();
-            i0.ɵɵelementStart(35, "div", 6)(36, "fieldset", 16)(37, "legend")(38, "label", 17);
-            i0.ɵɵtext(39);
-            i0.ɵɵpipe(40, "rpxTranslate");
-            i0.ɵɵelementEnd()();
-            i0.ɵɵtemplate(41, QueryWriteRaiseQueryComponent_p_41_Template, 6, 6, "p", 18);
-            i0.ɵɵelementStart(42, "div", 19)(43, "div", 20);
-            i0.ɵɵelement(44, "input", 21);
-            i0.ɵɵelementStart(45, "label", 22);
-            i0.ɵɵtext(46);
-            i0.ɵɵpipe(47, "rpxTranslate");
-            i0.ɵɵelementEnd()();
-            i0.ɵɵelementStart(48, "div", 20);
-            i0.ɵɵelement(49, "input", 23);
-            i0.ɵɵelementStart(50, "label", 24);
-            i0.ɵɵtext(51);
-            i0.ɵɵpipe(52, "rpxTranslate");
-            i0.ɵɵelementEnd()()()();
-            i0.ɵɵtemplate(53, QueryWriteRaiseQueryComponent_ng_container_53_Template, 9, 7, "ng-container", 25);
-            i0.ɵɵelementEnd()()()();
         } if (rf & 2) {
-            let tmp_8_0;
             i0.ɵɵadvance(3);
-            i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(4, 28, "Raise a query"));
+            i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(4, 4, "Raise a query"));
             i0.ɵɵadvance(3);
-            i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(7, 30, "Enter query details"));
+            i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(7, 6, "Enter query details"));
             i0.ɵɵadvance(3);
             i0.ɵɵproperty("caseDetails", ctx.caseDetails);
-            i0.ɵɵadvance(3);
-            i0.ɵɵproperty("formGroup", ctx.formGroup);
-            i0.ɵɵadvance(2);
-            i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(50, _c0$C, ctx.submitted && ctx.formGroup.get("subject").hasError("required")));
-            i0.ɵɵadvance(3);
-            i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(18, 32, "Query subject"), " ");
-            i0.ɵɵadvance(3);
-            i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(21, 34, "The subject should be a summary of your query"), " ");
-            i0.ɵɵadvance(2);
-            i0.ɵɵproperty("ngIf", ctx.submitted && ctx.formGroup.get("subject").hasError("required"));
-            i0.ɵɵadvance();
-            i0.ɵɵclassProp("govuk-input--error", ctx.submitted && ((tmp_8_0 = ctx.formGroup.get("subject")) == null ? null : tmp_8_0.hasError("required")));
-            i0.ɵɵproperty("formControlName", "subject");
-            i0.ɵɵadvance();
-            i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(52, _c0$C, ctx.submitted && ctx.formGroup.get("body").hasError("required")));
-            i0.ɵɵadvance(3);
-            i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(28, 36, "Query detail"), " ");
-            i0.ɵɵadvance(3);
-            i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(31, 38, "Include as many details as possible so case workers can respond to your query"), " ");
-            i0.ɵɵadvance(2);
-            i0.ɵɵproperty("ngIf", ctx.submitted && ctx.formGroup.get("body").hasError("required"));
-            i0.ɵɵadvance();
-            i0.ɵɵclassProp("govuk-textarea--error", ctx.submitted && ctx.formGroup.get("body").hasError("required"));
-            i0.ɵɵproperty("formControlName", "body");
-            i0.ɵɵadvance(2);
-            i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(54, _c0$C, ctx.submitted && ctx.formGroup.get("isHearingRelated").hasError("required")));
-            i0.ɵɵadvance(4);
-            i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(40, 40, "Is the query hearing related?"), " ");
-            i0.ɵɵadvance(2);
-            i0.ɵɵproperty("ngIf", ctx.submitted && ctx.formGroup.get("isHearingRelated").hasError("required"));
-            i0.ɵɵadvance(3);
-            i0.ɵɵproperty("checked", ctx.formGroup.get("isHearingRelated").value === true)("value", true);
-            i0.ɵɵadvance(2);
-            i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind3(47, 42, "Is the query hearing related?", null, "Yes"), " ");
-            i0.ɵɵadvance(3);
-            i0.ɵɵproperty("checked", ctx.formGroup.get("isHearingRelated").value === false)("value", false);
             i0.ɵɵadvance(2);
-            i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind3(52, 46, "Is the query hearing related?", null, "No"), " ");
-            i0.ɵɵadvance(2);
-            i0.ɵɵproperty("ngIf", ctx.formGroup.get("isHearingRelated").value);
+            i0.ɵɵproperty("ngIf", ctx.showForm);
         } }, encapsulation: 2 });
 }
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(QueryWriteRaiseQueryComponent, [{
         type: Component,
-        args: [{ selector: 'ccd-query-write-raise-query', template: "<div>\n  <div class=\"govuk-!-margin-bottom-6\">\n    <div class=\"govuk-caption-l\">{{ 'Raise a query' | rpxTranslate }}</div>\n    <h1 class=\"govuk-heading-l govuk-!-margin-bottom-4\">{{ 'Enter query details' | rpxTranslate }}</h1>\n  </div>\n\n  <div>\n    <ccd-query-case-details-header [caseDetails]=\"caseDetails\"></ccd-query-case-details-header>\n  </div>\n\n  <hr>\n\n  <div class=\"govuk-!-margin-bottom-4\">\n    <div [formGroup]=\"formGroup\">\n      <div>\n        <div class=\"govuk-form-group\" [ngClass]=\"{'govuk-form-group--error': submitted && formGroup.get('subject').hasError('required')}\">\n          <div class=\"govuk-label-wrapper\">\n            <label class=\"govuk-label govuk-label--m govuk-!-font-weight-bold\" for=\"subject\">\n              {{ 'Query subject' | rpxTranslate }}\n            </label>\n          </div>\n          <div id=\"subject-hint\" class=\"govuk-hint\">\n            {{ 'The subject should be a summary of your query' | rpxTranslate }}\n          </div>\n          <p id=\"subject-error\" class=\"govuk-error-message\"\n              *ngIf=\"submitted && formGroup.get('subject').hasError('required')\">\n            <span class=\"govuk-visually-hidden\">{{ 'Error:' | rpxTranslate }} </span>{{ raiseQueryErrorMessage.QUERY_SUBJECT | rpxTranslate }}\n          </p>\n          <input [formControlName]=\"'subject'\" type=\"text\" name=\"subject\"\n                 class=\"govuk-input\" id=\"subject\"\n                 [class.govuk-input--error]=\"submitted && formGroup.get('subject')?.hasError('required')\"\n          />\n        </div>\n      </div>\n\n        <div class=\"govuk-form-group\"\n             [ngClass]=\"{'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              {{ 'Query detail' | rpxTranslate }}\n            </label>\n          </div>\n          <div id=\"body-hint\" class=\"govuk-hint\">\n            {{ 'Include as many details as possible so case workers can respond to your query' | rpxTranslate }}\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>{{ raiseQueryErrorMessage.QUERY_BODY | rpxTranslate }}\n          </p>\n          <textarea [formControlName]=\"'body'\"\n                    id=\"body\" name=\"body\" rows=\"5\"\n                    aria-describedby=\"body-hint body-error\"\n                    class=\"govuk-textarea\"\n                    [class.govuk-textarea--error]=\"submitted && formGroup.get('body').hasError('required')\"\n          >\n          </textarea>\n      </div>\n\n      <div class=\"govuk-form-group\"\n           [ngClass]=\"{'govuk-form-group--error': submitted && formGroup.get('isHearingRelated').hasError('required')}\">\n        <fieldset class=\"govuk-fieldset\">\n          <legend>\n            <label class=\"govuk-label govuk-label--m govuk-!-font-weight-bold\">\n              {{ 'Is the query hearing related?' | rpxTranslate }}\n            </label>\n          </legend>\n          <p id=\"isHearingRelated-error\" class=\"govuk-error-message\"\n              *ngIf=\"submitted && formGroup.get('isHearingRelated').hasError('required')\">\n            <span class=\"govuk-visually-hidden\">{{ 'Error:' | rpxTranslate }} </span>{{ raiseQueryErrorMessage.QUERY_HEARING_RELATED | rpxTranslate }}\n          </p>\n          <div class=\"govuk-radios govuk-radios--inline\" data-module=\"govuk-radios\">\n            <div class=\"govuk-radios__item\">\n              <input class=\"govuk-radios__input\" id=\"isHearingRelated-yes\" name=\"isHearingRelated\"\n                     type=\"radio\"\n                     formControlName=\"isHearingRelated\"\n                     [checked]=\"formGroup.get('isHearingRelated').value === true\" [value]=\"true\"\n              >\n              <label class=\"govuk-label govuk-radios__label\" for=\"isHearingRelated-yes\">\n                {{ 'Is the query hearing related?' | rpxTranslate: null : 'Yes' }}\n              </label>\n            </div>\n            <div class=\"govuk-radios__item\">\n              <input class=\"govuk-radios__input\" id=\"isHearingRelated-no\" name=\"isHearingRelated\"\n                     type=\"radio\"\n                     formControlName=\"isHearingRelated\"\n                     [checked]=\"formGroup.get('isHearingRelated').value === false\" [value]=\"false\"\n              >\n              <label class=\"govuk-label govuk-radios__label\" for=\"isHearingRelated-no\">\n                {{ 'Is the query hearing related?' | rpxTranslate: null : 'No' }}\n              </label>\n            </div>\n          </div>\n        </fieldset>\n\n        <ng-container *ngIf=\"formGroup.get('isHearingRelated').value\">\n          <div class=\"govuk-radios__conditional govuk-!-margin-top-1\"\n               [ngClass]=\"{'govuk-form-group--error': submitted &&\n               formGroup.get('isHearingRelated').value === true &&\n               formGroup.get('hearingDate').value === null}\">\n            <fieldset class=\"govuk-fieldset\" role=\"group\">\n              <legend>\n                <label class=\"govuk-label govuk-label--s\">\n                  {{ 'What is the date of the hearing?' | rpxTranslate }}\n                </label>\n              </legend>\n              <p id=\"hearingDate-error\" class=\"govuk-error-message\"\n                  *ngIf=\"submitted && formGroup.get('isHearingRelated').value === true && formGroup.get('hearingDate').value === null\">\n                <span class=\"govuk-visually-hidden\">{{ 'Error:' | rpxTranslate }} </span>{{ raiseQueryErrorMessage.QUERY_HEARING_DATE | rpxTranslate }}\n              </p>\n              <ccd-query-write-date-input formControlName=\"hearingDate\"></ccd-query-write-date-input>\n            </fieldset>\n          </div>\n        </ng-container>\n      </div>\n    </div>\n  </div>\n</div>\n" }]
+        args: [{ selector: 'ccd-query-write-raise-query', template: "<div>\n  <div class=\"govuk-!-margin-bottom-6\">\n    <div class=\"govuk-caption-l\">{{ 'Raise a query' | rpxTranslate }}</div>\n    <h1 class=\"govuk-heading-l govuk-!-margin-bottom-4\">{{ 'Enter query details' | rpxTranslate }}</h1>\n  </div>\n\n  <div>\n    <ccd-query-case-details-header [caseDetails]=\"caseDetails\"></ccd-query-case-details-header>\n  </div>\n\n  <hr>\n\n  <div class=\"govuk-!-margin-bottom-4\" *ngIf=\"showForm\">\n    <div [formGroup]=\"formGroup\">\n      <div>\n        <div class=\"govuk-form-group\" [ngClass]=\"{'govuk-form-group--error': submitted && formGroup.get('subject').hasError('required')}\">\n          <div class=\"govuk-label-wrapper\">\n            <label class=\"govuk-label govuk-label--m govuk-!-font-weight-bold\" for=\"subject\">\n              {{ 'Query subject' | rpxTranslate }}\n            </label>\n          </div>\n          <div id=\"subject-hint\" class=\"govuk-hint\">\n            {{ 'The subject should be a summary of your query' | rpxTranslate }}\n          </div>\n          <p id=\"subject-error\" class=\"govuk-error-message\"\n              *ngIf=\"submitted && formGroup.get('subject').hasError('required')\">\n            <span class=\"govuk-visually-hidden\">{{ 'Error:' | rpxTranslate }} </span>{{ raiseQueryErrorMessage.QUERY_SUBJECT | rpxTranslate }}\n          </p>\n          <input [formControlName]=\"'subject'\" type=\"text\" name=\"subject\"\n                 class=\"govuk-input\" id=\"subject\"\n                 [class.govuk-input--error]=\"submitted && formGroup.get('subject')?.hasError('required')\"\n          />\n        </div>\n      </div>\n\n        <div class=\"govuk-form-group\"\n             [ngClass]=\"{'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              {{ 'Query detail' | rpxTranslate }}\n            </label>\n          </div>\n          <div id=\"body-hint\" class=\"govuk-hint\">\n            {{ 'Include as many details as possible so case workers can respond to your query' | rpxTranslate }}\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>{{ raiseQueryErrorMessage.QUERY_BODY | rpxTranslate }}\n          </p>\n          <textarea [formControlName]=\"'body'\"\n                    id=\"body\" name=\"body\" rows=\"5\"\n                    aria-describedby=\"body-hint body-error\"\n                    class=\"govuk-textarea\"\n                    [class.govuk-textarea--error]=\"submitted && formGroup.get('body').hasError('required')\"\n          >\n          </textarea>\n      </div>\n\n      <div class=\"govuk-form-group\"\n           [ngClass]=\"{'govuk-form-group--error': submitted && formGroup.get('isHearingRelated').hasError('required')}\">\n        <fieldset class=\"govuk-fieldset\">\n          <legend>\n            <label class=\"govuk-label govuk-label--m govuk-!-font-weight-bold\">\n              {{ 'Is the query hearing related?' | rpxTranslate }}\n            </label>\n          </legend>\n          <p id=\"isHearingRelated-error\" class=\"govuk-error-message\"\n              *ngIf=\"submitted && formGroup.get('isHearingRelated').hasError('required')\">\n            <span class=\"govuk-visually-hidden\">{{ 'Error:' | rpxTranslate }} </span>{{ raiseQueryErrorMessage.QUERY_HEARING_RELATED | rpxTranslate }}\n          </p>\n          <div class=\"govuk-radios govuk-radios--inline\" data-module=\"govuk-radios\">\n            <div class=\"govuk-radios__item\">\n              <input class=\"govuk-radios__input\" id=\"isHearingRelated-yes\" name=\"isHearingRelated\"\n                     type=\"radio\"\n                     formControlName=\"isHearingRelated\"\n                     [checked]=\"formGroup.get('isHearingRelated').value === true\" [value]=\"true\"\n              >\n              <label class=\"govuk-label govuk-radios__label\" for=\"isHearingRelated-yes\">\n                {{ 'Is the query hearing related?' | rpxTranslate: null : 'Yes' }}\n              </label>\n            </div>\n            <div class=\"govuk-radios__item\">\n              <input class=\"govuk-radios__input\" id=\"isHearingRelated-no\" name=\"isHearingRelated\"\n                     type=\"radio\"\n                     formControlName=\"isHearingRelated\"\n                     [checked]=\"formGroup.get('isHearingRelated').value === false\" [value]=\"false\"\n              >\n              <label class=\"govuk-label govuk-radios__label\" for=\"isHearingRelated-no\">\n                {{ 'Is the query hearing related?' | rpxTranslate: null : 'No' }}\n              </label>\n            </div>\n          </div>\n        </fieldset>\n\n        <ng-container *ngIf=\"formGroup.get('isHearingRelated').value\">\n          <div class=\"govuk-radios__conditional govuk-!-margin-top-1\"\n               [ngClass]=\"{'govuk-form-group--error': submitted &&\n               formGroup.get('isHearingRelated').value === true &&\n               formGroup.get('hearingDate').value === null}\">\n            <fieldset class=\"govuk-fieldset\" role=\"group\">\n              <legend>\n                <label class=\"govuk-label govuk-label--s\">\n                  {{ 'What is the date of the hearing?' | rpxTranslate }}\n                </label>\n              </legend>\n              <p id=\"hearingDate-error\" class=\"govuk-error-message\"\n                  *ngIf=\"submitted && formGroup.get('isHearingRelated').value === true && formGroup.get('hearingDate').value === null\">\n                <span class=\"govuk-visually-hidden\">{{ 'Error:' | rpxTranslate }} </span>{{ raiseQueryErrorMessage.QUERY_HEARING_DATE | rpxTranslate }}\n              </p>\n              <ccd-query-write-date-input formControlName=\"hearingDate\"></ccd-query-write-date-input>\n            </fieldset>\n          </div>\n        </ng-container>\n      </div>\n    </div>\n  </div>\n</div>\n" }]
     }], null, { formGroup: [{
             type: Input
         }], submitted: [{
             type: Input
         }], caseDetails: [{
             type: Input
+        }], showForm: [{
+            type: Input
         }] }); })();
 (() => { (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_p_23_Template(rf, ctx) { if (rf & 1) {
-    i0.ɵɵelementStart(0, "p", 14)(1, "span", 15);
+function QueryWriteRespondToQueryComponent_div_12_p_11_Template(rf, ctx) { if (rf & 1) {
+    i0.ɵɵelementStart(0, "p", 15)(1, "span", 16);
     i0.ɵɵtext(2);
     i0.ɵɵpipe(3, "rpxTranslate");
     i0.ɵɵelementEnd();
@@ -21497,18 +21522,51 @@ function QueryWriteRespondToQueryComponent_p_23_Template(rf, ctx) { if (rf & 1)
     i0.ɵɵpipe(5, "rpxTranslate");
     i0.ɵɵelementEnd();
 } if (rf & 2) {
-    const ctx_r0 = i0.ɵɵnextContext();
+    const ctx_r0 = i0.ɵɵnextContext(2);
     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");
+    i0.ɵɵelementEnd();
+    i0.ɵɵelementStart(5, "div", 9)(6, "div", 10)(7, "div", 11)(8, "label", 12);
+    i0.ɵɵtext(9);
+    i0.ɵɵpipe(10, "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()()()()();
+} if (rf & 2) {
+    let tmp_3_0;
+    let tmp_5_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"), " ");
+    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.ɵɵadvance(3);
+    i0.ɵɵtextInterpolate1(" ", ctx_r0.queryCreateContext === ctx_r0.queryCreateContextEnum.RESPOND ? "Response detail" : i0.ɵɵpipeBind1(10, 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.ɵɵ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.ɵɵproperty("formControlName", "body");
+} }
 class QueryWriteRespondToQueryComponent {
     caseNotifier;
     queryItem;
     formGroup;
     queryCreateContext;
     submitted = false;
+    showForm;
     queryCreateContextEnum = QueryCreateContext;
     raiseQueryErrorMessages = RaiseQueryErrorMessage;
     caseId;
@@ -21523,7 +21581,7 @@ class QueryWriteRespondToQueryComponent {
         });
     }
     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" }, decls: 26, vars: 21, 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"], [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) {
+    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) {
             i0.ɵɵelementStart(0, "div", 0)(1, "div", 0)(2, "div", 1);
             i0.ɵɵtext(3);
             i0.ɵɵpipe(4, "rpxTranslate");
@@ -21538,48 +21596,23 @@ class QueryWriteRespondToQueryComponent {
             i0.ɵɵelementStart(10, "div");
             i0.ɵɵelement(11, "ccd-query-details", 5);
             i0.ɵɵelementEnd()();
-            i0.ɵɵelementStart(12, "div", 6)(13, "div")(14, "h1", 7);
-            i0.ɵɵtext(15);
-            i0.ɵɵpipe(16, "rpxTranslate");
-            i0.ɵɵelementEnd();
-            i0.ɵɵelementStart(17, "div", 8)(18, "div", 9)(19, "div", 10)(20, "label", 11);
-            i0.ɵɵtext(21);
-            i0.ɵɵpipe(22, "rpxTranslate");
-            i0.ɵɵelementEnd()();
-            i0.ɵɵtemplate(23, QueryWriteRespondToQueryComponent_p_23_Template, 6, 6, "p", 12);
-            i0.ɵɵelementStart(24, "textarea", 13);
-            i0.ɵɵtext(25, "      ");
-            i0.ɵɵelementEnd()()()()();
+            i0.ɵɵtemplate(12, QueryWriteRespondToQueryComponent_div_12_Template, 14, 13, "div", 6);
         } if (rf & 2) {
-            let tmp_6_0;
-            let tmp_8_0;
-            let tmp_9_0;
             i0.ɵɵadvance(3);
-            i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(4, 13, "Respond to a query"));
+            i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(4, 5, "Respond to a query"));
             i0.ɵɵadvance(3);
-            i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(7, 15, "Query details"));
+            i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(7, 7, "Query details"));
             i0.ɵɵadvance(3);
             i0.ɵɵproperty("caseDetails", ctx.caseDetails);
             i0.ɵɵadvance(2);
             i0.ɵɵproperty("query", ctx.queryItem);
-            i0.ɵɵadvance(4);
-            i0.ɵɵtextInterpolate1(" ", ctx.queryCreateContext === ctx.queryCreateContextEnum.RESPOND ? "Respond to a query" : i0.ɵɵpipeBind1(16, 17, "Ask a follow-up question"), " ");
-            i0.ɵɵadvance(2);
-            i0.ɵɵproperty("formGroup", ctx.formGroup);
-            i0.ɵɵadvance();
-            i0.ɵɵclassProp("govuk-form-group--error", ctx.submitted && ((tmp_6_0 = ctx.formGroup.get("body")) == null ? null : tmp_6_0.hasError("required")));
-            i0.ɵɵadvance(3);
-            i0.ɵɵtextInterpolate1(" ", ctx.queryCreateContext === ctx.queryCreateContextEnum.RESPOND ? "Response detail" : i0.ɵɵpipeBind1(22, 19, "Query Body"), " ");
-            i0.ɵɵadvance(2);
-            i0.ɵɵproperty("ngIf", ctx.submitted && ((tmp_8_0 = ctx.formGroup.get("body")) == null ? null : tmp_8_0.hasError("required")));
             i0.ɵɵadvance();
-            i0.ɵɵclassProp("govuk-textarea--error", ctx.submitted && ((tmp_9_0 = ctx.formGroup.get("body")) == null ? null : tmp_9_0.hasError("required")));
-            i0.ɵɵproperty("formControlName", "body");
+            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\">\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"] }]
+        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: [{
             type: Input
         }], formGroup: [{
@@ -21588,6 +21621,8 @@ class QueryWriteRespondToQueryComponent {
             type: Input
         }], submitted: [{
             type: Input
+        }], showForm: [{
+            type: Input
         }] }); })();
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(QueryWriteRespondToQueryComponent, { className: "QueryWriteRespondToQueryComponent", filePath: "lib/shared/components/palette/query-management/components/query-write/query-write-respond-to-query/query-write-respond-to-query.component.ts", lineNumber: 14 }); })();
 
@@ -27635,7 +27670,7 @@ class EventLogTableComponent {
 
 function EventLogComponent_ccd_event_log_table_3_Template(rf, ctx) { if (rf & 1) {
     const _r1 = i0.ɵɵgetCurrentView();
-    i0.ɵɵelementStart(0, "ccd-event-log-table", 7);
+    i0.ɵɵelementStart(0, "ccd-event-log-table", 8);
     i0.ɵɵlistener("onSelect", function EventLogComponent_ccd_event_log_table_3_Template_ccd_event_log_table_onSelect_0_listener($event) { i0.ɵɵrestoreView(_r1); const ctx_r1 = i0.ɵɵnextContext(); return i0.ɵɵresetView(ctx_r1.select($event)); })("onCaseHistory", function EventLogComponent_ccd_event_log_table_3_Template_ccd_event_log_table_onCaseHistory_0_listener($event) { i0.ɵɵrestoreView(_r1); const ctx_r1 = i0.ɵɵnextContext(); return i0.ɵɵresetView(ctx_r1.caseHistoryClicked($event)); });
     i0.ɵɵelementEnd();
 } if (rf & 2) {
@@ -27644,7 +27679,7 @@ function EventLogComponent_ccd_event_log_table_3_Template(rf, ctx) { if (rf & 1)
 } }
 function EventLogComponent_ccd_event_log_table_4_Template(rf, ctx) { if (rf & 1) {
     const _r3 = i0.ɵɵgetCurrentView();
-    i0.ɵɵelementStart(0, "ccd-event-log-table", 8);
+    i0.ɵɵelementStart(0, "ccd-event-log-table", 9);
     i0.ɵɵlistener("onSelect", function EventLogComponent_ccd_event_log_table_4_Template_ccd_event_log_table_onSelect_0_listener($event) { i0.ɵɵrestoreView(_r3); const ctx_r1 = i0.ɵɵnextContext(); return i0.ɵɵresetView(ctx_r1.select($event)); });
     i0.ɵɵelementEnd();
 } if (rf & 2) {
@@ -27652,7 +27687,7 @@ function EventLogComponent_ccd_event_log_table_4_Template(rf, ctx) { if (rf & 1)
     i0.ɵɵproperty("events", ctx_r1.events)("selected", ctx_r1.selected);
 } }
 function EventLogComponent_ccd_event_log_details_7_Template(rf, ctx) { if (rf & 1) {
-    i0.ɵɵelement(0, "ccd-event-log-details", 9);
+    i0.ɵɵelement(0, "ccd-event-log-details", 10);
 } if (rf & 2) {
     const ctx_r1 = i0.ɵɵnextContext();
     i0.ɵɵproperty("event", ctx_r1.selected);
@@ -27673,14 +27708,14 @@ class EventLogComponent {
         this.onCaseHistory.emit(eventId);
     }
     static ɵfac = function EventLogComponent_Factory(t) { return new (t || EventLogComponent)(); };
-    static ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: EventLogComponent, selectors: [["ccd-event-log"]], inputs: { events: "events" }, outputs: { onCaseHistory: "onCaseHistory" }, decls: 8, vars: 4, consts: [[1, "grid-row"], [1, "column-one-half"], [3, "ngSwitch"], [3, "events", "selected", "onSelect", "onCaseHistory", 4, "ngSwitchCase"], [3, "events", "selected", "onSelect", 4, "ngSwitchCase"], [1, "EventLog-DetailsPanel"], [3, "event", 4, "ngIf"], [3, "onSelect", "onCaseHistory", "events", "selected"], [3, "onSelect", "events", "selected"], [3, "event"]], template: function EventLogComponent_Template(rf, ctx) { if (rf & 1) {
+    static ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: EventLogComponent, selectors: [["ccd-event-log"]], inputs: { events: "events" }, outputs: { onCaseHistory: "onCaseHistory" }, decls: 8, vars: 4, consts: [[1, "grid-row"], [1, "column-one-half", "scrollbar"], [3, "ngSwitch"], [3, "events", "selected", "onSelect", "onCaseHistory", 4, "ngSwitchCase"], [3, "events", "selected", "onSelect", 4, "ngSwitchCase"], [1, "column-one-half"], [1, "EventLog-DetailsPanel"], [3, "event", 4, "ngIf"], [3, "onSelect", "onCaseHistory", "events", "selected"], [3, "onSelect", "events", "selected"], [3, "event"]], template: function EventLogComponent_Template(rf, ctx) { if (rf & 1) {
             i0.ɵɵelementStart(0, "div", 0)(1, "div", 1);
             i0.ɵɵelementContainerStart(2, 2);
             i0.ɵɵtemplate(3, EventLogComponent_ccd_event_log_table_3_Template, 1, 2, "ccd-event-log-table", 3)(4, EventLogComponent_ccd_event_log_table_4_Template, 1, 2, "ccd-event-log-table", 4);
             i0.ɵɵelementContainerEnd();
             i0.ɵɵelementEnd();
-            i0.ɵɵelementStart(5, "div", 1)(6, "div", 5);
-            i0.ɵɵtemplate(7, EventLogComponent_ccd_event_log_details_7_Template, 1, 1, "ccd-event-log-details", 6);
+            i0.ɵɵelementStart(5, "div", 5)(6, "div", 6);
+            i0.ɵɵtemplate(7, EventLogComponent_ccd_event_log_details_7_Template, 1, 1, "ccd-event-log-details", 7);
             i0.ɵɵelementEnd()()();
         } if (rf & 2) {
             i0.ɵɵadvance(2);
@@ -27691,11 +27726,11 @@ class EventLogComponent {
             i0.ɵɵproperty("ngSwitchCase", false);
             i0.ɵɵadvance(3);
             i0.ɵɵproperty("ngIf", ctx.selected);
-        } }, styles: ["@media (max-width: 991px){[class*=col-md][_ngcontent-%COMP%]{margin-bottom:30px}}.EventLog-DetailsPanel[_ngcontent-%COMP%]{border:1px solid #bfc1c3;padding:0 10px 10px;margin-top:20px}"] });
+        } }, styles: ["@media (max-width: 991px){[class*=col-md][_ngcontent-%COMP%]{margin-bottom:30px}}.column-half[_ngcontent-%COMP%], .column-one-half[_ngcontent-%COMP%]{float:left;width:50%}@media (min-width: 641px){.scrollbar[_ngcontent-%COMP%]{height:70vh;overflow-y:auto}}.EventLog-DetailsPanel[_ngcontent-%COMP%]{border:1px solid #bfc1c3;padding:0 10px 10px;margin-top:20px}"] });
 }
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(EventLogComponent, [{
         type: Component,
-        args: [{ selector: 'ccd-event-log', template: "<div class=\"grid-row\">\n  <div class=\"column-one-half\">\n    <ng-container [ngSwitch]=\"isPartOfCaseTimeline\">\n      <ccd-event-log-table *ngSwitchCase=\"true\" [events]=\"events\" [selected]=\"selected\" (onSelect)=\"select($event)\" (onCaseHistory)=\"caseHistoryClicked($event)\"></ccd-event-log-table>\n      <ccd-event-log-table *ngSwitchCase=\"false\" [events]=\"events\" [selected]=\"selected\" (onSelect)=\"select($event)\"></ccd-event-log-table>\n    </ng-container>\n  </div>\n  <div class=\"column-one-half\">\n    <div class=\"EventLog-DetailsPanel\">\n      <ccd-event-log-details *ngIf=\"selected\" [event]=\"selected\"></ccd-event-log-details>\n    </div>\n  </div>\n</div>\n", styles: ["@media (max-width: 991px){[class*=col-md]{margin-bottom:30px}}.EventLog-DetailsPanel{border:1px solid #bfc1c3;padding:0 10px 10px;margin-top:20px}\n"] }]
+        args: [{ selector: 'ccd-event-log', template: "<div class=\"grid-row\">\n  <div class=\"column-one-half scrollbar\">\n    <ng-container [ngSwitch]=\"isPartOfCaseTimeline\">\n      <ccd-event-log-table\n        *ngSwitchCase=\"true\"\n        [events]=\"events\"\n        [selected]=\"selected\"\n        (onSelect)=\"select($event)\"\n        (onCaseHistory)=\"caseHistoryClicked($event)\"\n      ></ccd-event-log-table>\n      <ccd-event-log-table\n        *ngSwitchCase=\"false\"\n        [events]=\"events\"\n        [selected]=\"selected\"\n        (onSelect)=\"select($event)\"\n      ></ccd-event-log-table>\n    </ng-container>\n  </div>\n  <div class=\"column-one-half\">\n    <div class=\"EventLog-DetailsPanel\">\n      <ccd-event-log-details\n        *ngIf=\"selected\"\n        [event]=\"selected\"\n      ></ccd-event-log-details>\n    </div>\n  </div>\n</div>\n", styles: ["@media (max-width: 991px){[class*=col-md]{margin-bottom:30px}}.column-half,.column-one-half{float:left;width:50%}@media (min-width: 641px){.scrollbar{height:70vh;overflow-y:auto}}.EventLog-DetailsPanel{border:1px solid #bfc1c3;padding:0 10px 10px;margin-top:20px}\n"] }]
     }], null, { events: [{
             type: Input
         }], onCaseHistory: [{