@hmcts/ccd-case-ui-toolkit 6.16.0-query-details-ui-changes-v3 → 6.16.0-query-management-update-mock-data

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

@@ -531,7 +531,7 @@
     OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
     PERFORMANCE OF THIS SOFTWARE.
     ***************************************************************************** */
-    /* global Reflect, Promise */
+    /* global Reflect, Promise, SuppressedError, Symbol */
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
             ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
@@ -610,11 +610,11 @@
                 if (_ = accept(result.set))
                     descriptor.set = _;
                 if (_ = accept(result.init))
-                    initializers.push(_);
+                    initializers.unshift(_);
             }
             else if (_ = accept(result)) {
                 if (kind === "field")
-                    initializers.push(_);
+                    initializers.unshift(_);
                 else
                     descriptor[key] = _;
             }
@@ -901,6 +901,85 @@
             throw new TypeError("Cannot use 'in' operator on non-object");
         return typeof state === "function" ? receiver === state : state.has(receiver);
     }
+    function __addDisposableResource(env, value, async) {
+        if (value !== null && value !== void 0) {
+            if (typeof value !== "object")
+                throw new TypeError("Object expected.");
+            var dispose;
+            if (async) {
+                if (!Symbol.asyncDispose)
+                    throw new TypeError("Symbol.asyncDispose is not defined.");
+                dispose = value[Symbol.asyncDispose];
+            }
+            if (dispose === void 0) {
+                if (!Symbol.dispose)
+                    throw new TypeError("Symbol.dispose is not defined.");
+                dispose = value[Symbol.dispose];
+            }
+            if (typeof dispose !== "function")
+                throw new TypeError("Object not disposable.");
+            env.stack.push({ value: value, dispose: dispose, async: async });
+        }
+        else if (async) {
+            env.stack.push({ async: true });
+        }
+        return value;
+    }
+    var _SuppressedError = typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
+        var e = new Error(message);
+        return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+    };
+    function __disposeResources(env) {
+        function fail(e) {
+            env.error = env.hasError ? new _SuppressedError(e, env.error, "An error was suppressed during disposal.") : e;
+            env.hasError = true;
+        }
+        function next() {
+            while (env.stack.length) {
+                var rec = env.stack.pop();
+                try {
+                    var result = rec.dispose && rec.dispose.call(rec.value);
+                    if (rec.async)
+                        return Promise.resolve(result).then(next, function (e) { fail(e); return next(); });
+                }
+                catch (e) {
+                    fail(e);
+                }
+            }
+            if (env.hasError)
+                throw env.error;
+        }
+        return next();
+    }
+    var tslib_es6 = {
+        __extends: __extends,
+        __assign: __assign,
+        __rest: __rest,
+        __decorate: __decorate,
+        __param: __param,
+        __metadata: __metadata,
+        __awaiter: __awaiter,
+        __generator: __generator,
+        __createBinding: __createBinding,
+        __exportStar: __exportStar,
+        __values: __values,
+        __read: __read,
+        __spread: __spread,
+        __spreadArrays: __spreadArrays,
+        __spreadArray: __spreadArray,
+        __await: __await,
+        __asyncGenerator: __asyncGenerator,
+        __asyncDelegator: __asyncDelegator,
+        __asyncValues: __asyncValues,
+        __makeTemplateObject: __makeTemplateObject,
+        __importStar: __importStar,
+        __importDefault: __importDefault,
+        __classPrivateFieldGet: __classPrivateFieldGet,
+        __classPrivateFieldSet: __classPrivateFieldSet,
+        __classPrivateFieldIn: __classPrivateFieldIn,
+        __addDisposableResource: __addDisposableResource,
+        __disposeResources: __disposeResources,
+    };
 
     var _c0$$ = function (a0) { return { "govuk-input--error": a0 }; };
     function DateInputComponent_div_19_Template(rf, ctx) {
@@ -10775,7 +10854,7 @@
             this.wizard = this.caseEdit.wizard;
             this.caseFields = this.getCaseFields();
             this.syncCaseEditDataService();
-            this.route.params
+            this.routeParamsSub = this.route.params
                 .subscribe(function (params) {
                 var _a, _b;
                 var pageId = params['page'];
@@ -10797,13 +10876,14 @@
                 }
             });
             CaseEditPageComponent.setFocusToTop();
-            this.caseEditDataService.caseEditForm$.subscribe({
+            this.caseEditFormSub = this.caseEditDataService.caseEditForm$.subscribe({
                 next: function (editForm) { return _this.editForm = editForm; }
             });
-            this.caseEditDataService.caseIsLinkedCasesJourneyAtFinalStep$.subscribe({
-                next: function (isLinkedCasesJourneyAtFinalStep) { return _this.isLinkedCasesJourneyAtFinalStep = isLinkedCasesJourneyAtFinalStep; }
-            });
-            this.caseEditDataService.caseTriggerSubmitEvent$.subscribe({
+            this.caseIsLinkedCasesJourneyAtFinalStepSub =
+                this.caseEditDataService.caseIsLinkedCasesJourneyAtFinalStep$.subscribe({
+                    next: function (isLinkedCasesJourneyAtFinalStep) { return _this.isLinkedCasesJourneyAtFinalStep = isLinkedCasesJourneyAtFinalStep; }
+                });
+            this.caseTriggerSubmitEventSub = this.caseEditDataService.caseTriggerSubmitEvent$.subscribe({
                 next: function (state) {
                     if (state) {
                         _this.caseEditDataService.setTriggerSubmitEvent(false);
@@ -10816,6 +10896,17 @@
         CaseEditPageComponent.prototype.ngAfterViewChecked = function () {
             this.cdRef.detectChanges();
         };
+        CaseEditPageComponent.prototype.ngOnDestroy = function () {
+            var _a, _b, _c, _d, _e, _f, _g, _h;
+            (_a = this.routeParamsSub) === null || _a === void 0 ? void 0 : _a.unsubscribe();
+            (_b = this.caseEditFormSub) === null || _b === void 0 ? void 0 : _b.unsubscribe();
+            (_c = this.caseIsLinkedCasesJourneyAtFinalStepSub) === null || _c === void 0 ? void 0 : _c.unsubscribe();
+            (_d = this.caseTriggerSubmitEventSub) === null || _d === void 0 ? void 0 : _d.unsubscribe();
+            (_e = this.validateSub) === null || _e === void 0 ? void 0 : _e.unsubscribe();
+            (_f = this.dialogRefAfterClosedSub) === null || _f === void 0 ? void 0 : _f.unsubscribe();
+            (_g = this.saveDraftSub) === null || _g === void 0 ? void 0 : _g.unsubscribe();
+            (_h = this.caseFormValidationErrorsSub) === null || _h === void 0 ? void 0 : _h.unsubscribe();
+        };
         CaseEditPageComponent.prototype.applyValuesChanged = function (valuesChanged) {
             this.formValuesChanged = valuesChanged;
         };
@@ -10890,7 +10981,7 @@
                                 _this.generateErrorMessage(casefield.field_type.collection_field_type.complex_fields, c.get('value'), id_1);
                             });
                         }
-                        else if (FieldsUtils.isFlagLauncherCaseField(casefield)) {
+                        else if (FieldsUtils.isCaseFieldOfType(casefield, ['FlagLauncher'])) {
                             // Check whether the case field DisplayContextParameter is signalling "create" mode or "update" mode
                             // (expected always to be one of the two), to set the correct error message
                             var action = '';
@@ -10945,7 +11036,7 @@
                 this.caseEdit.error = null;
                 var caseEventData = this.buildCaseEventData();
                 var loadingSpinnerToken_1 = this.loadingService.register();
-                this.caseEdit.validate(caseEventData, this.currentPage.id)
+                this.validateSub = this.caseEdit.validate(caseEventData, this.currentPage.id)
                     .pipe(operators.finalize(function () {
                     _this.loadingService.unregister(loadingSpinnerToken_1);
                 }))
@@ -10964,10 +11055,10 @@
             CaseEditPageComponent.setFocusToTop();
         };
         CaseEditPageComponent.prototype.updateFormData = function (jsonData) {
-            var e_1, _c;
+            var e_1, _j;
             try {
-                for (var _d = __values(Object.keys(jsonData.data)), _e = _d.next(); !_e.done; _e = _d.next()) {
-                    var caseFieldId = _e.value;
+                for (var _k = __values(Object.keys(jsonData.data)), _l = _k.next(); !_l.done; _l = _k.next()) {
+                    var caseFieldId = _l.value;
                     /* istanbul ignore else */
                     if (this.pageWithFieldExists(caseFieldId)) {
                         this.updateEventTriggerCaseFields(caseFieldId, jsonData, this.caseEdit.eventTrigger);
@@ -10978,7 +11069,7 @@
             catch (e_1_1) { e_1 = { error: e_1_1 }; }
             finally {
                 try {
-                    if (_e && !_e.done && (_c = _d.return)) _c.call(_d);
+                    if (_l && !_l.done && (_j = _k.return)) _j.call(_k);
                 }
                 finally { if (e_1) throw e_1.error; }
             }
@@ -11007,12 +11098,12 @@
         CaseEditPageComponent.prototype.updateJsonDataObject = function (caseFieldId, jsonData, element) {
             var _this = this;
             return Object.keys(jsonData.data[caseFieldId]).reduce(function (acc, key) {
-                var _c;
+                var _j;
                 var elementValue = element.value[key];
                 var jsonDataValue = jsonData.data[caseFieldId][key];
                 var hasElementGotValueProperty = _this.isAnObject(elementValue) && elementValue.value !== undefined;
                 var jsonDataOrElementValue = (jsonDataValue === null || jsonDataValue === void 0 ? void 0 : jsonDataValue.value) !== null && (jsonDataValue === null || jsonDataValue === void 0 ? void 0 : jsonDataValue.value) !== undefined ? jsonDataValue : elementValue;
-                return Object.assign(Object.assign({}, acc), (_c = {}, _c["" + key] = hasElementGotValueProperty ? jsonDataOrElementValue : jsonDataValue, _c));
+                return Object.assign(Object.assign({}, acc), (_j = {}, _j["" + key] = hasElementGotValueProperty ? jsonDataOrElementValue : jsonDataValue, _j));
             }, {});
         };
         CaseEditPageComponent.prototype.isAnObject = function (property) {
@@ -11060,7 +11151,7 @@
             if (this.eventTrigger.can_save_draft) {
                 if (this.formValuesChanged) {
                     var dialogRef = this.dialog.open(SaveOrDiscardDialogComponent, this.dialogConfig);
-                    dialogRef.afterClosed().subscribe(function (result) {
+                    this.dialogRefAfterClosedSub = dialogRef.afterClosed().subscribe(function (result) {
                         if (result === 'Discard') {
                             _this.discard();
                         }
@@ -11147,7 +11238,7 @@
                 var draftCaseEventData = this.formValueService.sanitise(this.editForm.value);
                 draftCaseEventData.event_token = this.eventTrigger.event_token;
                 draftCaseEventData.ignore_warning = this.caseEdit.ignoreWarning;
-                this.caseEdit.saveDraft(draftCaseEventData).subscribe(function (draft) { return _this.eventTrigger.case_id = DRAFT_PREFIX + draft.id; }, function (error) { return _this.handleError(error); });
+                this.saveDraftSub = this.caseEdit.saveDraft(draftCaseEventData).subscribe(function (draft) { return _this.eventTrigger.case_id = DRAFT_PREFIX + draft.id; }, function (error) { return _this.handleError(error); });
             }
         };
         CaseEditPageComponent.prototype.getCaseFields = function () {
@@ -11215,7 +11306,7 @@
             this.caseEditDataService.setCaseEventTriggerName(this.eventTrigger.name);
             this.caseEditDataService.setCaseTitle(this.getCaseTitle());
             this.caseEditDataService.setCaseEditForm(this.editForm);
-            this.caseEditDataService.caseFormValidationErrors$.subscribe({
+            this.caseFormValidationErrorsSub = this.caseEditDataService.caseFormValidationErrors$.subscribe({
                 next: function (validationErrors) { return _this.validationErrors = validationErrors; }
             });
         };
@@ -20504,166 +20595,211 @@
             }], null, null);
     })();
 
-    var partyMessagesMockData = [
+    /**
+     * This mock file should be deleted after integrating with CCD
+     * CCD development ticket: https://tools.hmcts.net/jira/browse/CCD-4590
+     * ExUI tickets:
+     *   https://tools.hmcts.net/jira/browse/EUI-8460
+     *   https://tools.hmcts.net/jira/browse/EUI-8388
+     *   https://tools.hmcts.net/jira/browse/EUI-8389
+     */
+    var caseMessagesMockData = [
         {
             partyName: 'John Smith - Appellant',
             roleOnCase: null,
-            partyMessages: [
+            caseMessages: [
                 {
-                    id: 'case-message-001',
-                    subject: 'Review attached document',
-                    name: 'Maggie Conroy',
-                    body: 'Please review attached document and advise if hearing should proceed?',
-                    attachments: [
-                        {
-                            _links: {
-                                self: { href: 'https://dm-store-aat.service.core-compute-aat.internal/documents/e5366837-b3f6-492d-acbf-548730625e8f' },
-                                binary: { href: 'https://dm-store-aat.service.core-compute-aat.internal/documents/e5366837-b3f6-492d-acbf-548730625e8f/binary' },
-                            },
-                            originalDocumentName: 'Screenshot 2023-06-01 at 16.07.06.png',
-                        },
-                        {
-                            _links: {
-                                self: { href: 'https://dm-store-aat.service.core-compute-aat.internal/documents/f50ccd7a-7f28-40f3-b5f9-7ad2f6425506' },
-                                binary: { href: 'https://dm-store-aat.service.core-compute-aat.internal/documents/f50ccd7a-7f28-40f3-b5f9-7ad2f6425506/binary' },
+                    id: 'ccd-message-id-001',
+                    value: {
+                        id: 'case-message-001',
+                        subject: 'Review attached document',
+                        name: 'Maggie Conroy',
+                        body: 'Please review attached document and advise if hearing should proceed?',
+                        attachments: [
+                            {
+                                id: 'ccd-document-id-001',
+                                value: {
+                                    document_filename: 'Screenshot 2023-06-01 at 16.07.06.png',
+                                    document_url: 'https://dm-store-aat.service.core-compute-aat.internal/documents/e5366837-b3f6-492d-acbf-548730625e8f',
+                                    document_binary_url: 'https://dm-store-aat.service.core-compute-aat.internal/documents/e5366837-b3f6-492d-acbf-548730625e8f/binary'
+                                }
                             },
-                            originalDocumentName: 'dummy.pdf',
-                        }
-                    ],
-                    isHearingRelated: true,
-                    hearingDate: '10 Jan 2023',
-                    createdOn: new Date(2023, 0, 3),
-                    createdBy: '1111-1111-1111-1111'
+                            {
+                                id: 'ccd-document-id-002',
+                                value: {
+                                    document_filename: 'dummy.pdf',
+                                    document_url: 'https://dm-store-aat.service.core-compute-aat.internal/documents/f50ccd7a-7f28-40f3-b5f9-7ad2f6425506',
+                                    document_binary_url: 'https://dm-store-aat.service.core-compute-aat.internal/documents/f50ccd7a-7f28-40f3-b5f9-7ad2f6425506/binary'
+                                }
+                            }
+                        ],
+                        isHearingRelated: 'Yes',
+                        hearingDate: '2023-01-10',
+                        createdOn: new Date(2023, 0, 3),
+                        createdBy: '1111-1111-1111-1111'
+                    }
                 },
                 {
-                    id: 'case-message-002',
-                    subject: 'Games',
-                    name: 'Maggie Conroy',
-                    body: 'Can I play games in my phone when my solicitor is talking?',
-                    attachments: [
-                        {
-                            _links: {
-                                self: { href: '/' },
-                                binary: { href: '/' },
-                            },
-                            originalDocumentName: 'talking-document.pdf',
-                        }
-                    ],
-                    isHearingRelated: true,
-                    hearingDate: '10 Jan 2023',
-                    createdOn: new Date(2023, 0, 3),
-                    createdBy: '1111-1111-1111-1111'
+                    id: 'ccd-message-id-001',
+                    value: {
+                        id: 'case-message-002',
+                        subject: 'Games',
+                        name: 'Maggie Conroy',
+                        body: 'Can I play games in my phone when my solicitor is talking?',
+                        attachments: [
+                            {
+                                id: 'ccd-document-id-003',
+                                value: {
+                                    document_filename: 'talking-document.pdf',
+                                    document_url: '/',
+                                    document_binary_url: '/'
+                                }
+                            }
+                        ],
+                        isHearingRelated: 'Yes',
+                        hearingDate: '2023-01-10',
+                        createdOn: new Date(2023, 0, 3),
+                        createdBy: '1111-1111-1111-1111'
+                    }
                 },
                 {
-                    id: 'case-message-011',
-                    name: 'John Smith',
-                    body: 'Using mobile phone is strictly prohibited in the court room.',
-                    attachments: [
-                        {
-                            _links: {
-                                self: { href: '/' },
-                                binary: { href: '/' },
-                            },
-                            originalDocumentName: 'games-document.pdf',
-                        }
-                    ],
-                    isHearingRelated: true,
-                    hearingDate: '10 Jan 2023',
-                    createdOn: new Date(2023, 2, 4),
-                    createdBy: '2222-2222-2222-2222',
-                    parentId: 'case-message-002'
+                    id: 'ccd-message-id-003',
+                    value: {
+                        id: 'case-message-003',
+                        name: 'John Smith',
+                        body: 'Using mobile phone is strictly prohibited in the court room.',
+                        attachments: [
+                            {
+                                id: 'ccd-document-id-004',
+                                value: {
+                                    document_filename: 'games-document.pdf',
+                                    document_url: '/',
+                                    document_binary_url: '/'
+                                }
+                            }
+                        ],
+                        isHearingRelated: 'Yes',
+                        hearingDate: '2023-01-10',
+                        createdOn: new Date(2023, 2, 4),
+                        createdBy: '2222-2222-2222-2222',
+                        parentId: 'case-message-002'
+                    }
                 },
                 {
-                    id: 'case-message-012',
-                    name: 'Maggie Conroy',
-                    body: 'Can I use a tablet instead?',
-                    attachments: [],
-                    isHearingRelated: true,
-                    hearingDate: '10 Jan 2023',
-                    createdOn: new Date(2023, 3, 8),
-                    createdBy: '2222-2222-2222-2222',
-                    parentId: 'case-message-002'
+                    id: 'ccd-message-id-004',
+                    value: {
+                        id: 'case-message-004',
+                        name: 'Maggie Conroy',
+                        body: 'Can I use a tablet instead?',
+                        attachments: [],
+                        isHearingRelated: 'Yes',
+                        hearingDate: '2023-01-10',
+                        createdOn: new Date(2023, 3, 8),
+                        createdBy: '2222-2222-2222-2222',
+                        parentId: 'case-message-003'
+                    }
                 },
                 {
-                    id: 'case-message-013',
-                    name: 'John Smith',
-                    body: 'No, you cannot use a tablet either.',
-                    attachments: [],
-                    isHearingRelated: true,
-                    hearingDate: '10 Jan 2023',
-                    createdOn: new Date(2023, 4, 24),
-                    createdBy: '2222-2222-2222-2222',
-                    parentId: 'case-message-002'
+                    id: 'ccd-message-id-005',
+                    value: {
+                        id: 'case-message-005',
+                        name: 'John Smith',
+                        body: 'No, you cannot use a tablet either.',
+                        attachments: [],
+                        isHearingRelated: 'Yes',
+                        hearingDate: '2023-01-10',
+                        createdOn: new Date(2023, 4, 24),
+                        createdBy: '2222-2222-2222-2222',
+                        parentId: 'case-message-004'
+                    }
                 }
             ]
         },
         {
             partyName: 'Kevin Peterson - Respondent',
             roleOnCase: null,
-            partyMessages: [
+            caseMessages: [
                 {
-                    id: 'case-message-005',
-                    subject: 'Add respondent detention order',
-                    name: 'Maggie Conroy',
-                    body: 'Please add respondent detention order to the file XX20230423-DX.',
-                    attachments: [],
-                    isHearingRelated: false,
-                    createdOn: new Date(2023, 1, 5),
-                    createdBy: '1111-1111-1111-1111'
+                    id: 'ccd-message-id-006',
+                    value: {
+                        id: 'case-message-006',
+                        subject: 'Add respondent detention order',
+                        name: 'Maggie Conroy',
+                        body: 'Please add respondent detention order to the file XX20230423-DX.',
+                        attachments: [],
+                        isHearingRelated: 'Yes',
+                        createdOn: new Date(2023, 1, 5),
+                        createdBy: '1111-1111-1111-1111'
+                    }
                 },
                 {
-                    id: 'case-message-006',
-                    name: 'Maggie Conroy',
-                    body: 'I confirm that the respondent detention order is now added to the file XX20230423-DX.',
-                    attachments: [],
-                    isHearingRelated: false,
-                    createdOn: new Date(2023, 1, 6),
-                    createdBy: '2222-2222-2222-2222',
-                    parentId: 'case-message-005'
+                    id: 'ccd-message-id-007',
+                    value: {
+                        id: 'case-message-007',
+                        name: 'Maggie Conroy',
+                        body: 'I confirm that the respondent detention order is now added to the file XX20230423-DX.',
+                        attachments: [],
+                        isHearingRelated: 'Yes',
+                        createdOn: new Date(2023, 1, 6),
+                        createdBy: '2222-2222-2222-2222',
+                        parentId: 'case-message-006'
+                    }
                 },
                 {
-                    id: 'case-message-007',
-                    subject: 'Food',
-                    name: 'Maggie Conroy',
-                    body: 'Can I eat in the hearings?',
-                    attachments: [],
-                    isHearingRelated: true,
-                    hearingDate: '10 Jan 2023',
-                    createdOn: new Date(2023, 0, 3),
-                    createdBy: '1111-1111-1111-1111'
+                    id: 'ccd-message-id-008',
+                    value: {
+                        id: 'case-message-008',
+                        subject: 'Food',
+                        name: 'Maggie Conroy',
+                        body: 'Can I eat in the hearings?',
+                        attachments: [],
+                        isHearingRelated: 'Yes',
+                        hearingDate: '2023-01-10',
+                        createdOn: new Date(2023, 0, 3),
+                        createdBy: '1111-1111-1111-1111'
+                    }
                 },
                 {
-                    id: 'case-message-008',
-                    name: 'Maggie Conroy',
-                    body: 'Consumption of food is not allowed when a hearing is taking place.',
-                    attachments: [],
-                    isHearingRelated: true,
-                    hearingDate: '10 Jan 2023',
-                    createdOn: new Date(2023, 0, 5),
-                    createdBy: '2222-2222-2222-2222',
-                    parentId: 'case-message-007'
+                    id: 'ccd-message-id-009',
+                    value: {
+                        id: 'case-message-009',
+                        name: 'Maggie Conroy',
+                        body: 'Consumption of food is not allowed when a hearing is taking place.',
+                        attachments: [],
+                        isHearingRelated: 'Yes',
+                        hearingDate: '2023-01-10',
+                        createdOn: new Date(2023, 0, 5),
+                        createdBy: '2222-2222-2222-2222',
+                        parentId: 'case-message-008'
+                    }
                 },
                 {
-                    id: 'case-message-009',
-                    subject: 'Bring relatives',
-                    name: 'Maggie Conroy',
-                    body: 'Can I bring my grandma with me so she get out from the residence?',
-                    attachments: [],
-                    isHearingRelated: true,
-                    hearingDate: '10 Jan 2023',
-                    createdOn: new Date(2023, 0, 6),
-                    createdBy: '1111-1111-1111-1111'
+                    id: 'ccd-message-id-010',
+                    value: {
+                        id: 'case-message-010',
+                        subject: 'Bring relatives',
+                        name: 'Maggie Conroy',
+                        body: 'Can I bring my grandma with me so she get out from the residence?',
+                        attachments: [],
+                        isHearingRelated: 'Yes',
+                        hearingDate: '2023-01-10',
+                        createdOn: new Date(2023, 0, 6),
+                        createdBy: '1111-1111-1111-1111'
+                    }
                 },
                 {
-                    id: 'case-message-010',
-                    name: 'Maggie Conroy',
-                    body: 'Sorry, only those required for the hearing should be present inside the court room.',
-                    attachments: [],
-                    isHearingRelated: true,
-                    hearingDate: '10 Jan 2023',
-                    createdOn: new Date(2023, 0, 7),
-                    createdBy: '2222-2222-2222-2222',
-                    parentId: 'case-message-009'
+                    id: 'ccd-message-id-011',
+                    value: {
+                        id: 'case-message-011',
+                        name: 'Maggie Conroy',
+                        body: 'Sorry, only those required for the hearing should be present inside the court room.',
+                        attachments: [],
+                        isHearingRelated: 'Yes',
+                        hearingDate: '2023-01-10',
+                        createdOn: new Date(2023, 0, 7),
+                        createdBy: '2222-2222-2222-2222',
+                        parentId: 'case-message-010'
+                    }
                 }
             ]
         }
@@ -20991,6 +21127,15 @@
             }], function () { return [{ type: i1__namespace$1.ActivatedRoute }]; }, null);
     })();
 
+    exports.QueryCreateContext = void 0;
+    (function (QueryCreateContext) {
+        QueryCreateContext["NEW_QUERY_QUALIFYING_QUESTION_OPTIONS"] = "NewQueryQualifyingQuestionOptions";
+        QueryCreateContext["NEW_QUERY_QUALIFYING_QUESTION_DETAIL"] = "NewQueryQualifyingQuestionDetail";
+        QueryCreateContext["NEW_QUERY"] = "NewQuery";
+        QueryCreateContext["RESPOND"] = "Respond";
+        QueryCreateContext["FOLLOWUP"] = "Followup";
+    })(exports.QueryCreateContext || (exports.QueryCreateContext = {}));
+
     var QueryListItem = /** @class */ (function () {
         function QueryListItem() {
             this.attachments = [];
@@ -21068,34 +21213,25 @@
     }());
 
     var QueryListData = /** @class */ (function () {
-        function QueryListData(partyMessagesGroup) {
+        function QueryListData(caseQueriesCollection) {
             var _this = this;
-            this.partyName = partyMessagesGroup.partyName;
-            this.roleOnCase = partyMessagesGroup.roleOnCase;
+            this.partyName = caseQueriesCollection.partyName;
+            this.roleOnCase = caseQueriesCollection.roleOnCase;
             // get the parent messages (messages without parentId) and add the children to them
-            var parentMessages = partyMessagesGroup.partyMessages.filter(function (message) { return !message.parentId; });
-            this.partyMessages = parentMessages.map(function (message) { return _this.buildQueryListItem(message, partyMessagesGroup.partyMessages); });
+            var parentMessages = caseQueriesCollection.caseMessages.filter(function (message) { return !message.value.parentId; });
+            this.queries = parentMessages.map(function (message) { return _this.buildQueryListItem(message, caseQueriesCollection.caseMessages); });
         }
         QueryListData.prototype.buildQueryListItem = function (message, allMessages) {
             var _this = this;
             var queryListItem = new QueryListItem();
-            Object.assign(queryListItem, Object.assign(Object.assign({}, message), { children: allMessages
-                    .filter(function (childMessage) { return childMessage.parentId === message.id; })
+            Object.assign(queryListItem, Object.assign(Object.assign({}, message.value), { children: allMessages
+                    .filter(function (childMessage) { return childMessage.value.parentId === message.value.id; })
                     .map(function (childMessage) { return _this.buildQueryListItem(childMessage, allMessages); }) }));
             return queryListItem;
         };
         return QueryListData;
     }());
 
-    exports.QueryCreateContext = void 0;
-    (function (QueryCreateContext) {
-        QueryCreateContext["NEW_QUERY_QUALIFYING_QUESTION_OPTIONS"] = "NewQueryQualifyingQuestionOptions";
-        QueryCreateContext["NEW_QUERY_QUALIFYING_QUESTION_DETAIL"] = "NewQueryQualifyingQuestionDetail";
-        QueryCreateContext["NEW_QUERY"] = "NewQuery";
-        QueryCreateContext["RESPOND"] = "Respond";
-        QueryCreateContext["FOLLOWUP"] = "Followup";
-    })(exports.QueryCreateContext || (exports.QueryCreateContext = {}));
-
     function QueryCheckYourAnswersComponent_ng_container_2_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementContainerStart(0);
@@ -21131,9 +21267,22 @@
             i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(1, 1, "Review query details"), " ");
         }
     }
+    function QueryCheckYourAnswersComponent_dl_9_a_8_Template(rf, ctx) {
+        if (rf & 1) {
+            var _r9_1 = i0__namespace.ɵɵgetCurrentView();
+            i0__namespace.ɵɵelementStart(0, "a", 13);
+            i0__namespace.ɵɵlistener("click", function QueryCheckYourAnswersComponent_dl_9_a_8_Template_a_click_0_listener() { i0__namespace.ɵɵrestoreView(_r9_1); var ctx_r8 = i0__namespace.ɵɵnextContext(2); return ctx_r8.goBack(); });
+            i0__namespace.ɵɵtext(1);
+            i0__namespace.ɵɵpipe(2, "rpxTranslate");
+            i0__namespace.ɵɵelementEnd();
+        }
+        if (rf & 2) {
+            i0__namespace.ɵɵadvance(1);
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(2, 1, "Change"), " ");
+        }
+    }
     function QueryCheckYourAnswersComponent_dl_9_Template(rf, ctx) {
         if (rf & 1) {
-            var _r8_1 = i0__namespace.ɵɵgetCurrentView();
             i0__namespace.ɵɵelementStart(0, "dl", 8);
             i0__namespace.ɵɵelementStart(1, "div", 9);
             i0__namespace.ɵɵelementStart(2, "dt", 10);
@@ -21144,11 +21293,7 @@
             i0__namespace.ɵɵtext(6);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementStart(7, "dd", 12);
-            i0__namespace.ɵɵelementStart(8, "a", 13);
-            i0__namespace.ɵɵlistener("click", function QueryCheckYourAnswersComponent_dl_9_Template_a_click_8_listener() { i0__namespace.ɵɵrestoreView(_r8_1); var ctx_r7 = i0__namespace.ɵɵnextContext(); return ctx_r7.goBack(); });
-            i0__namespace.ɵɵtext(9);
-            i0__namespace.ɵɵpipe(10, "rpxTranslate");
-            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵtemplate(8, QueryCheckYourAnswersComponent_dl_9_a_8_Template, 3, 3, "a", 19);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
@@ -21157,11 +21302,11 @@
             var ctx_r4 = i0__namespace.ɵɵnextContext();
             var tmp_1_0 = null;
             i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(4, 3, "Query subject"), " ");
+            i0__namespace.ɵɵtextInterpolate1(" ", ctx_r4.queryCreateContext === ctx_r4.queryCreateContextEnum.RESPOND ? "Submitted query" : i0__namespace.ɵɵpipeBind1(4, 3, "Query subject"), " ");
             i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵtextInterpolate1(" ", (tmp_1_0 = ctx_r4.formGroup.get("subject")) == null ? null : tmp_1_0.value, " ");
-            i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(10, 5, "Change"), " ");
+            i0__namespace.ɵɵtextInterpolate1(" ", ctx_r4.queryCreateContext === ctx_r4.queryCreateContextEnum.RESPOND ? ctx_r4.queryItem.subject : (tmp_1_0 = ctx_r4.formGroup.get("subject")) == null ? null : tmp_1_0.value, " ");
+            i0__namespace.ɵɵadvance(2);
+            i0__namespace.ɵɵproperty("ngIf", ctx_r4.queryCreateContext === ctx_r4.queryCreateContextEnum.NEW_QUERY);
         }
     }
     function QueryCheckYourAnswersComponent_dl_21_ng_container_6_Template(rf, ctx) {
@@ -21187,7 +21332,7 @@
     }
     function QueryCheckYourAnswersComponent_dl_21_div_13_Template(rf, ctx) {
         if (rf & 1) {
-            var _r14_1 = i0__namespace.ɵɵgetCurrentView();
+            var _r15_1 = i0__namespace.ɵɵgetCurrentView();
             i0__namespace.ɵɵelementStart(0, "div", 9);
             i0__namespace.ɵɵelementStart(1, "dt", 10);
             i0__namespace.ɵɵtext(2);
@@ -21199,7 +21344,7 @@
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementStart(7, "dd", 12);
             i0__namespace.ɵɵelementStart(8, "a", 13);
-            i0__namespace.ɵɵlistener("click", function QueryCheckYourAnswersComponent_dl_21_div_13_Template_a_click_8_listener() { i0__namespace.ɵɵrestoreView(_r14_1); var ctx_r13 = i0__namespace.ɵɵnextContext(2); return ctx_r13.goBack(); });
+            i0__namespace.ɵɵlistener("click", function QueryCheckYourAnswersComponent_dl_21_div_13_Template_a_click_8_listener() { i0__namespace.ɵɵrestoreView(_r15_1); var ctx_r14 = i0__namespace.ɵɵnextContext(2); return ctx_r14.goBack(); });
             i0__namespace.ɵɵtext(9);
             i0__namespace.ɵɵpipe(10, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
@@ -21207,19 +21352,19 @@
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
-            var ctx_r12 = i0__namespace.ɵɵnextContext(2);
+            var ctx_r13 = i0__namespace.ɵɵnextContext(2);
             var tmp_1_0 = null;
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵtextInterpolate1(" ", ctx_r12.queryCreateContext === ctx_r12.queryCreateContextEnum.NEW_QUERY ? "What is the date of the hearing?" : i0__namespace.ɵɵpipeBind1(3, 3, "What is the date of the hearing your query is related to?"), " ");
+            i0__namespace.ɵɵtextInterpolate1(" ", ctx_r13.queryCreateContext === ctx_r13.queryCreateContextEnum.NEW_QUERY ? "What is the date of the hearing?" : i0__namespace.ɵɵpipeBind1(3, 3, "What is the date of the hearing your query is related to?"), " ");
             i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind2(6, 5, (tmp_1_0 = ctx_r12.formGroup.get("hearingDate")) == null ? null : tmp_1_0.value, "dd MMM yyyy"), " ");
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind2(6, 5, (tmp_1_0 = ctx_r13.formGroup.get("hearingDate")) == null ? null : tmp_1_0.value, "dd MMM yyyy"), " ");
             i0__namespace.ɵɵadvance(4);
             i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(10, 8, "Change"), " ");
         }
     }
     function QueryCheckYourAnswersComponent_dl_21_Template(rf, ctx) {
         if (rf & 1) {
-            var _r16_1 = i0__namespace.ɵɵgetCurrentView();
+            var _r17_1 = i0__namespace.ɵɵgetCurrentView();
             i0__namespace.ɵɵelementStart(0, "dl", 8);
             i0__namespace.ɵɵelementStart(1, "div", 9);
             i0__namespace.ɵɵelementStart(2, "dt", 10);
@@ -21228,28 +21373,28 @@
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementStart(5, "dd", 11);
             i0__namespace.ɵɵtemplate(6, QueryCheckYourAnswersComponent_dl_21_ng_container_6_Template, 3, 5, "ng-container", 4);
-            i0__namespace.ɵɵtemplate(7, QueryCheckYourAnswersComponent_dl_21_ng_template_7_Template, 2, 5, "ng-template", null, 19, i0__namespace.ɵɵtemplateRefExtractor);
+            i0__namespace.ɵɵtemplate(7, QueryCheckYourAnswersComponent_dl_21_ng_template_7_Template, 2, 5, "ng-template", null, 20, i0__namespace.ɵɵtemplateRefExtractor);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementStart(9, "dd", 12);
             i0__namespace.ɵɵelementStart(10, "a", 13);
-            i0__namespace.ɵɵlistener("click", function QueryCheckYourAnswersComponent_dl_21_Template_a_click_10_listener() { i0__namespace.ɵɵrestoreView(_r16_1); var ctx_r15 = i0__namespace.ɵɵnextContext(); return ctx_r15.goBack(); });
+            i0__namespace.ɵɵlistener("click", function QueryCheckYourAnswersComponent_dl_21_Template_a_click_10_listener() { i0__namespace.ɵɵrestoreView(_r17_1); var ctx_r16 = i0__namespace.ɵɵnextContext(); return ctx_r16.goBack(); });
             i0__namespace.ɵɵtext(11);
             i0__namespace.ɵɵpipe(12, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵtemplate(13, QueryCheckYourAnswersComponent_dl_21_div_13_Template, 11, 10, "div", 20);
+            i0__namespace.ɵɵtemplate(13, QueryCheckYourAnswersComponent_dl_21_div_13_Template, 11, 10, "div", 21);
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
-            var _r10 = i0__namespace.ɵɵreference(8);
+            var _r11 = i0__namespace.ɵɵreference(8);
             var ctx_r5 = i0__namespace.ɵɵnextContext();
             var tmp_1_0 = null;
             var tmp_4_0 = null;
             i0__namespace.ɵɵadvance(3);
             i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(4, 5, "Is the query hearing related?"), " ");
             i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵproperty("ngIf", ((tmp_1_0 = ctx_r5.formGroup.get("isHearingRelated")) == null ? null : tmp_1_0.value) === true)("ngIfElse", _r10);
+            i0__namespace.ɵɵproperty("ngIf", ((tmp_1_0 = ctx_r5.formGroup.get("isHearingRelated")) == null ? null : tmp_1_0.value) === true)("ngIfElse", _r11);
             i0__namespace.ɵɵadvance(5);
             i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(12, 7, "Change"), " ");
             i0__namespace.ɵɵadvance(2);
@@ -21258,7 +21403,7 @@
     }
     function QueryCheckYourAnswersComponent_ccd_query_attachments_read_28_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelement(0, "ccd-query-attachments-read", 21);
+            i0__namespace.ɵɵelement(0, "ccd-query-attachments-read", 22);
         }
         if (rf & 2) {
             var ctx_r6 = i0__namespace.ɵɵnextContext();
@@ -21276,7 +21421,7 @@
         return QueryCheckYourAnswersComponent;
     }());
     QueryCheckYourAnswersComponent.ɵfac = function QueryCheckYourAnswersComponent_Factory(t) { return new (t || QueryCheckYourAnswersComponent)(); };
-    QueryCheckYourAnswersComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: QueryCheckYourAnswersComponent, selectors: [["ccd-query-check-your-answers"]], inputs: { formGroup: "formGroup", queryItem: "queryItem", queryCreateContext: "queryCreateContext" }, outputs: { backClicked: "backClicked" }, decls: 41, vars: 25, consts: [[1, "govuk-grid-row"], [1, "govuk-grid-column-two-thirds-from-desktop"], [4, "ngIf"], [1, "govuk-heading-l"], [4, "ngIf", "ngIfElse"], ["defaultCheckYourAnswersTitle", ""], [1, "govuk-!-margin-bottom-4"], ["class", "govuk-summary-list govuk-!-margin-bottom-0", 4, "ngIf"], [1, "govuk-summary-list", "govuk-!-margin-bottom-0"], [1, "govuk-summary-list__row"], [1, "govuk-summary-list__key"], [1, "govuk-summary-list__value"], [1, "govuk-summary-list__actions"], ["href", "javascript:void(0)", 1, "govuk-link", 3, "click"], [1, "govuk-summary-list__value", "govuk-summary-list__value--documentAttached"], [3, "attachments", 4, "ngIf"], ["data-module", "govuk-button", 1, "govuk-button", "govuk-button--secondary", "govuk-!-margin-right-3", 3, "click"], ["data-module", "govuk-button", 1, "govuk-button"], [1, "govuk-caption-l"], ["isHearingRelatedFalse", ""], ["class", "govuk-summary-list__row", 4, "ngIf"], [3, "attachments"]], template: function QueryCheckYourAnswersComponent_Template(rf, ctx) {
+    QueryCheckYourAnswersComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: QueryCheckYourAnswersComponent, selectors: [["ccd-query-check-your-answers"]], inputs: { formGroup: "formGroup", queryItem: "queryItem", queryCreateContext: "queryCreateContext" }, outputs: { backClicked: "backClicked" }, decls: 41, vars: 25, consts: [[1, "govuk-grid-row"], [1, "govuk-grid-column-two-thirds-from-desktop"], [4, "ngIf"], [1, "govuk-heading-l"], [4, "ngIf", "ngIfElse"], ["defaultCheckYourAnswersTitle", ""], [1, "govuk-!-margin-bottom-4"], ["class", "govuk-summary-list govuk-!-margin-bottom-0", 4, "ngIf"], [1, "govuk-summary-list", "govuk-!-margin-bottom-0"], [1, "govuk-summary-list__row"], [1, "govuk-summary-list__key"], [1, "govuk-summary-list__value"], [1, "govuk-summary-list__actions"], ["href", "javascript:void(0)", 1, "govuk-link", 3, "click"], [1, "govuk-summary-list__value", "govuk-summary-list__value--documentAttached"], [3, "attachments", 4, "ngIf"], ["data-module", "govuk-button", 1, "govuk-button", "govuk-button--secondary", "govuk-!-margin-right-3", 3, "click"], ["data-module", "govuk-button", 1, "govuk-button"], [1, "govuk-caption-l"], ["href", "javascript:void(0)", "class", "govuk-link", 3, "click", 4, "ngIf"], ["isHearingRelatedFalse", ""], ["class", "govuk-summary-list__row", 4, "ngIf"], [3, "attachments"]], template: function QueryCheckYourAnswersComponent_Template(rf, ctx) {
             if (rf & 1) {
                 i0__namespace.ɵɵelementStart(0, "div", 0);
                 i0__namespace.ɵɵelementStart(1, "div", 1);
@@ -21288,7 +21433,7 @@
                 i0__namespace.ɵɵelementStart(7, "div", 6);
                 i0__namespace.ɵɵelement(8, "ccd-query-case-details-header");
                 i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵtemplate(9, QueryCheckYourAnswersComponent_dl_9_Template, 11, 7, "dl", 7);
+                i0__namespace.ɵɵtemplate(9, QueryCheckYourAnswersComponent_dl_9_Template, 9, 5, "dl", 7);
                 i0__namespace.ɵɵelementStart(10, "dl", 8);
                 i0__namespace.ɵɵelementStart(11, "div", 9);
                 i0__namespace.ɵɵelementStart(12, "dt", 10);
@@ -21349,9 +21494,9 @@
                 i0__namespace.ɵɵadvance(2);
                 i0__namespace.ɵɵproperty("ngIf", ctx.queryCreateContext === ctx.queryCreateContextEnum.RESPOND)("ngIfElse", _r2);
                 i0__namespace.ɵɵadvance(5);
-                i0__namespace.ɵɵproperty("ngIf", ctx.queryCreateContext === ctx.queryCreateContextEnum.NEW_QUERY);
+                i0__namespace.ɵɵproperty("ngIf", ctx.queryCreateContext !== ctx.queryCreateContextEnum.FOLLOWUP);
                 i0__namespace.ɵɵadvance(4);
-                i0__namespace.ɵɵtextInterpolate1(" ", ctx.queryCreateContext === ctx.queryCreateContextEnum.RESPOND ? "Response message" : i0__namespace.ɵɵpipeBind1(14, 13, "Query detail"), " ");
+                i0__namespace.ɵɵtextInterpolate1(" ", ctx.queryCreateContext === ctx.queryCreateContextEnum.RESPOND ? "Response detail" : i0__namespace.ɵɵpipeBind1(14, 13, "Query detail"), " ");
                 i0__namespace.ɵɵadvance(3);
                 i0__namespace.ɵɵtextInterpolate1(" ", (tmp_5_0 = ctx.formGroup.get("body")) == null ? null : tmp_5_0.value, " ");
                 i0__namespace.ɵɵadvance(3);
@@ -21389,14 +21534,14 @@
                 }] });
     })();
 
-    function QueryDetailsTableComponent_ng_container_0_tr_36_Template(rf, ctx) {
+    function QueryDetailsComponent_ng_container_0_tr_41_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "tr", 8);
-            i0__namespace.ɵɵelementStart(1, "th", 4);
+            i0__namespace.ɵɵelementStart(0, "tr", 9);
+            i0__namespace.ɵɵelementStart(1, "th", 5);
             i0__namespace.ɵɵtext(2);
             i0__namespace.ɵɵpipe(3, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(4, "td", 5);
+            i0__namespace.ɵɵelementStart(4, "td", 6);
             i0__namespace.ɵɵtext(5);
             i0__namespace.ɵɵpipe(6, "date");
             i0__namespace.ɵɵelementEnd();
@@ -21407,193 +21552,86 @@
             i0__namespace.ɵɵadvance(2);
             i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(3, 2, "What is the date of the hearing?"));
             i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind2(6, 4, ctx_r1.queryItem.hearingDate, "dd MMM yyyy"));
+            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind2(6, 4, ctx_r1.query.hearingDate, "dd MMM yyyy"));
         }
     }
-    function QueryDetailsTableComponent_ng_container_0_ccd_query_attachments_read_42_Template(rf, ctx) {
+    function QueryDetailsComponent_ng_container_0_ccd_query_attachments_read_47_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelement(0, "ccd-query-attachments-read", 9);
+            i0__namespace.ɵɵelement(0, "ccd-query-attachments-read", 10);
         }
         if (rf & 2) {
             var ctx_r2 = i0__namespace.ɵɵnextContext(2);
-            i0__namespace.ɵɵproperty("attachments", ctx_r2.queryItem.attachments);
+            i0__namespace.ɵɵproperty("attachments", ctx_r2.query.attachments);
         }
     }
-    function QueryDetailsTableComponent_ng_container_0_Template(rf, ctx) {
+    function QueryDetailsComponent_ng_container_0_ng_container_48_ng_container_1_ng_container_1_tr_15_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelementContainerStart(0);
-            i0__namespace.ɵɵelementStart(1, "table", 1);
-            i0__namespace.ɵɵpipe(2, "rpxTranslate");
-            i0__namespace.ɵɵelementStart(3, "tbody", 2);
-            i0__namespace.ɵɵelementStart(4, "tr", 3);
-            i0__namespace.ɵɵelementStart(5, "th", 4);
-            i0__namespace.ɵɵtext(6);
-            i0__namespace.ɵɵpipe(7, "rpxTranslate");
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(8, "td", 5);
-            i0__namespace.ɵɵtext(9);
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(10, "tr", 3);
-            i0__namespace.ɵɵelementStart(11, "th", 4);
-            i0__namespace.ɵɵtext(12);
-            i0__namespace.ɵɵpipe(13, "rpxTranslate");
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(14, "td", 5);
-            i0__namespace.ɵɵtext(15);
-            i0__namespace.ɵɵpipe(16, "date");
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(17, "tr", 3);
-            i0__namespace.ɵɵelementStart(18, "th", 4);
-            i0__namespace.ɵɵtext(19);
-            i0__namespace.ɵɵpipe(20, "rpxTranslate");
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(21, "td", 5);
-            i0__namespace.ɵɵtext(22);
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(23, "tr", 3);
-            i0__namespace.ɵɵelementStart(24, "th", 4);
-            i0__namespace.ɵɵtext(25);
-            i0__namespace.ɵɵpipe(26, "rpxTranslate");
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(27, "td", 5);
-            i0__namespace.ɵɵtext(28);
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(29, "tr", 3);
-            i0__namespace.ɵɵelementStart(30, "th", 4);
-            i0__namespace.ɵɵtext(31);
-            i0__namespace.ɵɵpipe(32, "rpxTranslate");
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(33, "td", 5);
-            i0__namespace.ɵɵtext(34);
-            i0__namespace.ɵɵpipe(35, "rpxTranslate");
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵtemplate(36, QueryDetailsTableComponent_ng_container_0_tr_36_Template, 7, 7, "tr", 6);
-            i0__namespace.ɵɵelementStart(37, "tr", 3);
-            i0__namespace.ɵɵelementStart(38, "th", 4);
-            i0__namespace.ɵɵtext(39);
-            i0__namespace.ɵɵpipe(40, "rpxTranslate");
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(41, "td", 5);
-            i0__namespace.ɵɵtemplate(42, QueryDetailsTableComponent_ng_container_0_ccd_query_attachments_read_42_Template, 1, 1, "ccd-query-attachments-read", 7);
-            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementStart(0, "tr", 4);
+            i0__namespace.ɵɵelementStart(1, "th", 5);
+            i0__namespace.ɵɵtext(2);
+            i0__namespace.ɵɵpipe(3, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementStart(4, "td", 6);
+            i0__namespace.ɵɵtext(5);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementContainerEnd();
         }
         if (rf & 2) {
-            var ctx_r0 = i0__namespace.ɵɵnextContext();
-            i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵattribute("aria-describedby", i0__namespace.ɵɵpipeBind1(2, 18, "Details of the query"));
-            i0__namespace.ɵɵadvance(5);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(7, 20, "Last submitted by"));
-            i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵtextInterpolate(ctx_r0.queryItem.lastSubmittedBy);
-            i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(13, 22, "Submission date"));
-            i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind2(16, 24, ctx_r0.queryItem.createdOn, "dd MMM yyyy"));
-            i0__namespace.ɵɵadvance(4);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(20, 27, "Query subject"));
-            i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵtextInterpolate(ctx_r0.queryItem.subject);
-            i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(26, 29, "Query detail"));
-            i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵtextInterpolate(ctx_r0.queryItem.body);
-            i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵclassProp("govuk-table__header--no-border", ctx_r0.queryItem.isHearingRelated);
-            i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(32, 31, "Is the query hearing related?"), " ");
-            i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵclassProp("govuk-table__cell--no-border", ctx_r0.queryItem.isHearingRelated);
-            i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind3(35, 33, "Is the query hearing related?", null, ctx_r0.queryItem.isHearingRelated ? "Yes" : "No"), "");
+            var child_r5 = i0__namespace.ɵɵnextContext(2).$implicit;
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵproperty("ngIf", ctx_r0.queryItem.isHearingRelated);
-            i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(40, 37, "Attachments"));
+            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(3, 2, "Caseworker name"));
             i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵproperty("ngIf", ctx_r0.queryItem.attachments);
+            i0__namespace.ɵɵtextInterpolate(child_r5.name);
         }
     }
-    var QueryDetailsTableComponent = /** @class */ (function () {
-        function QueryDetailsTableComponent() {
-        }
-        return QueryDetailsTableComponent;
-    }());
-    QueryDetailsTableComponent.ɵfac = function QueryDetailsTableComponent_Factory(t) { return new (t || QueryDetailsTableComponent)(); };
-    QueryDetailsTableComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: QueryDetailsTableComponent, selectors: [["ccd-query-details-table"]], inputs: { queryItem: "queryItem" }, decls: 1, vars: 1, consts: [[4, "ngIf"], [1, "govuk-table", "query-details-table"], [1, "govuk-table__body"], [1, "govuk-table__row"], ["scope", "row", 1, "govuk-table__header"], [1, "govuk-table__cell"], ["class", "govuk-table__row govuk-table__row--isHearingRelated", 4, "ngIf"], [3, "attachments", 4, "ngIf"], [1, "govuk-table__row", "govuk-table__row--isHearingRelated"], [3, "attachments"]], template: function QueryDetailsTableComponent_Template(rf, ctx) {
-            if (rf & 1) {
-                i0__namespace.ɵɵtemplate(0, QueryDetailsTableComponent_ng_container_0_Template, 43, 39, "ng-container", 0);
-            }
-            if (rf & 2) {
-                i0__namespace.ɵɵproperty("ngIf", ctx.queryItem);
-            }
-        }, styles: [".query-details-table[_ngcontent-%COMP%]   .govuk-table__header[_ngcontent-%COMP%]{width:330px}.query-details-table[_ngcontent-%COMP%]   .collection-field-table[_ngcontent-%COMP%]   tr[_ngcontent-%COMP%] > td[_ngcontent-%COMP%]{border-bottom:none}.query-details-table[_ngcontent-%COMP%]   .govuk-table__cell--no-border[_ngcontent-%COMP%], .query-details-table[_ngcontent-%COMP%]   .govuk-table__header--no-border[_ngcontent-%COMP%]{border-bottom:0}"] });
-    (function () {
-        (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(QueryDetailsTableComponent, [{
-                type: i0.Component,
-                args: [{
-                        selector: 'ccd-query-details-table',
-                        templateUrl: './query-details-table.component.html',
-                        styleUrls: ['./query-details-table.component.scss']
-                    }]
-            }], null, { queryItem: [{
-                    type: i0.Input
-                }] });
-    })();
-
-    function QueryDetailsComponent_ng_container_0_ng_container_10_ng_container_1_ng_container_1_ccd_query_attachments_read_25_Template(rf, ctx) {
+    function QueryDetailsComponent_ng_container_0_ng_container_48_ng_container_1_ng_container_1_ccd_query_attachments_read_27_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelement(0, "ccd-query-attachments-read", 14);
+            i0__namespace.ɵɵelement(0, "ccd-query-attachments-read", 10);
         }
         if (rf & 2) {
             var child_r5 = i0__namespace.ɵɵnextContext(2).$implicit;
             i0__namespace.ɵɵproperty("attachments", child_r5.attachments);
         }
     }
-    function QueryDetailsComponent_ng_container_0_ng_container_10_ng_container_1_ng_container_1_Template(rf, ctx) {
+    function QueryDetailsComponent_ng_container_0_ng_container_48_ng_container_1_ng_container_1_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementContainerStart(0);
-            i0__namespace.ɵɵelementStart(1, "div", 2);
-            i0__namespace.ɵɵtext(2);
-            i0__namespace.ɵɵpipe(3, "rpxTranslate");
+            i0__namespace.ɵɵelementStart(1, "table", 1);
+            i0__namespace.ɵɵpipe(2, "rpxTranslate");
+            i0__namespace.ɵɵelementStart(3, "caption", 2);
+            i0__namespace.ɵɵelementStart(4, "div");
+            i0__namespace.ɵɵtext(5);
+            i0__namespace.ɵɵpipe(6, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(4, "table", 8);
-            i0__namespace.ɵɵpipe(5, "rpxTranslate");
-            i0__namespace.ɵɵelementStart(6, "tbody", 9);
-            i0__namespace.ɵɵelementStart(7, "tr", 10);
-            i0__namespace.ɵɵelementStart(8, "th", 11);
-            i0__namespace.ɵɵtext(9);
-            i0__namespace.ɵɵpipe(10, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(11, "td", 12);
-            i0__namespace.ɵɵtext(12);
-            i0__namespace.ɵɵpipe(13, "date");
+            i0__namespace.ɵɵelementStart(7, "tbody", 3);
+            i0__namespace.ɵɵelementStart(8, "tr", 4);
+            i0__namespace.ɵɵelementStart(9, "th", 5);
+            i0__namespace.ɵɵtext(10);
+            i0__namespace.ɵɵpipe(11, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementStart(12, "td", 6);
+            i0__namespace.ɵɵtext(13);
+            i0__namespace.ɵɵpipe(14, "date");
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(14, "tr", 10);
-            i0__namespace.ɵɵelementStart(15, "th", 11);
-            i0__namespace.ɵɵtext(16);
-            i0__namespace.ɵɵpipe(17, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(18, "td", 12);
-            i0__namespace.ɵɵtext(19);
+            i0__namespace.ɵɵtemplate(15, QueryDetailsComponent_ng_container_0_ng_container_48_ng_container_1_ng_container_1_tr_15_Template, 6, 4, "tr", 14);
+            i0__namespace.ɵɵelementStart(16, "tr", 4);
+            i0__namespace.ɵɵelementStart(17, "th", 5);
+            i0__namespace.ɵɵtext(18);
+            i0__namespace.ɵɵpipe(19, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementStart(20, "td", 6);
+            i0__namespace.ɵɵtext(21);
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(20, "tr", 10);
-            i0__namespace.ɵɵelementStart(21, "th", 11);
-            i0__namespace.ɵɵtext(22);
-            i0__namespace.ɵɵpipe(23, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(24, "td", 12);
-            i0__namespace.ɵɵtemplate(25, QueryDetailsComponent_ng_container_0_ng_container_10_ng_container_1_ng_container_1_ccd_query_attachments_read_25_Template, 1, 1, "ccd-query-attachments-read", 13);
+            i0__namespace.ɵɵelementStart(22, "tr", 4);
+            i0__namespace.ɵɵelementStart(23, "th", 5);
+            i0__namespace.ɵɵtext(24);
+            i0__namespace.ɵɵpipe(25, "rpxTranslate");
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementStart(26, "td", 6);
+            i0__namespace.ɵɵtemplate(27, QueryDetailsComponent_ng_container_0_ng_container_48_ng_container_1_ng_container_1_ccd_query_attachments_read_27_Template, 1, 1, "ccd-query-attachments-read", 8);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
@@ -21602,59 +21640,64 @@
         }
         if (rf & 2) {
             var child_r5 = i0__namespace.ɵɵnextContext().$implicit;
-            i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(3, 8, "Response"));
-            i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵattribute("aria-describedby", i0__namespace.ɵɵpipeBind1(5, 10, "Response of the query"));
+            var ctx_r7 = i0__namespace.ɵɵnextContext(3);
+            i0__namespace.ɵɵadvance(1);
+            i0__namespace.ɵɵattribute("aria-describedby", i0__namespace.ɵɵpipeBind1(2, 9, "Response of the query"));
+            i0__namespace.ɵɵadvance(4);
+            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(6, 11, "Response"));
             i0__namespace.ɵɵadvance(5);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(10, 12, "Last response date"));
+            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(11, 13, "Last response date"));
             i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind2(13, 14, child_r5.createdOn, "dd MMM yyyy"));
-            i0__namespace.ɵɵadvance(4);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(17, 17, "Response detail"));
+            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind2(14, 15, child_r5.createdOn, "dd MMM yyyy"));
+            i0__namespace.ɵɵadvance(2);
+            i0__namespace.ɵɵproperty("ngIf", ctx_r7.isCaseworker());
+            i0__namespace.ɵɵadvance(3);
+            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(19, 18, "Response detail"));
             i0__namespace.ɵɵadvance(3);
             i0__namespace.ɵɵtextInterpolate(child_r5.body);
             i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(23, 19, "Attachments"));
+            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(25, 20, "Attachments"));
             i0__namespace.ɵɵadvance(3);
             i0__namespace.ɵɵproperty("ngIf", child_r5.attachments);
         }
     }
-    function QueryDetailsComponent_ng_container_0_ng_container_10_ng_container_1_ng_template_2_Template(rf, ctx) {
+    function QueryDetailsComponent_ng_container_0_ng_container_48_ng_container_1_ng_template_2_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "div", 2);
-            i0__namespace.ɵɵtext(1);
-            i0__namespace.ɵɵpipe(2, "rpxTranslate");
+            i0__namespace.ɵɵelementStart(0, "table", 1);
+            i0__namespace.ɵɵpipe(1, "rpxTranslate");
+            i0__namespace.ɵɵelementStart(2, "caption", 2);
+            i0__namespace.ɵɵelementStart(3, "div");
+            i0__namespace.ɵɵtext(4);
+            i0__namespace.ɵɵpipe(5, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(3, "table", 8);
-            i0__namespace.ɵɵpipe(4, "rpxTranslate");
-            i0__namespace.ɵɵelementStart(5, "tbody", 9);
-            i0__namespace.ɵɵelementStart(6, "tr", 10);
-            i0__namespace.ɵɵelementStart(7, "th", 11);
-            i0__namespace.ɵɵtext(8);
-            i0__namespace.ɵɵpipe(9, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(10, "td", 12);
-            i0__namespace.ɵɵtext(11);
-            i0__namespace.ɵɵpipe(12, "date");
+            i0__namespace.ɵɵelementStart(6, "tbody", 3);
+            i0__namespace.ɵɵelementStart(7, "tr", 4);
+            i0__namespace.ɵɵelementStart(8, "th", 5);
+            i0__namespace.ɵɵtext(9);
+            i0__namespace.ɵɵpipe(10, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementStart(11, "td", 6);
+            i0__namespace.ɵɵtext(12);
+            i0__namespace.ɵɵpipe(13, "date");
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(13, "tr", 10);
-            i0__namespace.ɵɵelementStart(14, "th", 11);
-            i0__namespace.ɵɵtext(15);
-            i0__namespace.ɵɵpipe(16, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(17, "td", 12);
-            i0__namespace.ɵɵtext(18);
+            i0__namespace.ɵɵelementStart(14, "tr", 4);
+            i0__namespace.ɵɵelementStart(15, "th", 5);
+            i0__namespace.ɵɵtext(16);
+            i0__namespace.ɵɵpipe(17, "rpxTranslate");
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementStart(18, "td", 6);
+            i0__namespace.ɵɵtext(19);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(19, "tr", 10);
-            i0__namespace.ɵɵelementStart(20, "th", 11);
-            i0__namespace.ɵɵtext(21);
-            i0__namespace.ɵɵpipe(22, "rpxTranslate");
+            i0__namespace.ɵɵelementStart(20, "tr", 4);
+            i0__namespace.ɵɵelementStart(21, "th", 5);
+            i0__namespace.ɵɵtext(22);
+            i0__namespace.ɵɵpipe(23, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(23, "td", 12);
-            i0__namespace.ɵɵtext(24);
+            i0__namespace.ɵɵelementStart(24, "td", 6);
+            i0__namespace.ɵɵtext(25);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
@@ -21662,29 +21705,28 @@
         }
         if (rf & 2) {
             var child_r5 = i0__namespace.ɵɵnextContext().$implicit;
-            i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(2, 8, "Follow up query"));
-            i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵattribute("aria-describedby", i0__namespace.ɵɵpipeBind1(4, 10, "Follow-up of the response"));
+            i0__namespace.ɵɵattribute("aria-describedby", i0__namespace.ɵɵpipeBind1(1, 8, "Follow-up of the response"));
+            i0__namespace.ɵɵadvance(4);
+            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(5, 10, "Follow up query"));
             i0__namespace.ɵɵadvance(5);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(9, 12, "Last submission date"));
+            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(10, 12, "Last submission date"));
             i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind2(12, 14, child_r5.createdOn, "dd MMM yyyy"));
+            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind2(13, 14, child_r5.createdOn, "dd MMM yyyy"));
             i0__namespace.ɵɵadvance(4);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(16, 17, "Last submitted by"));
+            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(17, 17, "Last submitted by"));
             i0__namespace.ɵɵadvance(3);
             i0__namespace.ɵɵtextInterpolate(child_r5.name);
             i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(22, 19, "Query detail"));
+            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(23, 19, "Query detail"));
             i0__namespace.ɵɵadvance(3);
             i0__namespace.ɵɵtextInterpolate(child_r5.body);
         }
     }
-    function QueryDetailsComponent_ng_container_0_ng_container_10_ng_container_1_Template(rf, ctx) {
+    function QueryDetailsComponent_ng_container_0_ng_container_48_ng_container_1_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementContainerStart(0);
-            i0__namespace.ɵɵtemplate(1, QueryDetailsComponent_ng_container_0_ng_container_10_ng_container_1_ng_container_1_Template, 26, 21, "ng-container", 4);
-            i0__namespace.ɵɵtemplate(2, QueryDetailsComponent_ng_container_0_ng_container_10_ng_container_1_ng_template_2_Template, 25, 21, "ng-template", null, 7, i0__namespace.ɵɵtemplateRefExtractor);
+            i0__namespace.ɵɵtemplate(1, QueryDetailsComponent_ng_container_0_ng_container_48_ng_container_1_ng_container_1_Template, 28, 22, "ng-container", 12);
+            i0__namespace.ɵɵtemplate(2, QueryDetailsComponent_ng_container_0_ng_container_48_ng_container_1_ng_template_2_Template, 26, 21, "ng-template", null, 13, i0__namespace.ɵɵtemplateRefExtractor);
             i0__namespace.ɵɵelementContainerEnd();
         }
         if (rf & 2) {
@@ -21694,90 +21736,159 @@
             i0__namespace.ɵɵproperty("ngIf", i_r6 % 2 === 0)("ngIfElse", _r8);
         }
     }
-    function QueryDetailsComponent_ng_container_0_ng_container_10_Template(rf, ctx) {
+    function QueryDetailsComponent_ng_container_0_ng_container_48_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementContainerStart(0);
-            i0__namespace.ɵɵtemplate(1, QueryDetailsComponent_ng_container_0_ng_container_10_ng_container_1_Template, 4, 2, "ng-container", 6);
+            i0__namespace.ɵɵtemplate(1, QueryDetailsComponent_ng_container_0_ng_container_48_ng_container_1_Template, 4, 2, "ng-container", 11);
             i0__namespace.ɵɵelementContainerEnd();
         }
         if (rf & 2) {
-            var ctx_r1 = i0__namespace.ɵɵnextContext(2);
+            var ctx_r3 = i0__namespace.ɵɵnextContext(2);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("ngForOf", ctx_r1.query.children);
+            i0__namespace.ɵɵproperty("ngForOf", ctx_r3.query.children);
         }
     }
-    function QueryDetailsComponent_ng_container_0_ng_template_11_Template(rf, ctx) {
+    function QueryDetailsComponent_ng_container_0_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "div");
-            i0__namespace.ɵɵelementStart(1, "p", 15);
-            i0__namespace.ɵɵtext(2);
+            i0__namespace.ɵɵelementContainerStart(0);
+            i0__namespace.ɵɵelementStart(1, "div");
+            i0__namespace.ɵɵelementStart(2, "table", 1);
             i0__namespace.ɵɵpipe(3, "rpxTranslate");
+            i0__namespace.ɵɵelementStart(4, "caption", 2);
+            i0__namespace.ɵɵelementStart(5, "div");
+            i0__namespace.ɵɵtext(6);
+            i0__namespace.ɵɵpipe(7, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(4, "p");
-            i0__namespace.ɵɵtext(5);
-            i0__namespace.ɵɵpipe(6, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementStart(8, "tbody", 3);
+            i0__namespace.ɵɵelementStart(9, "tr", 4);
+            i0__namespace.ɵɵelementStart(10, "th", 5);
+            i0__namespace.ɵɵtext(11);
+            i0__namespace.ɵɵpipe(12, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
-        }
-        if (rf & 2) {
-            i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(3, 2, "Your query is under review"));
-            i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(6, 4, "Our team will read your query and will respond. Do not submit the same query more than once."));
-        }
-    }
-    function QueryDetailsComponent_ng_container_0_Template(rf, ctx) {
-        if (rf & 1) {
-            var _r15_1 = i0__namespace.ɵɵgetCurrentView();
-            i0__namespace.ɵɵelementContainerStart(0);
-            i0__namespace.ɵɵelement(1, "br");
-            i0__namespace.ɵɵelementStart(2, "p");
-            i0__namespace.ɵɵelementStart(3, "a", 1);
-            i0__namespace.ɵɵlistener("click", function QueryDetailsComponent_ng_container_0_Template_a_click_3_listener() { i0__namespace.ɵɵrestoreView(_r15_1); var ctx_r14 = i0__namespace.ɵɵnextContext(); return ctx_r14.onBack(); });
-            i0__namespace.ɵɵtext(4);
-            i0__namespace.ɵɵpipe(5, "rpxTranslate");
+            i0__namespace.ɵɵelementStart(13, "td", 6);
+            i0__namespace.ɵɵtext(14);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(6, "div", 2);
-            i0__namespace.ɵɵtext(7);
-            i0__namespace.ɵɵpipe(8, "rpxTranslate");
+            i0__namespace.ɵɵelementStart(15, "tr", 4);
+            i0__namespace.ɵɵelementStart(16, "th", 5);
+            i0__namespace.ɵɵtext(17);
+            i0__namespace.ɵɵpipe(18, "rpxTranslate");
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementStart(19, "td", 6);
+            i0__namespace.ɵɵtext(20);
+            i0__namespace.ɵɵpipe(21, "date");
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementStart(22, "tr", 4);
+            i0__namespace.ɵɵelementStart(23, "th", 5);
+            i0__namespace.ɵɵtext(24);
+            i0__namespace.ɵɵpipe(25, "rpxTranslate");
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementStart(26, "td", 6);
+            i0__namespace.ɵɵtext(27);
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementStart(28, "tr", 4);
+            i0__namespace.ɵɵelementStart(29, "th", 5);
+            i0__namespace.ɵɵtext(30);
+            i0__namespace.ɵɵpipe(31, "rpxTranslate");
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementStart(32, "td", 6);
+            i0__namespace.ɵɵtext(33);
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementStart(34, "tr", 4);
+            i0__namespace.ɵɵelementStart(35, "th", 5);
+            i0__namespace.ɵɵtext(36);
+            i0__namespace.ɵɵpipe(37, "rpxTranslate");
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementStart(38, "td", 6);
+            i0__namespace.ɵɵtext(39);
+            i0__namespace.ɵɵpipe(40, "rpxTranslate");
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵtemplate(41, QueryDetailsComponent_ng_container_0_tr_41_Template, 7, 7, "tr", 7);
+            i0__namespace.ɵɵelementStart(42, "tr", 4);
+            i0__namespace.ɵɵelementStart(43, "th", 5);
+            i0__namespace.ɵɵtext(44);
+            i0__namespace.ɵɵpipe(45, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelement(9, "ccd-query-details-table", 3);
-            i0__namespace.ɵɵtemplate(10, QueryDetailsComponent_ng_container_0_ng_container_10_Template, 2, 1, "ng-container", 4);
-            i0__namespace.ɵɵtemplate(11, QueryDetailsComponent_ng_container_0_ng_template_11_Template, 7, 6, "ng-template", null, 5, i0__namespace.ɵɵtemplateRefExtractor);
+            i0__namespace.ɵɵelementStart(46, "td", 6);
+            i0__namespace.ɵɵtemplate(47, QueryDetailsComponent_ng_container_0_ccd_query_attachments_read_47_Template, 1, 1, "ccd-query-attachments-read", 8);
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵtemplate(48, QueryDetailsComponent_ng_container_0_ng_container_48_Template, 2, 1, "ng-container", 0);
             i0__namespace.ɵɵelementContainerEnd();
         }
         if (rf & 2) {
-            var _r2 = i0__namespace.ɵɵreference(12);
             var ctx_r0 = i0__namespace.ɵɵnextContext();
+            i0__namespace.ɵɵadvance(2);
+            i0__namespace.ɵɵattribute("aria-describedby", i0__namespace.ɵɵpipeBind1(3, 20, "Details of the query"));
             i0__namespace.ɵɵadvance(4);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(5, 5, "Back to queries"));
+            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(7, 22, "Query details"));
+            i0__namespace.ɵɵadvance(5);
+            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(12, 24, "Last submitted by"));
+            i0__namespace.ɵɵadvance(3);
+            i0__namespace.ɵɵtextInterpolate(ctx_r0.query.lastSubmittedBy);
+            i0__namespace.ɵɵadvance(3);
+            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(18, 26, "Submission date"));
+            i0__namespace.ɵɵadvance(3);
+            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind2(21, 28, ctx_r0.query.createdOn, "dd MMM yyyy"));
+            i0__namespace.ɵɵadvance(4);
+            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(25, 31, "Query subject"));
+            i0__namespace.ɵɵadvance(3);
+            i0__namespace.ɵɵtextInterpolate(ctx_r0.query.subject);
+            i0__namespace.ɵɵadvance(3);
+            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(31, 33, "Query body"));
             i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(8, 7, "Query details"));
+            i0__namespace.ɵɵtextInterpolate(ctx_r0.query.body);
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵproperty("queryItem", ctx_r0.query);
+            i0__namespace.ɵɵclassProp("govuk-table__header--no-border", ctx_r0.query.isHearingRelated);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("ngIf", (ctx_r0.query.children == null ? null : ctx_r0.query.children.length) > 0)("ngIfElse", _r2);
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(37, 35, "Is the query hearing related?"), " ");
+            i0__namespace.ɵɵadvance(2);
+            i0__namespace.ɵɵclassProp("govuk-table__cell--no-border", ctx_r0.query.isHearingRelated);
+            i0__namespace.ɵɵadvance(1);
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind3(40, 37, "Is the query hearing related?", null, ctx_r0.query.isHearingRelated ? "Yes" : "No"), "");
+            i0__namespace.ɵɵadvance(2);
+            i0__namespace.ɵɵproperty("ngIf", ctx_r0.query.isHearingRelated);
+            i0__namespace.ɵɵadvance(3);
+            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(45, 41, "Attachments"));
+            i0__namespace.ɵɵadvance(3);
+            i0__namespace.ɵɵproperty("ngIf", ctx_r0.query.attachments);
+            i0__namespace.ɵɵadvance(1);
+            i0__namespace.ɵɵproperty("ngIf", (ctx_r0.query.children == null ? null : ctx_r0.query.children.length) > 0);
         }
     }
     var QueryDetailsComponent = /** @class */ (function () {
-        function QueryDetailsComponent() {
+        function QueryDetailsComponent(sessionStorage) {
+            this.sessionStorage = sessionStorage;
             this.backClicked = new i0.EventEmitter();
         }
         QueryDetailsComponent.prototype.onBack = function () {
             this.backClicked.emit(true);
         };
+        QueryDetailsComponent.prototype.isCaseworker = function () {
+            var userDetails = JSON.parse(this.sessionStorage.getItem('userDetails'));
+            return userDetails && userDetails.roles
+                && !(userDetails.roles.includes('pui-case-manager')
+                    || userDetails.roles.some(function (role) { return role.toLowerCase().includes('judge'); }));
+        };
         return QueryDetailsComponent;
     }());
-    QueryDetailsComponent.ɵfac = function QueryDetailsComponent_Factory(t) { return new (t || QueryDetailsComponent)(); };
-    QueryDetailsComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: QueryDetailsComponent, selectors: [["ccd-query-details"]], inputs: { query: "query" }, outputs: { backClicked: "backClicked" }, decls: 1, vars: 1, consts: [[4, "ngIf"], ["href", "javascript:void(0)", 1, "govuk-link", 3, "click"], [1, "query_details_caption"], [3, "queryItem"], [4, "ngIf", "ngIfElse"], ["queryIsInReview", ""], [4, "ngFor", "ngForOf"], ["followUpMessage", ""], [1, "govuk-table", "query-details-table"], [1, "govuk-table__body"], [1, "govuk-table__row"], ["scope", "row", 1, "govuk-table__header"], [1, "govuk-table__cell"], [3, "attachments", 4, "ngIf"], [3, "attachments"], [1, "govuk-!-font-weight-bold"]], template: function QueryDetailsComponent_Template(rf, ctx) {
+    QueryDetailsComponent.ɵfac = function QueryDetailsComponent_Factory(t) { return new (t || QueryDetailsComponent)(i0__namespace.ɵɵdirectiveInject(SessionStorageService)); };
+    QueryDetailsComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: QueryDetailsComponent, selectors: [["ccd-query-details"]], inputs: { query: "query", caseId: "caseId" }, outputs: { backClicked: "backClicked" }, decls: 1, vars: 1, consts: [[4, "ngIf"], [1, "govuk-table", "query-details-table"], [1, "govuk-table__caption", "govuk-table__caption--l"], [1, "govuk-table__body"], [1, "govuk-table__row"], ["scope", "row", 1, "govuk-table__header"], [1, "govuk-table__cell"], ["class", "govuk-table__row govuk-table__row--isHearingRelated", 4, "ngIf"], [3, "attachments", 4, "ngIf"], [1, "govuk-table__row", "govuk-table__row--isHearingRelated"], [3, "attachments"], [4, "ngFor", "ngForOf"], [4, "ngIf", "ngIfElse"], ["followUpMessage", ""], ["class", "govuk-table__row", 4, "ngIf"]], template: function QueryDetailsComponent_Template(rf, ctx) {
             if (rf & 1) {
-                i0__namespace.ɵɵtemplate(0, QueryDetailsComponent_ng_container_0_Template, 13, 9, "ng-container", 0);
+                i0__namespace.ɵɵtemplate(0, QueryDetailsComponent_ng_container_0_Template, 49, 43, "ng-container", 0);
             }
             if (rf & 2) {
                 i0__namespace.ɵɵproperty("ngIf", ctx.query);
             }
-        }, styles: [".query_details_caption[_ngcontent-%COMP%]{background:#f3f2f1;padding:10px;font-size:x-large;font-weight:700}.query-details-table[_ngcontent-%COMP%]   .govuk-table__header[_ngcontent-%COMP%]{width:330px}"] });
+        }, styles: [".query-details-table[_ngcontent-%COMP%]   .govuk-table__header[_ngcontent-%COMP%]{width:330px}"] });
     (function () {
         (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(QueryDetailsComponent, [{
                 type: i0.Component,
@@ -21786,10 +21897,12 @@
                         templateUrl: './query-details.component.html',
                         styleUrls: ['./query-details.component.scss']
                     }]
-            }], null, { query: [{
+            }], function () { return [{ type: SessionStorageService }]; }, { query: [{
                     type: i0.Input
                 }], backClicked: [{
                     type: i0.Output
+                }], caseId: [{
+                    type: i0.Input
                 }] });
     })();
 
@@ -21890,7 +22003,7 @@
             i0__namespace.ɵɵadvance(3);
             i0__namespace.ɵɵproperty("ngForOf", ctx_r0.displayedColumns);
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵproperty("ngForOf", ctx_r0.queryListData.partyMessages);
+            i0__namespace.ɵɵproperty("ngForOf", ctx_r0.queryListData.queries);
         }
     }
     var QueryListComponent = /** @class */ (function () {
@@ -21906,9 +22019,9 @@
         }
         QueryListComponent.prototype.ngOnChanges = function (simpleChanges) {
             var _a;
-            var currentPartyMessageGroup = (_a = simpleChanges.partyMessageGroup) === null || _a === void 0 ? void 0 : _a.currentValue;
-            if (currentPartyMessageGroup) {
-                this.queryListData = new QueryListData(currentPartyMessageGroup);
+            var currentCaseQueriesCollection = (_a = simpleChanges.caseQueriesCollection) === null || _a === void 0 ? void 0 : _a.currentValue;
+            if (currentCaseQueriesCollection) {
+                this.queryListData = new QueryListData(currentCaseQueriesCollection);
             }
         };
         QueryListComponent.prototype.sortTable = function (col) {
@@ -21942,24 +22055,24 @@
         };
         QueryListComponent.prototype.sort = function (col) {
             if (col.sortOrder === SortOrder.ASCENDING) {
-                this.queryListData.partyMessages.sort(function (a, b) { return (a[col.name] < b[col.name]) ? 1 : -1; });
+                this.queryListData.queries.sort(function (a, b) { return (a[col.name] < b[col.name]) ? 1 : -1; });
                 this.displayedColumns.forEach(function (c) { return c.sortOrder = SortOrder.UNSORTED; });
                 col.sortOrder = SortOrder.DESCENDING;
             }
             else {
-                this.queryListData.partyMessages.sort(function (a, b) { return (a[col.name] > b[col.name]) ? 1 : -1; });
+                this.queryListData.queries.sort(function (a, b) { return (a[col.name] > b[col.name]) ? 1 : -1; });
                 this.displayedColumns.forEach(function (c) { return c.sortOrder = SortOrder.UNSORTED; });
                 col.sortOrder = SortOrder.ASCENDING;
             }
         };
         QueryListComponent.prototype.sortDate = function (col) {
             if (col.sortOrder === SortOrder.ASCENDING) {
-                this.queryListData.partyMessages.sort(function (a, b) { return b[col.name] - a[col.name]; });
+                this.queryListData.queries.sort(function (a, b) { return b[col.name] - a[col.name]; });
                 this.displayedColumns.forEach(function (c) { return c.sortOrder = SortOrder.UNSORTED; });
                 col.sortOrder = SortOrder.DESCENDING;
             }
             else {
-                this.queryListData.partyMessages.sort(function (a, b) { return a[col.name] - b[col.name]; });
+                this.queryListData.queries.sort(function (a, b) { return a[col.name] - b[col.name]; });
                 this.displayedColumns.forEach(function (c) { return c.sortOrder = SortOrder.UNSORTED; });
                 col.sortOrder = SortOrder.ASCENDING;
             }
@@ -21967,14 +22080,14 @@
         return QueryListComponent;
     }());
     QueryListComponent.ɵfac = function QueryListComponent_Factory(t) { return new (t || QueryListComponent)(); };
-    QueryListComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: QueryListComponent, selectors: [["ccd-query-list"]], inputs: { partyMessageGroup: "partyMessageGroup" }, outputs: { selectedQuery: "selectedQuery" }, features: [i0__namespace.ɵɵNgOnChangesFeature], decls: 1, vars: 1, consts: [[4, "ngIf"], [1, "govuk-table", "query-list__table"], [1, "govuk-table__cell", "query-list__caption", "query-list__row"], [1, "govuk-table__head"], [1, "govuk-table__row", "query-list__row"], ["scope", "col", "class", "govuk-table__header", 4, "ngFor", "ngForOf"], [1, "govuk-table__body"], ["class", "govuk-table__row query-list__row", 4, "ngFor", "ngForOf"], ["scope", "col", 1, "govuk-table__header"], ["type", "button", "aria-sort", "none", "href", "javascript:void(0)", 3, "click"], [1, "govuk-table__cell", "query-list__cell", "query-list__cell--first"], ["href", "javascript:void(0)", 3, "click"], [1, "govuk-table__cell", "query-list__cell"]], template: function QueryListComponent_Template(rf, ctx) {
+    QueryListComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: QueryListComponent, selectors: [["ccd-query-list"]], inputs: { caseQueriesCollection: "caseQueriesCollection" }, outputs: { selectedQuery: "selectedQuery" }, features: [i0__namespace.ɵɵNgOnChangesFeature], decls: 1, vars: 1, consts: [[4, "ngIf"], [1, "govuk-table", "query-list__table"], [1, "govuk-table__caption", "govuk-table__caption--l"], [1, "govuk-table__head"], [1, "govuk-table__row", "query-list__row"], ["scope", "col", "class", "govuk-table__header", 4, "ngFor", "ngForOf"], [1, "govuk-table__body"], ["class", "govuk-table__row query-list__row", 4, "ngFor", "ngForOf"], ["scope", "col", 1, "govuk-table__header"], ["type", "button", "aria-sort", "none", "href", "javascript:void(0)", 3, "click"], [1, "govuk-table__cell", "query-list__cell", "query-list__cell--first"], ["href", "javascript:void(0)", 3, "click"], [1, "govuk-table__cell", "query-list__cell"]], template: function QueryListComponent_Template(rf, ctx) {
             if (rf & 1) {
                 i0__namespace.ɵɵtemplate(0, QueryListComponent_ng_container_0_Template, 10, 3, "ng-container", 0);
             }
             if (rf & 2) {
                 i0__namespace.ɵɵproperty("ngIf", ctx.queryListData);
             }
-        }, directives: [i5__namespace.NgIf, i5__namespace.NgForOf], pipes: [i1__namespace.RpxTranslatePipe, i5__namespace.DatePipe], styles: ["@charset \"UTF-8\";.query-list__caption[_ngcontent-%COMP%], .query-list__table[_ngcontent-%COMP%]{border:1px solid #b1b4b6}.query-list__caption[_ngcontent-%COMP%]{background:#f3f2f1;border-bottom:0;font-weight:700}.query-list__row[_ngcontent-%COMP%] > [_ngcontent-%COMP%]:first-child{padding-left:10px}.query-list__row[_ngcontent-%COMP%] > [_ngcontent-%COMP%]:last-child{padding-right:10px}.query-list__cell--first[_ngcontent-%COMP%]{width:33%}[aria-sort][_ngcontent-%COMP%]   button[_ngcontent-%COMP%], [aria-sort][_ngcontent-%COMP%]   button[_ngcontent-%COMP%]:hover, [aria-sort][_ngcontent-%COMP%]   button[_ngcontent-%COMP%]:hover:hover{background-color:transparent;border-width:0;box-shadow:0 0 0 0;color:#000;cursor:pointer;font-family:inherit;font-weight:inherit;padding:0 10px 0 0;position:relative;text-align:inherit;font-size:1em;margin:0}[aria-sort][_ngcontent-%COMP%]   button[_ngcontent-%COMP%]:focus, [aria-sort][_ngcontent-%COMP%]   button[_ngcontent-%COMP%]:hover:focus{background-color:#fd0;color:#000;box-shadow:0 -2px #fd0,0 4px #000;outline:none}[aria-sort][_ngcontent-%COMP%]:first-child   button[_ngcontent-%COMP%]{right:auto}[aria-sort][_ngcontent-%COMP%]   button[_ngcontent-%COMP%]:before{content:\" \u25BC\";position:absolute;right:-1px;top:9px;font-size:.5em}[aria-sort][_ngcontent-%COMP%]   button[_ngcontent-%COMP%]:after{content:\" \u25B2\";position:absolute;right:-1px;top:1px;font-size:.5em}[aria-sort=ascending][_ngcontent-%COMP%]   button[_ngcontent-%COMP%]:before, [aria-sort=descending][_ngcontent-%COMP%]   button[_ngcontent-%COMP%]:before{content:none}[aria-sort=ascending][_ngcontent-%COMP%]   button[_ngcontent-%COMP%]:after{content:\" \u25B2\";font-size:.8em;position:absolute;right:-5px;top:2px}[aria-sort=descending][_ngcontent-%COMP%]   button[_ngcontent-%COMP%]:after{content:\" \u25BC\";font-size:.8em;position:absolute;right:-5px;top:2px}"] });
+        }, directives: [i5__namespace.NgIf, i5__namespace.NgForOf], pipes: [i1__namespace.RpxTranslatePipe, i5__namespace.DatePipe], styles: ["@charset \"UTF-8\";.query-list__row[_ngcontent-%COMP%] > [_ngcontent-%COMP%]:first-child{padding-left:10px}.query-list__row[_ngcontent-%COMP%] > [_ngcontent-%COMP%]:last-child{padding-right:10px}.query-list__cell--first[_ngcontent-%COMP%]{width:33%}[aria-sort][_ngcontent-%COMP%]   button[_ngcontent-%COMP%], [aria-sort][_ngcontent-%COMP%]   button[_ngcontent-%COMP%]:hover, [aria-sort][_ngcontent-%COMP%]   button[_ngcontent-%COMP%]:hover:hover{background-color:transparent;border-width:0;box-shadow:0 0 0 0;color:#000;cursor:pointer;font-family:inherit;font-weight:inherit;padding:0 10px 0 0;position:relative;text-align:inherit;font-size:1em;margin:0}[aria-sort][_ngcontent-%COMP%]   button[_ngcontent-%COMP%]:focus, [aria-sort][_ngcontent-%COMP%]   button[_ngcontent-%COMP%]:hover:focus{background-color:#fd0;color:#000;box-shadow:0 -2px #fd0,0 4px #000;outline:none}[aria-sort][_ngcontent-%COMP%]:first-child   button[_ngcontent-%COMP%]{right:auto}[aria-sort][_ngcontent-%COMP%]   button[_ngcontent-%COMP%]:before{content:\" \u25BC\";position:absolute;right:-1px;top:9px;font-size:.5em}[aria-sort][_ngcontent-%COMP%]   button[_ngcontent-%COMP%]:after{content:\" \u25B2\";position:absolute;right:-1px;top:1px;font-size:.5em}[aria-sort=ascending][_ngcontent-%COMP%]   button[_ngcontent-%COMP%]:before, [aria-sort=descending][_ngcontent-%COMP%]   button[_ngcontent-%COMP%]:before{content:none}[aria-sort=ascending][_ngcontent-%COMP%]   button[_ngcontent-%COMP%]:after{content:\" \u25B2\";font-size:.8em;position:absolute;right:-5px;top:2px}[aria-sort=descending][_ngcontent-%COMP%]   button[_ngcontent-%COMP%]:after{content:\" \u25BC\";font-size:.8em;position:absolute;right:-5px;top:2px}"] });
     (function () {
         (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(QueryListComponent, [{
                 type: i0.Component,
@@ -21983,7 +22096,7 @@
                         templateUrl: './query-list.component.html',
                         styleUrls: ['./query-list.component.scss']
                     }]
-            }], null, { partyMessageGroup: [{
+            }], null, { caseQueriesCollection: [{
                     type: i0.Input
                 }], selectedQuery: [{
                     type: i0.Output
@@ -22476,10 +22589,10 @@
                 }] });
     })();
 
-    function QueryWriteRespondToQueryComponent_p_27_Template(rf, ctx) {
+    function QueryWriteRespondToQueryComponent_p_23_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "p", 15);
-            i0__namespace.ɵɵelementStart(1, "span", 16);
+            i0__namespace.ɵɵelementStart(0, "p", 13);
+            i0__namespace.ɵɵelementStart(1, "span", 14);
             i0__namespace.ɵɵtext(2);
             i0__namespace.ɵɵpipe(3, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
@@ -22495,7 +22608,6 @@
             i0__namespace.ɵɵtextInterpolate1("", ctx_r0.queryCreateContext === ctx_r0.queryCreateContextEnum.RESPOND ? ctx_r0.raiseQueryErrorMessages.RESPOND_QUERY_BODY : i0__namespace.ɵɵpipeBind1(5, 4, ctx_r0.raiseQueryErrorMessages.QUERY_BODY), " ");
         }
     }
-    var _c0$B = function (a3) { return ["/", "cases", "case-details", a3, "tasks"]; };
     var QueryWriteRespondToQueryComponent = /** @class */ (function () {
         function QueryWriteRespondToQueryComponent(caseNotifier) {
             this.caseNotifier = caseNotifier;
@@ -22512,49 +22624,43 @@
         return QueryWriteRespondToQueryComponent;
     }());
     QueryWriteRespondToQueryComponent.ɵfac = function QueryWriteRespondToQueryComponent_Factory(t) { return new (t || QueryWriteRespondToQueryComponent)(i0__namespace.ɵɵdirectiveInject(CaseNotifier)); };
-    QueryWriteRespondToQueryComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: QueryWriteRespondToQueryComponent, selectors: [["ccd-query-write-respond-to-query"]], inputs: { queryItem: "queryItem", formGroup: "formGroup", queryCreateContext: "queryCreateContext", submitted: "submitted" }, decls: 30, vars: 26, consts: [[1, "govuk-!-margin-bottom-2"], ["href", "javascript:void(0)", 1, "govuk-back-link", "govuk-!-margin-top-0", 3, "routerLink"], [1, "govuk-!-margin-bottom-6"], [1, "govuk-caption-l"], [1, "govuk-heading-l", "govuk-!-margin-bottom-0"], [1, "govuk-!-margin-bottom-4"], [3, "queryItem"], [1, "query-respond"], [1, "govuk-heading-m"], [3, "formGroup"], [1, "govuk-form-group", "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) {
+    QueryWriteRespondToQueryComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: QueryWriteRespondToQueryComponent, selectors: [["ccd-query-write-respond-to-query"]], inputs: { queryItem: "queryItem", formGroup: "formGroup", queryCreateContext: "queryCreateContext", submitted: "submitted" }, decls: 26, vars: 20, consts: [[1, "govuk-!-margin-bottom-6"], [1, "govuk-caption-l"], [1, "govuk-heading-l", "govuk-!-margin-bottom-0"], [1, "govuk-!-margin-bottom-4"], [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) {
                 i0__namespace.ɵɵelementStart(0, "div", 0);
-                i0__namespace.ɵɵelementStart(1, "a", 1);
-                i0__namespace.ɵɵtext(2);
-                i0__namespace.ɵɵpipe(3, "rpxTranslate");
-                i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementStart(4, "div", 2);
-                i0__namespace.ɵɵelementStart(5, "div", 2);
-                i0__namespace.ɵɵelementStart(6, "div", 3);
-                i0__namespace.ɵɵtext(7);
-                i0__namespace.ɵɵpipe(8, "rpxTranslate");
+                i0__namespace.ɵɵelementStart(1, "div", 0);
+                i0__namespace.ɵɵelementStart(2, "div", 1);
+                i0__namespace.ɵɵtext(3);
+                i0__namespace.ɵɵpipe(4, "rpxTranslate");
                 i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementStart(9, "h1", 4);
-                i0__namespace.ɵɵtext(10);
-                i0__namespace.ɵɵpipe(11, "rpxTranslate");
+                i0__namespace.ɵɵelementStart(5, "h1", 2);
+                i0__namespace.ɵɵtext(6);
+                i0__namespace.ɵɵpipe(7, "rpxTranslate");
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementStart(12, "div", 5);
-                i0__namespace.ɵɵelement(13, "ccd-query-case-details-header");
+                i0__namespace.ɵɵelementStart(8, "div", 3);
+                i0__namespace.ɵɵelement(9, "ccd-query-case-details-header");
                 i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementStart(14, "div");
-                i0__namespace.ɵɵelement(15, "ccd-query-details-table", 6);
+                i0__namespace.ɵɵelementStart(10, "div");
+                i0__namespace.ɵɵelement(11, "ccd-query-details", 4);
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementStart(16, "div", 7);
-                i0__namespace.ɵɵelementStart(17, "div");
-                i0__namespace.ɵɵelementStart(18, "h1", 8);
-                i0__namespace.ɵɵtext(19);
-                i0__namespace.ɵɵpipe(20, "rpxTranslate");
+                i0__namespace.ɵɵelementStart(12, "div", 5);
+                i0__namespace.ɵɵelementStart(13, "div");
+                i0__namespace.ɵɵelementStart(14, "h1", 6);
+                i0__namespace.ɵɵtext(15);
+                i0__namespace.ɵɵpipe(16, "rpxTranslate");
                 i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementStart(21, "div", 9);
-                i0__namespace.ɵɵelementStart(22, "div", 10);
-                i0__namespace.ɵɵelementStart(23, "div", 11);
-                i0__namespace.ɵɵelementStart(24, "label", 12);
-                i0__namespace.ɵɵtext(25);
-                i0__namespace.ɵɵpipe(26, "rpxTranslate");
+                i0__namespace.ɵɵelementStart(17, "div", 7);
+                i0__namespace.ɵɵelementStart(18, "div", 8);
+                i0__namespace.ɵɵelementStart(19, "div", 9);
+                i0__namespace.ɵɵelementStart(20, "label", 10);
+                i0__namespace.ɵɵtext(21);
+                i0__namespace.ɵɵpipe(22, "rpxTranslate");
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵtemplate(27, QueryWriteRespondToQueryComponent_p_27_Template, 6, 6, "p", 13);
-                i0__namespace.ɵɵelementStart(28, "textarea", 14);
-                i0__namespace.ɵɵtext(29, "      ");
+                i0__namespace.ɵɵtemplate(23, QueryWriteRespondToQueryComponent_p_23_Template, 6, 6, "p", 11);
+                i0__namespace.ɵɵelementStart(24, "textarea", 12);
+                i0__namespace.ɵɵtext(25, "      ");
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementEnd();
@@ -22562,31 +22668,27 @@
                 i0__namespace.ɵɵelementEnd();
             }
             if (rf & 2) {
+                var tmp_5_0 = null;
                 var tmp_7_0 = null;
-                var tmp_9_0 = null;
-                var tmp_10_0 = null;
-                i0__namespace.ɵɵadvance(1);
-                i0__namespace.ɵɵproperty("routerLink", i0__namespace.ɵɵpureFunction1(24, _c0$B, ctx.caseId));
-                i0__namespace.ɵɵadvance(1);
-                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(3, 14, "Cancel and return to tasks"), " ");
-                i0__namespace.ɵɵadvance(5);
-                i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(8, 16, "Respond to query"));
+                var tmp_8_0 = null;
+                i0__namespace.ɵɵadvance(3);
+                i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(4, 12, "Respond to a query"));
                 i0__namespace.ɵɵadvance(3);
-                i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(11, 18, "Query details"));
+                i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(7, 14, "Query details"));
                 i0__namespace.ɵɵadvance(5);
-                i0__namespace.ɵɵproperty("queryItem", ctx.queryItem);
+                i0__namespace.ɵɵproperty("query", ctx.queryItem);
                 i0__namespace.ɵɵadvance(4);
-                i0__namespace.ɵɵtextInterpolate1(" ", ctx.queryCreateContext === ctx.queryCreateContextEnum.RESPOND ? "Respond to a query" : i0__namespace.ɵɵpipeBind1(20, 20, "Ask a follow-up question"), " ");
+                i0__namespace.ɵɵtextInterpolate1(" ", ctx.queryCreateContext === ctx.queryCreateContextEnum.RESPOND ? "Respond to a query" : i0__namespace.ɵɵpipeBind1(16, 16, "Ask a follow-up question"), " ");
                 i0__namespace.ɵɵadvance(2);
                 i0__namespace.ɵɵproperty("formGroup", ctx.formGroup);
                 i0__namespace.ɵɵadvance(1);
-                i0__namespace.ɵɵclassProp("govuk-form-group--error", ctx.submitted && ((tmp_7_0 = ctx.formGroup.get("body")) == null ? null : tmp_7_0.hasError("required")));
+                i0__namespace.ɵɵclassProp("govuk-form-group--error", ctx.submitted && ((tmp_5_0 = ctx.formGroup.get("body")) == null ? null : tmp_5_0.hasError("required")));
                 i0__namespace.ɵɵadvance(3);
-                i0__namespace.ɵɵtextInterpolate1(" ", ctx.queryCreateContext === ctx.queryCreateContextEnum.RESPOND ? "Response message" : i0__namespace.ɵɵpipeBind1(26, 22, "Query Body"), " ");
+                i0__namespace.ɵɵtextInterpolate1(" ", ctx.queryCreateContext === ctx.queryCreateContextEnum.RESPOND ? "Response detail" : i0__namespace.ɵɵpipeBind1(22, 18, "Query Body"), " ");
                 i0__namespace.ɵɵadvance(2);
-                i0__namespace.ɵɵproperty("ngIf", ctx.submitted && ((tmp_9_0 = ctx.formGroup.get("body")) == null ? null : tmp_9_0.hasError("required")));
+                i0__namespace.ɵɵproperty("ngIf", ctx.submitted && ((tmp_7_0 = ctx.formGroup.get("body")) == null ? null : tmp_7_0.hasError("required")));
                 i0__namespace.ɵɵadvance(1);
-                i0__namespace.ɵɵclassProp("govuk-textarea--error", ctx.submitted && ((tmp_10_0 = ctx.formGroup.get("body")) == null ? null : tmp_10_0.hasError("required")));
+                i0__namespace.ɵɵclassProp("govuk-textarea--error", ctx.submitted && ((tmp_8_0 = ctx.formGroup.get("body")) == null ? null : tmp_8_0.hasError("required")));
                 i0__namespace.ɵɵproperty("formControlName", "body");
             }
         }, styles: [".query-respond[_ngcontent-%COMP%]{width:100%;max-width:720px}"] });
@@ -22688,43 +22790,108 @@
                 }] });
     })();
 
-    function ReadQueryManagementFieldComponent_ng_container_1_div_1_Template(rf, ctx) {
+    function ReadQueryManagementFieldComponent_ng_container_0_ng_container_1_div_1_Template(rf, ctx) {
         if (rf & 1) {
-            var _r5_1 = i0__namespace.ɵɵgetCurrentView();
-            i0__namespace.ɵɵelementStart(0, "div", 3);
-            i0__namespace.ɵɵelementStart(1, "ccd-query-list", 4);
-            i0__namespace.ɵɵlistener("selectedQuery", function ReadQueryManagementFieldComponent_ng_container_1_div_1_Template_ccd_query_list_selectedQuery_1_listener($event) { i0__namespace.ɵɵrestoreView(_r5_1); var ctx_r4 = i0__namespace.ɵɵnextContext(2); return ctx_r4.setQuery($event); });
+            var _r7_1 = i0__namespace.ɵɵgetCurrentView();
+            i0__namespace.ɵɵelementStart(0, "div", 4);
+            i0__namespace.ɵɵelementStart(1, "ccd-query-list", 5);
+            i0__namespace.ɵɵlistener("selectedQuery", function ReadQueryManagementFieldComponent_ng_container_0_ng_container_1_div_1_Template_ccd_query_list_selectedQuery_1_listener($event) { i0__namespace.ɵɵrestoreView(_r7_1); var ctx_r6 = i0__namespace.ɵɵnextContext(3); return ctx_r6.setQuery($event); });
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
-            var singlePartyMessageGroup_r2 = i0__namespace.ɵɵnextContext().$implicit;
+            var caseQueriesCollection_r4 = i0__namespace.ɵɵnextContext().$implicit;
+            i0__namespace.ɵɵadvance(1);
+            i0__namespace.ɵɵproperty("caseQueriesCollection", caseQueriesCollection_r4);
+        }
+    }
+    function ReadQueryManagementFieldComponent_ng_container_0_ng_container_1_Template(rf, ctx) {
+        if (rf & 1) {
+            i0__namespace.ɵɵelementContainerStart(0);
+            i0__namespace.ɵɵtemplate(1, ReadQueryManagementFieldComponent_ng_container_0_ng_container_1_div_1_Template, 2, 1, "div", 3);
+            i0__namespace.ɵɵelementContainerEnd();
+        }
+        if (rf & 2) {
+            var ctx_r3 = i0__namespace.ɵɵnextContext(2);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("partyMessageGroup", singlePartyMessageGroup_r2);
+            i0__namespace.ɵɵproperty("ngIf", ctx_r3.showQueryList);
         }
     }
-    function ReadQueryManagementFieldComponent_ng_container_1_Template(rf, ctx) {
+    function ReadQueryManagementFieldComponent_ng_container_0_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementContainerStart(0);
-            i0__namespace.ɵɵtemplate(1, ReadQueryManagementFieldComponent_ng_container_1_div_1_Template, 2, 1, "div", 2);
+            i0__namespace.ɵɵtemplate(1, ReadQueryManagementFieldComponent_ng_container_0_ng_container_1_Template, 2, 1, "ng-container", 2);
             i0__namespace.ɵɵelementContainerEnd();
         }
         if (rf & 2) {
             var ctx_r0 = i0__namespace.ɵɵnextContext();
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("ngIf", ctx_r0.showQueryList);
+            i0__namespace.ɵɵproperty("ngForOf", ctx_r0.caseQueriesCollections);
         }
     }
-    function ReadQueryManagementFieldComponent_ccd_query_details_2_Template(rf, ctx) {
+    var _c0$B = function (a2) { return ["/query-management", "query", a2, "4"]; };
+    function ReadQueryManagementFieldComponent_ng_template_1_ng_container_6_Template(rf, ctx) {
         if (rf & 1) {
-            var _r8_1 = i0__namespace.ɵɵgetCurrentView();
-            i0__namespace.ɵɵelementStart(0, "ccd-query-details", 5);
-            i0__namespace.ɵɵlistener("backClicked", function ReadQueryManagementFieldComponent_ccd_query_details_2_Template_ccd_query_details_backClicked_0_listener() { i0__namespace.ɵɵrestoreView(_r8_1); var ctx_r7 = i0__namespace.ɵɵnextContext(); return ctx_r7.showQueryList = true; });
+            i0__namespace.ɵɵelementContainerStart(0);
+            i0__namespace.ɵɵelementStart(1, "button", 9);
+            i0__namespace.ɵɵtext(2);
+            i0__namespace.ɵɵpipe(3, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementContainerEnd();
         }
         if (rf & 2) {
-            var ctx_r1 = i0__namespace.ɵɵnextContext();
-            i0__namespace.ɵɵproperty("query", ctx_r1.query);
+            var ctx_r9 = i0__namespace.ɵɵnextContext(2);
+            i0__namespace.ɵɵadvance(1);
+            i0__namespace.ɵɵproperty("routerLink", i0__namespace.ɵɵpureFunction1(4, _c0$B, ctx_r9.caseId));
+            i0__namespace.ɵɵadvance(1);
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(3, 2, "Ask a follow-up question"), " ");
+        }
+    }
+    function ReadQueryManagementFieldComponent_ng_template_1_ng_template_7_Template(rf, ctx) {
+        if (rf & 1) {
+            i0__namespace.ɵɵelementStart(0, "div");
+            i0__namespace.ɵɵelementStart(1, "p", 10);
+            i0__namespace.ɵɵtext(2);
+            i0__namespace.ɵɵpipe(3, "rpxTranslate");
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementStart(4, "p");
+            i0__namespace.ɵɵtext(5);
+            i0__namespace.ɵɵpipe(6, "rpxTranslate");
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementEnd();
+        }
+        if (rf & 2) {
+            i0__namespace.ɵɵadvance(2);
+            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(3, 2, "Your query is under review"));
+            i0__namespace.ɵɵadvance(3);
+            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(6, 4, "Our team will read your query and will respond. Do not submit the same query more than once."));
+        }
+    }
+    function ReadQueryManagementFieldComponent_ng_template_1_Template(rf, ctx) {
+        if (rf & 1) {
+            var _r13_1 = i0__namespace.ɵɵgetCurrentView();
+            i0__namespace.ɵɵelement(0, "br");
+            i0__namespace.ɵɵelementStart(1, "p");
+            i0__namespace.ɵɵelementStart(2, "a", 6);
+            i0__namespace.ɵɵtext(3);
+            i0__namespace.ɵɵpipe(4, "rpxTranslate");
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementStart(5, "ccd-query-details", 7);
+            i0__namespace.ɵɵlistener("backClicked", function ReadQueryManagementFieldComponent_ng_template_1_Template_ccd_query_details_backClicked_5_listener() { i0__namespace.ɵɵrestoreView(_r13_1); var ctx_r12 = i0__namespace.ɵɵnextContext(); return ctx_r12.showQueryList = true; });
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵtemplate(6, ReadQueryManagementFieldComponent_ng_template_1_ng_container_6_Template, 4, 6, "ng-container", 0);
+            i0__namespace.ɵɵtemplate(7, ReadQueryManagementFieldComponent_ng_template_1_ng_template_7_Template, 7, 6, "ng-template", null, 8, i0__namespace.ɵɵtemplateRefExtractor);
+        }
+        if (rf & 2) {
+            var _r10 = i0__namespace.ɵɵreference(8);
+            var ctx_r2 = i0__namespace.ɵɵnextContext();
+            i0__namespace.ɵɵadvance(3);
+            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(4, 5, "Back to queries"));
+            i0__namespace.ɵɵadvance(2);
+            i0__namespace.ɵɵproperty("query", ctx_r2.query)("caseId", ctx_r2.caseId);
+            i0__namespace.ɵɵadvance(1);
+            i0__namespace.ɵɵproperty("ngIf", (ctx_r2.query == null ? null : ctx_r2.query.children == null ? null : ctx_r2.query.children.length) > 0)("ngIfElse", _r10);
         }
     }
     var ReadQueryManagementFieldComponent = /** @class */ (function (_super) {
@@ -22736,9 +22903,10 @@
             return _this;
         }
         ReadQueryManagementFieldComponent.prototype.ngOnInit = function () {
+            this.caseId = this.route.snapshot.params.cid;
             if (this.context === exports.PaletteContext.DEFAULT) {
                 // EUI-8303 Using mock data until CCD is ready with the API and data contract
-                this.partyMessagesGroups = partyMessagesMockData;
+                this.caseQueriesCollections = caseMessagesMockData;
                 // TODO: Actual implementation once the CCD API and data contract is available
                 // Each parties will have a separate collection of party messages
                 // Find whether queries tab is available in the case data
@@ -22756,18 +22924,14 @@
         return ReadQueryManagementFieldComponent;
     }(AbstractFieldReadComponent));
     ReadQueryManagementFieldComponent.ɵfac = function ReadQueryManagementFieldComponent_Factory(t) { return new (t || ReadQueryManagementFieldComponent)(i0__namespace.ɵɵdirectiveInject(i1__namespace$1.ActivatedRoute)); };
-    ReadQueryManagementFieldComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: ReadQueryManagementFieldComponent, selectors: [["ccd-read-query-management-field"]], features: [i0__namespace.ɵɵInheritDefinitionFeature], decls: 3, vars: 2, consts: [[4, "ngFor", "ngForOf"], [3, "query", "backClicked", 4, "ngIf"], ["class", "govuk-!-margin-top-8 govuk-!-margin-bottom-8", 4, "ngIf"], [1, "govuk-!-margin-top-8", "govuk-!-margin-bottom-8"], [3, "partyMessageGroup", "selectedQuery"], [3, "query", "backClicked"]], template: function ReadQueryManagementFieldComponent_Template(rf, ctx) {
+    ReadQueryManagementFieldComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: ReadQueryManagementFieldComponent, selectors: [["ccd-read-query-management-field"]], features: [i0__namespace.ɵɵInheritDefinitionFeature], decls: 3, vars: 2, consts: [[4, "ngIf", "ngIfElse"], ["singleQueryDetails", ""], [4, "ngFor", "ngForOf"], ["class", "govuk-!-margin-top-8 govuk-!-margin-bottom-8", 4, "ngIf"], [1, "govuk-!-margin-top-8", "govuk-!-margin-bottom-8"], [3, "caseQueriesCollection", "selectedQuery"], ["href", "javascript:void(0)", 1, "govuk-link"], [3, "query", "caseId", "backClicked"], ["queryIsInReview", ""], ["id", "ask-follow-up-question", "data-module", "govuk-button", 1, "govuk-button", 3, "routerLink"], [1, "govuk-!-font-weight-bold"]], template: function ReadQueryManagementFieldComponent_Template(rf, ctx) {
             if (rf & 1) {
-                i0__namespace.ɵɵelementContainerStart(0);
-                i0__namespace.ɵɵtemplate(1, ReadQueryManagementFieldComponent_ng_container_1_Template, 2, 1, "ng-container", 0);
-                i0__namespace.ɵɵtemplate(2, ReadQueryManagementFieldComponent_ccd_query_details_2_Template, 1, 1, "ccd-query-details", 1);
-                i0__namespace.ɵɵelementContainerEnd();
+                i0__namespace.ɵɵtemplate(0, ReadQueryManagementFieldComponent_ng_container_0_Template, 2, 1, "ng-container", 0);
+                i0__namespace.ɵɵtemplate(1, ReadQueryManagementFieldComponent_ng_template_1_Template, 9, 7, "ng-template", null, 1, i0__namespace.ɵɵtemplateRefExtractor);
             }
             if (rf & 2) {
-                i0__namespace.ɵɵadvance(1);
-                i0__namespace.ɵɵproperty("ngForOf", ctx.partyMessagesGroups);
-                i0__namespace.ɵɵadvance(1);
-                i0__namespace.ɵɵproperty("ngIf", !ctx.showQueryList);
+                var _r1 = i0__namespace.ɵɵreference(2);
+                i0__namespace.ɵɵproperty("ngIf", ctx.showQueryList)("ngIfElse", _r1);
             }
         }, encapsulation: 2 });
     (function () {
@@ -30521,7 +30685,6 @@
         ReadQueryManagementFieldComponent,
         QueryDetailsComponent,
         QueryListComponent,
-        QueryDetailsTableComponent,
         QueryWriteRespondToQueryComponent,
         QueryWriteRaiseQueryComponent,
         QueryCaseDetailsHeaderComponent,
@@ -30710,7 +30873,6 @@
                 ReadQueryManagementFieldComponent,
                 QueryDetailsComponent,
                 QueryListComponent,
-                QueryDetailsTableComponent,
                 QueryWriteRespondToQueryComponent,
                 QueryWriteRaiseQueryComponent,
                 QueryCaseDetailsHeaderComponent,
@@ -30860,7 +31022,6 @@
                 ReadQueryManagementFieldComponent,
                 QueryDetailsComponent,
                 QueryListComponent,
-                QueryDetailsTableComponent,
                 QueryWriteRespondToQueryComponent,
                 QueryWriteRaiseQueryComponent,
                 QueryCaseDetailsHeaderComponent,
@@ -31009,12 +31170,11 @@
     i0__namespace.ɵɵsetComponentScope(CheckYourAnswersComponent, [i5__namespace.NgIf, i5__namespace.NgForOf], [CaseReferencePipe, LinkCasesReasonValuePipe]);
     i0__namespace.ɵɵsetComponentScope(
     // Components for Query Management
-    ReadQueryManagementFieldComponent, [i5__namespace.NgForOf, i5__namespace.NgIf, QueryListComponent,
-        QueryDetailsComponent], []);
-    i0__namespace.ɵɵsetComponentScope(QueryDetailsComponent, [i5__namespace.NgIf, QueryDetailsTableComponent, i5__namespace.NgForOf, QueryAttachmentsReadComponent], [i1__namespace.RpxTranslatePipe, i5__namespace.DatePipe]);
-    i0__namespace.ɵɵsetComponentScope(QueryDetailsTableComponent, [i5__namespace.NgIf, QueryAttachmentsReadComponent], [i1__namespace.RpxTranslatePipe, i5__namespace.DatePipe]);
-    i0__namespace.ɵɵsetComponentScope(QueryWriteRespondToQueryComponent, [i1__namespace$1.RouterLinkWithHref, QueryCaseDetailsHeaderComponent,
-        QueryDetailsTableComponent, i3__namespace.NgControlStatusGroup, i3__namespace.FormGroupDirective, i5__namespace.NgIf, i3__namespace.DefaultValueAccessor, i3__namespace.NgControlStatus, i3__namespace.FormControlName], [i1__namespace.RpxTranslatePipe]);
+    ReadQueryManagementFieldComponent, [i5__namespace.NgIf, i5__namespace.NgForOf, QueryListComponent,
+        QueryDetailsComponent, i1__namespace$1.RouterLink], [i1__namespace.RpxTranslatePipe]);
+    i0__namespace.ɵɵsetComponentScope(QueryDetailsComponent, [i5__namespace.NgIf, QueryAttachmentsReadComponent, i5__namespace.NgForOf], [i1__namespace.RpxTranslatePipe, i5__namespace.DatePipe]);
+    i0__namespace.ɵɵsetComponentScope(QueryWriteRespondToQueryComponent, [QueryCaseDetailsHeaderComponent,
+        QueryDetailsComponent, i3__namespace.NgControlStatusGroup, i3__namespace.FormGroupDirective, i5__namespace.NgIf, i3__namespace.DefaultValueAccessor, i3__namespace.NgControlStatus, i3__namespace.FormControlName], [i1__namespace.RpxTranslatePipe]);
     i0__namespace.ɵɵsetComponentScope(QueryWriteRaiseQueryComponent, [QueryCaseDetailsHeaderComponent, i3__namespace.NgControlStatusGroup, i3__namespace.FormGroupDirective, i5__namespace.NgClass, i5__namespace.NgIf, i3__namespace.DefaultValueAccessor, i3__namespace.NgControlStatus, i3__namespace.FormControlName, i3__namespace.RadioControlValueAccessor, QueryWriteDateInputComponent], [i1__namespace.RpxTranslatePipe]);
     i0__namespace.ɵɵsetComponentScope(QueryCheckYourAnswersComponent, [i5__namespace.NgIf, QueryCaseDetailsHeaderComponent,
         QueryAttachmentsReadComponent], [i1__namespace.RpxTranslatePipe, i5__namespace.DatePipe]);
@@ -41406,7 +41566,6 @@
     exports.QueryCaseDetailsHeaderComponent = QueryCaseDetailsHeaderComponent;
     exports.QueryCheckYourAnswersComponent = QueryCheckYourAnswersComponent;
     exports.QueryDetailsComponent = QueryDetailsComponent;
-    exports.QueryDetailsTableComponent = QueryDetailsTableComponent;
     exports.QueryListComponent = QueryListComponent;
     exports.QueryListData = QueryListData;
     exports.QueryListItem = QueryListItem;
@@ -41523,6 +41682,7 @@
     exports.WriteYesNoFieldComponent = WriteYesNoFieldComponent;
     exports.YesNoService = YesNoService;
     exports.aCaseField = aCaseField;
+    exports.caseMessagesMockData = caseMessagesMockData;
     exports.createACL = createACL;
     exports.createCaseEventTrigger = createCaseEventTrigger;
     exports.createCaseField = createCaseField;
@@ -41536,7 +41696,6 @@
     exports.editorRouting = editorRouting;
     exports.initDialog = initDialog;
     exports.newCaseField = newCaseField;
-    exports.partyMessagesMockData = partyMessagesMockData;
     exports.textFieldType = textFieldType;
     exports.viewerRouting = viewerRouting;