@hmcts/ccd-case-ui-toolkit 6.16.1-case-details-in-title → 6.16.1-rc2

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

@@ -1,8 +1,8 @@
 (function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('@angular/common'), require('@angular/router'), require('@angular/forms'), require('rx-polling'), require('rxjs'), require('@angular/common/http'), require('rxjs/operators'), require('class-transformer'), require('moment'), require('underscore'), require('pegjs'), require('util'), require('@edium/fsm'), require('@angular/material/dialog'), require('@nicky-lenaers/ngx-scroll-to'), require('@angular/material/autocomplete'), require('@angular/material/core'), require('@hmcts/ccpay-web-component'), require('@angular/cdk/overlay'), require('@angular/cdk/tree'), require('@angular/material/input'), require('@angular-material-components/datetime-picker'), require('@angular-material-components/moment-adapter'), require('@angular/material/datepicker'), require('@angular/material/form-field'), require('ngx-md'), require('@hmcts/media-viewer'), require('@angular/cdk/portal'), require('ngx-pagination'), require('@angular/platform-browser'), require('@angular/material/tabs')) :
-    typeof define === 'function' && define.amd ? define('@hmcts/ccd-case-ui-toolkit', ['exports', '@angular/core', '@angular/common', '@angular/router', '@angular/forms', 'rx-polling', 'rxjs', '@angular/common/http', 'rxjs/operators', 'class-transformer', 'moment', 'underscore', 'pegjs', 'util', '@edium/fsm', '@angular/material/dialog', '@nicky-lenaers/ngx-scroll-to', '@angular/material/autocomplete', '@angular/material/core', '@hmcts/ccpay-web-component', '@angular/cdk/overlay', '@angular/cdk/tree', '@angular/material/input', '@angular-material-components/datetime-picker', '@angular-material-components/moment-adapter', '@angular/material/datepicker', '@angular/material/form-field', 'ngx-md', '@hmcts/media-viewer', '@angular/cdk/portal', 'ngx-pagination', '@angular/platform-browser', '@angular/material/tabs'], factory) :
-    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.hmcts = global.hmcts || {}, global.hmcts["ccd-case-ui-toolkit"] = {}), global.ng.core, global.ng.common, global.ng.router, global.ng.forms, global["rx-polling"], global.rxjs, global.ng.common.http, global.rxjs.operators, global["class-transformer"], global.moment, global.underscore, global.pegjs, global.util, global["@edium/fsm"], global.ng.material.dialog, global["@nicky-lenaers/ngx-scroll-to"], global.ng.material.autocomplete, global.ng.material.core, global["@hmcts/ccpay-web-component"], global.ng.cdk.overlay, global.ng.cdk.tree, global.ng.material.input, global["@angular-material-components/datetime-picker"], global["@angular-material-components/moment-adapter"], global.ng.material.datepicker, global.ng.material.formField, global["ngx-md"], global.i11, global.ng.cdk.portal, global["ngx-pagination"], global.ng.platformBrowser, global.ng.material.tabs));
-})(this, (function (exports, i0, i1, i1$1, i2, polling, rxjs, i1$2, operators, classTransformer, moment, _, pegjs, util, fsm, i1$3, i2$1, i5, i6, i3, i1$4, i7, i3$1, i4, momentAdapter, i5$1, i6$1, i1$5, i11, i6$2, i1$6, i3$2, i9) { 'use strict';
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('@angular/common'), require('@angular/router'), require('@angular/forms'), require('rx-polling'), require('rxjs'), require('@angular/common/http'), require('rxjs/operators'), require('class-transformer'), require('moment'), require('underscore'), require('pegjs'), require('util'), require('@edium/fsm'), require('@angular/material/dialog'), require('@nicky-lenaers/ngx-scroll-to'), require('@angular/material/autocomplete'), require('@angular/material/core'), require('@hmcts/ccpay-web-component'), require('@angular/cdk/overlay'), require('@angular/cdk/tree'), require('@angular/material/input'), require('@angular-material-components/datetime-picker'), require('@angular-material-components/moment-adapter'), require('@angular/material/datepicker'), require('@angular/material/form-field'), require('ngx-md'), require('@hmcts/media-viewer'), require('@angular/cdk/portal'), require('ngx-pagination'), require('@angular/material/tabs')) :
+    typeof define === 'function' && define.amd ? define('@hmcts/ccd-case-ui-toolkit', ['exports', '@angular/core', '@angular/common', '@angular/router', '@angular/forms', 'rx-polling', 'rxjs', '@angular/common/http', 'rxjs/operators', 'class-transformer', 'moment', 'underscore', 'pegjs', 'util', '@edium/fsm', '@angular/material/dialog', '@nicky-lenaers/ngx-scroll-to', '@angular/material/autocomplete', '@angular/material/core', '@hmcts/ccpay-web-component', '@angular/cdk/overlay', '@angular/cdk/tree', '@angular/material/input', '@angular-material-components/datetime-picker', '@angular-material-components/moment-adapter', '@angular/material/datepicker', '@angular/material/form-field', 'ngx-md', '@hmcts/media-viewer', '@angular/cdk/portal', 'ngx-pagination', '@angular/material/tabs'], factory) :
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.hmcts = global.hmcts || {}, global.hmcts["ccd-case-ui-toolkit"] = {}), global.ng.core, global.ng.common, global.ng.router, global.ng.forms, global["rx-polling"], global.rxjs, global.ng.common.http, global.rxjs.operators, global["class-transformer"], global.moment, global.underscore, global.pegjs, global.util, global["@edium/fsm"], global.ng.material.dialog, global["@nicky-lenaers/ngx-scroll-to"], global.ng.material.autocomplete, global.ng.material.core, global["@hmcts/ccpay-web-component"], global.ng.cdk.overlay, global.ng.cdk.tree, global.ng.material.input, global["@angular-material-components/datetime-picker"], global["@angular-material-components/moment-adapter"], global.ng.material.datepicker, global.ng.material.formField, global["ngx-md"], global.i11, global.ng.cdk.portal, global["ngx-pagination"], global.ng.material.tabs));
+})(this, (function (exports, i0, i1, i1$1, i2, polling, rxjs, i1$2, operators, classTransformer, moment, _, pegjs, util, fsm, i1$3, i2$1, i4, i5, i3, i1$4, i7, i3$1, i4$1, momentAdapter, i5$1, i6, i1$5, i11, i6$1, i1$6, i9) { 'use strict';
 
     function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -34,20 +34,19 @@
     var ___namespace = /*#__PURE__*/_interopNamespace(_);
     var i1__namespace$3 = /*#__PURE__*/_interopNamespace(i1$3);
     var i2__namespace$1 = /*#__PURE__*/_interopNamespace(i2$1);
+    var i4__namespace = /*#__PURE__*/_interopNamespace(i4);
     var i5__namespace = /*#__PURE__*/_interopNamespace(i5);
-    var i6__namespace = /*#__PURE__*/_interopNamespace(i6);
     var i3__namespace = /*#__PURE__*/_interopNamespace(i3);
     var i1__namespace$4 = /*#__PURE__*/_interopNamespace(i1$4);
     var i7__namespace = /*#__PURE__*/_interopNamespace(i7);
     var i3__namespace$1 = /*#__PURE__*/_interopNamespace(i3$1);
-    var i4__namespace = /*#__PURE__*/_interopNamespace(i4);
+    var i4__namespace$1 = /*#__PURE__*/_interopNamespace(i4$1);
     var i5__namespace$1 = /*#__PURE__*/_interopNamespace(i5$1);
-    var i6__namespace$1 = /*#__PURE__*/_interopNamespace(i6$1);
+    var i6__namespace = /*#__PURE__*/_interopNamespace(i6);
     var i1__namespace$5 = /*#__PURE__*/_interopNamespace(i1$5);
     var i11__namespace = /*#__PURE__*/_interopNamespace(i11);
-    var i6__namespace$2 = /*#__PURE__*/_interopNamespace(i6$2);
+    var i6__namespace$1 = /*#__PURE__*/_interopNamespace(i6$1);
     var i1__namespace$6 = /*#__PURE__*/_interopNamespace(i1$6);
-    var i3__namespace$2 = /*#__PURE__*/_interopNamespace(i3$2);
     var i9__namespace = /*#__PURE__*/_interopNamespace(i9);
 
     function FooterComponent_div_2_Template(rf, ctx) {
@@ -4652,6 +4651,9 @@
                 var _a = __read(path.split(/[_]+/g)), _ = _a[0], pathTail = _a.slice(1);
                 return this.findValueForComplexCondition(fields[head], tail[0], tail.slice(1), pathTail.join('_'));
             }
+            else if (!fields[head]) {
+                return this.findValueForComplexCondition(fields, tail[0], tail.slice(1), path);
+            }
             else {
                 return this.findValueForComplexCondition(fields[head], tail[0], tail.slice(1), path);
             }
@@ -5207,7 +5209,7 @@
                         if (cf.hidden === true && !control.disabled) {
                             control.disable({ emitEvent: false });
                         }
-                        else if (cf.hidden !== true && control.disabled) {
+                        else if (cf.hidden !== true) {
                             control.enable({ emitEvent: false });
                         }
                     }
@@ -8752,44 +8754,48 @@
                 }] });
     })();
 
-    var ConvertHrefToRouterService = /** @class */ (function () {
-        function ConvertHrefToRouterService(router) {
-            this.router = router;
-            this.hrefMarkdownLinkContent = new rxjs.BehaviorSubject('Default');
+    var Confirmation = /** @class */ (function () {
+        function Confirmation(caseId, status, header, body) {
+            this.caseId = caseId;
+            this.status = status;
+            this.header = header;
+            this.body = body;
         }
-        ConvertHrefToRouterService.prototype.updateHrefLink = function (content) {
-            this.hrefMarkdownLinkContent.next(content);
+        Confirmation.prototype.getCaseId = function () {
+            return this.caseId;
         };
-        ConvertHrefToRouterService.prototype.getHrefMarkdownLinkContent = function () {
-            return this.hrefMarkdownLinkContent.asObservable();
+        Confirmation.prototype.getStatus = function () {
+            return this.status;
         };
-        ConvertHrefToRouterService.prototype.callAngularRouter = function (hrefMarkdownLinkContent) {
-            var urls = hrefMarkdownLinkContent.split('?');
-            var queryParams = urls[1];
-            var queryParamObj = {};
-            if (queryParams) {
-                var queryParam = queryParams.split('&');
-                if (queryParam[0]) {
-                    // tslint:disable-next-line: prefer-for-of
-                    for (var i = 0; i < queryParam.length; i++) {
-                        var param = queryParam[i].split('=');
-                        queryParamObj[param[0]] = param[1];
-                    }
-                }
-            }
-            this.router.navigate([urls[0]], {
-                queryParams: queryParamObj && (Object.keys(queryParamObj).length) ? queryParamObj : ''
-            });
+        Confirmation.prototype.getHeader = function () {
+            return this.header;
         };
-        return ConvertHrefToRouterService;
+        Confirmation.prototype.getBody = function () {
+            return this.body;
+        };
+        return Confirmation;
     }());
-    ConvertHrefToRouterService.ɵfac = function ConvertHrefToRouterService_Factory(t) { return new (t || ConvertHrefToRouterService)(i0__namespace.ɵɵinject(i1__namespace$1.Router)); };
-    ConvertHrefToRouterService.ɵprov = i0__namespace.ɵɵdefineInjectable({ token: ConvertHrefToRouterService, factory: ConvertHrefToRouterService.ɵfac });
-    (function () {
-        (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(ConvertHrefToRouterService, [{
-                type: i0.Injectable
-            }], function () { return [{ type: i1__namespace$1.Router }]; }, null);
-    })();
+
+    exports.EventCompletionReturnStates = void 0;
+    (function (EventCompletionReturnStates) {
+        EventCompletionReturnStates["InProgress"] = "in-progress";
+        EventCompletionReturnStates["CompleteEvent"] = "complete-event";
+        EventCompletionReturnStates["CancelEvent"] = "cancel-event";
+    })(exports.EventCompletionReturnStates || (exports.EventCompletionReturnStates = {}));
+
+    exports.EventCompletionStates = void 0;
+    (function (EventCompletionStates) {
+        EventCompletionStates["CheckTasksCanBeCompleted"] = "check-tasks-can-be-completed";
+        EventCompletionStates["CompleteEventAndTask"] = "complete-event-and-task";
+        EventCompletionStates["CancelEvent"] = "cancel-event";
+        EventCompletionStates["CompleteEventNotTask"] = "complete-event-not-task";
+        EventCompletionStates["TaskCompetedOrCancelled"] = "task-completed-or-cancelled";
+        EventCompletionStates["TaskAssignedToAnotherUser"] = "task-assigned-to-another-user";
+        EventCompletionStates["TaskReassignToUser"] = "task-reassign-to-user";
+        EventCompletionStates["TaskAssignToUser"] = "task-assign-to-user";
+        EventCompletionStates["TaskUnassigned"] = "task-unassigned";
+        EventCompletionStates["Final"] = "final";
+    })(exports.EventCompletionStates || (exports.EventCompletionStates = {}));
 
     var Wizard = /** @class */ (function () {
         function Wizard(wizardPages) {
@@ -8848,6 +8854,45 @@
         return Wizard;
     }());
 
+    var ConvertHrefToRouterService = /** @class */ (function () {
+        function ConvertHrefToRouterService(router) {
+            this.router = router;
+            this.hrefMarkdownLinkContent = new rxjs.BehaviorSubject('Default');
+        }
+        ConvertHrefToRouterService.prototype.updateHrefLink = function (content) {
+            this.hrefMarkdownLinkContent.next(content);
+        };
+        ConvertHrefToRouterService.prototype.getHrefMarkdownLinkContent = function () {
+            return this.hrefMarkdownLinkContent.asObservable();
+        };
+        ConvertHrefToRouterService.prototype.callAngularRouter = function (hrefMarkdownLinkContent) {
+            var urls = hrefMarkdownLinkContent.split('?');
+            var queryParams = urls[1];
+            var queryParamObj = {};
+            if (queryParams) {
+                var queryParam = queryParams.split('&');
+                if (queryParam[0]) {
+                    // tslint:disable-next-line: prefer-for-of
+                    for (var i = 0; i < queryParam.length; i++) {
+                        var param = queryParam[i].split('=');
+                        queryParamObj[param[0]] = param[1];
+                    }
+                }
+            }
+            this.router.navigate([urls[0]], {
+                queryParams: queryParamObj && (Object.keys(queryParamObj).length) ? queryParamObj : ''
+            });
+        };
+        return ConvertHrefToRouterService;
+    }());
+    ConvertHrefToRouterService.ɵfac = function ConvertHrefToRouterService_Factory(t) { return new (t || ConvertHrefToRouterService)(i0__namespace.ɵɵinject(i1__namespace$1.Router)); };
+    ConvertHrefToRouterService.ɵprov = i0__namespace.ɵɵdefineInjectable({ token: ConvertHrefToRouterService, factory: ConvertHrefToRouterService.ɵfac });
+    (function () {
+        (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(ConvertHrefToRouterService, [{
+                type: i0.Injectable
+            }], function () { return [{ type: i1__namespace$1.Router }]; }, null);
+    })();
+
     var WizardFactoryService = /** @class */ (function () {
         function WizardFactoryService() {
         }
@@ -9040,20 +9085,6 @@
         EventCompletionPortalTypes[EventCompletionPortalTypes["TaskReassigned"] = 1] = "TaskReassigned";
     })(EventCompletionPortalTypes || (EventCompletionPortalTypes = {}));
 
-    exports.EventCompletionStates = void 0;
-    (function (EventCompletionStates) {
-        EventCompletionStates["CheckTasksCanBeCompleted"] = "check-tasks-can-be-completed";
-        EventCompletionStates["CompleteEventAndTask"] = "complete-event-and-task";
-        EventCompletionStates["CancelEvent"] = "cancel-event";
-        EventCompletionStates["CompleteEventNotTask"] = "complete-event-not-task";
-        EventCompletionStates["TaskCompetedOrCancelled"] = "task-completed-or-cancelled";
-        EventCompletionStates["TaskAssignedToAnotherUser"] = "task-assigned-to-another-user";
-        EventCompletionStates["TaskReassignToUser"] = "task-reassign-to-user";
-        EventCompletionStates["TaskAssignToUser"] = "task-assign-to-user";
-        EventCompletionStates["TaskUnassigned"] = "task-unassigned";
-        EventCompletionStates["Final"] = "final";
-    })(exports.EventCompletionStates || (exports.EventCompletionStates = {}));
-
     var EVENT_COMPLETION_STATE_MACHINE = 'EVENT COMPLETION STATE MACHINE';
     var EventCompletionStateMachineService = /** @class */ (function () {
         function EventCompletionStateMachineService() {
@@ -9499,8 +9530,9 @@
     })();
 
     var CaseEditComponent = /** @class */ (function () {
-        function CaseEditComponent(fb, router, route, fieldsUtils, fieldsPurger, registrarService, wizardFactory, sessionStorageService, windowsService) {
+        function CaseEditComponent(fb, caseNotifier, router, route, fieldsUtils, fieldsPurger, registrarService, wizardFactory, sessionStorageService, windowsService, formValueService, formErrorService, loadingService) {
             this.fb = fb;
+            this.caseNotifier = caseNotifier;
             this.router = router;
             this.route = route;
             this.fieldsUtils = fieldsUtils;
@@ -9509,8 +9541,16 @@
             this.wizardFactory = wizardFactory;
             this.sessionStorageService = sessionStorageService;
             this.windowsService = windowsService;
+            this.formValueService = formValueService;
+            this.formErrorService = formErrorService;
+            this.loadingService = loadingService;
             this.cancelled = new i0.EventEmitter();
             this.submitted = new i0.EventEmitter();
+            this.isEventCompletionChecksRequired = false;
+            this.isCaseFlagSubmission = false;
+            this.ignoreWarning = false;
+            this.isLinkedCasesSubmission = false;
+            this.callbackErrorsSubject = new rxjs.Subject();
         }
         CaseEditComponent.prototype.ngOnInit = function () {
             var _this = this;
@@ -9518,6 +9558,7 @@
             this.initialUrl = this.sessionStorageService.getItem('eventUrl');
             this.isPageRefreshed = JSON.parse(this.sessionStorageService.getItem('isPageRefreshed'));
             this.checkPageRefresh();
+            /* istanbul ignore else */
             if (this.router.url && !this.isPageRefreshed) {
                 this.sessionStorageService.setItem('eventUrl', this.router.url);
             }
@@ -9533,6 +9574,12 @@
                 _this.navigationOrigin = params[CaseEditComponent.ORIGIN_QUERY_PARAM];
             });
         };
+        CaseEditComponent.prototype.ngOnDestroy = function () {
+            /* istanbul ignore else */
+            if (this.callbackErrorsSubject) {
+                this.callbackErrorsSubject.unsubscribe();
+            }
+        };
         CaseEditComponent.prototype.checkPageRefresh = function () {
             if (this.isPageRefreshed && this.initialUrl) {
                 this.sessionStorageService.removeItem('eventUrl');
@@ -9555,20 +9602,37 @@
         };
         CaseEditComponent.prototype.next = function (currentPageId) {
             this.initialUrl = this.sessionStorageService.getItem('eventUrl');
+            /* istanbul ignore else */
             if (this.router.url && !this.initialUrl) {
                 this.sessionStorageService.setItem('eventUrl', this.router.url);
             }
             this.fieldsPurger.clearHiddenFields(this.form, this.wizard, this.eventTrigger, currentPageId);
+            var nextPage = this.getNextPage({
+                currentPageId: currentPageId,
+                wizard: this.wizard,
+                eventTrigger: this.eventTrigger,
+                form: this.form,
+            });
+            /* istanbul ignore else */
+            if (!nextPage && !this.eventTrigger.show_summary && !this.eventTrigger.show_event_notes) {
+                this.submitForm({
+                    eventTrigger: this.eventTrigger,
+                    form: this.form,
+                    submit: this.submit,
+                    caseDetails: this.caseDetails,
+                });
+                return;
+            }
             this.registrarService.reset();
             var theQueryParams = {};
             theQueryParams[CaseEditComponent.ORIGIN_QUERY_PARAM] = this.navigationOrigin;
-            var nextPage = this.wizard.nextPage(currentPageId, this.fieldsUtils.buildCanShowPredicate(this.eventTrigger, this.form));
             return this.router.navigate([nextPage ? nextPage.id : 'submit'], { queryParams: theQueryParams, relativeTo: this.route });
         };
         CaseEditComponent.prototype.previous = function (currentPageId) {
             this.fieldsPurger.clearHiddenFields(this.form, this.wizard, this.eventTrigger, currentPageId);
             this.registrarService.reset();
             var previousPage = this.wizard.previousPage(currentPageId, this.fieldsUtils.buildCanShowPredicate(this.eventTrigger, this.form));
+            /* istanbul ignore else */
             if (!previousPage) {
                 return Promise.resolve(false);
             }
@@ -9582,15 +9646,245 @@
         CaseEditComponent.prototype.cancel = function () {
             this.cancelled.emit();
         };
+        CaseEditComponent.prototype.emitSubmitted = function (response) {
+            this.submitted.emit({ caseId: response['id'], status: this.getStatus(response) });
+        };
+        CaseEditComponent.prototype.getNextPage = function (_a) {
+            var wizard = _a.wizard, currentPageId = _a.currentPageId, eventTrigger = _a.eventTrigger, form = _a.form;
+            return wizard.nextPage(currentPageId, this.fieldsUtils.buildCanShowPredicate(eventTrigger, form));
+        };
         CaseEditComponent.prototype.confirm = function (confirmation) {
             this.confirmation = confirmation;
             return this.router.navigate(['confirm'], { relativeTo: this.route });
         };
+        CaseEditComponent.prototype.submitForm = function (_a) {
+            var eventTrigger = _a.eventTrigger, form = _a.form, caseDetails = _a.caseDetails, submit = _a.submit;
+            this.isSubmitting = true;
+            // We have to run the event completion checks if task in session storage
+            // and if the task is in session storage, then is it associated to the case
+            var taskInSessionStorage;
+            var taskStr = this.sessionStorageService.getItem('taskToComplete');
+            if (taskStr) {
+                taskInSessionStorage = JSON.parse(taskStr);
+            }
+            if (taskInSessionStorage && taskInSessionStorage.case_id === this.getCaseId(caseDetails)) {
+                // Show event completion component to perform event completion checks
+                this.eventCompletionParams = ({
+                    caseId: this.getCaseId(caseDetails),
+                    eventId: this.getEventId(form),
+                    task: taskInSessionStorage
+                });
+                this.isEventCompletionChecksRequired = true;
+            }
+            else {
+                // Task not in session storage, proceed to submit
+                var caseEventData = this.generateCaseEventData({
+                    eventTrigger: eventTrigger,
+                    form: form
+                });
+                this.caseSubmit({ form: form,
+                    caseEventData: caseEventData,
+                    submit: submit
+                });
+            }
+        };
+        CaseEditComponent.prototype.getCaseId = function (caseDetails) {
+            return (caseDetails ? caseDetails.case_id : '');
+        };
+        CaseEditComponent.prototype.getEventId = function (form) {
+            return form.value.event.id;
+        };
+        CaseEditComponent.prototype.generateCaseEventData = function (_a) {
+            var eventTrigger = _a.eventTrigger, form = _a.form;
+            var caseEventData = {
+                data: this.replaceEmptyComplexFieldValues(this.formValueService.sanitise(this.replaceHiddenFormValuesWithOriginalCaseData(form.get('data'), eventTrigger.case_fields))),
+                event: form.value.event
+            };
+            this.formValueService.clearNonCaseFields(caseEventData.data, eventTrigger.case_fields);
+            this.formValueService.removeNullLabels(caseEventData.data, eventTrigger.case_fields);
+            this.formValueService.removeEmptyDocuments(caseEventData.data, eventTrigger.case_fields);
+            // Remove collection fields that have "min" validation of greater than zero set on the FieldType but are empty;
+            // these will fail validation
+            this.formValueService.removeEmptyCollectionsWithMinValidation(caseEventData.data, eventTrigger.case_fields);
+            // If this is a Case Flag submission (and thus a FlagLauncher field is present in the event trigger), the flag
+            // details data needs populating for each Flags field, then the FlagLauncher field needs removing
+            if (this.isCaseFlagSubmission) {
+                this.formValueService.populateFlagDetailsFromCaseFields(caseEventData.data, eventTrigger.case_fields);
+                this.formValueService.removeFlagLauncherField(caseEventData.data, eventTrigger.case_fields);
+            }
+            if (this.isLinkedCasesSubmission) {
+                this.formValueService.populateLinkedCasesDetailsFromCaseFields(caseEventData.data, eventTrigger.case_fields);
+                this.formValueService.removeComponentLauncherField(caseEventData.data, eventTrigger.case_fields);
+            }
+            caseEventData.event_token = eventTrigger.event_token;
+            caseEventData.ignore_warning = this.ignoreWarning;
+            if (this.confirmation) {
+                caseEventData.data = {};
+            }
+            return caseEventData;
+        };
+        /**
+         * Replaces non-array value objects with `null` for any Complex-type fields whose value is effectively empty, i.e.
+         * all its sub-fields and descendants are `null` or `undefined`.
+         *
+         * @param data The object tree representing all the form field data
+         * @returns The form field data modified accordingly
+         */
+        CaseEditComponent.prototype.replaceEmptyComplexFieldValues = function (data) {
+            Object.keys(data).forEach(function (key) {
+                if (!Array.isArray(data[key]) && typeof data[key] === 'object' && !FieldsUtils.containsNonEmptyValues(data[key])) {
+                    data[key] = null;
+                }
+            });
+            return data;
+        };
+        /**
+         * Traverse *all* values of a {@link FormGroup}, including those for disabled fields (i.e. hidden ones), replacing the
+         * value of any that are hidden AND have `retain_hidden_value` set to `true` in the corresponding `CaseField`, with
+         * the *original* value held in the `CaseField` object.
+         *
+         * This is as per design in EUI-3622, where any user-driven updates to hidden fields with `retain_hidden_value` =
+         * `true` are ignored (thus retaining the value displayed originally).
+         *
+         * * For Complex field types, the replacement above is performed recursively for all hidden sub-fields with
+         * `retain_hidden_value` = `true`.
+         *
+         * * For Collection field types, including collections of Complex and Document field types, the replacement is
+         * performed for all fields in the collection.
+         *
+         * @param formGroup The `FormGroup` instance whose raw values are to be traversed
+         * @param caseFields The array of {@link CaseField} domain model objects corresponding to fields in `formGroup`
+         * @param parentField Reference to the parent `CaseField`. Used for retrieving the sub-field values of a Complex field
+         * to perform recursive replacement - the sub-field `CaseField`s themselves do *not* contain any values
+         * @returns An object with the *raw* form value data (as key-value pairs), with any value replacements as necessary
+         */
+        CaseEditComponent.prototype.replaceHiddenFormValuesWithOriginalCaseData = function (formGroup, caseFields, parentField) {
+            var _this = this;
+            // Get the raw form value data, which includes the values of any disabled controls, as key-value pairs
+            var rawFormValueData = formGroup.getRawValue();
+            // Place all case fields in a lookup object, so they can be retrieved by id
+            var caseFieldsLookup = {};
+            for (var i = 0, len = caseFields.length; i < len; i++) {
+                caseFieldsLookup[caseFields[i].id] = caseFields[i];
+            }
+            /**
+             * Replace any form value with the original, where its CaseField is hidden AND has the retain_hidden_value flag set
+             * to true.
+             *
+             * If the CaseField's `hidden` attribute is null or undefined, then check this attribute in the parent CaseField (if
+             * one exists). This is occurring (and is possibly a bug) when a CaseField is a sub-field of a Complex type, or an
+             * item in a Collection type.
+             *
+             * If the field is a Complex type with retain_hidden_value = true, perform a recursive replacement for all (hidden)
+             * sub-fields with retain_hidden_value = true, using their original CaseField values (from the `formatted_value`
+             * attribute).
+             *
+             * If the field is a Collection type with retain_hidden_value = true, the entire collection is replaced with the
+             * original from `formatted_value`. This applies to *all* types of Collections.
+             */
+            /* istanbul ignore next */
+            Object.keys(rawFormValueData).forEach(function (key) {
+                var caseField = caseFieldsLookup[key];
+                // If caseField.hidden is NOT truthy and also NOT equal to false, then it must be null/undefined (remember that
+                // both null and undefined are equal to *neither false nor true*)
+                if (caseField && caseField.retain_hidden_value &&
+                    (caseField.hidden || (caseField.hidden !== false && parentField && parentField.hidden))) {
+                    if (caseField.field_type.type === 'Complex') {
+                        // Note: Deliberate use of equality (==) and non-equality (!=) operators for null checks throughout, to
+                        // handle both null and undefined values
+                        if (caseField.value != null) {
+                            // Call this function recursively to replace the Complex field's sub-fields as necessary, passing the
+                            // CaseField itself (the sub-fields do not contain any values, so these need to be obtained from the
+                            // parent)
+                            // Update rawFormValueData for this field
+                            // creating form group and adding control into it in case caseField is of complext type and and part of formGroup
+                            var form_1 = new i2.FormGroup({});
+                            if (formGroup.controls[key].value) {
+                                Object.keys(formGroup.controls[key].value).forEach(function (item) {
+                                    form_1.addControl(item, new i2.FormControl(formGroup.controls[key].value[item]));
+                                });
+                            }
+                            rawFormValueData[key] = _this.replaceHiddenFormValuesWithOriginalCaseData(form_1, caseField.field_type.complex_fields, caseField);
+                        }
+                    }
+                    else {
+                        // Default case also handles collections of *all* types; the entire collection in rawFormValueData will be
+                        // replaced with the original from formatted_value
+                        // Use the CaseField's existing *formatted_value* from the parent, if available. (This is necessary for
+                        // Complex fields, whose sub-fields do not hold any values in the model.) Otherwise, use formatted_value
+                        // from the CaseField itself.
+                        if (parentField && parentField.formatted_value) {
+                            rawFormValueData[key] = parentField.formatted_value[caseField.id];
+                        }
+                        else {
+                            rawFormValueData[key] = caseField.formatted_value;
+                        }
+                    }
+                }
+            });
+            return rawFormValueData;
+        };
+        CaseEditComponent.prototype.caseSubmit = function (_a) {
+            var _this = this;
+            var form = _a.form, caseEventData = _a.caseEventData, submit = _a.submit;
+            var loadingSpinnerToken = this.loadingService.register();
+            submit(caseEventData)
+                .pipe(operators.finalize(function () {
+                _this.loadingService.unregister(loadingSpinnerToken);
+            }))
+                .subscribe(function (response) {
+                _this.caseNotifier.cachedCaseView = null;
+                _this.sessionStorageService.removeItem('eventUrl');
+                var confirmation = _this.buildConfirmation(response);
+                if (confirmation && (confirmation.getHeader() || confirmation.getBody())) {
+                    // Add finally to fix sonar bug
+                    _this.confirm(confirmation).finally();
+                }
+                else {
+                    _this.emitSubmitted(response);
+                }
+            }, function (error) {
+                _this.error = error;
+                _this.callbackErrorsSubject.next(error);
+                /* istanbul ignore else */
+                if (_this.error.details) {
+                    _this.formErrorService
+                        .mapFieldErrors(_this.error.details.field_errors, form.controls['data'], 'validation');
+                }
+                _this.isSubmitting = false;
+            });
+        };
+        CaseEditComponent.prototype.buildConfirmation = function (response) {
+            if (response['after_submit_callback_response']) {
+                return new Confirmation(response['id'], response['callback_response_status'], response['after_submit_callback_response']['confirmation_header'], response['after_submit_callback_response']['confirmation_body']);
+            }
+            else {
+                return null;
+            }
+        };
+        CaseEditComponent.prototype.onEventCanBeCompleted = function (_a) {
+            var eventTrigger = _a.eventTrigger, eventCanBeCompleted = _a.eventCanBeCompleted, caseDetails = _a.caseDetails, form = _a.form, submit = _a.submit;
+            if (eventCanBeCompleted) {
+                // Submit
+                var caseEventData = this.generateCaseEventData({ eventTrigger: eventTrigger, form: form });
+                this.caseSubmit({ form: form, caseEventData: caseEventData, submit: submit });
+            }
+            else {
+                // Navigate to tasks tab on case details page
+                this.router.navigate(["/cases/case-details/" + this.getCaseId(caseDetails) + "/tasks"], { relativeTo: this.route });
+            }
+        };
+        CaseEditComponent.prototype.getStatus = function (response) {
+            return this.hasCallbackFailed(response) ? response['callback_response_status'] : response['delete_draft_response_status'];
+        };
+        CaseEditComponent.prototype.hasCallbackFailed = function (response) {
+            return response['callback_response_status'] !== 'CALLBACK_COMPLETED';
+        };
         return CaseEditComponent;
     }());
     CaseEditComponent.ORIGIN_QUERY_PARAM = 'origin';
     CaseEditComponent.ALERT_MESSAGE = 'Page is being refreshed so you will be redirected to the first page of this event.';
-    CaseEditComponent.ɵfac = function CaseEditComponent_Factory(t) { return new (t || CaseEditComponent)(i0__namespace.ɵɵdirectiveInject(i2__namespace.FormBuilder), i0__namespace.ɵɵdirectiveInject(i1__namespace$1.Router), i0__namespace.ɵɵdirectiveInject(i1__namespace$1.ActivatedRoute), i0__namespace.ɵɵdirectiveInject(FieldsUtils), i0__namespace.ɵɵdirectiveInject(FieldsPurger), i0__namespace.ɵɵdirectiveInject(ConditionalShowRegistrarService), i0__namespace.ɵɵdirectiveInject(WizardFactoryService), i0__namespace.ɵɵdirectiveInject(SessionStorageService), i0__namespace.ɵɵdirectiveInject(WindowService)); };
+    CaseEditComponent.ɵfac = function CaseEditComponent_Factory(t) { return new (t || CaseEditComponent)(i0__namespace.ɵɵdirectiveInject(i2__namespace.FormBuilder), i0__namespace.ɵɵdirectiveInject(CaseNotifier), i0__namespace.ɵɵdirectiveInject(i1__namespace$1.Router), i0__namespace.ɵɵdirectiveInject(i1__namespace$1.ActivatedRoute), i0__namespace.ɵɵdirectiveInject(FieldsUtils), i0__namespace.ɵɵdirectiveInject(FieldsPurger), i0__namespace.ɵɵdirectiveInject(ConditionalShowRegistrarService), i0__namespace.ɵɵdirectiveInject(WizardFactoryService), i0__namespace.ɵɵdirectiveInject(SessionStorageService), i0__namespace.ɵɵdirectiveInject(WindowService), i0__namespace.ɵɵdirectiveInject(FormValueService), i0__namespace.ɵɵdirectiveInject(FormErrorService), i0__namespace.ɵɵdirectiveInject(LoadingService)); };
     CaseEditComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: CaseEditComponent, selectors: [["ccd-case-edit"]], inputs: { eventTrigger: "eventTrigger", submit: "submit", validate: "validate", saveDraft: "saveDraft", caseDetails: "caseDetails" }, outputs: { cancelled: "cancelled", submitted: "submitted" }, features: [i0__namespace.ɵɵProvidersFeature([GreyBarService])], decls: 1, vars: 0, template: function CaseEditComponent_Template(rf, ctx) {
             if (rf & 1) {
                 i0__namespace.ɵɵelement(0, "router-outlet");
@@ -9605,7 +9899,7 @@
                         styleUrls: ['../case-edit.scss'],
                         providers: [GreyBarService]
                     }]
-            }], function () { return [{ type: i2__namespace.FormBuilder }, { type: i1__namespace$1.Router }, { type: i1__namespace$1.ActivatedRoute }, { type: FieldsUtils }, { type: FieldsPurger }, { type: ConditionalShowRegistrarService }, { type: WizardFactoryService }, { type: SessionStorageService }, { type: WindowService }]; }, { eventTrigger: [{
+            }], function () { return [{ type: i2__namespace.FormBuilder }, { type: CaseNotifier }, { type: i1__namespace$1.Router }, { type: i1__namespace$1.ActivatedRoute }, { type: FieldsUtils }, { type: FieldsPurger }, { type: ConditionalShowRegistrarService }, { type: WizardFactoryService }, { type: SessionStorageService }, { type: WindowService }, { type: FormValueService }, { type: FormErrorService }, { type: LoadingService }]; }, { eventTrigger: [{
                     type: i0.Input
                 }], submit: [{
                     type: i0.Input
@@ -9694,7 +9988,6 @@
             this.caseFields = this.getCaseFields();
             if (this.caseEdit.confirmation) {
                 this.confirmation = this.caseEdit.confirmation;
-                this.caseId = this.caseEdit.confirmation.getCaseId();
             }
             else {
                 this.router.navigate(['/']);
@@ -9704,7 +9997,8 @@
             this.caseEdit.submitted.emit({ caseId: this.confirmation.getCaseId(), status: this.confirmation.getStatus() });
         };
         CaseEditConfirmComponent.prototype.getCaseId = function () {
-            return (this.caseEdit.caseDetails ? this.caseEdit.caseDetails.case_id : '');
+            var _a, _b;
+            return ((_b = (_a = this.caseEdit) === null || _a === void 0 ? void 0 : _a.caseDetails) === null || _b === void 0 ? void 0 : _b.case_id) || '';
         };
         CaseEditConfirmComponent.prototype.getCaseTitle = function () {
             return (this.caseEdit.caseDetails && this.caseEdit.caseDetails.state &&
@@ -10062,102 +10356,97 @@
             }], null, null);
     })();
 
-    function CaseEditPageComponent_ccd_loading_spinner_0_Template(rf, ctx) {
-        if (rf & 1) {
-            i0__namespace.ɵɵelement(0, "ccd-loading-spinner");
-        }
-    }
-    function CaseEditPageComponent_ng_container_1_h1_1_Template(rf, ctx) {
+    function CaseEditPageComponent_ng_container_0_h1_1_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "h1", 10);
+            i0__namespace.ɵɵelementStart(0, "h1", 11);
             i0__namespace.ɵɵtext(1);
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
-            var ctx_r11 = i0__namespace.ɵɵnextContext(2);
+            var ctx_r9 = i0__namespace.ɵɵnextContext(2);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵtextInterpolate(ctx_r11.eventTrigger.name);
+            i0__namespace.ɵɵtextInterpolate(ctx_r9.eventTrigger.name);
         }
     }
-    function CaseEditPageComponent_ng_container_1_ng_container_2_Template(rf, ctx) {
+    function CaseEditPageComponent_ng_container_0_ng_container_2_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementContainerStart(0);
-            i0__namespace.ɵɵelementStart(1, "span", 11);
+            i0__namespace.ɵɵelementStart(1, "span", 12);
             i0__namespace.ɵɵtext(2);
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(3, "h1", 10);
+            i0__namespace.ɵɵelementStart(3, "h1", 11);
             i0__namespace.ɵɵtext(4);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementContainerEnd();
         }
         if (rf & 2) {
-            var ctx_r12 = i0__namespace.ɵɵnextContext(2);
+            var ctx_r10 = i0__namespace.ɵɵnextContext(2);
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵtextInterpolate(ctx_r12.eventTrigger.name);
+            i0__namespace.ɵɵtextInterpolate(ctx_r10.eventTrigger.name);
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵtextInterpolate(ctx_r12.currentPage.label);
+            i0__namespace.ɵɵtextInterpolate(ctx_r10.currentPage.label);
         }
     }
-    function CaseEditPageComponent_ng_container_1_Template(rf, ctx) {
+    function CaseEditPageComponent_ng_container_0_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementContainerStart(0);
-            i0__namespace.ɵɵtemplate(1, CaseEditPageComponent_ng_container_1_h1_1_Template, 2, 1, "h1", 9);
-            i0__namespace.ɵɵtemplate(2, CaseEditPageComponent_ng_container_1_ng_container_2_Template, 5, 2, "ng-container", 0);
+            i0__namespace.ɵɵtemplate(1, CaseEditPageComponent_ng_container_0_h1_1_Template, 2, 1, "h1", 10);
+            i0__namespace.ɵɵtemplate(2, CaseEditPageComponent_ng_container_0_ng_container_2_Template, 5, 2, "ng-container", 0);
             i0__namespace.ɵɵelementContainerEnd();
         }
         if (rf & 2) {
-            var ctx_r1 = i0__namespace.ɵɵnextContext();
+            var ctx_r0 = i0__namespace.ɵɵnextContext();
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("ngIf", !ctx_r1.currentPage.label);
+            i0__namespace.ɵɵproperty("ngIf", !ctx_r0.currentPage.label);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("ngIf", ctx_r1.currentPage.label);
+            i0__namespace.ɵɵproperty("ngIf", ctx_r0.currentPage.label);
         }
     }
-    function CaseEditPageComponent_div_2_Template(rf, ctx) {
+    function CaseEditPageComponent_div_1_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelement(0, "div");
         }
     }
-    function CaseEditPageComponent_ng_template_3_Template(rf, ctx) {
+    function CaseEditPageComponent_ng_template_2_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelement(0, "ccd-markdown", 12);
+            i0__namespace.ɵɵelement(0, "ccd-markdown", 13);
             i0__namespace.ɵɵpipe(1, "ccdCaseTitle");
         }
         if (rf & 2) {
-            var ctx_r4 = i0__namespace.ɵɵnextContext();
-            i0__namespace.ɵɵproperty("content", i0__namespace.ɵɵpipeBind3(1, 1, ctx_r4.getCaseTitle(), ctx_r4.caseFields, ctx_r4.editForm.controls["data"]));
+            var ctx_r3 = i0__namespace.ɵɵnextContext();
+            i0__namespace.ɵɵproperty("content", i0__namespace.ɵɵpipeBind3(1, 1, ctx_r3.getCaseTitle(), ctx_r3.caseFields, ctx_r3.editForm.controls["data"]));
         }
     }
-    function CaseEditPageComponent_ng_template_5_h2_0_Template(rf, ctx) {
+    function CaseEditPageComponent_ng_template_4_h2_0_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "h2", 14);
+            i0__namespace.ɵɵelementStart(0, "h2", 15);
             i0__namespace.ɵɵtext(1);
             i0__namespace.ɵɵpipe(2, "ccdCaseReference");
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
-            var ctx_r13 = i0__namespace.ɵɵnextContext(2);
+            var ctx_r11 = i0__namespace.ɵɵnextContext(2);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵtextInterpolate1("#", i0__namespace.ɵɵpipeBind1(2, 1, ctx_r13.getCaseId()), "");
+            i0__namespace.ɵɵtextInterpolate1("#", i0__namespace.ɵɵpipeBind1(2, 1, ctx_r11.getCaseId()), "");
         }
     }
-    function CaseEditPageComponent_ng_template_5_Template(rf, ctx) {
+    function CaseEditPageComponent_ng_template_4_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵtemplate(0, CaseEditPageComponent_ng_template_5_h2_0_Template, 3, 3, "h2", 13);
+            i0__namespace.ɵɵtemplate(0, CaseEditPageComponent_ng_template_4_h2_0_Template, 3, 3, "h2", 14);
         }
         if (rf & 2) {
-            var ctx_r6 = i0__namespace.ɵɵnextContext();
-            i0__namespace.ɵɵproperty("ngIf", ctx_r6.getCaseId());
+            var ctx_r5 = i0__namespace.ɵɵnextContext();
+            i0__namespace.ɵɵproperty("ngIf", ctx_r5.getCaseId());
         }
     }
-    function CaseEditPageComponent_div_7_div_3_Template(rf, ctx) {
+    function CaseEditPageComponent_div_6_div_3_Template(rf, ctx) {
         if (rf & 1) {
-            var _r17_1 = i0__namespace.ɵɵgetCurrentView();
-            i0__namespace.ɵɵelementStart(0, "div", 18);
-            i0__namespace.ɵɵelementStart(1, "ul", 19);
+            var _r15_1 = i0__namespace.ɵɵgetCurrentView();
+            i0__namespace.ɵɵelementStart(0, "div", 19);
+            i0__namespace.ɵɵelementStart(1, "ul", 20);
             i0__namespace.ɵɵelementStart(2, "li");
-            i0__namespace.ɵɵelementStart(3, "a", 20);
-            i0__namespace.ɵɵlistener("click", function CaseEditPageComponent_div_7_div_3_Template_a_click_3_listener() { i0__namespace.ɵɵrestoreView(_r17_1); var validationError_r15 = ctx.$implicit; var ctx_r16 = i0__namespace.ɵɵnextContext(2); return ctx_r16.navigateToErrorElement(validationError_r15.id); });
+            i0__namespace.ɵɵelementStart(3, "a", 21);
+            i0__namespace.ɵɵlistener("click", function CaseEditPageComponent_div_6_div_3_Template_a_click_3_listener() { i0__namespace.ɵɵrestoreView(_r15_1); var validationError_r13 = ctx.$implicit; var ctx_r14 = i0__namespace.ɵɵnextContext(2); return ctx_r14.navigateToErrorElement(validationError_r13.id); });
             i0__namespace.ɵɵtext(4);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
@@ -10165,168 +10454,116 @@
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
-            var validationError_r15 = ctx.$implicit;
+            var validationError_r13 = ctx.$implicit;
             i0__namespace.ɵɵadvance(4);
-            i0__namespace.ɵɵtextInterpolate(validationError_r15.message);
+            i0__namespace.ɵɵtextInterpolate(validationError_r13.message);
         }
     }
-    function CaseEditPageComponent_div_7_Template(rf, ctx) {
+    function CaseEditPageComponent_div_6_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "div", 15);
-            i0__namespace.ɵɵelementStart(1, "h2", 16);
+            i0__namespace.ɵɵelementStart(0, "div", 16);
+            i0__namespace.ɵɵelementStart(1, "h2", 17);
             i0__namespace.ɵɵtext(2, " There is a problem ");
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵtemplate(3, CaseEditPageComponent_div_7_div_3_Template, 5, 1, "div", 17);
+            i0__namespace.ɵɵtemplate(3, CaseEditPageComponent_div_6_div_3_Template, 5, 1, "div", 18);
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
-            var ctx_r7 = i0__namespace.ɵɵnextContext();
+            var ctx_r6 = i0__namespace.ɵɵnextContext();
             i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵproperty("ngForOf", ctx_r7.validationErrors);
-        }
-    }
-    function CaseEditPageComponent_div_8_Template(rf, ctx) {
-        if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "div", 21);
-            i0__namespace.ɵɵelementStart(1, "h1", 22);
-            i0__namespace.ɵɵtext(2, " Something went wrong ");
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(3, "div", 23);
-            i0__namespace.ɵɵelementStart(4, "p");
-            i0__namespace.ɵɵtext(5, "We're working to fix the problem. Try again shortly.");
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(6, "p");
-            i0__namespace.ɵɵelementStart(7, "a", 24);
-            i0__namespace.ɵɵtext(8, "Contact us");
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵtext(9, " if you're still having problems.");
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementEnd();
-        }
-    }
-    function CaseEditPageComponent_div_9_ul_5_li_1_Template(rf, ctx) {
-        if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "li", 29);
-            i0__namespace.ɵɵtext(1);
-            i0__namespace.ɵɵelementEnd();
-        }
-        if (rf & 2) {
-            var fieldError_r20 = ctx.$implicit;
-            i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵtextInterpolate(fieldError_r20.message);
-        }
-    }
-    function CaseEditPageComponent_div_9_ul_5_Template(rf, ctx) {
-        if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "ul", 27);
-            i0__namespace.ɵɵtemplate(1, CaseEditPageComponent_div_9_ul_5_li_1_Template, 2, 1, "li", 28);
-            i0__namespace.ɵɵelementEnd();
-        }
-        if (rf & 2) {
-            var ctx_r18 = i0__namespace.ɵɵnextContext(2);
-            i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("ngForOf", ctx_r18.error.details.field_errors);
+            i0__namespace.ɵɵproperty("ngForOf", ctx_r6.validationErrors);
         }
     }
-    function CaseEditPageComponent_div_9_Template(rf, ctx) {
+    function CaseEditPageComponent_form_10_ccd_case_edit_form_3_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "div", 21);
-            i0__namespace.ɵɵelementStart(1, "h3", 25);
-            i0__namespace.ɵɵtext(2, " The event could not be created ");
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(3, "p");
-            i0__namespace.ɵɵtext(4);
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵtemplate(5, CaseEditPageComponent_div_9_ul_5_Template, 2, 1, "ul", 26);
-            i0__namespace.ɵɵelementEnd();
-        }
-        if (rf & 2) {
-            var ctx_r9 = i0__namespace.ɵɵnextContext();
-            i0__namespace.ɵɵadvance(4);
-            i0__namespace.ɵɵtextInterpolate(ctx_r9.error.message);
-            i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("ngIf", ctx_r9.error.details == null ? null : ctx_r9.error.details.field_errors);
-        }
-    }
-    function CaseEditPageComponent_form_12_ccd_case_edit_form_3_Template(rf, ctx) {
-        if (rf & 1) {
-            var _r24_1 = i0__namespace.ɵɵgetCurrentView();
-            i0__namespace.ɵɵelementStart(0, "ccd-case-edit-form", 40);
-            i0__namespace.ɵɵlistener("valuesChanged", function CaseEditPageComponent_form_12_ccd_case_edit_form_3_Template_ccd_case_edit_form_valuesChanged_0_listener($event) { i0__namespace.ɵɵrestoreView(_r24_1); var ctx_r23 = i0__namespace.ɵɵnextContext(2); return ctx_r23.applyValuesChanged($event); });
+            var _r19_1 = i0__namespace.ɵɵgetCurrentView();
+            i0__namespace.ɵɵelementStart(0, "ccd-case-edit-form", 32);
+            i0__namespace.ɵɵlistener("valuesChanged", function CaseEditPageComponent_form_10_ccd_case_edit_form_3_Template_ccd_case_edit_form_valuesChanged_0_listener($event) { i0__namespace.ɵɵrestoreView(_r19_1); var ctx_r18 = i0__namespace.ɵɵnextContext(2); return ctx_r18.applyValuesChanged($event); });
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
-            var ctx_r21 = i0__namespace.ɵɵnextContext(2);
-            i0__namespace.ɵɵproperty("fields", ctx_r21.currentPage.getCol1Fields())("formGroup", ctx_r21.editForm.controls["data"])("caseFields", ctx_r21.caseFields)("pageChangeSubject", ctx_r21.pageChangeSubject);
+            var ctx_r16 = i0__namespace.ɵɵnextContext(2);
+            i0__namespace.ɵɵproperty("fields", ctx_r16.currentPage.getCol1Fields())("formGroup", ctx_r16.editForm.controls["data"])("caseFields", ctx_r16.caseFields)("pageChangeSubject", ctx_r16.pageChangeSubject);
         }
     }
-    function CaseEditPageComponent_form_12_div_4_Template(rf, ctx) {
+    function CaseEditPageComponent_form_10_div_4_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "div", 41);
-            i0__namespace.ɵɵelementStart(1, "div", 42);
-            i0__namespace.ɵɵelement(2, "ccd-case-edit-form", 43);
+            i0__namespace.ɵɵelementStart(0, "div", 33);
+            i0__namespace.ɵɵelementStart(1, "div", 34);
+            i0__namespace.ɵɵelement(2, "ccd-case-edit-form", 35);
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(3, "div", 44);
-            i0__namespace.ɵɵelement(4, "ccd-case-edit-form", 45);
+            i0__namespace.ɵɵelementStart(3, "div", 36);
+            i0__namespace.ɵɵelement(4, "ccd-case-edit-form", 37);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
-            var ctx_r22 = i0__namespace.ɵɵnextContext(2);
+            var ctx_r17 = i0__namespace.ɵɵnextContext(2);
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵproperty("fields", ctx_r22.currentPage.getCol1Fields())("formGroup", ctx_r22.editForm.controls["data"])("caseFields", ctx_r22.caseFields);
+            i0__namespace.ɵɵproperty("fields", ctx_r17.currentPage.getCol1Fields())("formGroup", ctx_r17.editForm.controls["data"])("caseFields", ctx_r17.caseFields);
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵproperty("fields", ctx_r22.currentPage.getCol2Fields())("formGroup", ctx_r22.editForm.controls["data"])("caseFields", ctx_r22.caseFields);
+            i0__namespace.ɵɵproperty("fields", ctx_r17.currentPage.getCol2Fields())("formGroup", ctx_r17.editForm.controls["data"])("caseFields", ctx_r17.caseFields);
         }
     }
-    function CaseEditPageComponent_form_12_Template(rf, ctx) {
+    function CaseEditPageComponent_form_10_Template(rf, ctx) {
         if (rf & 1) {
-            var _r26_1 = i0__namespace.ɵɵgetCurrentView();
-            i0__namespace.ɵɵelementStart(0, "form", 30);
-            i0__namespace.ɵɵlistener("submit", function CaseEditPageComponent_form_12_Template_form_submit_0_listener() { i0__namespace.ɵɵrestoreView(_r26_1); var ctx_r25 = i0__namespace.ɵɵnextContext(); return ctx_r25.submit(); });
-            i0__namespace.ɵɵelementStart(1, "fieldset", 31);
-            i0__namespace.ɵɵelement(2, "legend", 32);
-            i0__namespace.ɵɵtemplate(3, CaseEditPageComponent_form_12_ccd_case_edit_form_3_Template, 1, 4, "ccd-case-edit-form", 33);
-            i0__namespace.ɵɵtemplate(4, CaseEditPageComponent_form_12_div_4_Template, 5, 6, "div", 34);
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(5, "div", 35);
-            i0__namespace.ɵɵelementStart(6, "button", 36);
-            i0__namespace.ɵɵlistener("click", function CaseEditPageComponent_form_12_Template_button_click_6_listener() { i0__namespace.ɵɵrestoreView(_r26_1); var ctx_r27 = i0__namespace.ɵɵnextContext(); return ctx_r27.toPreviousPage(); });
+            var _r21_1 = i0__namespace.ɵɵgetCurrentView();
+            i0__namespace.ɵɵelementStart(0, "form", 22);
+            i0__namespace.ɵɵlistener("submit", function CaseEditPageComponent_form_10_Template_form_submit_0_listener() { i0__namespace.ɵɵrestoreView(_r21_1); var ctx_r20 = i0__namespace.ɵɵnextContext(); return ctx_r20.submit(); });
+            i0__namespace.ɵɵelementStart(1, "fieldset", 23);
+            i0__namespace.ɵɵelement(2, "legend", 24);
+            i0__namespace.ɵɵtemplate(3, CaseEditPageComponent_form_10_ccd_case_edit_form_3_Template, 1, 4, "ccd-case-edit-form", 25);
+            i0__namespace.ɵɵtemplate(4, CaseEditPageComponent_form_10_div_4_Template, 5, 6, "div", 26);
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementStart(5, "div", 27);
+            i0__namespace.ɵɵelementStart(6, "button", 28);
+            i0__namespace.ɵɵlistener("click", function CaseEditPageComponent_form_10_Template_button_click_6_listener() { i0__namespace.ɵɵrestoreView(_r21_1); var ctx_r22 = i0__namespace.ɵɵnextContext(); return ctx_r22.toPreviousPage(); });
             i0__namespace.ɵɵpipe(7, "async");
             i0__namespace.ɵɵtext(8, " Previous ");
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(9, "button", 37);
+            i0__namespace.ɵɵelementStart(9, "button", 29);
             i0__namespace.ɵɵtext(10);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(11, "p", 38);
-            i0__namespace.ɵɵelementStart(12, "a", 39);
-            i0__namespace.ɵɵlistener("click", function CaseEditPageComponent_form_12_Template_a_click_12_listener() { i0__namespace.ɵɵrestoreView(_r26_1); var ctx_r28 = i0__namespace.ɵɵnextContext(); return ctx_r28.cancel(); });
+            i0__namespace.ɵɵelementStart(11, "p", 30);
+            i0__namespace.ɵɵelementStart(12, "a", 31);
+            i0__namespace.ɵɵlistener("click", function CaseEditPageComponent_form_10_Template_a_click_12_listener() { i0__namespace.ɵɵrestoreView(_r21_1); var ctx_r23 = i0__namespace.ɵɵnextContext(); return ctx_r23.cancel(); });
             i0__namespace.ɵɵtext(13);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
-            var ctx_r10 = i0__namespace.ɵɵnextContext();
-            i0__namespace.ɵɵproperty("formGroup", ctx_r10.editForm);
+            var ctx_r7 = i0__namespace.ɵɵnextContext();
+            i0__namespace.ɵɵproperty("formGroup", ctx_r7.editForm);
             i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵproperty("ngIf", !ctx_r10.currentPage.isMultiColumn());
+            i0__namespace.ɵɵproperty("ngIf", !ctx_r7.currentPage.isMultiColumn());
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("ngIf", ctx_r10.currentPage.isMultiColumn());
+            i0__namespace.ɵɵproperty("ngIf", ctx_r7.currentPage.isMultiColumn());
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵproperty("disabled", !i0__namespace.ɵɵpipeBind1(7, 7, ctx_r10.hasPreviousPage$));
+            i0__namespace.ɵɵproperty("disabled", !i0__namespace.ɵɵpipeBind1(7, 7, ctx_r7.hasPreviousPage$));
             i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵproperty("disabled", ctx_r10.submitting());
+            i0__namespace.ɵɵproperty("disabled", ctx_r7.submitting());
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵtextInterpolate(ctx_r10.triggerText);
+            i0__namespace.ɵɵtextInterpolate(ctx_r7.triggerText);
             i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵtextInterpolate(ctx_r10.getCancelText());
+            i0__namespace.ɵɵtextInterpolate(ctx_r7.getCancelText());
+        }
+    }
+    function CaseEditPageComponent_ccd_case_event_completion_11_Template(rf, ctx) {
+        if (rf & 1) {
+            var _r25_1 = i0__namespace.ɵɵgetCurrentView();
+            i0__namespace.ɵɵelementStart(0, "ccd-case-event-completion", 38);
+            i0__namespace.ɵɵlistener("eventCanBeCompleted", function CaseEditPageComponent_ccd_case_event_completion_11_Template_ccd_case_event_completion_eventCanBeCompleted_0_listener($event) { i0__namespace.ɵɵrestoreView(_r25_1); var ctx_r24 = i0__namespace.ɵɵnextContext(); return ctx_r24.onEventCanBeCompleted($event); });
+            i0__namespace.ɵɵelementEnd();
+        }
+        if (rf & 2) {
+            var ctx_r8 = i0__namespace.ɵɵnextContext();
+            i0__namespace.ɵɵproperty("eventCompletionParams", ctx_r8.caseEdit.eventCompletionParams);
         }
     }
     var CaseEditPageComponent = /** @class */ (function () {
-        function CaseEditPageComponent(caseEdit, route, formValueService, formErrorService, cdRef, pageValidationService, dialog, caseFieldService, caseEditDataService) {
+        function CaseEditPageComponent(caseEdit, route, formValueService, formErrorService, cdRef, pageValidationService, dialog, caseFieldService, caseEditDataService, loadingService) {
             this.caseEdit = caseEdit;
             this.route = route;
             this.formValueService = formValueService;
@@ -10336,15 +10573,14 @@
             this.dialog = dialog;
             this.caseFieldService = caseFieldService;
             this.caseEditDataService = caseEditDataService;
-            this.callbackErrorsSubject = new rxjs.Subject();
-            this.ignoreWarning = false;
+            this.loadingService = loadingService;
             this.triggerTextStart = CaseEditPageComponent.TRIGGER_TEXT_START;
             this.triggerTextIgnoreWarnings = CaseEditPageComponent.TRIGGER_TEXT_CONTINUE;
-            this.isSubmitting = false;
             this.formValuesChanged = false;
             this.pageChangeSubject = new rxjs.Subject();
             this.validationErrors = [];
             this.hasPreviousPage$ = new rxjs.BehaviorSubject(false);
+            this.callbackErrorsSubject = new rxjs.Subject();
         }
         CaseEditPageComponent.scrollToTop = function () {
             window.scrollTo(0, 0);
@@ -10362,12 +10598,13 @@
             this.editForm = this.caseEdit.form;
             this.wizard = this.caseEdit.wizard;
             this.caseFields = this.getCaseFields();
-            this.triggerText = this.getTriggerText();
             this.syncCaseEditDataService();
             this.route.params
                 .subscribe(function (params) {
+                var _a, _b;
                 var pageId = params['page'];
-                if (!_this.currentPage || pageId !== _this.currentPage.id) {
+                /* istanbul ignore else */
+                if (!_this.currentPage || pageId !== ((_a = _this.currentPage) === null || _a === void 0 ? void 0 : _a.id)) {
                     var page = _this.caseEdit.getPage(pageId);
                     if (page) {
                         _this.currentPage = page;
@@ -10380,7 +10617,7 @@
                             return _this.first();
                         }
                     }
-                    _this.hasPreviousPage$.next(_this.caseEdit.hasPrevious(_this.currentPage.id));
+                    _this.hasPreviousPage$.next(_this.caseEdit.hasPrevious((_b = _this.currentPage) === null || _b === void 0 ? void 0 : _b.id));
                 }
             });
             CaseEditPageComponent.setFocusToTop();
@@ -10398,6 +10635,7 @@
                     }
                 }
             });
+            this.triggerText = this.getTriggerText();
         };
         CaseEditPageComponent.prototype.ngAfterViewChecked = function () {
             this.cdRef.detectChanges();
@@ -10501,8 +10739,10 @@
             CaseEditPageComponent.scrollToTop();
         };
         CaseEditPageComponent.prototype.navigateToErrorElement = function (elementId) {
+            /* istanbul ignore else */
             if (elementId) {
                 var htmlElement = document.getElementById(elementId);
+                /* istanbul ignore else */
                 if (htmlElement) {
                     htmlElement.scrollIntoView({ behavior: 'smooth', block: 'center' });
                     htmlElement.focus();
@@ -10524,21 +10764,23 @@
                     this.generateErrorMessage(this.currentPage.case_fields);
                 }
             }
-            if (!this.isSubmitting && !this.currentPageIsNotValid()) {
-                this.isSubmitting = true;
-                this.error = null;
+            if (!this.caseEdit.isSubmitting && !this.currentPageIsNotValid()) {
+                this.caseEdit.isSubmitting = true;
+                this.caseEdit.error = null;
                 var caseEventData = this.buildCaseEventData();
-                this.showSpinner = true;
+                var loadingSpinnerToken_1 = this.loadingService.register();
                 this.caseEdit.validate(caseEventData, this.currentPage.id)
+                    .pipe(operators.finalize(function () {
+                    _this.loadingService.unregister(loadingSpinnerToken_1);
+                }))
                     .subscribe(function (jsonData) {
+                    /* istanbul ignore else */
                     if (jsonData) {
                         _this.updateFormData(jsonData);
                     }
                     _this.saveDraft();
-                    _this.showSpinner = false;
                     _this.next();
                 }, function (error) {
-                    _this.showSpinner = false;
                     _this.handleError(error);
                 });
                 CaseEditPageComponent.scrollToTop();
@@ -10546,10 +10788,11 @@
             CaseEditPageComponent.setFocusToTop();
         };
         CaseEditPageComponent.prototype.updateFormData = function (jsonData) {
-            var e_1, _a;
+            var e_1, _c;
             try {
-                for (var _b = __values(Object.keys(jsonData.data)), _c = _b.next(); !_c.done; _c = _b.next()) {
-                    var caseFieldId = _c.value;
+                for (var _d = __values(Object.keys(jsonData.data)), _e = _d.next(); !_e.done; _e = _d.next()) {
+                    var caseFieldId = _e.value;
+                    /* istanbul ignore else */
                     if (this.pageWithFieldExists(caseFieldId)) {
                         this.updateEventTriggerCaseFields(caseFieldId, jsonData, this.caseEdit.eventTrigger);
                         this.updateFormControlsValue(this.editForm, caseFieldId, jsonData.data[caseFieldId]);
@@ -10559,7 +10802,7 @@
             catch (e_1_1) { e_1 = { error: e_1_1 }; }
             finally {
                 try {
-                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                    if (_e && !_e.done && (_c = _d.return)) _c.call(_d);
                 }
                 finally { if (e_1) throw e_1.error; }
             }
@@ -10569,12 +10812,36 @@
             return this.wizard.findWizardPage(caseFieldId);
         };
         CaseEditPageComponent.prototype.updateEventTriggerCaseFields = function (caseFieldId, jsonData, eventTrigger) {
-            if (eventTrigger.case_fields) {
+            var _this = this;
+            /* istanbul ignore else */
+            if (eventTrigger === null || eventTrigger === void 0 ? void 0 : eventTrigger.case_fields) {
                 eventTrigger.case_fields
                     .filter(function (element) { return element.id === caseFieldId; })
-                    .forEach(function (element) { return element.value = jsonData.data[caseFieldId]; });
+                    .forEach(function (element) {
+                    if (_this.isAnObject(element.value)) {
+                        var updatedJsonDataObject = _this.updateJsonDataObject(caseFieldId, jsonData, element);
+                        element.value = Object.assign(Object.assign({}, element.value), updatedJsonDataObject);
+                    }
+                    else {
+                        element.value = jsonData.data[caseFieldId];
+                    }
+                });
             }
         };
+        CaseEditPageComponent.prototype.updateJsonDataObject = function (caseFieldId, jsonData, element) {
+            var _this = this;
+            return Object.keys(jsonData.data[caseFieldId]).reduce(function (acc, key) {
+                var _c;
+                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));
+            }, {});
+        };
+        CaseEditPageComponent.prototype.isAnObject = function (property) {
+            return typeof property === 'object' && !Array.isArray(property) && property !== null;
+        };
         CaseEditPageComponent.prototype.updateFormControlsValue = function (formGroup, caseFieldId, value) {
             var theControl = formGroup.controls['data'].get(caseFieldId);
             if (theControl && theControl['status'] !== 'DISABLED') {
@@ -10590,12 +10857,14 @@
             }
         };
         CaseEditPageComponent.prototype.callbackErrorsNotify = function (errorContext) {
-            this.ignoreWarning = errorContext.ignoreWarning;
+            this.caseEdit.ignoreWarning = errorContext.ignoreWarning;
             this.triggerText = errorContext.triggerText;
         };
         CaseEditPageComponent.prototype.next = function () {
+            if (this.canNavigateToSummaryPage()) {
+                this.caseEdit.isSubmitting = false;
+            }
             this.resetErrors();
-            this.isSubmitting = false;
             this.formValuesChanged = false;
             this.pageChangeSubject.next(true);
             return this.caseEdit.next(this.currentPage.id);
@@ -10637,9 +10906,10 @@
             else {
                 this.caseEdit.cancelled.emit();
             }
+            this.caseEditDataService.clearFormValidationErrors();
         };
         CaseEditPageComponent.prototype.submitting = function () {
-            return this.isSubmitting;
+            return this.caseEdit.isSubmitting;
         };
         CaseEditPageComponent.prototype.getCaseId = function () {
             return (this.caseEdit.caseDetails ? this.caseEdit.caseDetails.case_id : '');
@@ -10651,10 +10921,23 @@
         CaseEditPageComponent.prototype.getCancelText = function () {
             return this.eventTrigger.can_save_draft ? 'Return to case list' : 'Cancel';
         };
+        CaseEditPageComponent.prototype.canNavigateToSummaryPage = function () {
+            var _a;
+            var nextPage = this.caseEdit.getNextPage({
+                currentPageId: (_a = this.currentPage) === null || _a === void 0 ? void 0 : _a.id,
+                wizard: this.wizard,
+                eventTrigger: this.eventTrigger,
+                form: this.editForm
+            });
+            return this.eventTrigger.show_summary || !!nextPage;
+        };
         CaseEditPageComponent.prototype.getTriggerText = function () {
-            return this.eventTrigger && this.eventTrigger.can_save_draft
+            var textBasedOnCanSaveDraft = this.eventTrigger && this.eventTrigger.can_save_draft
                 ? CaseEditPageComponent.TRIGGER_TEXT_SAVE
                 : CaseEditPageComponent.TRIGGER_TEXT_START;
+            return this.canNavigateToSummaryPage()
+                ? textBasedOnCanSaveDraft
+                : 'Submit';
         };
         CaseEditPageComponent.prototype.discard = function () {
             if (this.route.snapshot.queryParamMap.get(CaseEditComponent.ORIGIN_QUERY_PARAM) === 'viewDraft') {
@@ -10665,26 +10948,29 @@
             }
         };
         CaseEditPageComponent.prototype.handleError = function (error) {
-            this.isSubmitting = false;
-            this.error = error;
-            this.callbackErrorsSubject.next(this.error);
-            if (this.error.details) {
+            var _a, _b;
+            this.caseEdit.isSubmitting = false;
+            this.caseEdit.error = error;
+            this.caseEdit.callbackErrorsSubject.next(this.caseEdit.error);
+            this.callbackErrorsSubject.next(this.caseEdit.error);
+            /* istanbul ignore else */
+            if (this.caseEdit.error.details) {
                 this.formErrorService
-                    .mapFieldErrors(this.error.details.field_errors, this.editForm.controls['data'], 'validation');
+                    .mapFieldErrors(this.caseEdit.error.details.field_errors, (_b = (_a = this.editForm) === null || _a === void 0 ? void 0 : _a.controls) === null || _b === void 0 ? void 0 : _b['data'], 'validation');
             }
         };
         CaseEditPageComponent.prototype.resetErrors = function () {
-            this.error = null;
-            this.ignoreWarning = false;
+            this.caseEdit.error = null;
+            this.caseEdit.ignoreWarning = false;
             this.triggerText = this.getTriggerText();
-            this.callbackErrorsSubject.next(null);
+            this.caseEdit.callbackErrorsSubject.next(null);
         };
         CaseEditPageComponent.prototype.saveDraft = function () {
             var _this = this;
             if (this.eventTrigger.can_save_draft) {
                 var draftCaseEventData = this.formValueService.sanitise(this.editForm.value);
                 draftCaseEventData.event_token = this.eventTrigger.event_token;
-                draftCaseEventData.ignore_warning = this.ignoreWarning;
+                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); });
             }
         };
@@ -10717,7 +11003,7 @@
             pageEventData.event_data = formEventData.data;
             // Finalise the CaseEventData object.
             pageEventData.event_token = this.eventTrigger.event_token;
-            pageEventData.ignore_warning = this.ignoreWarning;
+            pageEventData.ignore_warning = this.caseEdit.ignoreWarning;
             // Finally, try to set up the case_reference.
             if (this.caseEdit.caseDetails) {
                 pageEventData.case_reference = this.caseEdit.caseDetails.case_id;
@@ -10757,6 +11043,15 @@
                 next: function (validationErrors) { return _this.validationErrors = validationErrors; }
             });
         };
+        CaseEditPageComponent.prototype.onEventCanBeCompleted = function (eventCanBeCompleted) {
+            this.caseEdit.onEventCanBeCompleted({
+                eventTrigger: this.eventTrigger,
+                eventCanBeCompleted: eventCanBeCompleted,
+                caseDetails: this.caseEdit.caseDetails,
+                form: this.editForm,
+                submit: this.caseEdit.submit,
+            });
+        };
         return CaseEditPageComponent;
     }());
     CaseEditPageComponent.RESUMED_FORM_DISCARD = 'RESUMED_FORM_DISCARD';
@@ -10766,42 +11061,39 @@
     CaseEditPageComponent.TRIGGER_TEXT_START = 'Continue';
     CaseEditPageComponent.TRIGGER_TEXT_SAVE = 'Save and continue';
     CaseEditPageComponent.TRIGGER_TEXT_CONTINUE = 'Ignore Warning and Continue';
-    CaseEditPageComponent.ɵfac = function CaseEditPageComponent_Factory(t) { return new (t || CaseEditPageComponent)(i0__namespace.ɵɵdirectiveInject(CaseEditComponent), i0__namespace.ɵɵdirectiveInject(i1__namespace$1.ActivatedRoute), i0__namespace.ɵɵdirectiveInject(FormValueService), i0__namespace.ɵɵdirectiveInject(FormErrorService), i0__namespace.ɵɵdirectiveInject(i0__namespace.ChangeDetectorRef), i0__namespace.ɵɵdirectiveInject(PageValidationService), i0__namespace.ɵɵdirectiveInject(i1__namespace$3.MatDialog), i0__namespace.ɵɵdirectiveInject(CaseFieldService), i0__namespace.ɵɵdirectiveInject(CaseEditDataService)); };
-    CaseEditPageComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: CaseEditPageComponent, selectors: [["ccd-case-edit-page"]], decls: 13, vars: 12, consts: [[4, "ngIf"], [4, "ngIf", "ngIfThen", "ngIfElse"], ["titleBlock", ""], ["idBlock", ""], ["class", "govuk-error-summary", "aria-labelledby", "error-summary-title", "role", "alert", "tabindex", "-1", "data-module", "govuk-error-summary", 4, "ngIf"], ["class", "error-summary", "role", "status", "aria-labelledby", "edit-case-event_error-summary-heading", "tabindex", "-1", 4, "ngIf"], [3, "triggerTextContinue", "triggerTextIgnore", "callbackErrorsSubject", "callbackErrorsContext"], [1, "width-50"], ["class", "form", 3, "formGroup", "submit", 4, "ngIf"], ["class", "govuk-heading-l", 4, "ngIf"], [1, "govuk-heading-l"], [1, "govuk-caption-l"], [3, "content"], ["class", "heading-h2", 4, "ngIf"], [1, "heading-h2"], ["aria-labelledby", "error-summary-title", "role", "alert", "tabindex", "-1", "data-module", "govuk-error-summary", 1, "govuk-error-summary"], ["id", "error-summary-title", 1, "govuk-error-summary__title"], ["class", "govuk-error-summary__body", 4, "ngFor", "ngForOf"], [1, "govuk-error-summary__body"], [1, "govuk-list", "govuk-error-summary__list"], [1, "validation-error", 3, "click"], ["role", "status", "aria-labelledby", "edit-case-event_error-summary-heading", "tabindex", "-1", 1, "error-summary"], ["id", "edit-case-event_error-summary-heading", 1, "heading-h1", "error-summary-heading"], ["id", "edit-case-event_error-summary-body", 1, "govuk-error-summary__body"], ["href", "get-help", "target", "_blank"], ["id", "edit-case-event_error-summary-heading-3", 1, "heading-h3", "error-summary-heading"], ["class", "error-summary-list", 4, "ngIf"], [1, "error-summary-list"], ["class", "ccd-error-summary-li", 4, "ngFor", "ngForOf"], [1, "ccd-error-summary-li"], [1, "form", 3, "formGroup", "submit"], ["id", "fieldset-case-data"], [2, "display", "none"], ["id", "caseEditForm", 3, "fields", "formGroup", "caseFields", "pageChangeSubject", "valuesChanged", 4, "ngIf"], ["class", "grid-row", 4, "ngIf"], [1, "form-group", "form-group-related"], ["type", "button", 1, "button", "button-secondary", 3, "disabled", "click"], ["type", "submit", 1, "button", 3, "disabled"], [1, "cancel"], ["href", "javascript:void(0)", 3, "click"], ["id", "caseEditForm", 3, "fields", "formGroup", "caseFields", "pageChangeSubject", "valuesChanged"], [1, "grid-row"], [1, "column-two-thirds", "rightBorderSeparator"], ["id", "caseEditForm1", 3, "fields", "formGroup", "caseFields"], [1, "column-one-third"], ["id", "caseEditForm2", 3, "fields", "formGroup", "caseFields"]], template: function CaseEditPageComponent_Template(rf, ctx) {
+    CaseEditPageComponent.ɵfac = function CaseEditPageComponent_Factory(t) { return new (t || CaseEditPageComponent)(i0__namespace.ɵɵdirectiveInject(CaseEditComponent), i0__namespace.ɵɵdirectiveInject(i1__namespace$1.ActivatedRoute), i0__namespace.ɵɵdirectiveInject(FormValueService), i0__namespace.ɵɵdirectiveInject(FormErrorService), i0__namespace.ɵɵdirectiveInject(i0__namespace.ChangeDetectorRef), i0__namespace.ɵɵdirectiveInject(PageValidationService), i0__namespace.ɵɵdirectiveInject(i1__namespace$3.MatDialog), i0__namespace.ɵɵdirectiveInject(CaseFieldService), i0__namespace.ɵɵdirectiveInject(CaseEditDataService), i0__namespace.ɵɵdirectiveInject(LoadingService)); };
+    CaseEditPageComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: CaseEditPageComponent, selectors: [["ccd-case-edit-page"]], decls: 12, vars: 11, consts: [[4, "ngIf"], [4, "ngIf", "ngIfThen", "ngIfElse"], ["titleBlock", ""], ["idBlock", ""], ["class", "govuk-error-summary", "aria-labelledby", "error-summary-title", "role", "alert", "tabindex", "-1", "data-module", "govuk-error-summary", 4, "ngIf"], [3, "error"], [3, "triggerTextContinue", "triggerTextIgnore", "callbackErrorsSubject", "callbackErrorsContext"], [1, "width-50"], ["class", "form", 3, "formGroup", "submit", 4, "ngIf"], [3, "eventCompletionParams", "eventCanBeCompleted", 4, "ngIf"], ["class", "govuk-heading-l", 4, "ngIf"], [1, "govuk-heading-l"], [1, "govuk-caption-l"], [3, "content"], ["class", "heading-h2", 4, "ngIf"], [1, "heading-h2"], ["aria-labelledby", "error-summary-title", "role", "alert", "tabindex", "-1", "data-module", "govuk-error-summary", 1, "govuk-error-summary"], ["id", "error-summary-title", 1, "govuk-error-summary__title"], ["class", "govuk-error-summary__body", 4, "ngFor", "ngForOf"], [1, "govuk-error-summary__body"], [1, "govuk-list", "govuk-error-summary__list"], [1, "validation-error", 3, "click"], [1, "form", 3, "formGroup", "submit"], ["id", "fieldset-case-data"], [2, "display", "none"], ["id", "caseEditForm", 3, "fields", "formGroup", "caseFields", "pageChangeSubject", "valuesChanged", 4, "ngIf"], ["class", "grid-row", 4, "ngIf"], [1, "form-group", "form-group-related"], ["type", "button", 1, "button", "button-secondary", 3, "disabled", "click"], ["type", "submit", 1, "button", 3, "disabled"], [1, "cancel"], ["href", "javascript:void(0)", 3, "click"], ["id", "caseEditForm", 3, "fields", "formGroup", "caseFields", "pageChangeSubject", "valuesChanged"], [1, "grid-row"], [1, "column-two-thirds", "rightBorderSeparator"], ["id", "caseEditForm1", 3, "fields", "formGroup", "caseFields"], [1, "column-one-third"], ["id", "caseEditForm2", 3, "fields", "formGroup", "caseFields"], [3, "eventCompletionParams", "eventCanBeCompleted"]], template: function CaseEditPageComponent_Template(rf, ctx) {
             if (rf & 1) {
-                i0__namespace.ɵɵtemplate(0, CaseEditPageComponent_ccd_loading_spinner_0_Template, 1, 0, "ccd-loading-spinner", 0);
-                i0__namespace.ɵɵtemplate(1, CaseEditPageComponent_ng_container_1_Template, 3, 2, "ng-container", 0);
-                i0__namespace.ɵɵtemplate(2, CaseEditPageComponent_div_2_Template, 1, 0, "div", 1);
-                i0__namespace.ɵɵtemplate(3, CaseEditPageComponent_ng_template_3_Template, 2, 5, "ng-template", null, 2, i0__namespace.ɵɵtemplateRefExtractor);
-                i0__namespace.ɵɵtemplate(5, CaseEditPageComponent_ng_template_5_Template, 1, 1, "ng-template", null, 3, i0__namespace.ɵɵtemplateRefExtractor);
-                i0__namespace.ɵɵtemplate(7, CaseEditPageComponent_div_7_Template, 4, 1, "div", 4);
-                i0__namespace.ɵɵtemplate(8, CaseEditPageComponent_div_8_Template, 10, 0, "div", 5);
-                i0__namespace.ɵɵtemplate(9, CaseEditPageComponent_div_9_Template, 6, 2, "div", 5);
-                i0__namespace.ɵɵelementStart(10, "ccd-callback-errors", 6);
-                i0__namespace.ɵɵlistener("callbackErrorsContext", function CaseEditPageComponent_Template_ccd_callback_errors_callbackErrorsContext_10_listener($event) { return ctx.callbackErrorsNotify($event); });
+                i0__namespace.ɵɵtemplate(0, CaseEditPageComponent_ng_container_0_Template, 3, 2, "ng-container", 0);
+                i0__namespace.ɵɵtemplate(1, CaseEditPageComponent_div_1_Template, 1, 0, "div", 1);
+                i0__namespace.ɵɵtemplate(2, CaseEditPageComponent_ng_template_2_Template, 2, 5, "ng-template", null, 2, i0__namespace.ɵɵtemplateRefExtractor);
+                i0__namespace.ɵɵtemplate(4, CaseEditPageComponent_ng_template_4_Template, 1, 1, "ng-template", null, 3, i0__namespace.ɵɵtemplateRefExtractor);
+                i0__namespace.ɵɵtemplate(6, CaseEditPageComponent_div_6_Template, 4, 1, "div", 4);
+                i0__namespace.ɵɵelement(7, "ccd-case-edit-generic-errors", 5);
+                i0__namespace.ɵɵelementStart(8, "ccd-callback-errors", 6);
+                i0__namespace.ɵɵlistener("callbackErrorsContext", function CaseEditPageComponent_Template_ccd_callback_errors_callbackErrorsContext_8_listener($event) { return ctx.callbackErrorsNotify($event); });
                 i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementStart(11, "div", 7);
-                i0__namespace.ɵɵtemplate(12, CaseEditPageComponent_form_12_Template, 14, 9, "form", 8);
+                i0__namespace.ɵɵelementStart(9, "div", 7);
+                i0__namespace.ɵɵtemplate(10, CaseEditPageComponent_form_10_Template, 14, 9, "form", 8);
                 i0__namespace.ɵɵelementEnd();
+                i0__namespace.ɵɵtemplate(11, CaseEditPageComponent_ccd_case_event_completion_11_Template, 1, 1, "ccd-case-event-completion", 9);
             }
             if (rf & 2) {
-                var _r3 = i0__namespace.ɵɵreference(4);
-                var _r5 = i0__namespace.ɵɵreference(6);
-                i0__namespace.ɵɵproperty("ngIf", ctx.showSpinner);
-                i0__namespace.ɵɵadvance(1);
+                var _r2 = i0__namespace.ɵɵreference(3);
+                var _r4 = i0__namespace.ɵɵreference(5);
                 i0__namespace.ɵɵproperty("ngIf", ctx.currentPage);
                 i0__namespace.ɵɵadvance(1);
-                i0__namespace.ɵɵproperty("ngIf", ctx.getCaseTitle())("ngIfThen", _r3)("ngIfElse", _r5);
+                i0__namespace.ɵɵproperty("ngIf", ctx.getCaseTitle())("ngIfThen", _r2)("ngIfElse", _r4);
                 i0__namespace.ɵɵadvance(5);
                 i0__namespace.ɵɵproperty("ngIf", ctx.validationErrors.length > 0);
                 i0__namespace.ɵɵadvance(1);
-                i0__namespace.ɵɵproperty("ngIf", ctx.error && !(ctx.error.callbackErrors || ctx.error.callbackWarnings || ctx.error.details));
-                i0__namespace.ɵɵadvance(1);
-                i0__namespace.ɵɵproperty("ngIf", ctx.error && ctx.error.details);
+                i0__namespace.ɵɵproperty("error", ctx.caseEdit.error);
                 i0__namespace.ɵɵadvance(1);
-                i0__namespace.ɵɵproperty("triggerTextContinue", ctx.triggerTextStart)("triggerTextIgnore", ctx.triggerTextIgnoreWarnings)("callbackErrorsSubject", ctx.callbackErrorsSubject);
+                i0__namespace.ɵɵproperty("triggerTextContinue", ctx.triggerTextStart)("triggerTextIgnore", ctx.triggerTextIgnoreWarnings)("callbackErrorsSubject", ctx.caseEdit.callbackErrorsSubject);
                 i0__namespace.ɵɵadvance(2);
                 i0__namespace.ɵɵproperty("ngIf", ctx.currentPage);
+                i0__namespace.ɵɵadvance(1);
+                i0__namespace.ɵɵproperty("ngIf", ctx.caseEdit.isEventCompletionChecksRequired);
             }
         }, styles: [".rightBorderSeparator[_ngcontent-%COMP%]{border-right:4px solid #ffcc02}.validation-error[_ngcontent-%COMP%]{cursor:pointer;text-decoration:underline;color:#d4351c}"] });
     (function () {
@@ -10812,7 +11104,7 @@
                         templateUrl: 'case-edit-page.html',
                         styleUrls: ['./case-edit-page.scss']
                     }]
-            }], function () { return [{ type: CaseEditComponent }, { type: i1__namespace$1.ActivatedRoute }, { type: FormValueService }, { type: FormErrorService }, { type: i0__namespace.ChangeDetectorRef }, { type: PageValidationService }, { type: i1__namespace$3.MatDialog }, { type: CaseFieldService }, { type: CaseEditDataService }]; }, null);
+            }], function () { return [{ type: CaseEditComponent }, { type: i1__namespace$1.ActivatedRoute }, { type: FormValueService }, { type: FormErrorService }, { type: i0__namespace.ChangeDetectorRef }, { type: PageValidationService }, { type: i1__namespace$3.MatDialog }, { type: CaseFieldService }, { type: CaseEditDataService }, { type: LoadingService }]; }, null);
     })();
 
     var CallbackErrorsContext = /** @class */ (function () {
@@ -10919,11 +11211,6 @@
                 }
             });
         };
-        CallbackErrorsComponent.prototype.ngOnDestroy = function () {
-            if (this.callbackErrorsSubject) {
-                this.callbackErrorsSubject.unsubscribe();
-            }
-        };
         CallbackErrorsComponent.prototype.hasErrors = function () {
             return this.error
                 && this.error.callbackErrors
@@ -11312,59 +11599,95 @@
     (function (DisplayContextCustomParameter) {
         DisplayContextCustomParameter["CaseFileView"] = "CaseFileView";
         DisplayContextCustomParameter["LinkedCases"] = "LinkedCases";
-        DisplayContextCustomParameter["QueryManagement"] = "QueryManagement";
     })(DisplayContextCustomParameter || (DisplayContextCustomParameter = {}));
 
-    function CaseFileViewFieldComponent_div_0_Template(rf, ctx) {
+    function CaseFileViewFieldComponent_ng_container_0_li_7_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "div", 2);
-            i0__namespace.ɵɵelementStart(1, "h1", 3);
+            i0__namespace.ɵɵelementStart(0, "li");
+            i0__namespace.ɵɵelementStart(1, "a", 8);
+            i0__namespace.ɵɵtext(2);
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementEnd();
+        }
+        if (rf & 2) {
+            var errorMessage_r4 = ctx.$implicit;
+            i0__namespace.ɵɵadvance(2);
+            i0__namespace.ɵɵtextInterpolate(errorMessage_r4);
+        }
+    }
+    function CaseFileViewFieldComponent_ng_container_0_Template(rf, ctx) {
+        if (rf & 1) {
+            i0__namespace.ɵɵelementContainerStart(0);
+            i0__namespace.ɵɵelementStart(1, "div", 2);
+            i0__namespace.ɵɵelementStart(2, "div", 3);
+            i0__namespace.ɵɵelementStart(3, "h2", 4);
+            i0__namespace.ɵɵtext(4, " There is a problem ");
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementStart(5, "div", 5);
+            i0__namespace.ɵɵelementStart(6, "ul", 6);
+            i0__namespace.ɵɵtemplate(7, CaseFileViewFieldComponent_ng_container_0_li_7_Template, 3, 1, "li", 7);
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementContainerEnd();
+        }
+        if (rf & 2) {
+            var ctx_r0 = i0__namespace.ɵɵnextContext();
+            i0__namespace.ɵɵadvance(7);
+            i0__namespace.ɵɵproperty("ngForOf", ctx_r0.errorMessages);
+        }
+    }
+    function CaseFileViewFieldComponent_div_1_Template(rf, ctx) {
+        if (rf & 1) {
+            i0__namespace.ɵɵelementStart(0, "div", 9);
+            i0__namespace.ɵɵelementStart(1, "h1", 10);
             i0__namespace.ɵɵtext(2, "Sorry, there is a problem with the service");
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(3, "p", 4);
+            i0__namespace.ɵɵelementStart(3, "p", 11);
             i0__namespace.ɵɵtext(4, "Try again later.");
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
         }
     }
-    function CaseFileViewFieldComponent_div_1_ng_container_8_Template(rf, ctx) {
+    function CaseFileViewFieldComponent_div_2_ng_container_8_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementContainerStart(0);
-            i0__namespace.ɵɵelement(1, "mv-media-viewer", 11);
+            i0__namespace.ɵɵelement(1, "mv-media-viewer", 18);
             i0__namespace.ɵɵelementContainerEnd();
         }
         if (rf & 2) {
-            var ctx_r2 = i0__namespace.ɵɵnextContext(2);
+            var ctx_r5 = i0__namespace.ɵɵnextContext(2);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("url", ctx_r2.currentDocument.document_binary_url)("downloadFileName", ctx_r2.currentDocument.document_filename)("showToolbar", true)("contentType", ctx_r2.currentDocument.content_type)("enableAnnotations", true)("enableRedactions", true)("height", "94.5vh");
+            i0__namespace.ɵɵproperty("url", ctx_r5.currentDocument.document_binary_url)("downloadFileName", ctx_r5.currentDocument.document_filename)("showToolbar", true)("contentType", ctx_r5.currentDocument.content_type)("enableAnnotations", true)("enableRedactions", true)("height", "94.5vh");
         }
     }
-    function CaseFileViewFieldComponent_div_1_Template(rf, ctx) {
+    function CaseFileViewFieldComponent_div_2_Template(rf, ctx) {
         if (rf & 1) {
-            var _r4_1 = i0__namespace.ɵɵgetCurrentView();
+            var _r7_1 = i0__namespace.ɵɵgetCurrentView();
             i0__namespace.ɵɵelementStart(0, "div");
-            i0__namespace.ɵɵelementStart(1, "h2", 5);
+            i0__namespace.ɵɵelementStart(1, "h2", 12);
             i0__namespace.ɵɵtext(2, "Case file");
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(3, "div", 6);
-            i0__namespace.ɵɵelementStart(4, "div", 7);
-            i0__namespace.ɵɵelementStart(5, "ccd-case-file-view-folder", 8);
-            i0__namespace.ɵɵlistener("clickedDocument", function CaseFileViewFieldComponent_div_1_Template_ccd_case_file_view_folder_clickedDocument_5_listener($event) { i0__namespace.ɵɵrestoreView(_r4_1); var ctx_r3 = i0__namespace.ɵɵnextContext(); return ctx_r3.setMediaViewerFile($event); })("moveDocument", function CaseFileViewFieldComponent_div_1_Template_ccd_case_file_view_folder_moveDocument_5_listener($event) { i0__namespace.ɵɵrestoreView(_r4_1); var ctx_r5 = i0__namespace.ɵɵnextContext(); return ctx_r5.moveDocument($event); });
+            i0__namespace.ɵɵelementStart(3, "div", 13);
+            i0__namespace.ɵɵelementStart(4, "div", 14);
+            i0__namespace.ɵɵelementStart(5, "ccd-case-file-view-folder", 15);
+            i0__namespace.ɵɵlistener("clickedDocument", function CaseFileViewFieldComponent_div_2_Template_ccd_case_file_view_folder_clickedDocument_5_listener($event) { i0__namespace.ɵɵrestoreView(_r7_1); var ctx_r6 = i0__namespace.ɵɵnextContext(); ctx_r6.setMediaViewerFile($event); return ctx_r6.resetErrorMessages(); })("moveDocument", function CaseFileViewFieldComponent_div_2_Template_ccd_case_file_view_folder_moveDocument_5_listener($event) { i0__namespace.ɵɵrestoreView(_r7_1); var ctx_r8 = i0__namespace.ɵɵnextContext(); return ctx_r8.moveDocument($event); });
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelement(6, "div", 9);
-            i0__namespace.ɵɵelementStart(7, "div", 10);
-            i0__namespace.ɵɵtemplate(8, CaseFileViewFieldComponent_div_1_ng_container_8_Template, 2, 7, "ng-container", 1);
+            i0__namespace.ɵɵelement(6, "div", 16);
+            i0__namespace.ɵɵelementStart(7, "div", 17);
+            i0__namespace.ɵɵtemplate(8, CaseFileViewFieldComponent_div_2_ng_container_8_Template, 2, 7, "ng-container", 0);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
-            var ctx_r1 = i0__namespace.ɵɵnextContext();
+            var ctx_r2 = i0__namespace.ɵɵnextContext();
             i0__namespace.ɵɵadvance(5);
-            i0__namespace.ɵɵproperty("categoriesAndDocuments", ctx_r1.categoriesAndDocuments$)("allowMoving", ctx_r1.allowMoving);
+            i0__namespace.ɵɵproperty("categoriesAndDocuments", ctx_r2.categoriesAndDocuments$)("allowMoving", ctx_r2.allowMoving);
             i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵproperty("ngIf", ctx_r1.currentDocument);
+            i0__namespace.ɵɵproperty("ngIf", ctx_r2.currentDocument);
         }
     }
     var CaseFileViewFieldComponent = /** @class */ (function () {
@@ -11377,6 +11700,7 @@
             this.sessionStorageService = sessionStorageService;
             this.allowMoving = true;
             this.getCategoriesAndDocumentsError = false;
+            this.errorMessages = [];
         }
         CaseFileViewFieldComponent.prototype.ngOnInit = function () {
             var _this = this;
@@ -11428,11 +11752,26 @@
             var _this = this;
             var cid = this.route.snapshot.paramMap.get(CaseFileViewFieldComponent.PARAM_CASE_ID);
             var loadingToken = this.loadingService.register();
-            this.caseFileViewService.updateDocumentCategory(cid, this.caseVersion, data.document.attribute_path, data.newCategory).subscribe(function (_) {
-                location.reload();
+            this.caseFileViewService.updateDocumentCategory(cid, this.caseVersion, data.document.attribute_path, data.newCategory)
+                .pipe(operators.finalize(function () {
                 _this.loadingService.unregister(loadingToken);
+            }), operators.catchError(function () {
+                _this.errorMessages = ['You do not have permission to move this document to the selected folder.'];
+                return rxjs.of(null);
+            }))
+                .subscribe(function (res) {
+                if (res) {
+                    _this.resetErrorMessages();
+                    _this.reloadPage();
+                }
             });
         };
+        CaseFileViewFieldComponent.prototype.reloadPage = function () {
+            location.reload();
+        };
+        CaseFileViewFieldComponent.prototype.resetErrorMessages = function () {
+            this.errorMessages = [];
+        };
         CaseFileViewFieldComponent.prototype.ngOnDestroy = function () {
             if (this.categoriesAndDocumentsSubscription) {
                 this.categoriesAndDocumentsSubscription.unsubscribe();
@@ -11442,12 +11781,15 @@
     }());
     CaseFileViewFieldComponent.PARAM_CASE_ID = 'cid';
     CaseFileViewFieldComponent.ɵfac = function CaseFileViewFieldComponent_Factory(t) { return new (t || CaseFileViewFieldComponent)(i0__namespace.ɵɵdirectiveInject(i0__namespace.ElementRef), i0__namespace.ɵɵdirectiveInject(i1__namespace$1.ActivatedRoute), i0__namespace.ɵɵdirectiveInject(CaseFileViewService), i0__namespace.ɵɵdirectiveInject(DocumentManagementService), i0__namespace.ɵɵdirectiveInject(LoadingService), i0__namespace.ɵɵdirectiveInject(SessionStorageService)); };
-    CaseFileViewFieldComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: CaseFileViewFieldComponent, selectors: [["ccd-case-file-view-field"]], decls: 2, vars: 2, consts: [["class", "govuk-grid-column-two-thirds", 4, "ngIf"], [4, "ngIf"], [1, "govuk-grid-column-two-thirds"], [1, "govuk-heading-xl"], [1, "govuk-body"], [1, "govuk-heading-l"], ["id", "case-file-view", 1, "govuk-form-group"], [1, "document-tree-container"], [1, "document-tree-container__tree", 3, "categoriesAndDocuments", "allowMoving", "clickedDocument", "moveDocument"], [1, "slider"], [1, "media-viewer-container"], [3, "url", "downloadFileName", "showToolbar", "contentType", "enableAnnotations", "enableRedactions", "height"]], template: function CaseFileViewFieldComponent_Template(rf, ctx) {
+    CaseFileViewFieldComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: CaseFileViewFieldComponent, selectors: [["ccd-case-file-view-field"]], decls: 3, vars: 3, consts: [[4, "ngIf"], ["class", "govuk-grid-column-two-thirds", 4, "ngIf"], ["id", "case-file-view-field-errors", "data-module", "govuk-error-summary", 1, "govuk-error-summary", "govuk-!-margin-bottom-4"], ["role", "alert"], [1, "govuk-error-summary__title"], [1, "govuk-error-summary__body"], [1, "govuk-list", "govuk-error-summary__list"], [4, "ngFor", "ngForOf"], ["href", "javascript:void(0);"], [1, "govuk-grid-column-two-thirds"], [1, "govuk-heading-xl"], [1, "govuk-body"], [1, "govuk-heading-l"], ["id", "case-file-view", 1, "govuk-form-group"], [1, "document-tree-container"], [1, "document-tree-container__tree", 3, "categoriesAndDocuments", "allowMoving", "clickedDocument", "moveDocument"], [1, "slider"], [1, "media-viewer-container"], [3, "url", "downloadFileName", "showToolbar", "contentType", "enableAnnotations", "enableRedactions", "height"]], template: function CaseFileViewFieldComponent_Template(rf, ctx) {
             if (rf & 1) {
-                i0__namespace.ɵɵtemplate(0, CaseFileViewFieldComponent_div_0_Template, 5, 0, "div", 0);
-                i0__namespace.ɵɵtemplate(1, CaseFileViewFieldComponent_div_1_Template, 9, 3, "div", 1);
+                i0__namespace.ɵɵtemplate(0, CaseFileViewFieldComponent_ng_container_0_Template, 8, 1, "ng-container", 0);
+                i0__namespace.ɵɵtemplate(1, CaseFileViewFieldComponent_div_1_Template, 5, 0, "div", 1);
+                i0__namespace.ɵɵtemplate(2, CaseFileViewFieldComponent_div_2_Template, 9, 3, "div", 0);
             }
             if (rf & 2) {
+                i0__namespace.ɵɵproperty("ngIf", ctx.errorMessages == null ? null : ctx.errorMessages.length);
+                i0__namespace.ɵɵadvance(1);
                 i0__namespace.ɵɵproperty("ngIf", ctx.getCategoriesAndDocumentsError);
                 i0__namespace.ɵɵadvance(1);
                 i0__namespace.ɵɵproperty("ngIf", !ctx.getCategoriesAndDocumentsError);
@@ -14706,7 +15048,7 @@
             var ctx_r4 = i0__namespace.ɵɵnextContext();
             i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(7, _c0$K, ctx_r4.dynamicRadioListControl.value === radioButton_r5.code));
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("id", ctx_r4.createElementId(radioButton_r5.code))("name", ctx_r4.createElementId(radioButton_r5.code))("formControl", ctx_r4.dynamicRadioListControl)("value", radioButton_r5.code);
+            i0__namespace.ɵɵproperty("id", ctx_r4.createElementId(radioButton_r5.code))("name", ctx_r4.id())("formControl", ctx_r4.dynamicRadioListControl)("value", radioButton_r5.code);
             i0__namespace.ɵɵadvance(1);
             i0__namespace.ɵɵproperty("for", ctx_r4.createElementId(radioButton_r5.code));
             i0__namespace.ɵɵadvance(1);
@@ -14721,7 +15063,6 @@
         }
         WriteDynamicRadioListFieldComponent.prototype.ngOnInit = function () {
             /**
-             *
              * Reassigning list_items from formatted_list when list_items is empty
              */
             if (!this.caseField.list_items && this.caseField.formatted_value && this.caseField.formatted_value.list_items) {
@@ -15375,12 +15716,11 @@
     }
     var WriteJudicialUserFieldComponent = /** @class */ (function (_super) {
         __extends(WriteJudicialUserFieldComponent, _super);
-        function WriteJudicialUserFieldComponent(route, cd, jurisdictionService) {
+        function WriteJudicialUserFieldComponent(jurisdictionService, sessionStorageService, caseFlagRefDataService) {
             var _this = _super.call(this) || this;
-            _this.route = route;
-            _this.cd = cd;
             _this.jurisdictionService = jurisdictionService;
-            _this.JURISDICTION_ID = 'jid';
+            _this.sessionStorageService = sessionStorageService;
+            _this.caseFlagRefDataService = caseFlagRefDataService;
             _this.MINIMUM_SEARCH_CHARACTERS = 2;
             _this.IDAM_ID = 'idamId';
             _this.PERSONAL_CODE = 'personalCode';
@@ -15390,18 +15730,46 @@
         }
         WriteJudicialUserFieldComponent.prototype.ngOnInit = function () {
             var _this = this;
-            this.jurisdictionId = this.route.snapshot.params[this.JURISDICTION_ID];
+            var _a;
             this.judicialUserFormGroup = this.registerControl(new i2.FormGroup({}), true);
             this.idamIdFormControl = new i2.FormControl('');
             this.judicialUserFormGroup.addControl(this.IDAM_ID, this.idamIdFormControl);
             this.personalCodeFormControl = new i2.FormControl('');
             this.judicialUserFormGroup.addControl(this.PERSONAL_CODE, this.personalCodeFormControl);
-            this.sub = this.idamIdFormControl.valueChanges.pipe(operators.tap(function () { return _this.showAutocomplete = false; }), operators.tap(function () { return _this.filteredJudicialUsers = []; }), operators.debounceTime(300), operators.filter(function (searchTerm) { return searchTerm && searchTerm.length > _this.MINIMUM_SEARCH_CHARACTERS; }), operators.switchMap(function (searchTerm) { return _this.filter(searchTerm).pipe(operators.tap(function () { return _this.showAutocomplete = true; }), operators.catchError(function () { return _this.filteredJudicialUsers = []; })); })).subscribe(function (judicialUsers) {
+            this.setJurisdictionAndCaseType();
+            this.sub = this.idamIdFormControl.valueChanges.pipe(operators.tap(function () { return _this.showAutocomplete = false; }), operators.tap(function () { return _this.filteredJudicialUsers = []; }), operators.debounceTime(300), operators.filter(function (searchTerm) { return searchTerm && searchTerm.length > _this.MINIMUM_SEARCH_CHARACTERS; }), operators.switchMap(function (searchTerm) { return _this.filterJudicialUsers(searchTerm).pipe(operators.tap(function () { return _this.showAutocomplete = true; }), operators.catchError(function () { return _this.filteredJudicialUsers = []; })); })).subscribe(function (judicialUsers) {
                 _this.filteredJudicialUsers = judicialUsers;
             });
+            if ((_a = this.caseField.value) === null || _a === void 0 ? void 0 : _a.personalCode) {
+                this.loadJudicialUser(this.caseField.value.personalCode);
+            }
         };
-        WriteJudicialUserFieldComponent.prototype.filter = function (searchTerm) {
-            return this.jurisdictionService.searchJudicialUsers(searchTerm, this.jurisdictionId);
+        WriteJudicialUserFieldComponent.prototype.filterJudicialUsers = function (searchTerm) {
+            var _this = this;
+            return this.caseFlagRefDataService.getHmctsServiceDetailsByCaseType(this.caseType).pipe(
+            // If an error occurs retrieving HMCTS service details by case type ID, try by service name instead
+            operators.catchError(function (_) { return _this.caseFlagRefDataService.getHmctsServiceDetailsByServiceName(_this.jurisdiction); }), 
+            // Use switchMap to return an inner Observable of the flag types data, having received the service details
+            // including service_code. This avoids having nested `subscribe`s, which is an anti-pattern!
+            operators.switchMap(function (serviceDetails) { return _this.jurisdictionService.searchJudicialUsers(searchTerm, serviceDetails[0].service_code); }));
+        };
+        WriteJudicialUserFieldComponent.prototype.loadJudicialUser = function (personalCode) {
+            var _this = this;
+            if (personalCode) {
+                this.jurisdictionService.searchJudicialUsersByPersonalCodes([personalCode]).subscribe(function (judicialUsers) {
+                    var judicialUser = judicialUsers[0];
+                    _this.idamIdFormControl.setValue(judicialUser.fullName + " (" + judicialUser.emailId + ")");
+                    _this.personalCodeFormControl.setValue(judicialUser.personalCode);
+                });
+            }
+        };
+        WriteJudicialUserFieldComponent.prototype.setJurisdictionAndCaseType = function () {
+            var caseInfoStr = this.sessionStorageService.getItem('caseInfo');
+            if (caseInfoStr) {
+                var caseInfo = JSON.parse(caseInfoStr);
+                this.jurisdiction = caseInfo === null || caseInfo === void 0 ? void 0 : caseInfo.jurisdiction;
+                this.caseType = caseInfo === null || caseInfo === void 0 ? void 0 : caseInfo.caseType;
+            }
         };
         WriteJudicialUserFieldComponent.prototype.onSelectionChange = function (judicialUser) {
             this.idamIdFormControl.setValue(judicialUser.fullName + " (" + judicialUser.emailId + ")");
@@ -15414,7 +15782,7 @@
         };
         return WriteJudicialUserFieldComponent;
     }(AbstractFieldWriteComponent));
-    WriteJudicialUserFieldComponent.ɵfac = function WriteJudicialUserFieldComponent_Factory(t) { return new (t || WriteJudicialUserFieldComponent)(i0__namespace.ɵɵdirectiveInject(i1__namespace$1.ActivatedRoute), i0__namespace.ɵɵdirectiveInject(i0__namespace.ChangeDetectorRef), i0__namespace.ɵɵdirectiveInject(JurisdictionService)); };
+    WriteJudicialUserFieldComponent.ɵfac = function WriteJudicialUserFieldComponent_Factory(t) { return new (t || WriteJudicialUserFieldComponent)(i0__namespace.ɵɵdirectiveInject(JurisdictionService), i0__namespace.ɵɵdirectiveInject(SessionStorageService), i0__namespace.ɵɵdirectiveInject(CaseFlagRefdataService)); };
     WriteJudicialUserFieldComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: WriteJudicialUserFieldComponent, selectors: [["ccd-write-judicial-user-field"]], features: [i0__namespace.ɵɵInheritDefinitionFeature], decls: 9, vars: 9, consts: [[1, "form-group", 3, "formGroup"], [3, "for"], ["class", "form-label", 4, "ngIf"], ["class", "form-hint", 4, "ngIf"], [1, "form-control", "bottom-30", 3, "id", "formControl", "matAutocomplete"], ["autoActiveFirstOption", ""], ["autoComplete", "matAutocomplete"], ["class", "select-option", 3, "ngClass", "value", "onSelectionChange", 4, "ngFor", "ngForOf"], ["class", "select-option", 4, "ngIf"], [1, "form-label"], [1, "form-hint"], [1, "select-option", 3, "ngClass", "value", "onSelectionChange"], [1, "select-option"]], template: function WriteJudicialUserFieldComponent_Template(rf, ctx) {
             if (rf & 1) {
                 i0__namespace.ɵɵelementStart(0, "div", 0);
@@ -15445,7 +15813,7 @@
                 i0__namespace.ɵɵadvance(1);
                 i0__namespace.ɵɵproperty("ngIf", !(ctx.filteredJudicialUsers == null ? null : ctx.filteredJudicialUsers.length) && ctx.showAutocomplete);
             }
-        }, directives: [i2__namespace.NgControlStatusGroup, i2__namespace.FormGroupDirective, i1__namespace.NgIf, i2__namespace.DefaultValueAccessor, i5__namespace.MatAutocompleteTrigger, i2__namespace.NgControlStatus, i2__namespace.FormControlDirective, i5__namespace.MatAutocomplete, i1__namespace.NgForOf, i6__namespace.MatOption, i1__namespace.NgClass], pipes: [FieldLabelPipe], styles: [".mat-option[_ngcontent-%COMP%]:hover{background:#2596be}.mat-option.select-option[_ngcontent-%COMP%]:hover{background:#1d70b8;color:#fff}.hide-autocomplete[_ngcontent-%COMP%]{display:none}"] });
+        }, directives: [i2__namespace.NgControlStatusGroup, i2__namespace.FormGroupDirective, i1__namespace.NgIf, i2__namespace.DefaultValueAccessor, i4__namespace.MatAutocompleteTrigger, i2__namespace.NgControlStatus, i2__namespace.FormControlDirective, i4__namespace.MatAutocomplete, i1__namespace.NgForOf, i5__namespace.MatOption, i1__namespace.NgClass], pipes: [FieldLabelPipe], styles: [".mat-option[_ngcontent-%COMP%]:hover{background:#2596be}.mat-option.select-option[_ngcontent-%COMP%]:hover{background:#1d70b8;color:#fff}.hide-autocomplete[_ngcontent-%COMP%]{display:none}"] });
     (function () {
         (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(WriteJudicialUserFieldComponent, [{
                 type: i0.Component,
@@ -15454,7 +15822,7 @@
                         styleUrls: ['./write-judicial-user-field.component.scss'],
                         templateUrl: './write-judicial-user-field.component.html'
                     }]
-            }], function () { return [{ type: i1__namespace$1.ActivatedRoute }, { type: i0__namespace.ChangeDetectorRef }, { type: JurisdictionService }]; }, null);
+            }], function () { return [{ type: JurisdictionService }, { type: SessionStorageService }, { type: CaseFlagRefdataService }]; }, null);
     })();
 
     var LabelFieldComponent = /** @class */ (function () {
@@ -15768,9 +16136,7 @@
             });
         };
         BeforeYouStartComponent.prototype.onBack = function () {
-            this.router.navigate(['cases', 'case-details', this.linkedCasesService.caseId]).then(function () {
-                window.location.hash = 'Linked cases';
-            });
+            this.router.navigate(['cases', 'case-details', this.linkedCasesService.caseId], { fragment: 'Linked cases' });
         };
         return BeforeYouStartComponent;
     }());
@@ -17286,9 +17652,7 @@
             this.serverLinkedApiError = this.linkedCasesService.serverLinkedApiError;
         };
         NoLinkedCasesComponent.prototype.onBack = function () {
-            this.router.navigate(['cases', 'case-details', this.linkedCasesService.caseId]).then(function () {
-                window.location.hash = 'Linked cases';
-            });
+            this.router.navigate(['cases', 'case-details', this.linkedCasesService.caseId], { fragment: 'Linked cases' });
         };
         return NoLinkedCasesComponent;
     }());
@@ -17754,9 +18118,7 @@
             }
         };
         ReadLinkedCasesFieldComponent.prototype.reloadCurrentRoute = function () {
-            this.router.navigate(['cases', 'case-details', this.linkedCasesService.caseDetails.case_id]).then(function () {
-                window.location.hash = 'Linked cases';
-            });
+            this.router.navigate(['cases', 'case-details', this.linkedCasesService.caseDetails.case_id], { fragment: 'Linked cases' });
         };
         ReadLinkedCasesFieldComponent.prototype.getFailureLinkedToNotification = function (evt) {
             this.isServerLinkedToError = true;
@@ -19469,255 +19831,6 @@
             }], null, null);
     })();
 
-    var partyMessagesMockData = [
-        {
-            partyName: 'John Smith - Appellant',
-            roleOnCase: null,
-            partyMessages: [
-                {
-                    id: 'case-message-001',
-                    subject: 'Review attached document',
-                    name: 'Maggie Conroy',
-                    body: 'Please review attached document and advise if hearing should proceed?',
-                    attachments: [],
-                    isHearingRelated: true,
-                    hearingDate: '10 Jan 2023',
-                    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: [],
-                    isHearingRelated: true,
-                    hearingDate: '10 Jan 2023',
-                    createdOn: new Date(2023, 0, 3),
-                    createdBy: '1111-1111-1111-1111'
-                },
-                {
-                    id: 'case-message-003',
-                    name: 'Maggie Conroy',
-                    body: 'Using mobile phone is strictly prohibited in the court room.',
-                    attachments: [],
-                    isHearingRelated: true,
-                    hearingDate: '10 Jan 2023',
-                    createdOn: new Date(2023, 0, 4),
-                    createdBy: '2222-2222-2222-2222',
-                    parentId: 'case-message-002'
-                }
-            ]
-        },
-        {
-            partyName: 'Kevin Peterson - Respondent',
-            roleOnCase: null,
-            partyMessages: [
-                {
-                    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: '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: '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: '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: '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: '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'
-                }
-            ]
-        }
-    ];
-
-    var QueryCreateComponent = /** @class */ (function () {
-        function QueryCreateComponent() {
-        }
-        QueryCreateComponent.prototype.ngOnInit = function () {
-        };
-        return QueryCreateComponent;
-    }());
-    QueryCreateComponent.ɵfac = function QueryCreateComponent_Factory(t) { return new (t || QueryCreateComponent)(); };
-    QueryCreateComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: QueryCreateComponent, selectors: [["ccd-query-create"]], decls: 0, vars: 0, template: function QueryCreateComponent_Template(rf, ctx) { }, encapsulation: 2 });
-    (function () {
-        (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(QueryCreateComponent, [{
-                type: i0.Component,
-                args: [{
-                        selector: 'ccd-query-create',
-                        templateUrl: './query-create.component.html',
-                    }]
-            }], function () { return []; }, null);
-    })();
-
-    var QueryDetailComponent = /** @class */ (function () {
-        function QueryDetailComponent() {
-        }
-        QueryDetailComponent.prototype.ngOnInit = function () {
-        };
-        return QueryDetailComponent;
-    }());
-    QueryDetailComponent.ɵfac = function QueryDetailComponent_Factory(t) { return new (t || QueryDetailComponent)(); };
-    QueryDetailComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: QueryDetailComponent, selectors: [["ccd-query-detail"]], decls: 0, vars: 0, template: function QueryDetailComponent_Template(rf, ctx) { }, encapsulation: 2 });
-    (function () {
-        (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(QueryDetailComponent, [{
-                type: i0.Component,
-                args: [{
-                        selector: 'ccd-query-detail',
-                        templateUrl: './query-detail.component.html',
-                    }]
-            }], function () { return []; }, null);
-    })();
-
-    var QueryListComponent = /** @class */ (function () {
-        function QueryListComponent() {
-        }
-        QueryListComponent.prototype.ngOnInit = function () {
-        };
-        return QueryListComponent;
-    }());
-    QueryListComponent.ɵfac = function QueryListComponent_Factory(t) { return new (t || QueryListComponent)(); };
-    QueryListComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: QueryListComponent, selectors: [["ccd-query-list"]], inputs: { partyMessages: "partyMessages" }, decls: 0, vars: 0, template: function QueryListComponent_Template(rf, ctx) { }, encapsulation: 2 });
-    (function () {
-        (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(QueryListComponent, [{
-                type: i0.Component,
-                args: [{
-                        selector: 'ccd-query-list',
-                        templateUrl: './query-list.component.html',
-                    }]
-            }], function () { return []; }, { partyMessages: [{
-                    type: i0.Input
-                }] });
-    })();
-
-    var QueryManagementUtils = /** @class */ (function () {
-        function QueryManagementUtils() {
-        }
-        QueryManagementUtils.extractCaseQueriesFromCaseField = function () {
-        };
-        return QueryManagementUtils;
-    }());
-    QueryManagementUtils.ɵfac = function QueryManagementUtils_Factory(t) { return new (t || QueryManagementUtils)(); };
-    QueryManagementUtils.ɵprov = i0__namespace.ɵɵdefineInjectable({ token: QueryManagementUtils, factory: QueryManagementUtils.ɵfac });
-    (function () {
-        (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(QueryManagementUtils, [{
-                type: i0.Injectable
-            }], null, null);
-    })();
-
-    var ReadQueryManagementFieldComponent = /** @class */ (function (_super) {
-        __extends(ReadQueryManagementFieldComponent, _super);
-        function ReadQueryManagementFieldComponent(route) {
-            var _this = _super.call(this) || this;
-            _this.route = route;
-            return _this;
-        }
-        ReadQueryManagementFieldComponent.prototype.ngOnInit = function () {
-            if (this.context === exports.PaletteContext.DEFAULT) {
-                // EUI-8303 Using mock data until CCD is ready with the API and data contract
-                this.partyMessages = partyMessagesMockData;
-                // 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
-                var queriesTab = this.route.snapshot.data.case.tabs
-                    .filter(function (tab) { return tab.fields && tab.fields
-                    .some(function (caseField) { return caseField.id === 'QueryManagement'; }); });
-                // Loop through the list of parties and their case queries collections
-                QueryManagementUtils.extractCaseQueriesFromCaseField();
-            }
-        };
-        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: 1, vars: 1, consts: [[3, "partyMessages"]], template: function ReadQueryManagementFieldComponent_Template(rf, ctx) {
-            if (rf & 1) {
-                i0__namespace.ɵɵelement(0, "ccd-query-list", 0);
-            }
-            if (rf & 2) {
-                i0__namespace.ɵɵproperty("partyMessages", ctx.partyMessages);
-            }
-        }, directives: [QueryListComponent], encapsulation: 2 });
-    (function () {
-        (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(ReadQueryManagementFieldComponent, [{
-                type: i0.Component,
-                args: [{
-                        selector: 'ccd-read-query-management-field',
-                        templateUrl: './read-query-management-field.component.html',
-                    }]
-            }], function () { return [{ type: i1__namespace$1.ActivatedRoute }]; }, null);
-    })();
-
-    var WriteQueryManagementFieldComponent = /** @class */ (function (_super) {
-        __extends(WriteQueryManagementFieldComponent, _super);
-        function WriteQueryManagementFieldComponent() {
-            return _super.call(this) || this;
-        }
-        WriteQueryManagementFieldComponent.prototype.ngOnInit = function () {
-        };
-        return WriteQueryManagementFieldComponent;
-    }(AbstractFieldWriteComponent));
-    WriteQueryManagementFieldComponent.ɵfac = function WriteQueryManagementFieldComponent_Factory(t) { return new (t || WriteQueryManagementFieldComponent)(); };
-    WriteQueryManagementFieldComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: WriteQueryManagementFieldComponent, selectors: [["ccd-write-query-management-field"]], features: [i0__namespace.ɵɵInheritDefinitionFeature], decls: 0, vars: 0, template: function WriteQueryManagementFieldComponent_Template(rf, ctx) { }, encapsulation: 2 });
-    (function () {
-        (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(WriteQueryManagementFieldComponent, [{
-                type: i0.Component,
-                args: [{
-                        selector: 'ccd-write-query-management-field',
-                        templateUrl: './write-query-management-field.component.html',
-                    }]
-            }], function () { return []; }, null);
-    })();
-
     var ReadTextAreaFieldComponent = /** @class */ (function (_super) {
         __extends(ReadTextAreaFieldComponent, _super);
         function ReadTextAreaFieldComponent() {
@@ -20237,7 +20350,6 @@
             this.componentLauncherRegistry = (_b = {},
                 _b[DisplayContextCustomParameter.CaseFileView] = [CaseFileViewFieldComponent, CaseFileViewFieldComponent],
                 _b[DisplayContextCustomParameter.LinkedCases] = [WriteLinkedCasesFieldComponent, ReadLinkedCasesFieldComponent],
-                _b[DisplayContextCustomParameter.QueryManagement] = [WriteQueryManagementFieldComponent, ReadQueryManagementFieldComponent],
                 _b);
         }
         PaletteService.prototype.getFieldComponentClass = function (caseField, write) {
@@ -20490,7 +20602,7 @@
                 i0__namespace.ɵɵclassProp("grey-bar", ctx.canHaveGreyBar && !ctx.caseField.hiddenCannotChange);
                 i0__namespace.ɵɵproperty("hidden", ctx.caseField.hidden);
             }
-        }, styles: [".form   [_nghost-%COMP%]  .grey-bar>*>.form-group, .form   [_nghost-%COMP%]  .grey-bar>*>dl.case-field{margin-left:15px;padding-left:15px}.form   [_nghost-%COMP%]  .grey-bar>*>.form-group:not(.form-group-error), .form   [_nghost-%COMP%]  .grey-bar>*>dl.case-field:not(.form-group-error){border-left:5px solid #b1b4b6}.form   [_nghost-%COMP%]  .grey-bar>*>.form-group input:not(.inline-block), .form   [_nghost-%COMP%]  .grey-bar>*>.form-group select:not(.inline-block), .form   [_nghost-%COMP%]  .grey-bar>*>.form-group textarea:not(.inline-block), .form   [_nghost-%COMP%]  .grey-bar>*>dl.case-field input:not(.inline-block), .form   [_nghost-%COMP%]  .grey-bar>*>dl.case-field select:not(.inline-block), .form   [_nghost-%COMP%]  .grey-bar>*>dl.case-field textarea:not(.inline-block){display:block}"] });
+        }, styles: [".form   [_nghost-%COMP%]  .grey-bar>*>*>.form-group, .form   [_nghost-%COMP%]  .grey-bar>*>.form-group, .form   [_nghost-%COMP%]  .grey-bar>*>dl.case-field{margin-left:15px;padding-left:15px}.form   [_nghost-%COMP%]  .grey-bar>*>*>.form-group:not(.form-group-error), .form   [_nghost-%COMP%]  .grey-bar>*>.form-group:not(.form-group-error), .form   [_nghost-%COMP%]  .grey-bar>*>dl.case-field:not(.form-group-error){border-left:5px solid #b1b4b6}.form   [_nghost-%COMP%]  .grey-bar>*>*>.form-group input:not(.inline-block), .form   [_nghost-%COMP%]  .grey-bar>*>*>.form-group select:not(.inline-block), .form   [_nghost-%COMP%]  .grey-bar>*>*>.form-group textarea:not(.inline-block), .form   [_nghost-%COMP%]  .grey-bar>*>.form-group input:not(.inline-block), .form   [_nghost-%COMP%]  .grey-bar>*>.form-group select:not(.inline-block), .form   [_nghost-%COMP%]  .grey-bar>*>.form-group textarea:not(.inline-block), .form   [_nghost-%COMP%]  .grey-bar>*>dl.case-field input:not(.inline-block), .form   [_nghost-%COMP%]  .grey-bar>*>dl.case-field select:not(.inline-block), .form   [_nghost-%COMP%]  .grey-bar>*>dl.case-field textarea:not(.inline-block){display:block}"] });
     (function () {
         (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(FieldWriteComponent, [{
                 type: i0.Component,
@@ -20590,7 +20702,7 @@
                 i0__namespace.ɵɵadvance(1);
                 i0__namespace.ɵɵproperty("ngIf", ctx.withLabel && !ctx.isLabel() && (!ctx.isComplex() || ctx.isCaseLink()))("ngIfElse", _r1);
             }
-        }, directives: [i1__namespace.NgIf, i1__namespace.NgTemplateOutlet], styles: [".case-field[_ngcontent-%COMP%]:after{content:\"\";display:block;clear:both}.case-field[_ngcontent-%COMP%]{box-sizing:border-box;margin-bottom:15px}@media (min-width:641px){.case-field[_ngcontent-%COMP%]{margin-bottom:30px}}.case-field[_ngcontent-%COMP%]   .case-field__label[_ngcontent-%COMP%]{display:block;color:#0b0c0c;padding-bottom:2px;font-family:nta,Arial,sans-serif;font-weight:700;text-transform:none;font-size:16px;line-height:1.25}@media (min-width:641px){.case-field[_ngcontent-%COMP%]   .case-field__label[_ngcontent-%COMP%]{font-size:19px;line-height:1.3157894737}}.case-field[_ngcontent-%COMP%]   .case-field__value[_ngcontent-%COMP%]{font-family:nta,Arial,sans-serif;font-weight:400;text-transform:none;font-size:16px;line-height:1.25}@media (min-width:641px){.case-field[_ngcontent-%COMP%]   .case-field__value[_ngcontent-%COMP%]{font-size:19px;line-height:1.3157894737}}.form   [_nghost-%COMP%]  .grey-bar>*>.form-group, .form   [_nghost-%COMP%]  .grey-bar>*>dl.case-field{margin-left:15px;padding-left:15px}.form   [_nghost-%COMP%]  .grey-bar>*>.form-group:not(.form-group-error), .form   [_nghost-%COMP%]  .grey-bar>*>dl.case-field:not(.form-group-error){border-left:5px solid #b1b4b6}.form   [_nghost-%COMP%]  .grey-bar>*>.form-group input:not(.inline-block), .form   [_nghost-%COMP%]  .grey-bar>*>.form-group select:not(.inline-block), .form   [_nghost-%COMP%]  .grey-bar>*>.form-group textarea:not(.inline-block), .form   [_nghost-%COMP%]  .grey-bar>*>dl.case-field input:not(.inline-block), .form   [_nghost-%COMP%]  .grey-bar>*>dl.case-field select:not(.inline-block), .form   [_nghost-%COMP%]  .grey-bar>*>dl.case-field textarea:not(.inline-block){display:block}"] });
+        }, directives: [i1__namespace.NgIf, i1__namespace.NgTemplateOutlet], styles: [".case-field[_ngcontent-%COMP%]:after{content:\"\";display:block;clear:both}.case-field[_ngcontent-%COMP%]{box-sizing:border-box;margin-bottom:15px}@media (min-width:641px){.case-field[_ngcontent-%COMP%]{margin-bottom:30px}}.case-field[_ngcontent-%COMP%]   .case-field__label[_ngcontent-%COMP%]{display:block;color:#0b0c0c;padding-bottom:2px;font-family:nta,Arial,sans-serif;font-weight:700;text-transform:none;font-size:16px;line-height:1.25}@media (min-width:641px){.case-field[_ngcontent-%COMP%]   .case-field__label[_ngcontent-%COMP%]{font-size:19px;line-height:1.3157894737}}.case-field[_ngcontent-%COMP%]   .case-field__value[_ngcontent-%COMP%]{font-family:nta,Arial,sans-serif;font-weight:400;text-transform:none;font-size:16px;line-height:1.25}@media (min-width:641px){.case-field[_ngcontent-%COMP%]   .case-field__value[_ngcontent-%COMP%]{font-size:19px;line-height:1.3157894737}}.form   [_nghost-%COMP%]  .grey-bar>*>*>.form-group, .form   [_nghost-%COMP%]  .grey-bar>*>.form-group, .form   [_nghost-%COMP%]  .grey-bar>*>dl.case-field{margin-left:15px;padding-left:15px}.form   [_nghost-%COMP%]  .grey-bar>*>*>.form-group:not(.form-group-error), .form   [_nghost-%COMP%]  .grey-bar>*>.form-group:not(.form-group-error), .form   [_nghost-%COMP%]  .grey-bar>*>dl.case-field:not(.form-group-error){border-left:5px solid #b1b4b6}.form   [_nghost-%COMP%]  .grey-bar>*>*>.form-group input:not(.inline-block), .form   [_nghost-%COMP%]  .grey-bar>*>*>.form-group select:not(.inline-block), .form   [_nghost-%COMP%]  .grey-bar>*>*>.form-group textarea:not(.inline-block), .form   [_nghost-%COMP%]  .grey-bar>*>.form-group input:not(.inline-block), .form   [_nghost-%COMP%]  .grey-bar>*>.form-group select:not(.inline-block), .form   [_nghost-%COMP%]  .grey-bar>*>.form-group textarea:not(.inline-block), .form   [_nghost-%COMP%]  .grey-bar>*>dl.case-field input:not(.inline-block), .form   [_nghost-%COMP%]  .grey-bar>*>dl.case-field select:not(.inline-block), .form   [_nghost-%COMP%]  .grey-bar>*>dl.case-field textarea:not(.inline-block){display:block}"] });
     var ɵFieldReadLabelComponent_BaseFactory = /*@__PURE__*/ i0__namespace.ɵɵgetInheritedFactory(FieldReadLabelComponent);
     (function () {
         (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(FieldReadLabelComponent, [{
@@ -20789,7 +20901,7 @@
                 i0__namespace.ɵɵadvance(2);
                 i0__namespace.ɵɵproperty("ngForOf", ctx.currentCategories);
             }
-        }, directives: [i1__namespace.NgForOf, i1__namespace.NgTemplateOutlet], styles: [":host{position:relative;display:block}.folders{margin-bottom:20px}.folder{display:none;border-top:1px solid #ccc;margin:0 0 -1px}.folder,.folder:last-child{border-bottom:1px solid #ccc}.folders>.folder,input:checked~.folder{display:block}.iconImg{position:relative;display:inline-block;height:28px}.folder>.folder{margin-left:20px}.folder label:before{top:3px}.folder label:after{top:13px}p{font-weight:700}button{margin-right:20px}.close{float:right;width:30px;height:30px;background:url(/assets/img/x.PNG) no-repeat 50%}.cancel,.close{cursor:pointer}.cdk-overlay-pane{overflow:auto}.cdk-overlay-pane::-webkit-scrollbar{width:7px}.cdk-overlay-pane::-webkit-scrollbar-thumb{border:4px solid transparent;background-clip:padding-box;border-radius:9999px;background-color:#aaa}.cdk-overlay-pane::-webkit-scrollbar-button{display:none}.cdk-overlay-pane::-webkit-scrollbar-track-piece{background:#eee}.cdk-overlay-pane::-webkit-scrollbar-thumb{background:#ccc}"], encapsulation: 2 });
+        }, directives: [i1__namespace.NgForOf, i1__namespace.NgTemplateOutlet], styles: [":host{position:relative;display:block}.folders{margin-bottom:20px}.folder{display:none;border-top:1px solid #ccc;margin:0 0 -1px}.folder:last-child{border-bottom:1px solid #ccc}.folders>.folder,input:checked~.folder{display:block}.iconImg{position:relative;display:inline-block;height:28px}.folder>.folder{margin-left:20px}.folder label:before{top:3px}.folder label:after{top:13px}p{font-weight:700}button{margin-right:20px}.close{float:right;width:30px;height:30px;background:url(/assets/img/x.PNG) no-repeat 50%}.cancel,.close{cursor:pointer}.cdk-overlay-pane{overflow:auto}.cdk-overlay-pane::-webkit-scrollbar{width:7px}.cdk-overlay-pane::-webkit-scrollbar-thumb{border:4px solid transparent;background-clip:padding-box;border-radius:9999px;background-color:#aaa}.cdk-overlay-pane::-webkit-scrollbar-button{display:none}.cdk-overlay-pane::-webkit-scrollbar-track-piece{background:#eee}.cdk-overlay-pane::-webkit-scrollbar-thumb{background:#ccc}"], encapsulation: 2 });
     (function () {
         (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(CaseFileViewFolderSelectorComponent, [{
                 type: i0.Component,
@@ -20901,7 +21013,7 @@
                 i0__namespace.ɵɵadvance(4);
                 i0__namespace.ɵɵproperty("cdkConnectedOverlayOrigin", _r0)("cdkConnectedOverlayOpen", ctx.isOpen)("cdkConnectedOverlayHasBackdrop", true)("cdkConnectedOverlayBackdropClass", "cdk-overlay-transparent-backdrop");
             }
-        }, directives: [i1__namespace$4.CdkOverlayOrigin, i1__namespace$4.CdkConnectedOverlay, i1__namespace.NgIf, i1__namespace.NgForOf], styles: [".overlay-toggle[_ngcontent-%COMP%]{display:block;background:none;border:0;padding:0 6px;margin-right:-6px;cursor:pointer}.overlay-menu[_ngcontent-%COMP%]{background-color:#fafafa;border:1px solid grey;margin-top:8px;font-size:1rem}.overlay-menu__item[_ngcontent-%COMP%], .overlay-menu__title[_ngcontent-%COMP%]{padding:10px;border-bottom:1px solid grey}.overlay-menu__item[_ngcontent-%COMP%]:last-child, .overlay-menu__title[_ngcontent-%COMP%]:last-child{border:none}.overlay-menu__title[_ngcontent-%COMP%]{padding-left:6px;padding-right:6px}.overlay-menu__item[_ngcontent-%COMP%]{display:flex;align-items:center;cursor:pointer;font-size:.875em}.overlay-menu__item[_ngcontent-%COMP%]:hover{background-color:#fff2cc}.overlay-menu__itemIcon[_ngcontent-%COMP%]{height:1.25em;width:1.25em;margin-right:6px}"] });
+        }, directives: [i1__namespace$4.CdkOverlayOrigin, i1__namespace$4.CdkConnectedOverlay, i1__namespace.NgIf, i1__namespace.NgForOf], styles: [".overlay-toggle[_ngcontent-%COMP%]{display:block;background:none;border:0;padding:0 6px;margin-right:-4px;cursor:pointer}.overlay-menu[_ngcontent-%COMP%]{background-color:#fafafa;border:1px solid grey;margin-top:8px;font-size:1rem}.overlay-menu__item[_ngcontent-%COMP%], .overlay-menu__title[_ngcontent-%COMP%]{padding:10px;border-bottom:1px solid grey}.overlay-menu__item[_ngcontent-%COMP%]:last-child, .overlay-menu__title[_ngcontent-%COMP%]:last-child{border:none}.overlay-menu__title[_ngcontent-%COMP%]{padding-left:6px;padding-right:6px}.overlay-menu__item[_ngcontent-%COMP%]{display:flex;align-items:center;cursor:pointer;font-size:.875em}.overlay-menu__item[_ngcontent-%COMP%]:hover{background-color:#fff2cc}.overlay-menu__itemIcon[_ngcontent-%COMP%]{height:1.25em;width:1.25em;margin-right:6px}"] });
     (function () {
         (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(CaseFileViewOverlayMenuComponent, [{
                 type: i0.Component,
@@ -21515,21 +21627,21 @@
             i0__namespace.ɵɵelementEnd();
         }
     }
-    function CaseFlagTableComponent_table_0_tbody_17_tr_1_strong_15_Template(rf, ctx) {
+    function CaseFlagTableComponent_table_0_tbody_17_tr_1_strong_17_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "strong", 19);
             i0__namespace.ɵɵtext(1, "Active");
             i0__namespace.ɵɵelementEnd();
         }
     }
-    function CaseFlagTableComponent_table_0_tbody_17_tr_1_strong_16_Template(rf, ctx) {
+    function CaseFlagTableComponent_table_0_tbody_17_tr_1_strong_18_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "strong", 20);
             i0__namespace.ɵɵtext(1, "Inactive");
             i0__namespace.ɵɵelementEnd();
         }
     }
-    function CaseFlagTableComponent_table_0_tbody_17_tr_1_strong_17_Template(rf, ctx) {
+    function CaseFlagTableComponent_table_0_tbody_17_tr_1_strong_19_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "strong", 20);
             i0__namespace.ɵɵtext(1, "Requested");
@@ -21546,22 +21658,25 @@
             i0__namespace.ɵɵelementStart(4, "div");
             i0__namespace.ɵɵtext(5);
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(6, "td", 16);
+            i0__namespace.ɵɵelementStart(6, "div");
             i0__namespace.ɵɵtext(7);
             i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementStart(8, "td", 16);
             i0__namespace.ɵɵtext(9);
-            i0__namespace.ɵɵpipe(10, "date");
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(11, "td", 16);
-            i0__namespace.ɵɵtext(12);
-            i0__namespace.ɵɵpipe(13, "date");
+            i0__namespace.ɵɵelementStart(10, "td", 16);
+            i0__namespace.ɵɵtext(11);
+            i0__namespace.ɵɵpipe(12, "date");
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementStart(13, "td", 16);
+            i0__namespace.ɵɵtext(14);
+            i0__namespace.ɵɵpipe(15, "date");
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(14, "td", 16);
-            i0__namespace.ɵɵtemplate(15, CaseFlagTableComponent_table_0_tbody_17_tr_1_strong_15_Template, 2, 0, "strong", 17);
-            i0__namespace.ɵɵtemplate(16, CaseFlagTableComponent_table_0_tbody_17_tr_1_strong_16_Template, 2, 0, "strong", 18);
-            i0__namespace.ɵɵtemplate(17, CaseFlagTableComponent_table_0_tbody_17_tr_1_strong_17_Template, 2, 0, "strong", 18);
+            i0__namespace.ɵɵelementStart(16, "td", 16);
+            i0__namespace.ɵɵtemplate(17, CaseFlagTableComponent_table_0_tbody_17_tr_1_strong_17_Template, 2, 0, "strong", 17);
+            i0__namespace.ɵɵtemplate(18, CaseFlagTableComponent_table_0_tbody_17_tr_1_strong_18_Template, 2, 0, "strong", 18);
+            i0__namespace.ɵɵtemplate(19, CaseFlagTableComponent_table_0_tbody_17_tr_1_strong_19_Template, 2, 0, "strong", 18);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
         }
@@ -21573,11 +21688,13 @@
             i0__namespace.ɵɵadvance(2);
             i0__namespace.ɵɵtextInterpolate(flagDetail_r4.otherDescription);
             i0__namespace.ɵɵadvance(2);
+            i0__namespace.ɵɵtextInterpolate(flagDetail_r4.subTypeValue);
+            i0__namespace.ɵɵadvance(2);
             i0__namespace.ɵɵtextInterpolate(flagDetail_r4.flagComment);
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind2(10, 8, flagDetail_r4.dateTimeCreated, "dd LLL yyyy"));
+            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind2(12, 9, flagDetail_r4.dateTimeCreated, "dd LLL yyyy"));
             i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind2(13, 11, flagDetail_r4.dateTimeModified, "dd LLL yyyy"));
+            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind2(15, 12, flagDetail_r4.dateTimeModified, "dd LLL yyyy"));
             i0__namespace.ɵɵadvance(3);
             i0__namespace.ɵɵproperty("ngIf", flagDetail_r4.status === ctx_r3.caseFlagStatus.ACTIVE);
             i0__namespace.ɵɵadvance(1);
@@ -21589,7 +21706,7 @@
     function CaseFlagTableComponent_table_0_tbody_17_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "tbody", 10);
-            i0__namespace.ɵɵtemplate(1, CaseFlagTableComponent_table_0_tbody_17_tr_1_Template, 18, 14, "tr", 14);
+            i0__namespace.ɵɵtemplate(1, CaseFlagTableComponent_table_0_tbody_17_tr_1_Template, 20, 15, "tr", 14);
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
@@ -22252,7 +22369,7 @@
                 i0__namespace.ɵɵadvance(1);
                 i0__namespace.ɵɵproperty("ngIf", ctx.isCheckboxEnabled);
             }
-        }, directives: [i2__namespace.NgControlStatusGroup, i2__namespace.FormGroupDirective, i1__namespace.NgClass, i1__namespace.NgIf, i3__namespace$1.MatInput, i2__namespace.DefaultValueAccessor, i5__namespace.MatAutocompleteTrigger, i2__namespace.NgControlStatus, i2__namespace.FormControlName, i5__namespace.MatAutocomplete, i1__namespace.NgForOf, i6__namespace.MatOption], pipes: [i1__namespace.AsyncPipe], styles: [".autocomplete__input--show-all-values[_ngcontent-%COMP%]{padding:5px 34px 5px 5px;cursor:pointer}.autocomplete__dropdown-arrow-down[_ngcontent-%COMP%]{z-index:-1;display:inline-block;position:absolute;right:8px;width:24px;height:24px;top:10px}.autocomplete__menu[_ngcontent-%COMP%]{background-color:#fff;border:2px solid #0b0c0c;border-top:0;color:#0b0c0c;margin:0;max-height:342px;overflow-x:hidden;padding:0;width:100%;width:calc(100% - 4px)}.autocomplete__menu--visible[_ngcontent-%COMP%]{display:block}.autocomplete__menu--hidden[_ngcontent-%COMP%]{display:none}.autocomplete__menu--overlay[_ngcontent-%COMP%]{box-shadow:0 2px 6px rgba(0,0,0,.256863);left:0;position:absolute;top:100%;z-index:100}.autocomplete__menu--inline[_ngcontent-%COMP%]{position:relative}.autocomplete__option[_ngcontent-%COMP%]{border-left-width:0;border-bottom:1px solid #b1b4b6;border-right-width:0;border-top-width:1px;cursor:pointer;display:block;position:relative}.autocomplete__option[_ngcontent-%COMP%] > *[_ngcontent-%COMP%]{pointer-events:none}.autocomplete__option[_ngcontent-%COMP%]:first-of-type{border-top-width:0}.autocomplete__option[_ngcontent-%COMP%]:last-of-type{border-bottom-width:0}.autocomplete__option--odd[_ngcontent-%COMP%]{background-color:#fafafa}.autocomplete__option--focused[_ngcontent-%COMP%], .autocomplete__option[_ngcontent-%COMP%]:hover{background-color:#1d70b8;border-color:#1d70b8;color:#fff;outline:0}.autocomplete__option--no-results[_ngcontent-%COMP%]{background-color:#fafafa;color:#646b6f;cursor:not-allowed}.autocomplete__hint[_ngcontent-%COMP%], .autocomplete__input[_ngcontent-%COMP%], .autocomplete__option[_ngcontent-%COMP%]{font-size:13px;line-height:1.25}.autocomplete__hint[_ngcontent-%COMP%], .autocomplete__option[_ngcontent-%COMP%]{padding:5px}@media (min-width:641px){.autocomplete__hint[_ngcontent-%COMP%], .autocomplete__input[_ngcontent-%COMP%], .autocomplete__option[_ngcontent-%COMP%]{font-size:13px;line-height:1.31579}}.div-action[_ngcontent-%COMP%]{display:inline-block}.add-location[_ngcontent-%COMP%]{display:inline}.remove-location-button[_ngcontent-%COMP%]{margin:5px}.hide-autocomplete[_ngcontent-%COMP%]{display:none}.auto-complete-container[_ngcontent-%COMP%]{min-width:550px;display:inline-block;margin-right:4px}.autocomplete__input[_ngcontent-%COMP%]{line-height:24px;font-size:19px}.hidden[_ngcontent-%COMP%]{display:none}.search-language__input[_ngcontent-%COMP%]{position:relative;background-image:url(\"data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 36 36' width='40' height='40'%3E%3Cpath d='M25.7 24.8L21.9 21c.7-1 1.1-2.2 1.1-3.5 0-3.6-2.9-6.5-6.5-6.5S10 13.9 10 17.5s2.9 6.5 6.5 6.5c1.6 0 3-.6 4.1-1.5l3.7 3.7 1.4-1.4zM12 17.5c0-2.5 2-4.5 4.5-4.5s4.5 2 4.5 4.5-2 4.5-4.5 4.5-4.5-2-4.5-4.5z' fill='%23505a5f'%3E%3C/path%3E%3C/svg%3E\");background-repeat:no-repeat;background-position:center left -2px;background-size:40px 40px;padding-left:35px}"] });
+        }, directives: [i2__namespace.NgControlStatusGroup, i2__namespace.FormGroupDirective, i1__namespace.NgClass, i1__namespace.NgIf, i3__namespace$1.MatInput, i2__namespace.DefaultValueAccessor, i4__namespace.MatAutocompleteTrigger, i2__namespace.NgControlStatus, i2__namespace.FormControlName, i4__namespace.MatAutocomplete, i1__namespace.NgForOf, i5__namespace.MatOption], pipes: [i1__namespace.AsyncPipe], styles: [".autocomplete__input--show-all-values[_ngcontent-%COMP%]{padding:5px 34px 5px 5px;cursor:pointer}.autocomplete__dropdown-arrow-down[_ngcontent-%COMP%]{z-index:-1;display:inline-block;position:absolute;right:8px;width:24px;height:24px;top:10px}.autocomplete__menu[_ngcontent-%COMP%]{background-color:#fff;border:2px solid #0b0c0c;border-top:0;color:#0b0c0c;margin:0;max-height:342px;overflow-x:hidden;padding:0;width:100%;width:calc(100% - 4px)}.autocomplete__menu--visible[_ngcontent-%COMP%]{display:block}.autocomplete__menu--hidden[_ngcontent-%COMP%]{display:none}.autocomplete__menu--overlay[_ngcontent-%COMP%]{box-shadow:0 2px 6px rgba(0,0,0,.256863);left:0;position:absolute;top:100%;z-index:100}.autocomplete__menu--inline[_ngcontent-%COMP%]{position:relative}.autocomplete__option[_ngcontent-%COMP%]{border-left-width:0;border-bottom:1px solid #b1b4b6;border-right-width:0;border-top-width:1px;cursor:pointer;display:block;position:relative}.autocomplete__option[_ngcontent-%COMP%] > *[_ngcontent-%COMP%]{pointer-events:none}.autocomplete__option[_ngcontent-%COMP%]:first-of-type{border-top-width:0}.autocomplete__option[_ngcontent-%COMP%]:last-of-type{border-bottom-width:0}.autocomplete__option--odd[_ngcontent-%COMP%]{background-color:#fafafa}.autocomplete__option--focused[_ngcontent-%COMP%], .autocomplete__option[_ngcontent-%COMP%]:hover{background-color:#1d70b8;border-color:#1d70b8;color:#fff;outline:0}.autocomplete__option--no-results[_ngcontent-%COMP%]{background-color:#fafafa;color:#646b6f;cursor:not-allowed}.autocomplete__hint[_ngcontent-%COMP%], .autocomplete__input[_ngcontent-%COMP%], .autocomplete__option[_ngcontent-%COMP%]{font-size:13px;line-height:1.25}.autocomplete__hint[_ngcontent-%COMP%], .autocomplete__option[_ngcontent-%COMP%]{padding:5px}@media (min-width:641px){.autocomplete__hint[_ngcontent-%COMP%], .autocomplete__input[_ngcontent-%COMP%], .autocomplete__option[_ngcontent-%COMP%]{font-size:13px;line-height:1.31579}}.div-action[_ngcontent-%COMP%]{display:inline-block}.add-location[_ngcontent-%COMP%]{display:inline}.remove-location-button[_ngcontent-%COMP%]{margin:5px}.hide-autocomplete[_ngcontent-%COMP%]{display:none}.auto-complete-container[_ngcontent-%COMP%]{min-width:550px;display:inline-block;margin-right:4px}.autocomplete__input[_ngcontent-%COMP%]{line-height:24px;font-size:19px}.hidden[_ngcontent-%COMP%]{display:none}.search-language__input[_ngcontent-%COMP%]{position:relative;background-image:url(\"data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 36 36' width='40' height='40'%3E%3Cpath d='M25.7 24.8L21.9 21c.7-1 1.1-2.2 1.1-3.5 0-3.6-2.9-6.5-6.5-6.5S10 13.9 10 17.5s2.9 6.5 6.5 6.5c1.6 0 3-.6 4.1-1.5l3.7 3.7 1.4-1.4zM12 17.5c0-2.5 2-4.5 4.5-4.5s4.5 2 4.5 4.5-2 4.5-4.5 4.5-4.5-2-4.5-4.5z' fill='%23505a5f'%3E%3C/path%3E%3C/svg%3E\");background-repeat:no-repeat;background-position:center left -2px;background-size:40px 40px;padding-left:35px}"] });
     (function () {
         (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(SearchLanguageInterpreterComponent, [{
                 type: i0.Component,
@@ -24172,7 +24289,7 @@
         };
         return DatetimePickerComponent;
     }(AbstractFormFieldComponent));
-    DatetimePickerComponent.ɵfac = function DatetimePickerComponent_Factory(t) { return new (t || DatetimePickerComponent)(i0__namespace.ɵɵdirectiveInject(FormatTranslatorService), i0__namespace.ɵɵdirectiveInject(i4.NGX_MAT_DATE_FORMATS)); };
+    DatetimePickerComponent.ɵfac = function DatetimePickerComponent_Factory(t) { return new (t || DatetimePickerComponent)(i0__namespace.ɵɵdirectiveInject(FormatTranslatorService), i0__namespace.ɵɵdirectiveInject(i4$1.NGX_MAT_DATE_FORMATS)); };
     DatetimePickerComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: DatetimePickerComponent, selectors: [["ccd-datetime-picker"]], viewQuery: function DatetimePickerComponent_Query(rf, ctx) {
             if (rf & 1) {
                 i0__namespace.ɵɵviewQuery(_c0$i, 1);
@@ -24184,10 +24301,10 @@
                 i0__namespace.ɵɵqueryRefresh(_t = i0__namespace.ɵɵloadQuery()) && (ctx.inputElement = _t.first);
             }
         }, inputs: { dateControl: "dateControl" }, features: [i0__namespace.ɵɵProvidersFeature([
-                { provide: i4.NGX_MAT_DATE_FORMATS, useValue: CUSTOM_MOMENT_FORMATS },
-                { provide: i4.NgxMatDateAdapter,
+                { provide: i4$1.NGX_MAT_DATE_FORMATS, useValue: CUSTOM_MOMENT_FORMATS },
+                { provide: i4$1.NgxMatDateAdapter,
                     useClass: momentAdapter.NgxMatMomentAdapter,
-                    deps: [i6.MAT_DATE_LOCALE, momentAdapter.NGX_MAT_MOMENT_DATE_ADAPTER_OPTIONS]
+                    deps: [i5.MAT_DATE_LOCALE, momentAdapter.NGX_MAT_MOMENT_DATE_ADAPTER_OPTIONS]
                 },
                 { provide: momentAdapter.NGX_MAT_MOMENT_DATE_ADAPTER_OPTIONS, useValue: { useUtc: true } }
             ]), i0__namespace.ɵɵInheritDefinitionFeature], decls: 14, vars: 26, consts: [[1, "govuk-form-group", "bottom-30", 3, "id", "ngClass"], ["class", "form-label", 4, "ngIf"], ["class", "form-hint", 4, "ngIf"], ["class", "error-message", 4, "ngIf"], [1, "datepicker-container"], ["ng-model-options", "{timezone:'utc'}", 1, "govuk-input", 3, "min", "max", "formControl", "ngxMatDatetimePicker", "focusin", "focusout", "dateChange"], ["input", ""], ["matSuffix", "", "id", "pickerOpener", 3, "for"], [3, "color", "touchUi", "hideTime", "startView", "stepHour", "stepSecond", "stepMinute", "showSeconds", "showSpinners", "disableMinute", "enableMeridian", "yearSelected", "monthSelected", "opened"], ["picker", ""], [1, "form-label"], [1, "form-hint"], [1, "error-message"]], template: function DatetimePickerComponent_Template(rf, ctx) {
@@ -24234,7 +24351,7 @@
                 i0__namespace.ɵɵadvance(1);
                 i0__namespace.ɵɵproperty("color", ctx.color)("touchUi", ctx.touchUi)("hideTime", ctx.hideTime)("startView", ctx.startView)("stepHour", ctx.stepHour)("stepSecond", ctx.stepSecond)("stepMinute", ctx.stepMinute)("showSeconds", ctx.showSeconds)("showSpinners", ctx.showSpinners)("disableMinute", ctx.disableMinute)("enableMeridian", ctx.enableMeridian);
             }
-        }, directives: [i1__namespace.NgClass, i1__namespace.NgIf, i2__namespace.DefaultValueAccessor, i4__namespace.NgxMatDatetimeInput, i2__namespace.NgControlStatus, i2__namespace.FormControlDirective, i5__namespace$1.MatDatepickerToggle, i6__namespace$1.MatSuffix, i4__namespace.NgxMatDatetimePicker], pipes: [FieldLabelPipe, FirstErrorPipe], styles: ["@charset \"UTF-8\";.datepicker-container{display:inline-block;position:relative;min-width:298px}.datepicker-container .govuk-input{height:35px;min-width:298px;width:auto;padding-right:40px;border:1px solid #000}.datepicker-container .govuk-input:focus{outline:1px solid #fd0;border:1px solid #000}.datepicker-container .govuk-input::-ms-clear{display:none}.datepicker-container .datepicker-wrapper-input{position:relative;display:inline-block;top:-20%;border:0}.datepicker-container .datepicker-wrapper-input:focus{border:0;outline:none}.datepicker-container .mat-icon-button{height:32px;width:32px}.datepicker-container .mat-icon-button:focus{outline:1px solid #fd0}.datepicker-container .mat-icon-button .mat-datepicker-toggle-default-icon{position:relative;top:-5px}.datepicker-container .mat-datepicker-toggle{position:absolute;right:0}.cdk-overlay-container .mat-datepicker-content{border:1px solid #000;border-radius:0;max-width:295px}.cdk-overlay-container .mat-datepicker-content .mat-calendar-table{width:calc(100% - 1px);table-layout:fixed}.cdk-overlay-container .mat-datepicker-content .mat-calendar-header{height:34px;border-bottom:1px ridge #bfc1c3}.cdk-overlay-container .mat-datepicker-content .mat-calendar-period-button{left:14%;min-width:125px;border-right:1px ridge #bfc1c3;border-left:1px ridge #bfc1c3;border-radius:0;top:-20px;width:200%}.cdk-overlay-container .mat-datepicker-content .mat-calendar-period-button .mat-button-wrapper{text-align:center;font-weight:700}.cdk-overlay-container .mat-datepicker-content .mat-calendar-period-button:focus{border:2px solid #000}.cdk-overlay-container .mat-datepicker-content .mat-calendar-previous-button{left:-73%;top:-20px;border:2px solid transparent;border-radius:0}.cdk-overlay-container .mat-datepicker-content .mat-calendar-previous-button:focus{border-color:#000}.cdk-overlay-container .mat-datepicker-content .mat-calendar-previous-button:after{border-left-width:5px;border-top-width:5px;color:#000;padding:4px;top:-2px;left:-2px}.cdk-overlay-container .mat-datepicker-content .mat-calendar-next-button{top:-20px;left:1%;border:2px solid transparent;border-radius:0}.cdk-overlay-container .mat-datepicker-content .mat-calendar-next-button:focus{border-color:#000}.cdk-overlay-container .mat-datepicker-content .mat-calendar-next-button:after{border-right-width:5px;border-top-width:5px;color:#000;padding:4px;top:-2px;left:-2px}.cdk-overlay-container .mat-datepicker-content .mat-button-wrapper{text-transform:capitalize!important}.cdk-overlay-container .mat-datepicker-content .mat-calendar{border-bottom:1px solid #000}.cdk-overlay-container .mat-datepicker-content .mat-calendar-table-header-divider{padding:0;border-bottom:none}.cdk-overlay-container .mat-datepicker-content .mat-calendar-table-header-divider:after{height:0}.cdk-overlay-container .mat-datepicker-content .mat-calendar-content{padding:0}.cdk-overlay-container .mat-datepicker-content ngx-mat-month-view .mat-calendar-table-header{color:#000}.cdk-overlay-container .mat-datepicker-content ngx-mat-month-view .mat-calendar-table-header th.ng-star-inserted{font-weight:700;font-size:15px;padding-top:2%;padding-bottom:2%;-moz-column-width:20px;column-width:20px}.cdk-overlay-container .mat-datepicker-content ngx-mat-month-view .mat-calendar-table-header tr:first-of-type th{visibility:hidden}.cdk-overlay-container .mat-datepicker-content ngx-mat-month-view .mat-calendar-table-header tr:first-of-type th:after{visibility:visible;color:#000;position:relative;left:-15px}.cdk-overlay-container .mat-datepicker-content ngx-mat-month-view .mat-calendar-table-header tr:first-of-type th:first-of-type:after{content:\"MON\"}.cdk-overlay-container .mat-datepicker-content ngx-mat-month-view .mat-calendar-table-header tr:first-of-type th:nth-of-type(2):after{left:-12px;content:\"TUE\"}.cdk-overlay-container .mat-datepicker-content ngx-mat-month-view .mat-calendar-table-header tr:first-of-type th:nth-of-type(3):after{left:-18px;content:\"WED\"}.cdk-overlay-container .mat-datepicker-content ngx-mat-month-view .mat-calendar-table-header tr:first-of-type th:nth-of-type(4):after{left:-14px;content:\"THU\"}.cdk-overlay-container .mat-datepicker-content ngx-mat-month-view .mat-calendar-table-header tr:first-of-type th:nth-of-type(5):after{left:-10px;content:\"FRI\"}.cdk-overlay-container .mat-datepicker-content ngx-mat-month-view .mat-calendar-table-header tr:first-of-type th:nth-of-type(6):after{content:\"SAT\"}.cdk-overlay-container .mat-datepicker-content ngx-mat-month-view .mat-calendar-table-header tr:first-of-type th:nth-of-type(7):after{content:\"SUN\"}.cdk-overlay-container .mat-datepicker-content ngx-mat-month-view .mat-calendar-body-label{font-weight:700;font-size:large;color:#000}.cdk-overlay-container .mat-datepicker-content ngx-mat-month-view .mat-calendar-body-selected{border:none;background-color:transparent;color:#fff}.cdk-overlay-container .mat-datepicker-content ngx-mat-month-view .mat-calendar-body-active{background-color:#5694ca}.cdk-overlay-container .mat-datepicker-content ngx-mat-month-view .mat-calendar-body-today{border:none;box-shadow:none}.cdk-overlay-container .mat-datepicker-content ngx-mat-month-view .mat-calendar-body-cell{border:1px ridge #bfc1c3}.cdk-overlay-container .mat-datepicker-content ngx-mat-month-view .mat-calendar-body-cell[aria-selected=true]{background-color:#1d70b8;outline:3px solid #fd0;border:2px solid #000;outline-offset:1px;z-index:1}.cdk-overlay-container .mat-datepicker-content ngx-mat-multi-year-view .mat-calendar-table{border-collapse:separate;border-spacing:10px}.cdk-overlay-container .mat-datepicker-content ngx-mat-multi-year-view .mat-calendar-table .mat-calendar-body-active{background-color:#5694ca}.cdk-overlay-container .mat-datepicker-content ngx-mat-multi-year-view .mat-calendar-table .mat-calendar-body-cell{border:1px solid #bfc1c3}.cdk-overlay-container .mat-datepicker-content ngx-mat-multi-year-view .mat-calendar-table .mat-calendar-body-cell .mat-calendar-body-cell-content{border:none}.cdk-overlay-container .mat-datepicker-content ngx-mat-multi-year-view .mat-calendar-table .mat-calendar-body-cell .mat-calendar-body-selected{border:none;box-shadow:none;background-color:transparent}.cdk-overlay-container .mat-datepicker-content ngx-mat-multi-year-view .mat-calendar-table .mat-calendar-body-cell[aria-selected=true]{background-color:#1d70b8;outline:2px solid #fd0}.cdk-overlay-container .mat-datepicker-content ngx-mat-year-view .mat-calendar-table{border-collapse:separate;border-spacing:20px}.cdk-overlay-container .mat-datepicker-content ngx-mat-year-view .mat-calendar-table tr:first-of-type{visibility:collapse}.cdk-overlay-container .mat-datepicker-content ngx-mat-year-view .mat-calendar-table .mat-calendar-body-active{background-color:#5694ca}.cdk-overlay-container .mat-datepicker-content ngx-mat-year-view .mat-calendar-table .mat-calendar-body-cell{border:1px solid #bfc1c3}.cdk-overlay-container .mat-datepicker-content ngx-mat-year-view .mat-calendar-table .mat-calendar-body-cell .mat-calendar-body-cell-content{border:none}.cdk-overlay-container .mat-datepicker-content ngx-mat-year-view .mat-calendar-table .mat-calendar-body-cell .mat-calendar-body-selected{border:none;box-shadow:none;background-color:transparent}.cdk-overlay-container .mat-datepicker-content ngx-mat-year-view .mat-calendar-table .mat-calendar-body-cell[aria-selected=true]{background-color:#1d70b8;outline:3px solid #fd0;border:2px solid #000;outline-offset:1px}.cdk-overlay-container .mat-datepicker-content .time-container{height:80px;padding-top:0}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker{width:100%}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table{margin-left:0!important}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tbody{position:relative}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr .mat-icon-button .mat-button-wrapper{width:auto;height:auto}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr .mat-icon-button:focus{outline:none}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:first-child{position:absolute;left:49px;top:15px;z-index:2}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:first-child button:disabled{display:none}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:first-child td:first-child [aria-label=\"expand_less icon\"]{position:absolute;left:-2px;top:25px}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:first-child td:nth-child(3) [aria-label=\"expand_less icon\"].mat-icon-button{position:absolute;left:82px!important;top:25px}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:first-child td:nth-child(5) [aria-label=\"expand_less icon\"].mat-icon-button{position:absolute;left:169px!important;top:25px}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:first-child td:last-child [aria-label=\"expand_less icon\"].mat-icon-button{left:153px!important}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:first-child td:nth-last-child(2) [aria-label=\"expand_less icon\"].mat-icon-button{left:65px!important}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:nth-child(2){display:flex;padding:20px 0 20px 15px}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:nth-child(2) td{margin-right:30px;text-align:right}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:nth-child(2) td:first-child .mat-form-field{width:50px}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:nth-child(2) td:first-child .mat-form-field:before{color:#000;content:\"Hours\";position:relative;top:-5px;left:-5px;font-size:15px}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:nth-child(2) td:nth-child(3) .mat-form-field:before{color:#000;content:\"Minutes\";position:relative;top:-5px;font-size:15px}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:nth-child(2) td:last-child{text-align:left;left:-15px}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:nth-child(2) .mat-form-field-disabled{display:none}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:nth-child(2) td:nth-of-type(5) .mat-form-field:before{color:#000;content:\"Seconds\";position:relative;top:-5px;font-size:15px}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:nth-child(2) .meridian{border-bottom:none}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:nth-child(2) .meridian .mat-button{height:30px;top:21px;border-radius:0;color:#000;border-color:#000;background-color:#dee0e2;display:flex;justify-content:center}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:nth-child(2) .meridian .mat-button .mat-button-wrapper{position:relative;top:-2px}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:nth-child(4){display:flex;padding:2rem 0 2rem 15px}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:nth-child(4) td{margin-right:30px;text-align:right}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:nth-child(4) td:last-child{text-align:left}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:last-child{position:absolute;left:49px;top:40px}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:last-child button:disabled{display:none}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:last-child td:first-child [aria-label=\"expand_more icon\"]{position:absolute;top:15px;left:-2px}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:last-child td:nth-child(3) [aria-label=\"expand_more icon\"].mat-icon-button{position:absolute;left:82px!important;top:15px}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:last-child td:nth-child(5) [aria-label=\"expand_more icon\"].mat-icon-button{position:absolute;top:15px;left:169px}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:last-child td:last-child [aria-label=\"expand_more icon\"].mat-icon-button{left:65px!important}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:last-child td:last-child.ng-star-inserted [aria-label=\"expand_more icon\"].mat-icon-button{left:153px!important}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr td{padding:0;border-bottom:0;position:relative}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr .spacer{display:none}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr .mat-icon{visibility:hidden;display:none}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr .mat-button-wrapper{display:block;width:15px;height:8px}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr .mat-form-field-wrapper{padding-bottom:0}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr .mat-form-field{width:auto;max-width:none}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr [aria-label=\"expand_less icon\"].mat-icon-button .mat-button-wrapper:after{content:\" \u25B2\"}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr [aria-label=\"expand_more icon\"].mat-icon-button .mat-button-wrapper:after{content:\"\u25BC\"}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr .mat-form-field-flex{width:100%}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr .mat-form-field-flex .mat-form-field-infix{border:1px solid #000;height:20px;width:37px;display:flex;justify-content:center;align-items:center}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr .mat-form-field-underline{visibility:hidden}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr input{height:33px;width:37px}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr input:focus{border-color:#000}.cdk-overlay-container .mat-datepicker-content .actions{padding-bottom:20px;margin-top:20px;justify-content:flex-start}.cdk-overlay-container .mat-datepicker-content .actions .mat-button{background-color:#00823b;position:relative;display:-moz-inline-stack;display:inline-block;padding:.526315em .789473em .263157em;border:none;border-radius:0;outline:1px solid transparent;outline-offset:-1px;-webkit-appearance:none;box-shadow:0 2px 0 #003618;font-size:1em;line-height:1.25;text-decoration:none;-webkit-font-smoothing:antialiased;color:#fff;box-sizing:border-box;vertical-align:top;width:80px;cursor:pointer}.cdk-overlay-container .mat-datepicker-content .actions .mat-button:focus{outline:2px solid #fd0}.cdk-overlay-container .mat-datepicker-content .actions .mat-button:hover{background-color:#006400}.cdk-overlay-container .mat-datepicker-content .actions .mat-button .mat-icon{visibility:hidden}.cdk-overlay-container .mat-datepicker-content .actions .mat-button .mat-button-wrapper:before{color:#fff;content:\"Confirm\";position:relative;font-size:15px;left:-3px}"], encapsulation: 2 });
+        }, directives: [i1__namespace.NgClass, i1__namespace.NgIf, i2__namespace.DefaultValueAccessor, i4__namespace$1.NgxMatDatetimeInput, i2__namespace.NgControlStatus, i2__namespace.FormControlDirective, i5__namespace$1.MatDatepickerToggle, i6__namespace.MatSuffix, i4__namespace$1.NgxMatDatetimePicker], pipes: [FieldLabelPipe, FirstErrorPipe], styles: ["@charset \"UTF-8\";.datepicker-container{display:inline-block;position:relative;min-width:298px}.datepicker-container .govuk-input{height:35px;min-width:298px;width:auto;padding-right:40px;border:1px solid #000}.datepicker-container .govuk-input:focus{outline:1px solid #fd0;border:1px solid #000}.datepicker-container .govuk-input::-ms-clear{display:none}.datepicker-container .datepicker-wrapper-input{position:relative;display:inline-block;top:-20%;border:0}.datepicker-container .datepicker-wrapper-input:focus{border:0;outline:none}.datepicker-container .mat-icon-button{height:32px;width:32px}.datepicker-container .mat-icon-button:focus{outline:1px solid #fd0}.datepicker-container .mat-icon-button .mat-datepicker-toggle-default-icon{position:relative;top:-5px}.datepicker-container .mat-datepicker-toggle{position:absolute;right:0}.cdk-overlay-container .mat-datepicker-content{border:1px solid #000;border-radius:0;max-width:295px}.cdk-overlay-container .mat-datepicker-content .mat-calendar-table{width:calc(100% - 1px);table-layout:fixed}.cdk-overlay-container .mat-datepicker-content .mat-calendar-header{height:34px;border-bottom:1px ridge #bfc1c3}.cdk-overlay-container .mat-datepicker-content .mat-calendar-period-button{left:14%;min-width:125px;border-right:1px ridge #bfc1c3;border-left:1px ridge #bfc1c3;border-radius:0;top:-20px;width:200%}.cdk-overlay-container .mat-datepicker-content .mat-calendar-period-button .mat-button-wrapper{text-align:center;font-weight:700}.cdk-overlay-container .mat-datepicker-content .mat-calendar-period-button:focus{border:2px solid #000}.cdk-overlay-container .mat-datepicker-content .mat-calendar-previous-button{left:-73%;top:-20px;border:2px solid transparent;border-radius:0}.cdk-overlay-container .mat-datepicker-content .mat-calendar-previous-button:focus{border-color:#000}.cdk-overlay-container .mat-datepicker-content .mat-calendar-previous-button:after{border-left-width:5px;border-top-width:5px;color:#000;padding:4px;top:-2px;left:-2px}.cdk-overlay-container .mat-datepicker-content .mat-calendar-next-button{top:-20px;left:1%;border:2px solid transparent;border-radius:0}.cdk-overlay-container .mat-datepicker-content .mat-calendar-next-button:focus{border-color:#000}.cdk-overlay-container .mat-datepicker-content .mat-calendar-next-button:after{border-right-width:5px;border-top-width:5px;color:#000;padding:4px;top:-2px;left:-2px}.cdk-overlay-container .mat-datepicker-content .mat-button-wrapper{text-transform:capitalize!important}.cdk-overlay-container .mat-datepicker-content .mat-calendar{border-bottom:1px solid #000}.cdk-overlay-container .mat-datepicker-content .mat-calendar-table-header-divider{padding:0;border-bottom:none}.cdk-overlay-container .mat-datepicker-content .mat-calendar-table-header-divider:after{height:0}.cdk-overlay-container .mat-datepicker-content .mat-calendar-content{padding:0}.cdk-overlay-container .mat-datepicker-content ngx-mat-month-view .mat-calendar-table-header{color:#000}.cdk-overlay-container .mat-datepicker-content ngx-mat-month-view .mat-calendar-table-header th.ng-star-inserted{font-weight:700;font-size:15px;padding-top:2%;padding-bottom:2%;-moz-column-width:20px;column-width:20px}.cdk-overlay-container .mat-datepicker-content ngx-mat-month-view .mat-calendar-table-header tr:first-of-type th{visibility:hidden}.cdk-overlay-container .mat-datepicker-content ngx-mat-month-view .mat-calendar-table-header tr:first-of-type th:after{visibility:visible;color:#000;position:relative;left:-15px}.cdk-overlay-container .mat-datepicker-content ngx-mat-month-view .mat-calendar-table-header tr:first-of-type th:first-of-type:after{content:\"MON\"}.cdk-overlay-container .mat-datepicker-content ngx-mat-month-view .mat-calendar-table-header tr:first-of-type th:nth-of-type(2):after{left:-12px;content:\"TUE\"}.cdk-overlay-container .mat-datepicker-content ngx-mat-month-view .mat-calendar-table-header tr:first-of-type th:nth-of-type(3):after{left:-18px;content:\"WED\"}.cdk-overlay-container .mat-datepicker-content ngx-mat-month-view .mat-calendar-table-header tr:first-of-type th:nth-of-type(4):after{left:-14px;content:\"THU\"}.cdk-overlay-container .mat-datepicker-content ngx-mat-month-view .mat-calendar-table-header tr:first-of-type th:nth-of-type(5):after{left:-10px;content:\"FRI\"}.cdk-overlay-container .mat-datepicker-content ngx-mat-month-view .mat-calendar-table-header tr:first-of-type th:nth-of-type(6):after{content:\"SAT\"}.cdk-overlay-container .mat-datepicker-content ngx-mat-month-view .mat-calendar-table-header tr:first-of-type th:nth-of-type(7):after{content:\"SUN\"}.cdk-overlay-container .mat-datepicker-content ngx-mat-month-view .mat-calendar-body-label{font-weight:700;font-size:large;color:#000}.cdk-overlay-container .mat-datepicker-content ngx-mat-month-view .mat-calendar-body-selected{border:none;background-color:transparent;color:#fff}.cdk-overlay-container .mat-datepicker-content ngx-mat-month-view .mat-calendar-body-active{background-color:#5694ca}.cdk-overlay-container .mat-datepicker-content ngx-mat-month-view .mat-calendar-body-today{border:none;box-shadow:none}.cdk-overlay-container .mat-datepicker-content ngx-mat-month-view .mat-calendar-body-cell{border:1px ridge #bfc1c3}.cdk-overlay-container .mat-datepicker-content ngx-mat-month-view .mat-calendar-body-cell[aria-selected=true]{background-color:#1d70b8;outline:3px solid #fd0;border:2px solid #000;outline-offset:1px;z-index:1}.cdk-overlay-container .mat-datepicker-content ngx-mat-multi-year-view .mat-calendar-table{border-collapse:separate;border-spacing:10px}.cdk-overlay-container .mat-datepicker-content ngx-mat-multi-year-view .mat-calendar-table .mat-calendar-body-active{background-color:#5694ca}.cdk-overlay-container .mat-datepicker-content ngx-mat-multi-year-view .mat-calendar-table .mat-calendar-body-cell{border:1px solid #bfc1c3}.cdk-overlay-container .mat-datepicker-content ngx-mat-multi-year-view .mat-calendar-table .mat-calendar-body-cell .mat-calendar-body-cell-content{border:none}.cdk-overlay-container .mat-datepicker-content ngx-mat-multi-year-view .mat-calendar-table .mat-calendar-body-cell .mat-calendar-body-selected{border:none;box-shadow:none;background-color:transparent}.cdk-overlay-container .mat-datepicker-content ngx-mat-multi-year-view .mat-calendar-table .mat-calendar-body-cell[aria-selected=true]{background-color:#1d70b8;outline:2px solid #fd0}.cdk-overlay-container .mat-datepicker-content ngx-mat-year-view .mat-calendar-table{border-collapse:separate;border-spacing:20px}.cdk-overlay-container .mat-datepicker-content ngx-mat-year-view .mat-calendar-table tr:first-of-type{visibility:collapse}.cdk-overlay-container .mat-datepicker-content ngx-mat-year-view .mat-calendar-table .mat-calendar-body-active{background-color:#5694ca}.cdk-overlay-container .mat-datepicker-content ngx-mat-year-view .mat-calendar-table .mat-calendar-body-cell{border:1px solid #bfc1c3}.cdk-overlay-container .mat-datepicker-content ngx-mat-year-view .mat-calendar-table .mat-calendar-body-cell .mat-calendar-body-cell-content{border:none}.cdk-overlay-container .mat-datepicker-content ngx-mat-year-view .mat-calendar-table .mat-calendar-body-cell .mat-calendar-body-selected{border:none;box-shadow:none;background-color:transparent}.cdk-overlay-container .mat-datepicker-content ngx-mat-year-view .mat-calendar-table .mat-calendar-body-cell[aria-selected=true]{background-color:#1d70b8;outline:3px solid #fd0;border:2px solid #000;outline-offset:1px}.cdk-overlay-container .mat-datepicker-content .time-container{height:80px;padding-top:0}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker{width:100%}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table{margin-left:0!important}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tbody{position:relative}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr .mat-icon-button .mat-button-wrapper{width:auto;height:auto}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr .mat-icon-button:focus{outline:none}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:first-child{position:absolute;left:49px;top:15px;z-index:2}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:first-child button:disabled{display:none}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:first-child td:first-child [aria-label=\"expand_less icon\"]{position:absolute;left:-2px;top:25px}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:first-child td:nth-child(3) [aria-label=\"expand_less icon\"].mat-icon-button{position:absolute;left:82px!important;top:25px}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:first-child td:nth-child(5) [aria-label=\"expand_less icon\"].mat-icon-button{position:absolute;left:169px!important;top:25px}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:first-child td:last-child [aria-label=\"expand_less icon\"].mat-icon-button{left:153px!important}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:first-child td:nth-last-child(2) [aria-label=\"expand_less icon\"].mat-icon-button{left:65px!important}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:nth-child(2){display:flex;padding:20px 0 20px 15px}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:nth-child(2) td{margin-right:30px;text-align:right}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:nth-child(2) td:first-child .mat-form-field{width:50px}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:nth-child(2) td:first-child .mat-form-field:before{color:#000;content:\"Hours\";position:relative;top:-5px;left:-5px;font-size:15px}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:nth-child(2) td:nth-child(3) .mat-form-field:before{color:#000;content:\"Minutes\";position:relative;top:-5px;font-size:15px}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:nth-child(2) td:last-child{text-align:left;left:-15px}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:nth-child(2) .mat-form-field-disabled{display:none}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:nth-child(2) td:nth-of-type(5) .mat-form-field:before{color:#000;content:\"Seconds\";position:relative;top:-5px;font-size:15px}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:nth-child(2) .meridian{border-bottom:none}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:nth-child(2) .meridian .mat-button{height:30px;top:21px;border-radius:0;color:#000;border-color:#000;background-color:#dee0e2;display:flex;justify-content:center}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:nth-child(2) .meridian .mat-button .mat-button-wrapper{position:relative;top:-2px}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:nth-child(4){display:flex;padding:2rem 0 2rem 15px}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:nth-child(4) td{margin-right:30px;text-align:right}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:nth-child(4) td:last-child{text-align:left}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:last-child{position:absolute;left:49px;top:40px}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:last-child button:disabled{display:none}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:last-child td:first-child [aria-label=\"expand_more icon\"]{position:absolute;top:15px;left:-2px}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:last-child td:nth-child(3) [aria-label=\"expand_more icon\"].mat-icon-button{position:absolute;left:82px!important;top:15px}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:last-child td:nth-child(5) [aria-label=\"expand_more icon\"].mat-icon-button{position:absolute;top:15px;left:169px}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:last-child td:last-child [aria-label=\"expand_more icon\"].mat-icon-button{left:65px!important}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr:last-child td:last-child.ng-star-inserted [aria-label=\"expand_more icon\"].mat-icon-button{left:153px!important}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr td{padding:0;border-bottom:0;position:relative}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr .spacer{display:none}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr .mat-icon{visibility:hidden;display:none}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr .mat-button-wrapper{display:block;width:15px;height:8px}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr .mat-form-field-wrapper{padding-bottom:0}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr .mat-form-field{width:auto;max-width:none}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr [aria-label=\"expand_less icon\"].mat-icon-button .mat-button-wrapper:after{content:\" \u25B2\"}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr [aria-label=\"expand_more icon\"].mat-icon-button .mat-button-wrapper:after{content:\"\u25BC\"}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr .mat-form-field-flex{width:100%}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr .mat-form-field-flex .mat-form-field-infix{border:1px solid #000;height:20px;width:37px;display:flex;justify-content:center;align-items:center}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr .mat-form-field-underline{visibility:hidden}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr input{height:33px;width:37px}.cdk-overlay-container .mat-datepicker-content .time-container .ngx-mat-timepicker .table tr input:focus{border-color:#000}.cdk-overlay-container .mat-datepicker-content .actions{padding-bottom:20px;margin-top:20px;justify-content:flex-start}.cdk-overlay-container .mat-datepicker-content .actions .mat-button{background-color:#00823b;position:relative;display:-moz-inline-stack;display:inline-block;padding:.526315em .789473em .263157em;border:none;border-radius:0;outline:1px solid transparent;outline-offset:-1px;-webkit-appearance:none;box-shadow:0 2px 0 #003618;font-size:1em;line-height:1.25;text-decoration:none;-webkit-font-smoothing:antialiased;color:#fff;box-sizing:border-box;vertical-align:top;width:80px;cursor:pointer}.cdk-overlay-container .mat-datepicker-content .actions .mat-button:focus{outline:2px solid #fd0}.cdk-overlay-container .mat-datepicker-content .actions .mat-button:hover{background-color:#006400}.cdk-overlay-container .mat-datepicker-content .actions .mat-button .mat-icon{visibility:hidden}.cdk-overlay-container .mat-datepicker-content .actions .mat-button .mat-button-wrapper:before{color:#fff;content:\"Confirm\";position:relative;font-size:15px;left:-3px}"], encapsulation: 2 });
     (function () {
         (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(DatetimePickerComponent, [{
                 type: i0.Component,
@@ -24244,10 +24361,10 @@
                         styleUrls: ['./datetime-picker.component.scss'],
                         encapsulation: i0.ViewEncapsulation.None,
                         providers: [
-                            { provide: i4.NGX_MAT_DATE_FORMATS, useValue: CUSTOM_MOMENT_FORMATS },
-                            { provide: i4.NgxMatDateAdapter,
+                            { provide: i4$1.NGX_MAT_DATE_FORMATS, useValue: CUSTOM_MOMENT_FORMATS },
+                            { provide: i4$1.NgxMatDateAdapter,
                                 useClass: momentAdapter.NgxMatMomentAdapter,
-                                deps: [i6.MAT_DATE_LOCALE, momentAdapter.NGX_MAT_MOMENT_DATE_ADAPTER_OPTIONS]
+                                deps: [i5.MAT_DATE_LOCALE, momentAdapter.NGX_MAT_MOMENT_DATE_ADAPTER_OPTIONS]
                             },
                             { provide: momentAdapter.NGX_MAT_MOMENT_DATE_ADAPTER_OPTIONS, useValue: { useUtc: true } }
                         ]
@@ -24255,7 +24372,7 @@
             }], function () {
             return [{ type: FormatTranslatorService }, { type: undefined, decorators: [{
                             type: i0.Inject,
-                            args: [i4.NGX_MAT_DATE_FORMATS]
+                            args: [i4$1.NGX_MAT_DATE_FORMATS]
                         }] }];
         }, { datetimePicker: [{
                     type: i0.ViewChild,
@@ -25810,7 +25927,6 @@
         ReadComplexFieldCollectionTableComponent,
         ReadCaseFlagFieldComponent,
         ReadLinkedCasesFieldComponent,
-        ReadQueryManagementFieldComponent,
         // Write
         WriteJudicialUserFieldComponent,
         WriteAddressFieldComponent,
@@ -25830,7 +25946,6 @@
         WriteDateFieldComponent,
         WriteCaseFlagFieldComponent,
         WriteLinkedCasesFieldComponent,
-        WriteQueryManagementFieldComponent,
         // new
         WriteYesNoFieldComponent,
         WriteOrganisationFieldComponent,
@@ -25857,27 +25972,13 @@
         ReadDynamicMultiSelectListFieldComponent,
         ReadDynamicListFieldComponent,
         ReadDynamicRadioListFieldComponent,
-        // Components for Case flags
-        CaseFlagTableComponent,
-        SelectFlagTypeComponent,
-        SearchLanguageInterpreterComponent,
-        SelectFlagLocationComponent,
-        ManageCaseFlagsComponent,
-        AddCommentsComponent,
-        UpdateFlagComponent,
-        CaseFlagSummaryListComponent,
-        // Components for linked cases
         LinkedCasesToTableComponent,
         LinkedCasesFromTableComponent,
         BeforeYouStartComponent,
         LinkCasesComponent,
         CheckYourAnswersComponent,
         UnLinkCasesComponent,
-        NoLinkedCasesComponent,
-        // Components for query management
-        QueryCreateComponent,
-        QueryDetailComponent,
-        QueryListComponent
+        NoLinkedCasesComponent
     ];
     var PaletteModule = /** @class */ (function () {
         function PaletteModule() {
@@ -25896,10 +25997,10 @@
             FileUploadStateService,
             FileUploadProgressGuard,
             WindowService,
-            LinkedCasesService,
             CommonDataService,
             JurisdictionService,
-            { provide: i6.MAT_DATE_LOCALE, useValue: 'en-GB' }
+            LinkedCasesService,
+            { provide: i5.MAT_DATE_LOCALE, useValue: 'en-GB' }
         ], imports: [[
                 i1.CommonModule,
                 i1$1.RouterModule,
@@ -25916,13 +26017,13 @@
                 TabsModule,
                 LabelSubstitutorModule,
                 i1$5.NgxMdModule,
-                i4.NgxMatDatetimePickerModule,
-                i4.NgxMatTimepickerModule,
-                i4.NgxMatNativeDateModule,
-                i6$1.MatFormFieldModule,
+                i4$1.NgxMatDatetimePickerModule,
+                i4$1.NgxMatTimepickerModule,
+                i4$1.NgxMatNativeDateModule,
+                i6.MatFormFieldModule,
                 i3$1.MatInputModule,
                 i5$1.MatDatepickerModule,
-                i5.MatAutocompleteModule,
+                i4.MatAutocompleteModule,
                 i7.CdkTreeModule,
                 i1$4.OverlayModule,
                 i3.PaymentLibModule,
@@ -25930,9 +26031,9 @@
                 i1$3.MatDialogModule,
                 i11.MediaViewerModule,
                 LoadingModule
-            ], i4.NgxMatDatetimePickerModule,
-            i4.NgxMatNativeDateModule,
-            i4.NgxMatTimepickerModule,
+            ], i4$1.NgxMatDatetimePickerModule,
+            i4$1.NgxMatNativeDateModule,
+            i4$1.NgxMatTimepickerModule,
             TabsModule,
             PaletteUtilsModule,
             PipesModule] });
@@ -25941,7 +26042,15 @@
                 FixedRadioListPipe,
                 DynamicListPipe,
                 DynamicRadioListPipe,
-                DocumentUrlPipe, UnsupportedFieldComponent,
+                DocumentUrlPipe,
+                CaseFlagTableComponent,
+                SelectFlagTypeComponent,
+                SearchLanguageInterpreterComponent,
+                SelectFlagLocationComponent,
+                ManageCaseFlagsComponent,
+                AddCommentsComponent,
+                UpdateFlagComponent,
+                CaseFlagSummaryListComponent, UnsupportedFieldComponent,
                 DatetimePickerComponent,
                 WaysToPayFieldComponent,
                 MarkdownComponent,
@@ -25985,7 +26094,6 @@
                 ReadComplexFieldCollectionTableComponent,
                 ReadCaseFlagFieldComponent,
                 ReadLinkedCasesFieldComponent,
-                ReadQueryManagementFieldComponent,
                 // Write
                 WriteJudicialUserFieldComponent,
                 WriteAddressFieldComponent,
@@ -26005,7 +26113,6 @@
                 WriteDateFieldComponent,
                 WriteCaseFlagFieldComponent,
                 WriteLinkedCasesFieldComponent,
-                WriteQueryManagementFieldComponent,
                 // new
                 WriteYesNoFieldComponent,
                 WriteOrganisationFieldComponent,
@@ -26032,27 +26139,13 @@
                 ReadDynamicMultiSelectListFieldComponent,
                 ReadDynamicListFieldComponent,
                 ReadDynamicRadioListFieldComponent,
-                // Components for Case flags
-                CaseFlagTableComponent,
-                SelectFlagTypeComponent,
-                SearchLanguageInterpreterComponent,
-                SelectFlagLocationComponent,
-                ManageCaseFlagsComponent,
-                AddCommentsComponent,
-                UpdateFlagComponent,
-                CaseFlagSummaryListComponent,
-                // Components for linked cases
                 LinkedCasesToTableComponent,
                 LinkedCasesFromTableComponent,
                 BeforeYouStartComponent,
                 LinkCasesComponent,
                 CheckYourAnswersComponent,
                 UnLinkCasesComponent,
-                NoLinkedCasesComponent,
-                // Components for query management
-                QueryCreateComponent,
-                QueryDetailComponent,
-                QueryListComponent], imports: [i1.CommonModule,
+                NoLinkedCasesComponent], imports: [i1.CommonModule,
                 i1$1.RouterModule,
                 i2.FormsModule,
                 i2.ReactiveFormsModule,
@@ -26067,20 +26160,20 @@
                 TabsModule,
                 LabelSubstitutorModule,
                 i1$5.NgxMdModule,
-                i4.NgxMatDatetimePickerModule,
-                i4.NgxMatTimepickerModule,
-                i4.NgxMatNativeDateModule,
-                i6$1.MatFormFieldModule,
+                i4$1.NgxMatDatetimePickerModule,
+                i4$1.NgxMatTimepickerModule,
+                i4$1.NgxMatNativeDateModule,
+                i6.MatFormFieldModule,
                 i3$1.MatInputModule,
                 i5$1.MatDatepickerModule,
-                i5.MatAutocompleteModule,
+                i4.MatAutocompleteModule,
                 i7.CdkTreeModule,
                 i1$4.OverlayModule,
                 i3.PaymentLibModule, i2__namespace$1.ScrollToModule, i1$3.MatDialogModule,
                 i11.MediaViewerModule,
-                LoadingModule], exports: [i4.NgxMatDatetimePickerModule,
-                i4.NgxMatNativeDateModule,
-                i4.NgxMatTimepickerModule,
+                LoadingModule], exports: [i4$1.NgxMatDatetimePickerModule,
+                i4$1.NgxMatNativeDateModule,
+                i4$1.NgxMatTimepickerModule,
                 TabsModule,
                 PaletteUtilsModule,
                 PipesModule, UnsupportedFieldComponent,
@@ -26127,7 +26220,6 @@
                 ReadComplexFieldCollectionTableComponent,
                 ReadCaseFlagFieldComponent,
                 ReadLinkedCasesFieldComponent,
-                ReadQueryManagementFieldComponent,
                 // Write
                 WriteJudicialUserFieldComponent,
                 WriteAddressFieldComponent,
@@ -26147,7 +26239,6 @@
                 WriteDateFieldComponent,
                 WriteCaseFlagFieldComponent,
                 WriteLinkedCasesFieldComponent,
-                WriteQueryManagementFieldComponent,
                 // new
                 WriteYesNoFieldComponent,
                 WriteOrganisationFieldComponent,
@@ -26174,27 +26265,13 @@
                 ReadDynamicMultiSelectListFieldComponent,
                 ReadDynamicListFieldComponent,
                 ReadDynamicRadioListFieldComponent,
-                // Components for Case flags
-                CaseFlagTableComponent,
-                SelectFlagTypeComponent,
-                SearchLanguageInterpreterComponent,
-                SelectFlagLocationComponent,
-                ManageCaseFlagsComponent,
-                AddCommentsComponent,
-                UpdateFlagComponent,
-                CaseFlagSummaryListComponent,
-                // Components for linked cases
                 LinkedCasesToTableComponent,
                 LinkedCasesFromTableComponent,
                 BeforeYouStartComponent,
                 LinkCasesComponent,
                 CheckYourAnswersComponent,
                 UnLinkCasesComponent,
-                NoLinkedCasesComponent,
-                // Components for query management
-                QueryCreateComponent,
-                QueryDetailComponent,
-                QueryListComponent] });
+                NoLinkedCasesComponent] });
     })();
     (function () {
         (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(PaletteModule, [{
@@ -26216,13 +26293,13 @@
                             TabsModule,
                             LabelSubstitutorModule,
                             i1$5.NgxMdModule,
-                            i4.NgxMatDatetimePickerModule,
-                            i4.NgxMatTimepickerModule,
-                            i4.NgxMatNativeDateModule,
-                            i6$1.MatFormFieldModule,
+                            i4$1.NgxMatDatetimePickerModule,
+                            i4$1.NgxMatTimepickerModule,
+                            i4$1.NgxMatNativeDateModule,
+                            i6.MatFormFieldModule,
                             i3$1.MatInputModule,
                             i5$1.MatDatepickerModule,
-                            i5.MatAutocompleteModule,
+                            i4.MatAutocompleteModule,
                             i7.CdkTreeModule,
                             i1$4.OverlayModule,
                             i3.PaymentLibModule,
@@ -26236,12 +26313,20 @@
                             FixedRadioListPipe,
                             DynamicListPipe,
                             DynamicRadioListPipe,
-                            DocumentUrlPipe
+                            DocumentUrlPipe,
+                            CaseFlagTableComponent,
+                            SelectFlagTypeComponent,
+                            SearchLanguageInterpreterComponent,
+                            SelectFlagLocationComponent,
+                            ManageCaseFlagsComponent,
+                            AddCommentsComponent,
+                            UpdateFlagComponent,
+                            CaseFlagSummaryListComponent
                         ], PALETTE_COMPONENTS),
                         exports: __spread([
-                            i4.NgxMatDatetimePickerModule,
-                            i4.NgxMatNativeDateModule,
-                            i4.NgxMatTimepickerModule,
+                            i4$1.NgxMatDatetimePickerModule,
+                            i4$1.NgxMatNativeDateModule,
+                            i4$1.NgxMatTimepickerModule,
                             TabsModule,
                             PaletteUtilsModule,
                             PipesModule
@@ -26256,10 +26341,10 @@
                             FileUploadStateService,
                             FileUploadProgressGuard,
                             WindowService,
-                            LinkedCasesService,
                             CommonDataService,
                             JurisdictionService,
-                            { provide: i6.MAT_DATE_LOCALE, useValue: 'en-GB' }
+                            LinkedCasesService,
+                            { provide: i5.MAT_DATE_LOCALE, useValue: 'en-GB' }
                         ],
                         entryComponents: [CaseFileViewFolderSelectorComponent]
                     }]
@@ -26281,13 +26366,8 @@
     i0__namespace.ɵɵsetComponentScope(ReadComplexFieldTableComponent, [i1__namespace.NgForOf, i1__namespace.NgIf, FieldReadComponent], [ReadFieldsFilterPipe, IsCompoundPipe]);
     i0__namespace.ɵɵsetComponentScope(ReadComplexFieldCollectionTableComponent, [i1__namespace.NgForOf, i1__namespace.NgIf, FieldReadComponent,
         ReadCaseLinkFieldComponent], [ReadFieldsFilterPipe, CcdCollectionTableCaseFieldsFilterPipe, i1__namespace.KeyValuePipe, IsCompoundPipe]);
-    i0__namespace.ɵɵsetComponentScope(ReadCaseFlagFieldComponent, [i1__namespace.NgSwitch, i1__namespace.NgSwitchCase, CaseFlagSummaryListComponent, i1__namespace.NgSwitchDefault, i1__namespace.NgForOf, i1__namespace.NgIf,
-        // Components for Case flags
-        CaseFlagTableComponent], []);
-    i0__namespace.ɵɵsetComponentScope(ReadLinkedCasesFieldComponent, [
-        // Components for linked cases
-        LinkedCasesToTableComponent, i1__namespace.NgIf, LinkedCasesFromTableComponent
-    ], []);
+    i0__namespace.ɵɵsetComponentScope(ReadCaseFlagFieldComponent, [i1__namespace.NgSwitch, i1__namespace.NgSwitchCase, CaseFlagSummaryListComponent, i1__namespace.NgSwitchDefault, i1__namespace.NgForOf, i1__namespace.NgIf, CaseFlagTableComponent], []);
+    i0__namespace.ɵɵsetComponentScope(ReadLinkedCasesFieldComponent, [LinkedCasesToTableComponent, i1__namespace.NgIf, LinkedCasesFromTableComponent], []);
     i0__namespace.ɵɵsetComponentScope(WriteAddressFieldComponent, [i1__namespace.NgIf, i1__namespace.NgClass, i2__namespace.DefaultValueAccessor, i2__namespace.NgControlStatus, i2__namespace.FormControlDirective, i2__namespace.SelectControlValueAccessor, i1__namespace.NgForOf, i2__namespace.NgSelectOption, i2__namespace.ɵangular_packages_forms_forms_z, WriteComplexFieldComponent, i2__namespace.NgControlStatusGroup, i2__namespace.FormGroupDirective], [FieldLabelPipe]);
     i0__namespace.ɵɵsetComponentScope(WriteComplexFieldComponent, [i1__namespace.NgIf, i1__namespace.NgForOf, i1__namespace.NgSwitch, i1__namespace.NgSwitchCase, FieldReadComponent, LabelSubstitutorDirective, i2__namespace.NgControlStatusGroup, i2__namespace.FormGroupDirective, FieldWriteComponent], [FieldLabelPipe, IsReadOnlyPipe]);
     i0__namespace.ɵɵsetComponentScope(WriteDocumentFieldComponent, [i1__namespace.NgClass, i1__namespace.NgIf, ReadDocumentFieldComponent], [FieldLabelPipe]);
@@ -26310,43 +26390,12 @@
     i0__namespace.ɵɵsetComponentScope(WriteCollectionFieldComponent, [i1__namespace.NgIf, i1__namespace.NgForOf, FieldWriteComponent, i2__namespace.NgControlStatusGroup, i2__namespace.FormGroupDirective], [FieldLabelPipe, FirstErrorPipe]);
     i0__namespace.ɵɵsetComponentScope(
     // ComponentLauncher web components
-    CaseFileViewFieldComponent, [i1__namespace.NgIf, CaseFileViewFolderComponent, i11__namespace.MediaViewerComponent], []);
-    i0__namespace.ɵɵsetComponentScope(
-    // Components for linked cases
-    LinkedCasesToTableComponent, [i1__namespace.NgIf, i1__namespace.NgForOf], [CaseReferencePipe, LinkCasesReasonValuePipe]);
+    CaseFileViewFieldComponent, [i1__namespace.NgIf, i1__namespace.NgForOf, CaseFileViewFolderComponent, i11__namespace.MediaViewerComponent], []);
+    i0__namespace.ɵɵsetComponentScope(LinkedCasesToTableComponent, [i1__namespace.NgIf, i1__namespace.NgForOf], [CaseReferencePipe, LinkCasesReasonValuePipe]);
     i0__namespace.ɵɵsetComponentScope(LinkedCasesFromTableComponent, [i1__namespace.NgIf, i1__namespace.NgForOf], [CaseReferencePipe, LinkCasesFromReasonValuePipe]);
     i0__namespace.ɵɵsetComponentScope(LinkCasesComponent, [i1__namespace.NgIf, i2__namespace.NgControlStatusGroup, i2__namespace.FormGroupDirective, i1__namespace.NgClass, i2__namespace.DefaultValueAccessor, i2__namespace.NgControlStatus, i2__namespace.FormControlName, i2__namespace.FormArrayName, i1__namespace.NgForOf, i2__namespace.FormGroupName, i2__namespace.CheckboxControlValueAccessor], [CaseReferencePipe, LinkCasesReasonValuePipe]);
     i0__namespace.ɵɵsetComponentScope(CheckYourAnswersComponent, [i1__namespace.NgIf, i1__namespace.NgForOf], [CaseReferencePipe, LinkCasesReasonValuePipe]);
 
-    var Confirmation = /** @class */ (function () {
-        function Confirmation(caseId, status, header, body) {
-            this.caseId = caseId;
-            this.status = status;
-            this.header = header;
-            this.body = body;
-        }
-        Confirmation.prototype.getCaseId = function () {
-            return this.caseId;
-        };
-        Confirmation.prototype.getStatus = function () {
-            return this.status;
-        };
-        Confirmation.prototype.getHeader = function () {
-            return this.header;
-        };
-        Confirmation.prototype.getBody = function () {
-            return this.body;
-        };
-        return Confirmation;
-    }());
-
-    exports.EventCompletionReturnStates = void 0;
-    (function (EventCompletionReturnStates) {
-        EventCompletionReturnStates["InProgress"] = "in-progress";
-        EventCompletionReturnStates["CompleteEvent"] = "complete-event";
-        EventCompletionReturnStates["CancelEvent"] = "cancel-event";
-    })(exports.EventCompletionReturnStates || (exports.EventCompletionReturnStates = {}));
-
     function CaseEditSubmitComponent_div_0_div_3_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelement(0, "div");
@@ -26370,9 +26419,9 @@
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
-            var ctx_r12 = i0__namespace.ɵɵnextContext(3);
+            var ctx_r10 = i0__namespace.ɵɵnextContext(3);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵtextInterpolate1("#", i0__namespace.ɵɵpipeBind1(2, 1, ctx_r12.getCaseId()), "");
+            i0__namespace.ɵɵtextInterpolate1("#", i0__namespace.ɵɵpipeBind1(2, 1, ctx_r10.getCaseId()), "");
         }
     }
     function CaseEditSubmitComponent_div_0_ng_template_6_Template(rf, ctx) {
@@ -26384,313 +26433,249 @@
             i0__namespace.ɵɵproperty("ngIf", ctx_r6.getCaseId());
         }
     }
-    function CaseEditSubmitComponent_div_0_div_8_Template(rf, ctx) {
+    function CaseEditSubmitComponent_div_0_ng_container_11_span_3_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "div", 17);
-            i0__namespace.ɵɵelementStart(1, "h1", 18);
-            i0__namespace.ɵɵtext(2, " Something went wrong ");
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(3, "div", 19);
-            i0__namespace.ɵɵelementStart(4, "p");
-            i0__namespace.ɵɵtext(5, "We're working to fix the problem. Try again shortly.");
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(6, "p");
-            i0__namespace.ɵɵelementStart(7, "a", 20);
-            i0__namespace.ɵɵtext(8, "Contact us");
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵtext(9, " if you're still having problems.");
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementEnd();
-        }
-    }
-    function CaseEditSubmitComponent_div_0_div_9_ul_5_li_1_Template(rf, ctx) {
-        if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "li", 25);
-            i0__namespace.ɵɵtext(1);
-            i0__namespace.ɵɵelementEnd();
-        }
-        if (rf & 2) {
-            var fieldError_r15 = ctx.$implicit;
-            i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵtextInterpolate(fieldError_r15.message);
-        }
-    }
-    function CaseEditSubmitComponent_div_0_div_9_ul_5_Template(rf, ctx) {
-        if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "ul", 23);
-            i0__namespace.ɵɵtemplate(1, CaseEditSubmitComponent_div_0_div_9_ul_5_li_1_Template, 2, 1, "li", 24);
-            i0__namespace.ɵɵelementEnd();
-        }
-        if (rf & 2) {
-            var ctx_r13 = i0__namespace.ɵɵnextContext(3);
-            i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("ngForOf", ctx_r13.error.details.field_errors);
-        }
-    }
-    function CaseEditSubmitComponent_div_0_div_9_Template(rf, ctx) {
-        if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "div", 17);
-            i0__namespace.ɵɵelementStart(1, "h3", 21);
-            i0__namespace.ɵɵtext(2, " The event could not be created ");
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(3, "p");
-            i0__namespace.ɵɵtext(4);
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵtemplate(5, CaseEditSubmitComponent_div_0_div_9_ul_5_Template, 2, 1, "ul", 22);
-            i0__namespace.ɵɵelementEnd();
-        }
-        if (rf & 2) {
-            var ctx_r8 = i0__namespace.ɵɵnextContext(2);
-            i0__namespace.ɵɵadvance(4);
-            i0__namespace.ɵɵtextInterpolate(ctx_r8.error.message);
-            i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("ngIf", ctx_r8.error.details == null ? null : ctx_r8.error.details.field_errors);
-        }
-    }
-    function CaseEditSubmitComponent_div_0_ng_container_12_span_3_Template(rf, ctx) {
-        if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "span", 29);
+            i0__namespace.ɵɵelementStart(0, "span", 20);
             i0__namespace.ɵɵtext(1, "Check the information below carefully.");
             i0__namespace.ɵɵelementEnd();
         }
     }
-    function CaseEditSubmitComponent_div_0_ng_container_12_ng_container_6_ng_container_1_ng_container_1_ng_container_1_th_2_Template(rf, ctx) {
+    function CaseEditSubmitComponent_div_0_ng_container_11_ng_container_6_ng_container_1_ng_container_1_ng_container_1_th_2_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "th", 36);
-            i0__namespace.ɵɵelementStart(1, "span", 29);
+            i0__namespace.ɵɵelementStart(0, "th", 27);
+            i0__namespace.ɵɵelementStart(1, "span", 20);
             i0__namespace.ɵɵtext(2);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
-            var field_r21 = i0__namespace.ɵɵnextContext(2).$implicit;
+            var field_r16 = i0__namespace.ɵɵnextContext(2).$implicit;
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵtextInterpolate(field_r21.label);
+            i0__namespace.ɵɵtextInterpolate(field_r16.label);
         }
     }
-    function CaseEditSubmitComponent_div_0_ng_container_12_ng_container_6_ng_container_1_ng_container_1_ng_container_1_a_6_Template(rf, ctx) {
+    function CaseEditSubmitComponent_div_0_ng_container_11_ng_container_6_ng_container_1_ng_container_1_ng_container_1_a_6_Template(rf, ctx) {
         if (rf & 1) {
-            var _r28_1 = i0__namespace.ɵɵgetCurrentView();
+            var _r23_1 = i0__namespace.ɵɵgetCurrentView();
             i0__namespace.ɵɵelementStart(0, "a", 13);
-            i0__namespace.ɵɵlistener("click", function CaseEditSubmitComponent_div_0_ng_container_12_ng_container_6_ng_container_1_ng_container_1_ng_container_1_a_6_Template_a_click_0_listener() { i0__namespace.ɵɵrestoreView(_r28_1); var page_r18 = i0__namespace.ɵɵnextContext(4).$implicit; var ctx_r26 = i0__namespace.ɵɵnextContext(3); return ctx_r26.navigateToPage(page_r18.id); });
-            i0__namespace.ɵɵelementStart(1, "span", 29);
+            i0__namespace.ɵɵlistener("click", function CaseEditSubmitComponent_div_0_ng_container_11_ng_container_6_ng_container_1_ng_container_1_ng_container_1_a_6_Template_a_click_0_listener() { i0__namespace.ɵɵrestoreView(_r23_1); var page_r13 = i0__namespace.ɵɵnextContext(4).$implicit; var ctx_r21 = i0__namespace.ɵɵnextContext(3); return ctx_r21.navigateToPage(page_r13.id); });
+            i0__namespace.ɵɵelementStart(1, "span", 20);
             i0__namespace.ɵɵtext(2, "Change");
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
-            var field_r21 = i0__namespace.ɵɵnextContext(2).$implicit;
+            var field_r16 = i0__namespace.ɵɵnextContext(2).$implicit;
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵattributeInterpolate1("aria-label", "Change ", field_r21.label, "");
+            i0__namespace.ɵɵattributeInterpolate1("aria-label", "Change ", field_r16.label, "");
         }
     }
-    function CaseEditSubmitComponent_div_0_ng_container_12_ng_container_6_ng_container_1_ng_container_1_ng_container_1_Template(rf, ctx) {
+    function CaseEditSubmitComponent_div_0_ng_container_11_ng_container_6_ng_container_1_ng_container_1_ng_container_1_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementContainerStart(0);
-            i0__namespace.ɵɵelementStart(1, "tr", 30);
-            i0__namespace.ɵɵtemplate(2, CaseEditSubmitComponent_div_0_ng_container_12_ng_container_6_ng_container_1_ng_container_1_ng_container_1_th_2_Template, 3, 1, "th", 31);
-            i0__namespace.ɵɵelementStart(3, "td", 32);
-            i0__namespace.ɵɵelement(4, "ccd-field-read", 33);
+            i0__namespace.ɵɵelementStart(1, "tr", 21);
+            i0__namespace.ɵɵtemplate(2, CaseEditSubmitComponent_div_0_ng_container_11_ng_container_6_ng_container_1_ng_container_1_ng_container_1_th_2_Template, 3, 1, "th", 22);
+            i0__namespace.ɵɵelementStart(3, "td", 23);
+            i0__namespace.ɵɵelement(4, "ccd-field-read", 24);
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(5, "td", 34);
-            i0__namespace.ɵɵtemplate(6, CaseEditSubmitComponent_div_0_ng_container_12_ng_container_6_ng_container_1_ng_container_1_ng_container_1_a_6_Template, 3, 1, "a", 35);
+            i0__namespace.ɵɵelementStart(5, "td", 25);
+            i0__namespace.ɵɵtemplate(6, CaseEditSubmitComponent_div_0_ng_container_11_ng_container_6_ng_container_1_ng_container_1_ng_container_1_a_6_Template, 3, 1, "a", 26);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementContainerEnd();
         }
         if (rf & 2) {
-            var field_r21 = i0__namespace.ɵɵnextContext().$implicit;
-            var ctx_r22 = i0__namespace.ɵɵnextContext(5);
+            var field_r16 = i0__namespace.ɵɵnextContext().$implicit;
+            var ctx_r17 = i0__namespace.ɵɵnextContext(5);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("caseField", field_r21)("hidden", field_r21.hidden)("formGroup", ctx_r22.editForm.controls["data"])("contextFields", ctx_r22.contextFields);
+            i0__namespace.ɵɵproperty("caseField", field_r16)("hidden", field_r16.hidden)("formGroup", ctx_r17.editForm.controls["data"])("contextFields", ctx_r17.contextFields);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("ngIf", !ctx_r22.isLabel(field_r21) && !ctx_r22.isCaseFlagSubmission);
+            i0__namespace.ɵɵproperty("ngIf", !ctx_r17.isLabel(field_r16) && !ctx_r17.caseEdit.isCaseFlagSubmission);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵattribute("colspan", ctx_r22.isLabel(field_r21) ? "2" : "1");
+            i0__namespace.ɵɵattribute("colspan", ctx_r17.isLabel(field_r16) ? "2" : "1");
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("formGroup", ctx_r22.editForm.controls["data"])("topLevelFormGroup", ctx_r22.editForm.controls["data"])("caseField", ctx_r22.summaryCaseField(field_r21))("context", ctx_r22.paletteContext)("caseFields", ctx_r22.contextFields);
+            i0__namespace.ɵɵproperty("formGroup", ctx_r17.editForm.controls["data"])("topLevelFormGroup", ctx_r17.editForm.controls["data"])("caseField", ctx_r17.summaryCaseField(field_r16))("context", ctx_r17.paletteContext)("caseFields", ctx_r17.contextFields);
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵproperty("ngIf", ctx_r22.isChangeAllowed(field_r21));
+            i0__namespace.ɵɵproperty("ngIf", ctx_r17.isChangeAllowed(field_r16));
         }
     }
-    function CaseEditSubmitComponent_div_0_ng_container_12_ng_container_6_ng_container_1_ng_container_1_Template(rf, ctx) {
+    function CaseEditSubmitComponent_div_0_ng_container_11_ng_container_6_ng_container_1_ng_container_1_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementContainerStart(0);
-            i0__namespace.ɵɵtemplate(1, CaseEditSubmitComponent_div_0_ng_container_12_ng_container_6_ng_container_1_ng_container_1_ng_container_1_Template, 7, 12, "ng-container", 0);
+            i0__namespace.ɵɵtemplate(1, CaseEditSubmitComponent_div_0_ng_container_11_ng_container_6_ng_container_1_ng_container_1_ng_container_1_Template, 7, 12, "ng-container", 0);
             i0__namespace.ɵɵelementContainerEnd();
         }
         if (rf & 2) {
-            var field_r21 = ctx.$implicit;
-            var ctx_r20 = i0__namespace.ɵɵnextContext(5);
+            var field_r16 = ctx.$implicit;
+            var ctx_r15 = i0__namespace.ɵɵnextContext(5);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("ngIf", ctx_r20.canShowFieldInCYA(field_r21));
+            i0__namespace.ɵɵproperty("ngIf", ctx_r15.canShowFieldInCYA(field_r16));
         }
     }
     var _c0$f = function (a0, a4) { return [a0, false, undefined, true, a4]; };
-    function CaseEditSubmitComponent_div_0_ng_container_12_ng_container_6_ng_container_1_Template(rf, ctx) {
+    function CaseEditSubmitComponent_div_0_ng_container_11_ng_container_6_ng_container_1_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementContainerStart(0);
-            i0__namespace.ɵɵtemplate(1, CaseEditSubmitComponent_div_0_ng_container_12_ng_container_6_ng_container_1_ng_container_1_Template, 2, 1, "ng-container", 28);
+            i0__namespace.ɵɵtemplate(1, CaseEditSubmitComponent_div_0_ng_container_11_ng_container_6_ng_container_1_ng_container_1_Template, 2, 1, "ng-container", 19);
             i0__namespace.ɵɵpipe(2, "ccdCYAPageLabelFilter");
             i0__namespace.ɵɵpipe(3, "ccdReadFieldsFilter");
             i0__namespace.ɵɵpipe(4, "ccdPageFields");
             i0__namespace.ɵɵelementContainerEnd();
         }
         if (rf & 2) {
-            var page_r18 = i0__namespace.ɵɵnextContext().$implicit;
-            var ctx_r19 = i0__namespace.ɵɵnextContext(3);
+            var page_r13 = i0__namespace.ɵɵnextContext().$implicit;
+            var ctx_r14 = i0__namespace.ɵɵnextContext(3);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("ngForOf", i0__namespace.ɵɵpipeBind1(2, 1, i0__namespace.ɵɵpipeBindV(3, 3, i0__namespace.ɵɵpureFunction2(12, _c0$f, i0__namespace.ɵɵpipeBind2(4, 9, page_r18, ctx_r19.editForm), ctx_r19.editForm.controls["data"]))));
+            i0__namespace.ɵɵproperty("ngForOf", i0__namespace.ɵɵpipeBind1(2, 1, i0__namespace.ɵɵpipeBindV(3, 3, i0__namespace.ɵɵpureFunction2(12, _c0$f, i0__namespace.ɵɵpipeBind2(4, 9, page_r13, ctx_r14.editForm), ctx_r14.editForm.controls["data"]))));
         }
     }
-    function CaseEditSubmitComponent_div_0_ng_container_12_ng_container_6_Template(rf, ctx) {
+    function CaseEditSubmitComponent_div_0_ng_container_11_ng_container_6_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementContainerStart(0);
-            i0__namespace.ɵɵtemplate(1, CaseEditSubmitComponent_div_0_ng_container_12_ng_container_6_ng_container_1_Template, 5, 15, "ng-container", 0);
+            i0__namespace.ɵɵtemplate(1, CaseEditSubmitComponent_div_0_ng_container_11_ng_container_6_ng_container_1_Template, 5, 15, "ng-container", 0);
             i0__namespace.ɵɵelementContainerEnd();
         }
         if (rf & 2) {
-            var page_r18 = ctx.$implicit;
-            var ctx_r17 = i0__namespace.ɵɵnextContext(3);
+            var page_r13 = ctx.$implicit;
+            var ctx_r12 = i0__namespace.ɵɵnextContext(3);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("ngIf", ctx_r17.isShown(page_r18));
+            i0__namespace.ɵɵproperty("ngIf", ctx_r12.isShown(page_r13));
         }
     }
-    function CaseEditSubmitComponent_div_0_ng_container_12_Template(rf, ctx) {
+    function CaseEditSubmitComponent_div_0_ng_container_11_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementContainerStart(0);
             i0__namespace.ɵɵelementStart(1, "h2", 16);
             i0__namespace.ɵɵtext(2);
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵtemplate(3, CaseEditSubmitComponent_div_0_ng_container_12_span_3_Template, 2, 0, "span", 26);
-            i0__namespace.ɵɵelementStart(4, "table", 27);
+            i0__namespace.ɵɵtemplate(3, CaseEditSubmitComponent_div_0_ng_container_11_span_3_Template, 2, 0, "span", 17);
+            i0__namespace.ɵɵelementStart(4, "table", 18);
             i0__namespace.ɵɵelementStart(5, "tbody");
-            i0__namespace.ɵɵtemplate(6, CaseEditSubmitComponent_div_0_ng_container_12_ng_container_6_Template, 2, 1, "ng-container", 28);
+            i0__namespace.ɵɵtemplate(6, CaseEditSubmitComponent_div_0_ng_container_11_ng_container_6_Template, 2, 1, "ng-container", 19);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementContainerEnd();
         }
         if (rf & 2) {
-            var ctx_r9 = i0__namespace.ɵɵnextContext(2);
+            var ctx_r7 = i0__namespace.ɵɵnextContext(2);
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵtextInterpolate(ctx_r9.pageTitle);
+            i0__namespace.ɵɵtextInterpolate(ctx_r7.pageTitle);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("ngIf", !ctx_r9.isCaseFlagSubmission);
+            i0__namespace.ɵɵproperty("ngIf", !ctx_r7.caseEdit.isCaseFlagSubmission);
             i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵproperty("ngForOf", ctx_r9.wizard.pages);
+            i0__namespace.ɵɵproperty("ngForOf", ctx_r7.wizard.pages);
         }
     }
-    function CaseEditSubmitComponent_div_0_ng_container_13_ng_container_3_tr_3_Template(rf, ctx) {
+    function CaseEditSubmitComponent_div_0_ng_container_12_ng_container_3_tr_3_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "tr", 41);
-            i0__namespace.ɵɵelementStart(1, "th", 42);
+            i0__namespace.ɵɵelementStart(0, "tr", 32);
+            i0__namespace.ɵɵelementStart(1, "th", 33);
             i0__namespace.ɵɵtext(2);
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(3, "td", 43);
-            i0__namespace.ɵɵelement(4, "ccd-field-read", 44);
+            i0__namespace.ɵɵelementStart(3, "td", 34);
+            i0__namespace.ɵɵelement(4, "ccd-field-read", 35);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
-            var field_r33 = i0__namespace.ɵɵnextContext().$implicit;
-            var ctx_r34 = i0__namespace.ɵɵnextContext(3);
-            i0__namespace.ɵɵproperty("caseField", field_r33)("formGroup", ctx_r34.editForm.controls["data"])("contextFields", ctx_r34.contextFields);
+            var field_r28 = i0__namespace.ɵɵnextContext().$implicit;
+            var ctx_r29 = i0__namespace.ɵɵnextContext(3);
+            i0__namespace.ɵɵproperty("caseField", field_r28)("formGroup", ctx_r29.editForm.controls["data"])("contextFields", ctx_r29.contextFields);
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵtextInterpolate(field_r33.label);
+            i0__namespace.ɵɵtextInterpolate(field_r28.label);
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵproperty("formGroup", ctx_r34.editForm.controls["data"])("caseField", ctx_r34.summaryCaseField(field_r33));
+            i0__namespace.ɵɵproperty("formGroup", ctx_r29.editForm.controls["data"])("caseField", ctx_r29.summaryCaseField(field_r28));
         }
     }
-    function CaseEditSubmitComponent_div_0_ng_container_13_ng_container_3_tr_4_Template(rf, ctx) {
+    function CaseEditSubmitComponent_div_0_ng_container_12_ng_container_3_tr_4_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "tr", 45);
-            i0__namespace.ɵɵelementStart(1, "td", 46);
-            i0__namespace.ɵɵelement(2, "ccd-field-read", 47);
+            i0__namespace.ɵɵelementStart(0, "tr", 36);
+            i0__namespace.ɵɵelementStart(1, "td", 37);
+            i0__namespace.ɵɵelement(2, "ccd-field-read", 38);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
-            var field_r33 = i0__namespace.ɵɵnextContext().$implicit;
-            var ctx_r35 = i0__namespace.ɵɵnextContext(3);
-            i0__namespace.ɵɵproperty("caseField", field_r33)("formGroup", ctx_r35.editForm.controls["data"])("contextFields", ctx_r35.contextFields);
+            var field_r28 = i0__namespace.ɵɵnextContext().$implicit;
+            var ctx_r30 = i0__namespace.ɵɵnextContext(3);
+            i0__namespace.ɵɵproperty("caseField", field_r28)("formGroup", ctx_r30.editForm.controls["data"])("contextFields", ctx_r30.contextFields);
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵproperty("formGroup", ctx_r35.editForm.controls["data"])("caseField", ctx_r35.summaryCaseField(field_r33))("caseFields", ctx_r35.contextFields);
+            i0__namespace.ɵɵproperty("formGroup", ctx_r30.editForm.controls["data"])("caseField", ctx_r30.summaryCaseField(field_r28))("caseFields", ctx_r30.contextFields);
         }
     }
-    function CaseEditSubmitComponent_div_0_ng_container_13_ng_container_3_Template(rf, ctx) {
+    function CaseEditSubmitComponent_div_0_ng_container_12_ng_container_3_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementContainerStart(0);
-            i0__namespace.ɵɵelementContainerStart(1, 38);
+            i0__namespace.ɵɵelementContainerStart(1, 29);
             i0__namespace.ɵɵpipe(2, "ccdIsCompound");
-            i0__namespace.ɵɵtemplate(3, CaseEditSubmitComponent_div_0_ng_container_13_ng_container_3_tr_3_Template, 5, 6, "tr", 39);
-            i0__namespace.ɵɵtemplate(4, CaseEditSubmitComponent_div_0_ng_container_13_ng_container_3_tr_4_Template, 3, 6, "tr", 40);
+            i0__namespace.ɵɵtemplate(3, CaseEditSubmitComponent_div_0_ng_container_12_ng_container_3_tr_3_Template, 5, 6, "tr", 30);
+            i0__namespace.ɵɵtemplate(4, CaseEditSubmitComponent_div_0_ng_container_12_ng_container_3_tr_4_Template, 3, 6, "tr", 31);
             i0__namespace.ɵɵelementContainerEnd();
             i0__namespace.ɵɵelementContainerEnd();
         }
         if (rf & 2) {
-            var field_r33 = ctx.$implicit;
+            var field_r28 = ctx.$implicit;
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("ngSwitch", !i0__namespace.ɵɵpipeBind1(2, 3, field_r33));
+            i0__namespace.ɵɵproperty("ngSwitch", !i0__namespace.ɵɵpipeBind1(2, 3, field_r28));
             i0__namespace.ɵɵadvance(2);
             i0__namespace.ɵɵproperty("ngSwitchCase", true);
             i0__namespace.ɵɵadvance(1);
             i0__namespace.ɵɵproperty("ngSwitchCase", false);
         }
     }
-    function CaseEditSubmitComponent_div_0_ng_container_13_Template(rf, ctx) {
+    function CaseEditSubmitComponent_div_0_ng_container_12_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementContainerStart(0);
-            i0__namespace.ɵɵelementStart(1, "table", 37);
+            i0__namespace.ɵɵelementStart(1, "table", 28);
             i0__namespace.ɵɵelementStart(2, "tbody");
-            i0__namespace.ɵɵtemplate(3, CaseEditSubmitComponent_div_0_ng_container_13_ng_container_3_Template, 5, 5, "ng-container", 28);
+            i0__namespace.ɵɵtemplate(3, CaseEditSubmitComponent_div_0_ng_container_12_ng_container_3_Template, 5, 5, "ng-container", 19);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementContainerEnd();
         }
         if (rf & 2) {
-            var ctx_r10 = i0__namespace.ɵɵnextContext(2);
+            var ctx_r8 = i0__namespace.ɵɵnextContext(2);
             i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵproperty("ngForOf", ctx_r10.showSummaryFields);
+            i0__namespace.ɵɵproperty("ngForOf", ctx_r8.showSummaryFields);
         }
     }
-    function CaseEditSubmitComponent_div_0_ng_container_14_fieldset_1_Template(rf, ctx) {
+    function CaseEditSubmitComponent_div_0_ng_container_13_fieldset_1_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "fieldset", 49);
-            i0__namespace.ɵɵelement(1, "legend", 50);
-            i0__namespace.ɵɵelementStart(2, "div", 51);
-            i0__namespace.ɵɵelementStart(3, "label", 52);
+            i0__namespace.ɵɵelementStart(0, "fieldset", 40);
+            i0__namespace.ɵɵelement(1, "legend", 41);
+            i0__namespace.ɵɵelementStart(2, "div", 42);
+            i0__namespace.ɵɵelementStart(3, "label", 43);
             i0__namespace.ɵɵtext(4, " Event summary (optional) ");
-            i0__namespace.ɵɵelementStart(5, "span", 53);
+            i0__namespace.ɵɵelementStart(5, "span", 44);
             i0__namespace.ɵɵtext(6, "A few words describing the purpose of the event.");
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelement(7, "input", 54);
+            i0__namespace.ɵɵelement(7, "input", 45);
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(8, "div", 51);
-            i0__namespace.ɵɵelementStart(9, "label", 55);
+            i0__namespace.ɵɵelementStart(8, "div", 42);
+            i0__namespace.ɵɵelementStart(9, "label", 46);
             i0__namespace.ɵɵtext(10, "Event description (optional)");
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelement(11, "textarea", 56);
+            i0__namespace.ɵɵelement(11, "textarea", 47);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
         }
     }
-    function CaseEditSubmitComponent_div_0_ng_container_14_Template(rf, ctx) {
+    function CaseEditSubmitComponent_div_0_ng_container_13_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementContainerStart(0);
-            i0__namespace.ɵɵtemplate(1, CaseEditSubmitComponent_div_0_ng_container_14_fieldset_1_Template, 12, 0, "fieldset", 48);
+            i0__namespace.ɵɵtemplate(1, CaseEditSubmitComponent_div_0_ng_container_13_fieldset_1_Template, 12, 0, "fieldset", 39);
             i0__namespace.ɵɵelementContainerEnd();
         }
         if (rf & 2) {
-            var ctx_r11 = i0__namespace.ɵɵnextContext(2);
+            var ctx_r9 = i0__namespace.ɵɵnextContext(2);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("ngIf", ctx_r11.profile && !ctx_r11.isSolicitor());
+            i0__namespace.ɵɵproperty("ngIf", ctx_r9.profile && !ctx_r9.isSolicitor());
         }
     }
     function CaseEditSubmitComponent_div_0_Template(rf, ctx) {
         if (rf & 1) {
-            var _r40_1 = i0__namespace.ɵɵgetCurrentView();
+            var _r35_1 = i0__namespace.ɵɵgetCurrentView();
             i0__namespace.ɵɵelementStart(0, "div");
             i0__namespace.ɵɵelementStart(1, "h1", 2);
             i0__namespace.ɵɵtext(2);
@@ -26698,29 +26683,28 @@
             i0__namespace.ɵɵtemplate(3, CaseEditSubmitComponent_div_0_div_3_Template, 1, 0, "div", 3);
             i0__namespace.ɵɵtemplate(4, CaseEditSubmitComponent_div_0_ng_template_4_Template, 2, 5, "ng-template", null, 4, i0__namespace.ɵɵtemplateRefExtractor);
             i0__namespace.ɵɵtemplate(6, CaseEditSubmitComponent_div_0_ng_template_6_Template, 1, 1, "ng-template", null, 5, i0__namespace.ɵɵtemplateRefExtractor);
-            i0__namespace.ɵɵtemplate(8, CaseEditSubmitComponent_div_0_div_8_Template, 10, 0, "div", 6);
-            i0__namespace.ɵɵtemplate(9, CaseEditSubmitComponent_div_0_div_9_Template, 6, 2, "div", 6);
-            i0__namespace.ɵɵelementStart(10, "ccd-callback-errors", 7);
-            i0__namespace.ɵɵlistener("callbackErrorsContext", function CaseEditSubmitComponent_div_0_Template_ccd_callback_errors_callbackErrorsContext_10_listener($event) { i0__namespace.ɵɵrestoreView(_r40_1); var ctx_r39 = i0__namespace.ɵɵnextContext(); return ctx_r39.callbackErrorsNotify($event); });
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(11, "form", 8);
-            i0__namespace.ɵɵlistener("submit", function CaseEditSubmitComponent_div_0_Template_form_submit_11_listener() { i0__namespace.ɵɵrestoreView(_r40_1); var ctx_r41 = i0__namespace.ɵɵnextContext(); return ctx_r41.submit(); });
-            i0__namespace.ɵɵtemplate(12, CaseEditSubmitComponent_div_0_ng_container_12_Template, 7, 3, "ng-container", 0);
-            i0__namespace.ɵɵtemplate(13, CaseEditSubmitComponent_div_0_ng_container_13_Template, 4, 1, "ng-container", 0);
-            i0__namespace.ɵɵtemplate(14, CaseEditSubmitComponent_div_0_ng_container_14_Template, 2, 1, "ng-container", 0);
-            i0__namespace.ɵɵelementStart(15, "div", 9);
-            i0__namespace.ɵɵelementStart(16, "button", 10);
-            i0__namespace.ɵɵlistener("click", function CaseEditSubmitComponent_div_0_Template_button_click_16_listener() { i0__namespace.ɵɵrestoreView(_r40_1); var ctx_r42 = i0__namespace.ɵɵnextContext(); return ctx_r42.previous(); });
-            i0__namespace.ɵɵtext(17, "Previous");
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(18, "button", 11);
-            i0__namespace.ɵɵtext(19);
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(20, "p", 12);
-            i0__namespace.ɵɵelementStart(21, "a", 13);
-            i0__namespace.ɵɵlistener("click", function CaseEditSubmitComponent_div_0_Template_a_click_21_listener() { i0__namespace.ɵɵrestoreView(_r40_1); var ctx_r43 = i0__namespace.ɵɵnextContext(); return ctx_r43.cancel(); });
-            i0__namespace.ɵɵtext(22);
+            i0__namespace.ɵɵelement(8, "ccd-case-edit-generic-errors", 6);
+            i0__namespace.ɵɵelementStart(9, "ccd-callback-errors", 7);
+            i0__namespace.ɵɵlistener("callbackErrorsContext", function CaseEditSubmitComponent_div_0_Template_ccd_callback_errors_callbackErrorsContext_9_listener($event) { i0__namespace.ɵɵrestoreView(_r35_1); var ctx_r34 = i0__namespace.ɵɵnextContext(); return ctx_r34.callbackErrorsNotify($event); });
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementStart(10, "form", 8);
+            i0__namespace.ɵɵlistener("submit", function CaseEditSubmitComponent_div_0_Template_form_submit_10_listener() { i0__namespace.ɵɵrestoreView(_r35_1); var ctx_r36 = i0__namespace.ɵɵnextContext(); return ctx_r36.submit(); });
+            i0__namespace.ɵɵtemplate(11, CaseEditSubmitComponent_div_0_ng_container_11_Template, 7, 3, "ng-container", 0);
+            i0__namespace.ɵɵtemplate(12, CaseEditSubmitComponent_div_0_ng_container_12_Template, 4, 1, "ng-container", 0);
+            i0__namespace.ɵɵtemplate(13, CaseEditSubmitComponent_div_0_ng_container_13_Template, 2, 1, "ng-container", 0);
+            i0__namespace.ɵɵelementStart(14, "div", 9);
+            i0__namespace.ɵɵelementStart(15, "button", 10);
+            i0__namespace.ɵɵlistener("click", function CaseEditSubmitComponent_div_0_Template_button_click_15_listener() { i0__namespace.ɵɵrestoreView(_r35_1); var ctx_r37 = i0__namespace.ɵɵnextContext(); return ctx_r37.previous(); });
+            i0__namespace.ɵɵtext(16, "Previous");
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementStart(17, "button", 11);
+            i0__namespace.ɵɵtext(18);
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementStart(19, "p", 12);
+            i0__namespace.ɵɵelementStart(20, "a", 13);
+            i0__namespace.ɵɵlistener("click", function CaseEditSubmitComponent_div_0_Template_a_click_20_listener() { i0__namespace.ɵɵrestoreView(_r35_1); var ctx_r38 = i0__namespace.ɵɵnextContext(); return ctx_r38.cancel(); });
+            i0__namespace.ɵɵtext(21);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
@@ -26735,11 +26719,9 @@
             i0__namespace.ɵɵadvance(1);
             i0__namespace.ɵɵproperty("ngIf", ctx_r0.getCaseTitle())("ngIfThen", _r3)("ngIfElse", _r5);
             i0__namespace.ɵɵadvance(5);
-            i0__namespace.ɵɵproperty("ngIf", ctx_r0.error && (!(ctx_r0.error.callbackErrors || ctx_r0.error.callbackWarnings || ctx_r0.error.details) && !ctx_r0.error.message));
-            i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("ngIf", ctx_r0.error && (ctx_r0.error.details || ctx_r0.error.message));
+            i0__namespace.ɵɵproperty("error", ctx_r0.caseEdit.error);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("callbackErrorsSubject", ctx_r0.callbackErrorsSubject);
+            i0__namespace.ɵɵproperty("callbackErrorsSubject", ctx_r0.caseEdit.callbackErrorsSubject);
             i0__namespace.ɵɵadvance(1);
             i0__namespace.ɵɵproperty("formGroup", ctx_r0.editForm);
             i0__namespace.ɵɵadvance(1);
@@ -26749,49 +26731,39 @@
             i0__namespace.ɵɵadvance(1);
             i0__namespace.ɵɵproperty("ngIf", ctx_r0.showEventNotes());
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵproperty("disabled", !ctx_r0.hasPrevious() || ctx_r0.isSubmitting);
+            i0__namespace.ɵɵproperty("disabled", !ctx_r0.hasPrevious() || ctx_r0.caseEdit.isSubmitting);
             i0__namespace.ɵɵadvance(2);
             i0__namespace.ɵɵproperty("disabled", ctx_r0.isDisabled);
             i0__namespace.ɵɵadvance(1);
             i0__namespace.ɵɵtextInterpolate(ctx_r0.triggerText);
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵclassProp("disabled", ctx_r0.isSubmitting);
+            i0__namespace.ɵɵclassProp("disabled", ctx_r0.caseEdit.isSubmitting);
             i0__namespace.ɵɵadvance(1);
             i0__namespace.ɵɵtextInterpolate(ctx_r0.getCancelText());
         }
     }
     function CaseEditSubmitComponent_ccd_case_event_completion_1_Template(rf, ctx) {
         if (rf & 1) {
-            var _r45_1 = i0__namespace.ɵɵgetCurrentView();
-            i0__namespace.ɵɵelementStart(0, "ccd-case-event-completion", 57);
-            i0__namespace.ɵɵlistener("eventCanBeCompleted", function CaseEditSubmitComponent_ccd_case_event_completion_1_Template_ccd_case_event_completion_eventCanBeCompleted_0_listener($event) { i0__namespace.ɵɵrestoreView(_r45_1); var ctx_r44 = i0__namespace.ɵɵnextContext(); return ctx_r44.onEventCanBeCompleted($event); });
+            var _r40_1 = i0__namespace.ɵɵgetCurrentView();
+            i0__namespace.ɵɵelementStart(0, "ccd-case-event-completion", 48);
+            i0__namespace.ɵɵlistener("eventCanBeCompleted", function CaseEditSubmitComponent_ccd_case_event_completion_1_Template_ccd_case_event_completion_eventCanBeCompleted_0_listener($event) { i0__namespace.ɵɵrestoreView(_r40_1); var ctx_r39 = i0__namespace.ɵɵnextContext(); return ctx_r39.onEventCanBeCompleted($event); });
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
             var ctx_r1 = i0__namespace.ɵɵnextContext();
-            i0__namespace.ɵɵproperty("eventCompletionParams", ctx_r1.eventCompletionParams);
+            i0__namespace.ɵɵproperty("eventCompletionParams", ctx_r1.caseEdit.eventCompletionParams);
         }
     }
     // @dynamic
     var CaseEditSubmitComponent = /** @class */ (function () {
-        function CaseEditSubmitComponent(caseEdit, formValueService, formErrorService, fieldsUtils, caseFieldService, route, router, orderService, profileNotifier, sessionStorageService, caseNotifier) {
+        function CaseEditSubmitComponent(caseEdit, fieldsUtils, caseFieldService, route, orderService, profileNotifier) {
             this.caseEdit = caseEdit;
-            this.formValueService = formValueService;
-            this.formErrorService = formErrorService;
             this.fieldsUtils = fieldsUtils;
             this.caseFieldService = caseFieldService;
             this.route = route;
-            this.router = router;
             this.orderService = orderService;
             this.profileNotifier = profileNotifier;
-            this.sessionStorageService = sessionStorageService;
-            this.caseNotifier = caseNotifier;
-            this.callbackErrorsSubject = new rxjs.Subject();
-            this.ignoreWarning = false;
             this.paletteContext = exports.PaletteContext.CHECK_YOUR_ANSWER;
-            this.eventCompletionChecksRequired = false;
-            this.isCaseFlagSubmission = false;
-            this.isLinkedCasesSubmission = false;
         }
         Object.defineProperty(CaseEditSubmitComponent.prototype, "isDisabled", {
             get: function () {
@@ -26799,7 +26771,7 @@
                 // We don't need to check the validity of the editForm as it is readonly.
                 // This was causing issues with hidden fields that aren't wanted but have
                 // not been disabled.
-                return this.isSubmitting || this.hasErrors;
+                return this.caseEdit.isSubmitting || this.hasErrors;
             },
             enumerable: false,
             configurable: true
@@ -26812,216 +26784,42 @@
             this.editForm = this.caseEdit.form;
             this.wizard = this.caseEdit.wizard;
             this.showSummaryFields = this.sortFieldsByShowSummaryContent(this.eventTrigger.case_fields);
-            this.isSubmitting = false;
+            this.caseEdit.isSubmitting = false;
             this.contextFields = this.getCaseFields();
             // Indicates if the submission is for a Case Flag, as opposed to a "regular" form submission, by the presence of
             // a FlagLauncher field in the event trigger
-            this.isCaseFlagSubmission = this.eventTrigger.case_fields.some(function (caseField) { return FieldsUtils.isFlagLauncherCaseField(caseField); });
-            this.pageTitle = this.isCaseFlagSubmission ? 'Review flag details' : 'Check your answers';
-            this.isLinkedCasesSubmission = this.eventTrigger.case_fields.some(function (caseField) { return FieldsUtils.isComponentLauncherCaseField(caseField); });
+            this.caseEdit.isCaseFlagSubmission = this.eventTrigger.case_fields.some(function (caseField) { return FieldsUtils.isFlagLauncherCaseField(caseField); });
+            this.caseEdit.isLinkedCasesSubmission =
+                this.eventTrigger.case_fields.some(function (caseField) { return FieldsUtils.isComponentLauncherCaseField(caseField); });
+            this.pageTitle = this.caseEdit.isCaseFlagSubmission ? 'Review flag details' : 'Check your answers';
         };
         CaseEditSubmitComponent.prototype.ngOnDestroy = function () {
+            /* istanbul ignore else */
             if (this.profileSubscription) {
                 this.profileSubscription.unsubscribe();
             }
         };
         CaseEditSubmitComponent.prototype.submit = function () {
-            this.isSubmitting = true;
-            // We have to run the event completion checks if task in session storage
-            // and if the task is in session storage, then is it associated to the case
-            var taskInSessionStorage;
-            var taskStr = this.sessionStorageService.getItem('taskToComplete');
-            if (taskStr) {
-                taskInSessionStorage = JSON.parse(taskStr);
-            }
-            if (taskInSessionStorage && taskInSessionStorage.case_id === this.getCaseId()) {
-                // Show event completion component to perform event completion checks
-                this.eventCompletionParams = {
-                    caseId: this.getCaseId(),
-                    eventId: this.getEventId(),
-                    task: taskInSessionStorage
-                };
-                this.eventCompletionChecksRequired = true;
-            }
-            else {
-                // Task not in session storage, proceed to submit
-                var caseEventData = this.generateCaseEventData();
-                this.caseSubmit(caseEventData);
-            }
-        };
-        CaseEditSubmitComponent.prototype.onEventCanBeCompleted = function (eventCanBeCompleted) {
-            if (eventCanBeCompleted) {
-                // Submit
-                var caseEventData = this.generateCaseEventData();
-                this.caseSubmit(caseEventData);
-            }
-            else {
-                // Navigate to tasks tab on case details page
-                this.router.navigate(["/cases/case-details/" + this.getCaseId() + "/tasks"], { relativeTo: this.route });
-            }
-        };
-        CaseEditSubmitComponent.prototype.generateCaseEventData = function () {
-            var caseEventData = {
-                data: this.replaceEmptyComplexFieldValues(this.formValueService.sanitise(this.replaceHiddenFormValuesWithOriginalCaseData(this.editForm.get('data'), this.eventTrigger.case_fields))),
-                event: this.editForm.value.event
-            };
-            this.formValueService.clearNonCaseFields(caseEventData.data, this.eventTrigger.case_fields);
-            this.formValueService.removeNullLabels(caseEventData.data, this.eventTrigger.case_fields);
-            this.formValueService.removeEmptyDocuments(caseEventData.data, this.eventTrigger.case_fields);
-            // Remove collection fields that have "min" validation of greater than zero set on the FieldType but are empty;
-            // these will fail validation
-            this.formValueService.removeEmptyCollectionsWithMinValidation(caseEventData.data, this.eventTrigger.case_fields);
-            // If this is a Case Flag submission (and thus a FlagLauncher field is present in the event trigger), the flag
-            // details data needs populating for each Flags field, then the FlagLauncher field needs removing
-            if (this.isCaseFlagSubmission) {
-                this.formValueService.populateFlagDetailsFromCaseFields(caseEventData.data, this.eventTrigger.case_fields);
-                this.formValueService.removeFlagLauncherField(caseEventData.data, this.eventTrigger.case_fields);
-            }
-            if (this.isLinkedCasesSubmission) {
-                this.formValueService.populateLinkedCasesDetailsFromCaseFields(caseEventData.data, this.eventTrigger.case_fields);
-                this.formValueService.removeComponentLauncherField(caseEventData.data, this.eventTrigger.case_fields);
-            }
-            caseEventData.event_token = this.eventTrigger.event_token;
-            caseEventData.ignore_warning = this.ignoreWarning;
-            if (this.caseEdit.confirmation) {
-                caseEventData.data = {};
-            }
-            return caseEventData;
-        };
-        CaseEditSubmitComponent.prototype.caseSubmit = function (caseEventData) {
-            var _this = this;
-            this.caseEdit.submit(caseEventData)
-                .subscribe(function (response) {
-                _this.caseNotifier.cachedCaseView = null;
-                _this.sessionStorageService.removeItem('eventUrl');
-                var confirmation = _this.buildConfirmation(response);
-                if (confirmation && (confirmation.getHeader() || confirmation.getBody())) {
-                    _this.caseEdit.confirm(confirmation);
-                }
-                else {
-                    _this.caseEdit.submitted.emit({ caseId: response['id'], status: _this.getStatus(response) });
-                }
-            }, function (error) {
-                _this.error = error;
-                _this.callbackErrorsSubject.next(_this.error);
-                if (_this.error.details) {
-                    _this.formErrorService
-                        .mapFieldErrors(_this.error.details.field_errors, _this.editForm.controls['data'], 'validation');
-                }
-                _this.isSubmitting = false;
+            this.caseEdit.submitForm({
+                eventTrigger: this.eventTrigger,
+                form: this.editForm,
+                submit: this.caseEdit.submit,
+                caseDetails: this.caseEdit.caseDetails,
             });
         };
-        /**
-         * Traverse *all* values of a {@link FormGroup}, including those for disabled fields (i.e. hidden ones), replacing the
-         * value of any that are hidden AND have `retain_hidden_value` set to `true` in the corresponding `CaseField`, with
-         * the *original* value held in the `CaseField` object.
-         *
-         * This is as per design in EUI-3622, where any user-driven updates to hidden fields with `retain_hidden_value` =
-         * `true` are ignored (thus retaining the value displayed originally).
-         *
-         * * For Complex field types, the replacement above is performed recursively for all hidden sub-fields with
-         * `retain_hidden_value` = `true`.
-         *
-         * * For Collection field types, including collections of Complex and Document field types, the replacement is
-         * performed for all fields in the collection.
-         *
-         * @param formGroup The `FormGroup` instance whose raw values are to be traversed
-         * @param caseFields The array of {@link CaseField} domain model objects corresponding to fields in `formGroup`
-         * @param parentField Reference to the parent `CaseField`. Used for retrieving the sub-field values of a Complex field
-         * to perform recursive replacement - the sub-field `CaseField`s themselves do *not* contain any values
-         * @returns An object with the *raw* form value data (as key-value pairs), with any value replacements as necessary
-         */
-        CaseEditSubmitComponent.prototype.replaceHiddenFormValuesWithOriginalCaseData = function (formGroup, caseFields, parentField) {
-            var _this = this;
-            // Get the raw form value data, which includes the values of any disabled controls, as key-value pairs
-            var rawFormValueData = formGroup.getRawValue();
-            // Place all case fields in a lookup object, so they can be retrieved by id
-            var caseFieldsLookup = {};
-            for (var i = 0, len = caseFields.length; i < len; i++) {
-                caseFieldsLookup[caseFields[i].id] = caseFields[i];
-            }
-            /**
-             * Replace any form value with the original, where its CaseField is hidden AND has the retain_hidden_value flag set
-             * to true.
-             *
-             * If the CaseField's `hidden` attribute is null or undefined, then check this attribute in the parent CaseField (if
-             * one exists). This is occurring (and is possibly a bug) when a CaseField is a sub-field of a Complex type, or an
-             * item in a Collection type.
-             *
-             * If the field is a Complex type with retain_hidden_value = true, perform a recursive replacement for all (hidden)
-             * sub-fields with retain_hidden_value = true, using their original CaseField values (from the `formatted_value`
-             * attribute).
-             *
-             * If the field is a Collection type with retain_hidden_value = true, the entire collection is replaced with the
-             * original from `formatted_value`. This applies to *all* types of Collections.
-             */
-            Object.keys(rawFormValueData).forEach(function (key) {
-                var caseField = caseFieldsLookup[key];
-                // If caseField.hidden is NOT truthy and also NOT equal to false, then it must be null/undefined (remember that
-                // both null and undefined are equal to *neither false nor true*)
-                if (caseField && caseField.retain_hidden_value &&
-                    (caseField.hidden || (caseField.hidden !== false && parentField && parentField.hidden))) {
-                    if (caseField.field_type.type === 'Complex') {
-                        // Note: Deliberate use of equality (==) and non-equality (!=) operators for null checks throughout, to
-                        // handle both null and undefined values
-                        if (caseField.value !== null) {
-                            // Call this function recursively to replace the Complex field's sub-fields as necessary, passing the
-                            // CaseField itself (the sub-fields do not contain any values, so these need to be obtained from the
-                            // parent)
-                            // Update rawFormValueData for this field
-                            // creating form group and adding control into it in case caseField is of complext type and and part of formGroup
-                            var form_1 = new i2.FormGroup({});
-                            if (formGroup.controls[key].value) {
-                                Object.keys(formGroup.controls[key].value).forEach(function (item) {
-                                    form_1.addControl(item, new i2.FormControl(formGroup.controls[key].value[item]));
-                                });
-                            }
-                            rawFormValueData[key] = _this.replaceHiddenFormValuesWithOriginalCaseData(form_1, caseField.field_type.complex_fields, caseField);
-                        }
-                    }
-                    else {
-                        // Default case also handles collections of *all* types; the entire collection in rawFormValueData will be
-                        // replaced with the original from formatted_value
-                        // Use the CaseField's existing *formatted_value* from the parent, if available. (This is necessary for
-                        // Complex fields, whose sub-fields do not hold any values in the model.) Otherwise, use formatted_value
-                        // from the CaseField itself.
-                        if (parentField && parentField.formatted_value) {
-                            rawFormValueData[key] = parentField.formatted_value[caseField.id];
-                        }
-                        else {
-                            rawFormValueData[key] = caseField.formatted_value;
-                        }
-                    }
-                }
-            });
-            return rawFormValueData;
-        };
-        /**
-         * Replaces non-array value objects with `null` for any Complex-type fields whose value is effectively empty, i.e.
-         * all its sub-fields and descendants are `null` or `undefined`.
-         *
-         * @param data The object tree representing all the form field data
-         * @returns The form field data modified accordingly
-         */
-        CaseEditSubmitComponent.prototype.replaceEmptyComplexFieldValues = function (data) {
-            Object.keys(data).forEach(function (key) {
-                if (!Array.isArray(data[key]) && typeof data[key] === 'object' && !FieldsUtils.containsNonEmptyValues(data[key])) {
-                    data[key] = null;
-                }
+        CaseEditSubmitComponent.prototype.onEventCanBeCompleted = function (eventCanBeCompleted) {
+            this.caseEdit.onEventCanBeCompleted({
+                eventTrigger: this.eventTrigger,
+                eventCanBeCompleted: eventCanBeCompleted,
+                caseDetails: this.caseEdit.caseDetails,
+                form: this.editForm,
+                submit: this.caseEdit.submit,
             });
-            return data;
-        };
-        CaseEditSubmitComponent.prototype.getStatus = function (response) {
-            return this.hasCallbackFailed(response) ? response['callback_response_status'] : response['delete_draft_response_status'];
-        };
-        CaseEditSubmitComponent.prototype.hasCallbackFailed = function (response) {
-            return response['callback_response_status'] !== 'CALLBACK_COMPLETED';
         };
         Object.defineProperty(CaseEditSubmitComponent.prototype, "hasErrors", {
             get: function () {
-                return this.error
-                    && this.error.callbackErrors
-                    && this.error.callbackErrors.length;
+                var _a, _b, _c;
+                return (_c = (_b = (_a = this.caseEdit) === null || _a === void 0 ? void 0 : _a.error) === null || _b === void 0 ? void 0 : _b.callbackErrors) === null || _c === void 0 ? void 0 : _c.length;
             },
             enumerable: false,
             configurable: true
@@ -27030,10 +26828,11 @@
             this.caseEdit.navigateToPage(pageId);
         };
         CaseEditSubmitComponent.prototype.callbackErrorsNotify = function (errorContext) {
-            this.ignoreWarning = errorContext.ignoreWarning;
+            this.caseEdit.ignoreWarning = errorContext.ignoreWarning;
             this.triggerText = errorContext.triggerText;
         };
         CaseEditSubmitComponent.prototype.summaryCaseField = function (field) {
+            /* istanbul ignore else */
             if (null === this.editForm.get('data').get(field.id)) {
                 // If not in form, return field itself
                 return field;
@@ -27062,17 +26861,20 @@
             return !this.caseFieldService.isReadOnly(field);
         };
         CaseEditSubmitComponent.prototype.checkYourAnswerFieldsToDisplayExists = function () {
-            var e_1, _a, e_2, _b;
+            var e_1, _d, e_2, _e;
+            /* istanbul ignore else */
             if (!this.eventTrigger.show_summary) {
                 return false;
             }
             try {
-                for (var _c = __values(this.wizard.pages), _d = _c.next(); !_d.done; _d = _c.next()) {
-                    var page = _d.value;
+                for (var _f = __values(this.wizard.pages), _g = _f.next(); !_g.done; _g = _f.next()) {
+                    var page = _g.value;
+                    /* istanbul ignore else */
                     if (this.isShown(page)) {
                         try {
-                            for (var _e = (e_2 = void 0, __values(page.case_fields)), _f = _e.next(); !_f.done; _f = _e.next()) {
-                                var field = _f.value;
+                            for (var _h = (e_2 = void 0, __values(page.case_fields)), _j = _h.next(); !_j.done; _j = _h.next()) {
+                                var field = _j.value;
+                                /* istanbul ignore else */
                                 if (this.canShowFieldInCYA(field)) {
                                     // at least one field needs showing
                                     return true;
@@ -27082,7 +26884,7 @@
                         catch (e_2_1) { e_2 = { error: e_2_1 }; }
                         finally {
                             try {
-                                if (_f && !_f.done && (_b = _e.return)) _b.call(_e);
+                                if (_j && !_j.done && (_e = _h.return)) _e.call(_h);
                             }
                             finally { if (e_2) throw e_2.error; }
                         }
@@ -27092,7 +26894,7 @@
             catch (e_1_1) { e_1 = { error: e_1_1 }; }
             finally {
                 try {
-                    if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
+                    if (_g && !_g.done && (_d = _f.return)) _d.call(_f);
                 }
                 finally { if (e_1) throw e_1.error; }
             }
@@ -27103,7 +26905,7 @@
             return this.eventTrigger.case_fields.some(function (field) { return field.show_summary_content_option >= 0; });
         };
         CaseEditSubmitComponent.prototype.showEventNotes = function () {
-            return this.eventTrigger.show_event_notes !== false;
+            return this.eventTrigger.show_event_notes === true;
         };
         CaseEditSubmitComponent.prototype.getLastPageShown = function () {
             var _this = this;
@@ -27117,6 +26919,7 @@
             return lastPage;
         };
         CaseEditSubmitComponent.prototype.previous = function () {
+            /* istanbul ignore else */
             if (this.hasPrevious()) {
                 this.navigateToPage(this.getLastPageShown().id);
             }
@@ -27135,14 +26938,6 @@
         CaseEditSubmitComponent.prototype.isSolicitor = function () {
             return this.profile.isSolicitor();
         };
-        CaseEditSubmitComponent.prototype.buildConfirmation = function (response) {
-            if (response['after_submit_callback_response']) {
-                return new Confirmation(response['id'], response['callback_response_status'], response['after_submit_callback_response']['confirmation_header'], response['after_submit_callback_response']['confirmation_body']);
-            }
-            else {
-                return null;
-            }
-        };
         CaseEditSubmitComponent.prototype.sortFieldsByShowSummaryContent = function (fields) {
             return this.orderService
                 .sort(fields, CaseEditSubmitComponent.SHOW_SUMMARY_CONTENT_COMPARE_FUNCTION)
@@ -27155,10 +26950,7 @@
             return this.eventTrigger.case_fields;
         };
         CaseEditSubmitComponent.prototype.getCaseId = function () {
-            return (this.caseEdit.caseDetails ? this.caseEdit.caseDetails.case_id : '');
-        };
-        CaseEditSubmitComponent.prototype.getEventId = function () {
-            return this.editForm.value.event.id;
+            return this.caseEdit.getCaseId(this.caseEdit.caseDetails);
         };
         CaseEditSubmitComponent.prototype.getCaseTitle = function () {
             return (this.caseEdit.caseDetails && this.caseEdit.caseDetails.state &&
@@ -27185,16 +26977,16 @@
         }
         return a.show_summary_content_option - b.show_summary_content_option;
     };
-    CaseEditSubmitComponent.ɵfac = function CaseEditSubmitComponent_Factory(t) { return new (t || CaseEditSubmitComponent)(i0__namespace.ɵɵdirectiveInject(CaseEditComponent), i0__namespace.ɵɵdirectiveInject(FormValueService), i0__namespace.ɵɵdirectiveInject(FormErrorService), i0__namespace.ɵɵdirectiveInject(FieldsUtils), i0__namespace.ɵɵdirectiveInject(CaseFieldService), i0__namespace.ɵɵdirectiveInject(i1__namespace$1.ActivatedRoute), i0__namespace.ɵɵdirectiveInject(i1__namespace$1.Router), i0__namespace.ɵɵdirectiveInject(OrderService), i0__namespace.ɵɵdirectiveInject(ProfileNotifier), i0__namespace.ɵɵdirectiveInject(SessionStorageService), i0__namespace.ɵɵdirectiveInject(CaseNotifier)); };
-    CaseEditSubmitComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: CaseEditSubmitComponent, selectors: [["ccd-case-edit-submit"]], decls: 2, vars: 2, consts: [[4, "ngIf"], [3, "eventCompletionParams", "eventCanBeCompleted", 4, "ngIf"], [1, "govuk-heading-l"], [4, "ngIf", "ngIfThen", "ngIfElse"], ["titleBlock", ""], ["idBlock", ""], ["class", "error-summary", "role", "group", "aria-labelledby", "edit-case-event_error-summary-heading", "tabindex", "-1", 4, "ngIf"], [3, "callbackErrorsSubject", "callbackErrorsContext"], [1, "check-your-answers", 3, "formGroup", "submit"], [1, "form-group", "form-group-related"], ["type", "button", 1, "button", "button-secondary", 3, "disabled", "click"], ["type", "submit", 1, "button", 3, "disabled"], [1, "cancel"], ["href", "javascript:void(0)", 3, "click"], [3, "content"], ["class", "heading-h2", 4, "ngIf"], [1, "heading-h2"], ["role", "group", "aria-labelledby", "edit-case-event_error-summary-heading", "tabindex", "-1", 1, "error-summary"], ["id", "edit-case-event_error-summary-heading", 1, "heading-h1", "error-summary-heading"], ["id", "edit-case-event_error-summary-body", 1, "govuk-error-summary__body"], ["href", "get-help", "target", "_blank"], ["id", "edit-case-event_error-summary-heading", 1, "heading-h3", "error-summary-heading"], ["class", "error-summary-list", 4, "ngIf"], [1, "error-summary-list"], ["class", "ccd-error-summary-li", 4, "ngFor", "ngForOf"], [1, "ccd-error-summary-li"], ["class", "text-16", 4, "ngIf"], ["aria-describedby", "check your answers table", 1, "form-table"], [4, "ngFor", "ngForOf"], [1, "text-16"], ["ccdLabelSubstitutor", "", 3, "caseField", "hidden", "formGroup", "contextFields"], ["class", "valign-top case-field-label", 4, "ngIf"], [1, "form-cell", "case-field-content"], [3, "formGroup", "topLevelFormGroup", "caseField", "context", "caseFields"], [1, "valign-top", "check-your-answers__change", "case-field-change"], ["href", "javascript:void(0)", 3, "click", 4, "ngIf"], [1, "valign-top", "case-field-label"], ["aria-describedby", "summary fields table", 1, "summary-fields"], [3, "ngSwitch"], ["ccdLabelSubstitutor", "", 3, "caseField", "formGroup", "contextFields", 4, "ngSwitchCase"], ["class", "compound-field", "ccdLabelSubstitutor", "", 3, "caseField", "formGroup", "contextFields", 4, "ngSwitchCase"], ["ccdLabelSubstitutor", "", 3, "caseField", "formGroup", "contextFields"], ["id", "summary-field-label"], [1, "form-cell"], [3, "formGroup", "caseField"], ["ccdLabelSubstitutor", "", 1, "compound-field", 3, "caseField", "formGroup", "contextFields"], ["colspan", "2"], [3, "formGroup", "caseField", "caseFields"], ["id", "fieldset-event", "formGroupName", "event", 4, "ngIf"], ["id", "fieldset-event", "formGroupName", "event"], [2, "display", "none"], [1, "form-group"], ["for", "field-trigger-summary", 1, "form-label"], [1, "form-hint"], ["type", "text", "id", "field-trigger-summary", "formControlName", "summary", "maxlength", "1024", 1, "form-control", "bottom-30", "width-50"], ["for", "field-trigger-description", 1, "form-label"], ["id", "field-trigger-description", "formControlName", "description", "maxlength", "65536", 1, "form-control", "bottom-30", "width-50"], [3, "eventCompletionParams", "eventCanBeCompleted"]], template: function CaseEditSubmitComponent_Template(rf, ctx) {
+    CaseEditSubmitComponent.ɵfac = function CaseEditSubmitComponent_Factory(t) { return new (t || CaseEditSubmitComponent)(i0__namespace.ɵɵdirectiveInject(CaseEditComponent), i0__namespace.ɵɵdirectiveInject(FieldsUtils), i0__namespace.ɵɵdirectiveInject(CaseFieldService), i0__namespace.ɵɵdirectiveInject(i1__namespace$1.ActivatedRoute), i0__namespace.ɵɵdirectiveInject(OrderService), i0__namespace.ɵɵdirectiveInject(ProfileNotifier)); };
+    CaseEditSubmitComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: CaseEditSubmitComponent, selectors: [["ccd-case-edit-submit"]], decls: 2, vars: 2, consts: [[4, "ngIf"], [3, "eventCompletionParams", "eventCanBeCompleted", 4, "ngIf"], [1, "govuk-heading-l"], [4, "ngIf", "ngIfThen", "ngIfElse"], ["titleBlock", ""], ["idBlock", ""], [3, "error"], [3, "callbackErrorsSubject", "callbackErrorsContext"], [1, "check-your-answers", 3, "formGroup", "submit"], [1, "form-group", "form-group-related"], ["type", "button", 1, "button", "button-secondary", 3, "disabled", "click"], ["type", "submit", 1, "button", 3, "disabled"], [1, "cancel"], ["href", "javascript:void(0)", 3, "click"], [3, "content"], ["class", "heading-h2", 4, "ngIf"], [1, "heading-h2"], ["class", "text-16", 4, "ngIf"], ["aria-describedby", "check your answers table", 1, "form-table"], [4, "ngFor", "ngForOf"], [1, "text-16"], ["ccdLabelSubstitutor", "", 3, "caseField", "hidden", "formGroup", "contextFields"], ["class", "valign-top case-field-label", 4, "ngIf"], [1, "form-cell", "case-field-content"], [3, "formGroup", "topLevelFormGroup", "caseField", "context", "caseFields"], [1, "valign-top", "check-your-answers__change", "case-field-change"], ["href", "javascript:void(0)", 3, "click", 4, "ngIf"], [1, "valign-top", "case-field-label"], ["aria-describedby", "summary fields table", 1, "summary-fields"], [3, "ngSwitch"], ["ccdLabelSubstitutor", "", 3, "caseField", "formGroup", "contextFields", 4, "ngSwitchCase"], ["class", "compound-field", "ccdLabelSubstitutor", "", 3, "caseField", "formGroup", "contextFields", 4, "ngSwitchCase"], ["ccdLabelSubstitutor", "", 3, "caseField", "formGroup", "contextFields"], ["id", "summary-field-label"], [1, "form-cell"], [3, "formGroup", "caseField"], ["ccdLabelSubstitutor", "", 1, "compound-field", 3, "caseField", "formGroup", "contextFields"], ["colspan", "2"], [3, "formGroup", "caseField", "caseFields"], ["id", "fieldset-event", "formGroupName", "event", 4, "ngIf"], ["id", "fieldset-event", "formGroupName", "event"], [2, "display", "none"], [1, "form-group"], ["for", "field-trigger-summary", 1, "form-label"], [1, "form-hint"], ["type", "text", "id", "field-trigger-summary", "formControlName", "summary", "maxlength", "1024", 1, "form-control", "bottom-30", "width-50"], ["for", "field-trigger-description", 1, "form-label"], ["id", "field-trigger-description", "formControlName", "description", "maxlength", "65536", 1, "form-control", "bottom-30", "width-50"], [3, "eventCompletionParams", "eventCanBeCompleted"]], template: function CaseEditSubmitComponent_Template(rf, ctx) {
             if (rf & 1) {
-                i0__namespace.ɵɵtemplate(0, CaseEditSubmitComponent_div_0_Template, 23, 17, "div", 0);
+                i0__namespace.ɵɵtemplate(0, CaseEditSubmitComponent_div_0_Template, 22, 16, "div", 0);
                 i0__namespace.ɵɵtemplate(1, CaseEditSubmitComponent_ccd_case_event_completion_1_Template, 1, 1, "ccd-case-event-completion", 1);
             }
             if (rf & 2) {
-                i0__namespace.ɵɵproperty("ngIf", !ctx.eventCompletionChecksRequired);
+                i0__namespace.ɵɵproperty("ngIf", !ctx.caseEdit.isEventCompletionChecksRequired);
                 i0__namespace.ɵɵadvance(1);
-                i0__namespace.ɵɵproperty("ngIf", ctx.eventCompletionChecksRequired);
+                i0__namespace.ɵɵproperty("ngIf", ctx.caseEdit.isEventCompletionChecksRequired);
             }
         }, styles: ["#fieldset-case-data[_ngcontent-%COMP%]{margin-bottom:30px}#fieldset-case-data[_ngcontent-%COMP%]   th[_ngcontent-%COMP%]{width:1%;white-space:nowrap;vertical-align:top}.compound-field[_ngcontent-%COMP%]   td[_ngcontent-%COMP%]{padding:0}#confirmation-header[_ngcontent-%COMP%]{width:630px;background-color:#17958b;border:1px solid #979797;color:#fff;text-align:center}#confirmation-body[_ngcontent-%COMP%]{width:630px;background-color:#fff}.valign-top[_ngcontent-%COMP%]{vertical-align:top}.summary-fields[_ngcontent-%COMP%]{margin-bottom:30px}.summary-fields[_ngcontent-%COMP%]   tbody[_ngcontent-%COMP%]   tr[_ngcontent-%COMP%]   td[_ngcontent-%COMP%], .summary-fields[_ngcontent-%COMP%]   tbody[_ngcontent-%COMP%]   tr[_ngcontent-%COMP%]   th[_ngcontent-%COMP%]{border-bottom:0}a.disabled[_ngcontent-%COMP%]{pointer-events:none;cursor:default}.case-field-label[_ngcontent-%COMP%]{width:45%}.case-field-content[_ngcontent-%COMP%]{width:50%}.case-field-change[_ngcontent-%COMP%]{width:5%}"] });
     (function () {
@@ -27205,7 +26997,7 @@
                         templateUrl: 'case-edit-submit.html',
                         styleUrls: ['../case-edit.scss']
                     }]
-            }], function () { return [{ type: CaseEditComponent }, { type: FormValueService }, { type: FormErrorService }, { type: FieldsUtils }, { type: CaseFieldService }, { type: i1__namespace$1.ActivatedRoute }, { type: i1__namespace$1.Router }, { type: OrderService }, { type: ProfileNotifier }, { type: SessionStorageService }, { type: CaseNotifier }]; }, null);
+            }], function () { return [{ type: CaseEditComponent }, { type: FieldsUtils }, { type: CaseFieldService }, { type: i1__namespace$1.ActivatedRoute }, { type: OrderService }, { type: ProfileNotifier }]; }, null);
     })();
 
     function CaseProgressComponent_div_0_Template(rf, ctx) {
@@ -27392,6 +27184,101 @@
             }], null, null);
     })();
 
+    function CaseEditGenericErrorsComponent_div_0_Template(rf, ctx) {
+        if (rf & 1) {
+            i0__namespace.ɵɵelementStart(0, "div", 1);
+            i0__namespace.ɵɵelementStart(1, "h1", 2);
+            i0__namespace.ɵɵtext(2, " Something went wrong ");
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementStart(3, "div", 3);
+            i0__namespace.ɵɵelementStart(4, "p");
+            i0__namespace.ɵɵtext(5, "We're working to fix the problem. Try again shortly.");
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementStart(6, "p");
+            i0__namespace.ɵɵelementStart(7, "a", 4);
+            i0__namespace.ɵɵtext(8, "Contact us");
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵtext(9, " if you're still having problems.");
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementEnd();
+        }
+    }
+    function CaseEditGenericErrorsComponent_div_1_ul_5_li_1_Template(rf, ctx) {
+        if (rf & 1) {
+            i0__namespace.ɵɵelementStart(0, "li", 9);
+            i0__namespace.ɵɵtext(1);
+            i0__namespace.ɵɵelementEnd();
+        }
+        if (rf & 2) {
+            var fieldError_r4 = ctx.$implicit;
+            i0__namespace.ɵɵadvance(1);
+            i0__namespace.ɵɵtextInterpolate(fieldError_r4.message);
+        }
+    }
+    function CaseEditGenericErrorsComponent_div_1_ul_5_Template(rf, ctx) {
+        if (rf & 1) {
+            i0__namespace.ɵɵelementStart(0, "ul", 7);
+            i0__namespace.ɵɵtemplate(1, CaseEditGenericErrorsComponent_div_1_ul_5_li_1_Template, 2, 1, "li", 8);
+            i0__namespace.ɵɵelementEnd();
+        }
+        if (rf & 2) {
+            var ctx_r2 = i0__namespace.ɵɵnextContext(2);
+            i0__namespace.ɵɵadvance(1);
+            i0__namespace.ɵɵproperty("ngForOf", ctx_r2.error.details.field_errors);
+        }
+    }
+    function CaseEditGenericErrorsComponent_div_1_Template(rf, ctx) {
+        if (rf & 1) {
+            i0__namespace.ɵɵelementStart(0, "div", 1);
+            i0__namespace.ɵɵelementStart(1, "h3", 5);
+            i0__namespace.ɵɵtext(2, " The event could not be created ");
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementStart(3, "p");
+            i0__namespace.ɵɵtext(4);
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵtemplate(5, CaseEditGenericErrorsComponent_div_1_ul_5_Template, 2, 1, "ul", 6);
+            i0__namespace.ɵɵelementEnd();
+        }
+        if (rf & 2) {
+            var ctx_r1 = i0__namespace.ɵɵnextContext();
+            i0__namespace.ɵɵadvance(4);
+            i0__namespace.ɵɵtextInterpolate(ctx_r1.error.message);
+            i0__namespace.ɵɵadvance(1);
+            i0__namespace.ɵɵproperty("ngIf", ctx_r1.error.details == null ? null : ctx_r1.error.details.field_errors);
+        }
+    }
+    var CaseEditGenericErrorsComponent = /** @class */ (function () {
+        function CaseEditGenericErrorsComponent() {
+        }
+        return CaseEditGenericErrorsComponent;
+    }());
+    CaseEditGenericErrorsComponent.ɵfac = function CaseEditGenericErrorsComponent_Factory(t) { return new (t || CaseEditGenericErrorsComponent)(); };
+    CaseEditGenericErrorsComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: CaseEditGenericErrorsComponent, selectors: [["ccd-case-edit-generic-errors"]], inputs: { error: "error" }, features: [i0__namespace.ɵɵProvidersFeature([])], decls: 2, vars: 2, consts: [["class", "error-summary", "role", "group", "aria-labelledby", "edit-case-event_error-summary-heading", "tabindex", "-1", 4, "ngIf"], ["role", "group", "aria-labelledby", "edit-case-event_error-summary-heading", "tabindex", "-1", 1, "error-summary"], ["id", "edit-case-event_error-summary-heading", 1, "heading-h1", "error-summary-heading"], ["id", "edit-case-event_error-summary-body", 1, "govuk-error-summary__body"], ["href", "get-help", "target", "_blank"], ["id", "edit-case-event_error-summary-heading", 1, "heading-h3", "error-summary-heading"], ["class", "error-summary-list", 4, "ngIf"], [1, "error-summary-list"], ["class", "ccd-error-summary-li", 4, "ngFor", "ngForOf"], [1, "ccd-error-summary-li"]], template: function CaseEditGenericErrorsComponent_Template(rf, ctx) {
+            if (rf & 1) {
+                i0__namespace.ɵɵtemplate(0, CaseEditGenericErrorsComponent_div_0_Template, 10, 0, "div", 0);
+                i0__namespace.ɵɵtemplate(1, CaseEditGenericErrorsComponent_div_1_Template, 6, 2, "div", 0);
+            }
+            if (rf & 2) {
+                i0__namespace.ɵɵproperty("ngIf", ctx.error && (!(ctx.error.callbackErrors || ctx.error.callbackWarnings || ctx.error.details) && !ctx.error.message));
+                i0__namespace.ɵɵadvance(1);
+                i0__namespace.ɵɵproperty("ngIf", ctx.error && (ctx.error.details || ctx.error.message));
+            }
+        }, directives: [i1__namespace.NgIf, i1__namespace.NgForOf], styles: ["#fieldset-case-data[_ngcontent-%COMP%]{margin-bottom:30px}#fieldset-case-data[_ngcontent-%COMP%]   th[_ngcontent-%COMP%]{width:1%;white-space:nowrap;vertical-align:top}.compound-field[_ngcontent-%COMP%]   td[_ngcontent-%COMP%]{padding:0}#confirmation-header[_ngcontent-%COMP%]{width:630px;background-color:#17958b;border:1px solid #979797;color:#fff;text-align:center}#confirmation-body[_ngcontent-%COMP%]{width:630px;background-color:#fff}.valign-top[_ngcontent-%COMP%]{vertical-align:top}.summary-fields[_ngcontent-%COMP%]{margin-bottom:30px}.summary-fields[_ngcontent-%COMP%]   tbody[_ngcontent-%COMP%]   tr[_ngcontent-%COMP%]   td[_ngcontent-%COMP%], .summary-fields[_ngcontent-%COMP%]   tbody[_ngcontent-%COMP%]   tr[_ngcontent-%COMP%]   th[_ngcontent-%COMP%]{border-bottom:0}a.disabled[_ngcontent-%COMP%]{pointer-events:none;cursor:default}.case-field-label[_ngcontent-%COMP%]{width:45%}.case-field-content[_ngcontent-%COMP%]{width:50%}.case-field-change[_ngcontent-%COMP%]{width:5%}"] });
+    (function () {
+        (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(CaseEditGenericErrorsComponent, [{
+                type: i0.Component,
+                args: [{
+                        selector: 'ccd-case-edit-generic-errors',
+                        templateUrl: 'case-edit-generic-errors.component.html',
+                        styleUrls: ['../case-edit.scss'],
+                        providers: []
+                    }]
+            }], null, { error: [{
+                    type: i0.Input
+                }] });
+    })();
+
     var _c0$e = function (a3) { return ["/", "cases", "case-details", a3, "tasks"]; };
     var CaseEventCompletionTaskCancelledComponent = /** @class */ (function () {
         function CaseEventCompletionTaskCancelledComponent(parentComponent) {
@@ -27666,10 +27553,10 @@
             // tslint:disable-next-line:switch-default
             switch (portalType) {
                 case EventCompletionPortalTypes.TaskCancelled:
-                    this.selectedComponentPortal = new i6$2.ComponentPortal(CaseEventCompletionTaskCancelledComponent, null, injector);
+                    this.selectedComponentPortal = new i6$1.ComponentPortal(CaseEventCompletionTaskCancelledComponent, null, injector);
                     break;
                 case EventCompletionPortalTypes.TaskReassigned:
-                    this.selectedComponentPortal = new i6$2.ComponentPortal(CaseEventCompletionTaskReassignedComponent, null, injector);
+                    this.selectedComponentPortal = new i6$1.ComponentPortal(CaseEventCompletionTaskReassignedComponent, null, injector);
                     break;
             }
         };
@@ -27683,7 +27570,7 @@
             if (rf & 2) {
                 i0__namespace.ɵɵproperty("cdkPortalOutlet", ctx.selectedComponentPortal);
             }
-        }, directives: [i6__namespace$2.CdkPortalOutlet], encapsulation: 2 });
+        }, directives: [i6__namespace$1.CdkPortalOutlet], encapsulation: 2 });
     (function () {
         (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(CaseEventCompletionComponent, [{
                 type: i0.Component,
@@ -27743,7 +27630,7 @@
                 LabelSubstitutorModule,
                 ConditionalShowModule,
                 ErrorsModule,
-                i6$2.PortalModule,
+                i6$1.PortalModule,
                 LoadingSpinnerModule,
                 BannersModule
             ]] });
@@ -27757,7 +27644,8 @@
                 CaseEventCompletionTaskCancelledComponent,
                 CaseEventCompletionTaskReassignedComponent,
                 CaseCreateComponent,
-                CaseProgressComponent], imports: [i1.CommonModule,
+                CaseProgressComponent,
+                CaseEditGenericErrorsComponent], imports: [i1.CommonModule,
                 i1$1.RouterModule,
                 i2.FormsModule,
                 i2.ReactiveFormsModule,
@@ -27766,7 +27654,7 @@
                 LabelSubstitutorModule,
                 ConditionalShowModule,
                 ErrorsModule,
-                i6$2.PortalModule,
+                i6$1.PortalModule,
                 LoadingSpinnerModule,
                 BannersModule], exports: [CaseEditConfirmComponent,
                 CaseEditComponent,
@@ -27791,7 +27679,7 @@
                             LabelSubstitutorModule,
                             ConditionalShowModule,
                             ErrorsModule,
-                            i6$2.PortalModule,
+                            i6$1.PortalModule,
                             LoadingSpinnerModule,
                             BannersModule
                         ],
@@ -27805,7 +27693,8 @@
                             CaseEventCompletionTaskCancelledComponent,
                             CaseEventCompletionTaskReassignedComponent,
                             CaseCreateComponent,
-                            CaseProgressComponent
+                            CaseProgressComponent,
+                            CaseEditGenericErrorsComponent
                         ],
                         exports: [
                             CaseEditConfirmComponent,
@@ -27850,9 +27739,10 @@
             }], null, null);
     })();
     i0__namespace.ɵɵsetComponentScope(CaseEditConfirmComponent, [i1__namespace.NgIf, MarkdownComponent, i2__namespace.ɵangular_packages_forms_forms_ba, i2__namespace.NgControlStatusGroup, i2__namespace.FormGroupDirective], [CcdCaseTitlePipe, CaseReferencePipe]);
-    i0__namespace.ɵɵsetComponentScope(CaseEditPageComponent, [i1__namespace.NgIf, LoadingSpinnerComponent, MarkdownComponent, i1__namespace.NgForOf, CallbackErrorsComponent, i2__namespace.ɵangular_packages_forms_forms_ba, i2__namespace.NgControlStatusGroup, i2__namespace.FormGroupDirective, CaseEditFormComponent], [CcdCaseTitlePipe, CaseReferencePipe, i1__namespace.AsyncPipe]);
+    i0__namespace.ɵɵsetComponentScope(CaseEditPageComponent, [i1__namespace.NgIf, MarkdownComponent, i1__namespace.NgForOf, CaseEditGenericErrorsComponent, CallbackErrorsComponent, i2__namespace.ɵangular_packages_forms_forms_ba, i2__namespace.NgControlStatusGroup, i2__namespace.FormGroupDirective, CaseEditFormComponent,
+        CaseEventCompletionComponent], [CcdCaseTitlePipe, CaseReferencePipe, i1__namespace.AsyncPipe]);
     i0__namespace.ɵɵsetComponentScope(CaseEditFormComponent, [i1__namespace.NgForOf, ConditionalShowFormDirective, i2__namespace.NgControlStatusGroup, i2__namespace.FormGroupDirective, LabelSubstitutorDirective, i1__namespace.NgSwitch, i1__namespace.NgSwitchCase, FieldReadComponent, i1__namespace.NgIf, FieldWriteComponent], [IsReadOnlyAndNotCollectionPipe, IsCompoundPipe]);
-    i0__namespace.ɵɵsetComponentScope(CaseEditSubmitComponent, [i1__namespace.NgIf, MarkdownComponent, i1__namespace.NgForOf, CallbackErrorsComponent, i2__namespace.ɵangular_packages_forms_forms_ba, i2__namespace.NgControlStatusGroup, i2__namespace.FormGroupDirective, LabelSubstitutorDirective, FieldReadComponent, i1__namespace.NgSwitch, i1__namespace.NgSwitchCase, i2__namespace.FormGroupName, i2__namespace.DefaultValueAccessor, i2__namespace.NgControlStatus, i2__namespace.FormControlName, i2__namespace.MaxLengthValidator, CaseEventCompletionComponent], [CcdCaseTitlePipe, CaseReferencePipe, CcdCYAPageLabelFilterPipe, ReadFieldsFilterPipe, CcdPageFieldsPipe, IsCompoundPipe]);
+    i0__namespace.ɵɵsetComponentScope(CaseEditSubmitComponent, [i1__namespace.NgIf, MarkdownComponent, CaseEditGenericErrorsComponent, CallbackErrorsComponent, i2__namespace.ɵangular_packages_forms_forms_ba, i2__namespace.NgControlStatusGroup, i2__namespace.FormGroupDirective, i1__namespace.NgForOf, LabelSubstitutorDirective, FieldReadComponent, i1__namespace.NgSwitch, i1__namespace.NgSwitchCase, i2__namespace.FormGroupName, i2__namespace.DefaultValueAccessor, i2__namespace.NgControlStatus, i2__namespace.FormControlName, i2__namespace.MaxLengthValidator, CaseEventCompletionComponent], [CcdCaseTitlePipe, CaseReferencePipe, CcdCYAPageLabelFilterPipe, ReadFieldsFilterPipe, CcdPageFieldsPipe, IsCompoundPipe]);
     i0__namespace.ɵɵsetComponentScope(CaseCreateComponent, [i1__namespace.NgIf, CaseEditComponent], []);
     i0__namespace.ɵɵsetComponentScope(CaseProgressComponent, [i1__namespace.NgIf, CaseEditComponent], []);
 
@@ -30251,9 +30141,7 @@
         };
         CaseEventTriggerComponent.prototype.cancel = function () {
             if (this.router.url && this.router.url.includes('linkCases')) {
-                this.router.navigate(['cases', 'case-details', this.caseDetails.case_id]).then(function () {
-                    window.location.hash = 'Linked cases';
-                });
+                this.router.navigate(['cases', 'case-details', this.caseDetails.case_id], { fragment: 'Linked cases' });
             }
             else {
                 return this.router.navigate([this.parentUrl]);
@@ -30503,27 +30391,15 @@
         }
     }
     var CaseBasicAccessViewComponent = /** @class */ (function () {
-        function CaseBasicAccessViewComponent(casesService, router, titleService, caseReferencePipe) {
+        function CaseBasicAccessViewComponent(casesService, router) {
             this.casesService = casesService;
             this.router = router;
-            this.titleService = titleService;
-            this.caseReferencePipe = caseReferencePipe;
             this.caseDetails = null;
             this.accessType = null;
             this.courtOrHearingCentre = null;
         }
         CaseBasicAccessViewComponent.prototype.ngOnInit = function () {
             var _this = this;
-            var _a;
-            var caseName = (_a = this.caseDetails.basicFields) === null || _a === void 0 ? void 0 : _a.caseNameHmctsInternal;
-            var caseDetails;
-            if (caseName) {
-                caseDetails = caseName + " (" + this.caseReferencePipe.transform(this.caseDetails.case_id) + ")";
-            }
-            else {
-                caseDetails = this.caseReferencePipe.transform(this.caseDetails.case_id);
-            }
-            this.titleService.setTitle(caseDetails + " - HM Courts & Tribunals Service - GOV.UK");
             var locationId = this.caseDetails &&
                 this.caseDetails.basicFields &&
                 this.caseDetails.basicFields.caseManagementLocation &&
@@ -30552,8 +30428,8 @@
         return CaseBasicAccessViewComponent;
     }());
     CaseBasicAccessViewComponent.CANCEL_LINK_DESTINATION = '/work/my-work/list';
-    CaseBasicAccessViewComponent.ɵfac = function CaseBasicAccessViewComponent_Factory(t) { return new (t || CaseBasicAccessViewComponent)(i0__namespace.ɵɵdirectiveInject(CasesService), i0__namespace.ɵɵdirectiveInject(i1__namespace$1.Router), i0__namespace.ɵɵdirectiveInject(i3__namespace$2.Title), i0__namespace.ɵɵdirectiveInject(CaseReferencePipe)); };
-    CaseBasicAccessViewComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: CaseBasicAccessViewComponent, selectors: [["ccd-case-basic-access-view"]], inputs: { caseDetails: "caseDetails", accessType: "accessType" }, features: [i0__namespace.ɵɵProvidersFeature([CaseReferencePipe])], decls: 26, vars: 14, consts: [[4, "ngIf"], ["type", "information"], [1, "heading-h1"], [1, "govuk-heading-m"], [1, "govuk-summary-list"], ["class", "govuk-summary-list__row", 4, "ngIf"], [1, "govuk-button-group"], [1, "govuk-button", "govuk-!-margin-right-3", 3, "routerLink"], [1, "govuk-grid-column-full", "govuk-!-padding-left-0"], ["href", "javascript:void(0)", 1, "govuk-body", 3, "click"], [1, "govuk-summary-list__row"], [1, "govuk-summary-list__key", "summary-key"], [1, "govuk-summary-list__value"]], template: function CaseBasicAccessViewComponent_Template(rf, ctx) {
+    CaseBasicAccessViewComponent.ɵfac = function CaseBasicAccessViewComponent_Factory(t) { return new (t || CaseBasicAccessViewComponent)(i0__namespace.ɵɵdirectiveInject(CasesService), i0__namespace.ɵɵdirectiveInject(i1__namespace$1.Router)); };
+    CaseBasicAccessViewComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: CaseBasicAccessViewComponent, selectors: [["ccd-case-basic-access-view"]], inputs: { caseDetails: "caseDetails", accessType: "accessType" }, decls: 26, vars: 14, consts: [[4, "ngIf"], ["type", "information"], [1, "heading-h1"], [1, "govuk-heading-m"], [1, "govuk-summary-list"], ["class", "govuk-summary-list__row", 4, "ngIf"], [1, "govuk-button-group"], [1, "govuk-button", "govuk-!-margin-right-3", 3, "routerLink"], [1, "govuk-grid-column-full", "govuk-!-padding-left-0"], ["href", "javascript:void(0)", 1, "govuk-body", 3, "click"], [1, "govuk-summary-list__row"], [1, "govuk-summary-list__key", "summary-key"], [1, "govuk-summary-list__value"]], template: function CaseBasicAccessViewComponent_Template(rf, ctx) {
             if (rf & 1) {
                 i0__namespace.ɵɵtemplate(0, CaseBasicAccessViewComponent_ccd_loading_spinner_0_Template, 1, 0, "ccd-loading-spinner", 0);
                 i0__namespace.ɵɵelementStart(1, "div");
@@ -30624,10 +30500,9 @@
                 type: i0.Component,
                 args: [{
                         selector: 'ccd-case-basic-access-view',
-                        templateUrl: 'case-basic-access-view.component.html',
-                        providers: [CaseReferencePipe]
+                        templateUrl: 'case-basic-access-view.component.html'
                     }]
-            }], function () { return [{ type: CasesService }, { type: i1__namespace$1.Router }, { type: i3__namespace$2.Title }, { type: CaseReferencePipe }]; }, { caseDetails: [{
+            }], function () { return [{ type: CasesService }, { type: i1__namespace$1.Router }]; }, { caseDetails: [{
                     type: i0.Input
                 }], accessType: [{
                     type: i0.Input
@@ -30864,9 +30739,9 @@
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
-            var field_r24 = i0__namespace.ɵɵnextContext(2).$implicit;
+            var field_r23 = i0__namespace.ɵɵnextContext(2).$implicit;
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵtextInterpolate(field_r24.label);
+            i0__namespace.ɵɵtextInterpolate(field_r23.label);
         }
     }
     function CaseFullAccessViewComponent_ng_container_12_mat_tab_4_ng_template_1_ng_container_2_tr_4_Template(rf, ctx) {
@@ -30881,14 +30756,14 @@
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
-            var field_r24 = i0__namespace.ɵɵnextContext().$implicit;
-            var ctx_r25 = i0__namespace.ɵɵnextContext(4);
+            var field_r23 = i0__namespace.ɵɵnextContext().$implicit;
+            var ctx_r24 = i0__namespace.ɵɵnextContext(4);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("ngIf", !ctx_r25.isFieldToHaveNoLabel(field_r24));
+            i0__namespace.ɵɵproperty("ngIf", !ctx_r24.isFieldToHaveNoLabel(field_r23));
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("id", "case-viewer-field-read--" + field_r24.id);
+            i0__namespace.ɵɵproperty("id", "case-viewer-field-read--" + field_r23.id);
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵproperty("topLevelFormGroup", ctx_r25.formGroup.controls["data"])("caseField", field_r24)("caseReference", ctx_r25.caseDetails.case_id)("markdownUseHrefAsRouterLink", ctx_r25.markdownUseHrefAsRouterLink);
+            i0__namespace.ɵɵproperty("topLevelFormGroup", ctx_r24.formGroup.controls["data"])("caseField", field_r23)("caseReference", ctx_r24.caseDetails.case_id)("markdownUseHrefAsRouterLink", ctx_r24.markdownUseHrefAsRouterLink);
         }
     }
     function CaseFullAccessViewComponent_ng_container_12_mat_tab_4_ng_template_1_ng_container_2_tr_5_Template(rf, ctx) {
@@ -30902,12 +30777,12 @@
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
-            var field_r24 = i0__namespace.ɵɵnextContext().$implicit;
-            var ctx_r26 = i0__namespace.ɵɵnextContext(4);
+            var field_r23 = i0__namespace.ɵɵnextContext().$implicit;
+            var ctx_r25 = i0__namespace.ɵɵnextContext(4);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("id", "case-viewer-field-read--" + field_r24.id);
+            i0__namespace.ɵɵproperty("id", "case-viewer-field-read--" + field_r23.id);
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵproperty("topLevelFormGroup", ctx_r26.formGroup.controls["data"])("caseField", field_r24)("caseReference", ctx_r26.caseDetails.case_id)("markdownUseHrefAsRouterLink", ctx_r26.markdownUseHrefAsRouterLink);
+            i0__namespace.ɵɵproperty("topLevelFormGroup", ctx_r25.formGroup.controls["data"])("caseField", field_r23)("caseReference", ctx_r25.caseDetails.case_id)("markdownUseHrefAsRouterLink", ctx_r25.markdownUseHrefAsRouterLink);
         }
     }
     function CaseFullAccessViewComponent_ng_container_12_mat_tab_4_ng_template_1_ng_container_2_Template(rf, ctx) {
@@ -30923,12 +30798,12 @@
             i0__namespace.ɵɵelementContainerEnd();
         }
         if (rf & 2) {
-            var field_r24 = ctx.$implicit;
-            var ctx_r23 = i0__namespace.ɵɵnextContext(4);
+            var field_r23 = ctx.$implicit;
+            var ctx_r22 = i0__namespace.ɵɵnextContext(4);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("caseField", field_r24)("contextFields", ctx_r23.caseFields)("hidden", field_r24.hidden);
+            i0__namespace.ɵɵproperty("caseField", field_r23)("contextFields", ctx_r22.caseFields)("hidden", field_r23.hidden);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("ngSwitch", !i0__namespace.ɵɵpipeBind1(3, 6, field_r24));
+            i0__namespace.ɵɵproperty("ngSwitch", !i0__namespace.ɵɵpipeBind1(3, 6, field_r23));
             i0__namespace.ɵɵadvance(2);
             i0__namespace.ɵɵproperty("ngSwitchCase", true);
             i0__namespace.ɵɵadvance(1);
@@ -30948,10 +30823,10 @@
         }
         if (rf & 2) {
             var tab_r20 = i0__namespace.ɵɵnextContext().$implicit;
-            var ctx_r22 = i0__namespace.ɵɵnextContext(2);
+            var ctx_r21 = i0__namespace.ɵɵnextContext(2);
             i0__namespace.ɵɵclassMap(tab_r20.id);
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵproperty("ngForOf", i0__namespace.ɵɵpipeBindV(3, 3, i0__namespace.ɵɵpureFunction2(11, _c1$3, i0__namespace.ɵɵpipeBind1(4, 9, tab_r20), ctx_r22.formGroup.controls["data"])));
+            i0__namespace.ɵɵproperty("ngForOf", i0__namespace.ɵɵpipeBindV(3, 3, i0__namespace.ɵɵpureFunction2(11, _c1$3, i0__namespace.ɵɵpipeBind1(4, 9, tab_r20), ctx_r21.formGroup.controls["data"])));
         }
     }
     function CaseFullAccessViewComponent_ng_container_12_mat_tab_4_Template(rf, ctx) {
@@ -30970,8 +30845,8 @@
             i0__namespace.ɵɵelement(0, "mat-tab", 26);
         }
         if (rf & 2) {
-            var tab_r32 = ctx.$implicit;
-            i0__namespace.ɵɵproperty("id", tab_r32.id)("label", tab_r32.label);
+            var tab_r31 = ctx.$implicit;
+            i0__namespace.ɵɵproperty("id", tab_r31.id)("label", tab_r31.label);
         }
     }
     function CaseFullAccessViewComponent_ng_container_12_router_outlet_6_Template(rf, ctx) {
@@ -30981,10 +30856,10 @@
     }
     function CaseFullAccessViewComponent_ng_container_12_Template(rf, ctx) {
         if (rf & 1) {
-            var _r34_1 = i0__namespace.ɵɵgetCurrentView();
+            var _r33_1 = i0__namespace.ɵɵgetCurrentView();
             i0__namespace.ɵɵelementContainerStart(0);
             i0__namespace.ɵɵelementStart(1, "mat-tab-group", 23, 24);
-            i0__namespace.ɵɵlistener("selectedTabChange", function CaseFullAccessViewComponent_ng_container_12_Template_mat_tab_group_selectedTabChange_1_listener($event) { i0__namespace.ɵɵrestoreView(_r34_1); var ctx_r33 = i0__namespace.ɵɵnextContext(); return ctx_r33.tabChanged($event); });
+            i0__namespace.ɵɵlistener("selectedIndexChange", function CaseFullAccessViewComponent_ng_container_12_Template_mat_tab_group_selectedIndexChange_1_listener($event) { i0__namespace.ɵɵrestoreView(_r33_1); var ctx_r32 = i0__namespace.ɵɵnextContext(); return ctx_r32.tabChanged($event); });
             i0__namespace.ɵɵtemplate(3, CaseFullAccessViewComponent_ng_container_12_mat_tab_3_Template, 1, 2, "mat-tab", 25);
             i0__namespace.ɵɵtemplate(4, CaseFullAccessViewComponent_ng_container_12_mat_tab_4_Template, 2, 2, "mat-tab", 25);
             i0__namespace.ɵɵtemplate(5, CaseFullAccessViewComponent_ng_container_12_mat_tab_5_Template, 1, 2, "mat-tab", 25);
@@ -31007,7 +30882,7 @@
         }
     }
     var CaseFullAccessViewComponent = /** @class */ (function () {
-        function CaseFullAccessViewComponent(ngZone, route, router, navigationNotifierService, orderService, activityPollingService, dialog, alertService, draftService, errorNotifierService, convertHrefToRouterService, location, crf, sessionStorageService, titleService, caseReferencePipe) {
+        function CaseFullAccessViewComponent(ngZone, route, router, navigationNotifierService, orderService, activityPollingService, dialog, alertService, draftService, errorNotifierService, convertHrefToRouterService, location, crf, sessionStorageService) {
             this.ngZone = ngZone;
             this.route = route;
             this.router = router;
@@ -31022,8 +30897,7 @@
             this.location = location;
             this.crf = crf;
             this.sessionStorageService = sessionStorageService;
-            this.titleService = titleService;
-            this.caseReferencePipe = caseReferencePipe;
+            this.HEARINGS_TAB_LABEL = 'Hearings';
             this.hasPrint = true;
             this.hasEventSelector = true;
             this.prependedTabs = [];
@@ -31035,20 +30909,11 @@
             this.ignoreWarning = false;
             this.selectedTabIndex = 0;
             this.activeCaseFlags = false;
+            this.subs = [];
             this.callbackErrorsSubject = new rxjs.Subject();
         }
         CaseFullAccessViewComponent.prototype.ngOnInit = function () {
             var _this = this;
-            var _a;
-            var caseName = (_a = this.caseDetails.basicFields) === null || _a === void 0 ? void 0 : _a.caseNameHmctsInternal;
-            var caseDetails;
-            if (caseName) {
-                caseDetails = caseName + " (" + this.caseReferencePipe.transform(this.caseDetails.case_id) + ")";
-            }
-            else {
-                caseDetails = this.caseReferencePipe.transform(this.caseDetails.case_id);
-            }
-            this.titleService.setTitle(caseDetails + " - HM Courts & Tribunals Service - GOV.UK");
             initDialog();
             this.init();
             this.callbackErrorsSubject.subscribe(function (errorEvent) {
@@ -31097,6 +30962,7 @@
             this.unsubscribe(this.callbackErrorsSubject);
             this.unsubscribe(this.errorSubscription);
             this.unsubscribe(this.subscription);
+            this.subs.forEach(function (s) { return s.unsubscribe(); });
         };
         CaseFullAccessViewComponent.prototype.unsubscribe = function (subscription) {
             if (subscription) {
@@ -31105,7 +30971,7 @@
         };
         CaseFullAccessViewComponent.prototype.checkRouteAndSetCaseViewTab = function () {
             var _this = this;
-            this.router.events
+            this.subs.push(this.router.events
                 .pipe(operators.filter(function (event) { return event instanceof i1$1.NavigationEnd; }))
                 .subscribe(function (event) {
                 var url = event && event.url;
@@ -31117,8 +30983,9 @@
                         _this.tabGroup.selectedIndex = matTab.position;
                     }
                 }
-            });
+            }));
         };
+        ;
         CaseFullAccessViewComponent.prototype.postViewActivity = function () {
             return this.activityPollingService.postViewActivity(this.caseDetails.case_id);
         };
@@ -31241,22 +31108,25 @@
                 }
             }
         };
-        CaseFullAccessViewComponent.prototype.tabChanged = function (tabChangeEvent) {
-            // Update selected tab index
-            this.selectedTabIndex = tabChangeEvent.index;
-            var tab = tabChangeEvent.tab['_viewContainerRef'];
-            var id = tab.element.nativeElement.id;
-            // due to some edge case like hidden tab we can't calculate the last index of existing tabs,
-            // so have to hard code the hearings id here
-            if ((tabChangeEvent.index <= 1 && this.prependedTabs && this.prependedTabs.length) ||
-                (this.appendedTabs && this.appendedTabs.length && id === 'hearings')) {
+        // Refactored under EXUI-110 to address infinite tab loop to use tabIndexChanged instead
+        CaseFullAccessViewComponent.prototype.tabChanged = function (tabIndexChanged) {
+            var matTab = this.tabGroup._tabs.find(function (tab) { return tab.isActive; });
+            var tabLabel = matTab.textLabel;
+            // sortedTabs are fragments
+            // appended/prepepended tabs use router navigation
+            if ((tabIndexChanged <= 1 && this.prependedTabs && this.prependedTabs.length) ||
+                (this.appendedTabs && this.appendedTabs.length && tabLabel === this.HEARINGS_TAB_LABEL)) {
+                // Hack to get ID from tab as it's not easily achieved through Angular Material Tabs
+                var tab = matTab['_viewContainerRef'];
+                var id = tab.element.nativeElement.id;
+                // cases/case-details/:caseId/hearings
+                // cases/case-details/:caseId/roles-and-access
                 this.router.navigate([id], { relativeTo: this.route });
             }
             else {
-                var label_1 = tabChangeEvent.tab.textLabel;
-                this.router.navigate(['cases', 'case-details', this.caseDetails.case_id]).then(function () {
-                    window.location.hash = label_1;
-                });
+                // Routing here is based on tab label, not ideal
+                // cases/case-details/:caseId#tabLabel
+                this.router.navigate(['cases', 'case-details', this.caseDetails.case_id], { fragment: tabLabel });
             }
         };
         CaseFullAccessViewComponent.prototype.onLinkClicked = function (triggerOutputEventText) {
@@ -31343,8 +31213,8 @@
             var value = {};
             if (caseFields) {
                 caseFields.forEach(function (caseField) {
-                    var _b;
-                    value = Object.assign(Object.assign({}, value), (_b = {}, _b[caseField.id] = caseField.value, _b));
+                    var _a;
+                    value = Object.assign(Object.assign({}, value), (_a = {}, _a[caseField.id] = caseField.value, _a));
                 });
             }
             return new i2.FormGroup({ data: new i2.FormControl(value) });
@@ -31354,6 +31224,12 @@
             this.callbackErrorsSubject.next(null);
             this.alertService.clear();
         };
+        CaseFullAccessViewComponent.prototype.getUrlFragment = function (url) {
+            return url.split('#')[url.split('#').length - 1];
+        };
+        CaseFullAccessViewComponent.prototype.getTabIndexByTabLabel = function (tabGroup, tabLabel) {
+            return tabGroup._tabs.toArray().findIndex(function (t) { return t.textLabel.toLowerCase() === tabLabel.toLowerCase(); });
+        };
         return CaseFullAccessViewComponent;
     }());
     CaseFullAccessViewComponent.ORIGIN_QUERY_PARAM = 'origin';
@@ -31361,7 +31237,7 @@
     CaseFullAccessViewComponent.TRIGGER_TEXT_CONTINUE = 'Ignore Warning and Go';
     CaseFullAccessViewComponent.UNICODE_SPACE = '%20';
     CaseFullAccessViewComponent.EMPTY_SPACE = ' ';
-    CaseFullAccessViewComponent.ɵfac = function CaseFullAccessViewComponent_Factory(t) { return new (t || CaseFullAccessViewComponent)(i0__namespace.ɵɵdirectiveInject(i0__namespace.NgZone), i0__namespace.ɵɵdirectiveInject(i1__namespace$1.ActivatedRoute), i0__namespace.ɵɵdirectiveInject(i1__namespace$1.Router), i0__namespace.ɵɵdirectiveInject(NavigationNotifierService), i0__namespace.ɵɵdirectiveInject(OrderService), i0__namespace.ɵɵdirectiveInject(ActivityPollingService), i0__namespace.ɵɵdirectiveInject(i1__namespace$3.MatDialog), i0__namespace.ɵɵdirectiveInject(AlertService), i0__namespace.ɵɵdirectiveInject(DraftService), i0__namespace.ɵɵdirectiveInject(ErrorNotifierService), i0__namespace.ɵɵdirectiveInject(ConvertHrefToRouterService), i0__namespace.ɵɵdirectiveInject(i1__namespace.Location), i0__namespace.ɵɵdirectiveInject(i0__namespace.ChangeDetectorRef), i0__namespace.ɵɵdirectiveInject(SessionStorageService), i0__namespace.ɵɵdirectiveInject(i3__namespace$2.Title), i0__namespace.ɵɵdirectiveInject(CaseReferencePipe)); };
+    CaseFullAccessViewComponent.ɵfac = function CaseFullAccessViewComponent_Factory(t) { return new (t || CaseFullAccessViewComponent)(i0__namespace.ɵɵdirectiveInject(i0__namespace.NgZone), i0__namespace.ɵɵdirectiveInject(i1__namespace$1.ActivatedRoute), i0__namespace.ɵɵdirectiveInject(i1__namespace$1.Router), i0__namespace.ɵɵdirectiveInject(NavigationNotifierService), i0__namespace.ɵɵdirectiveInject(OrderService), i0__namespace.ɵɵdirectiveInject(ActivityPollingService), i0__namespace.ɵɵdirectiveInject(i1__namespace$3.MatDialog), i0__namespace.ɵɵdirectiveInject(AlertService), i0__namespace.ɵɵdirectiveInject(DraftService), i0__namespace.ɵɵdirectiveInject(ErrorNotifierService), i0__namespace.ɵɵdirectiveInject(ConvertHrefToRouterService), i0__namespace.ɵɵdirectiveInject(i1__namespace.Location), i0__namespace.ɵɵdirectiveInject(i0__namespace.ChangeDetectorRef), i0__namespace.ɵɵdirectiveInject(SessionStorageService)); };
     CaseFullAccessViewComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: CaseFullAccessViewComponent, selectors: [["ccd-case-full-access-view"]], viewQuery: function CaseFullAccessViewComponent_Query(rf, ctx) {
             if (rf & 1) {
                 i0__namespace.ɵɵviewQuery(_c0$b, 1);
@@ -31370,7 +31246,7 @@
                 var _t = void 0;
                 i0__namespace.ɵɵqueryRefresh(_t = i0__namespace.ɵɵloadQuery()) && (ctx.tabGroup = _t.first);
             }
-        }, inputs: { hasPrint: "hasPrint", hasEventSelector: "hasEventSelector", caseDetails: "caseDetails", prependedTabs: "prependedTabs", appendedTabs: "appendedTabs" }, features: [i0__namespace.ɵɵProvidersFeature([CaseReferencePipe]), i0__namespace.ɵɵNgOnChangesFeature], decls: 13, vars: 12, consts: [["class", "error-summary", "role", "group", "aria-labelledby", "edit-case-event_error-summary-heading", "tabindex", "-1", 4, "ngIf"], [3, "triggerTextContinue", "triggerTextIgnore", "callbackErrorsSubject", "callbackErrorsContext"], [3, "caseId", "displayMode"], [1, "grid-row"], [1, "column-one-half"], [3, "caseDetails"], ["class", "case-viewer-controls", 4, "ngIf"], ["class", "column-one-half", 4, "ngIf"], ["class", "grid-row", 4, "ngIf"], [1, "column-full"], [4, "ngIf"], ["role", "group", "aria-labelledby", "edit-case-event_error-summary-heading", "tabindex", "-1", 1, "error-summary"], ["id", "edit-case-event_error-summary-heading", 1, "heading-h1", "error-summary-heading"], ["id", "edit-case-event_error-summary-body", 1, "govuk-error-summary__body"], ["href", "get-help", "target", "_blank"], ["id", "edit-case-event_error-summary-heading", 1, "heading-h2", "error-summary-heading"], ["class", "error-summary-list", 4, "ngIf"], [1, "error-summary-list"], [4, "ngFor", "ngForOf"], [1, "case-viewer-controls"], ["id", "case-viewer-control-print", "routerLink", "print", 1, "button", "button-secondary"], [3, "isDisabled", "triggers", "triggerText", "onTriggerChange", "onTriggerSubmit"], [3, "notificationBannerConfig", "linkClicked"], ["animationDuration", "0ms", 3, "disableRipple", "selectedIndex", "selectedTabChange"], ["tabGroup", ""], [3, "id", "label", 4, "ngFor", "ngForOf"], [3, "id", "label"], ["matTabContent", ""], ["aria-describedby", "case viewer table"], ["ccdLabelSubstitutor", "", 3, "caseField", "contextFields", "hidden"], [3, "ngSwitch"], [4, "ngSwitchCase"], ["class", "compound-field", 4, "ngSwitchCase"], ["id", "case-viewer-field-label", 4, "ngIf"], ["scope", "col", 3, "id"], [1, "text-16"], [3, "topLevelFormGroup", "caseField", "caseReference", "markdownUseHrefAsRouterLink"], ["id", "case-viewer-field-label"], [1, "case-viewer-label", "text-16"], [1, "compound-field"]], template: function CaseFullAccessViewComponent_Template(rf, ctx) {
+        }, inputs: { hasPrint: "hasPrint", hasEventSelector: "hasEventSelector", caseDetails: "caseDetails", prependedTabs: "prependedTabs", appendedTabs: "appendedTabs" }, features: [i0__namespace.ɵɵNgOnChangesFeature], decls: 13, vars: 12, consts: [["class", "error-summary", "role", "group", "aria-labelledby", "edit-case-event_error-summary-heading", "tabindex", "-1", 4, "ngIf"], [3, "triggerTextContinue", "triggerTextIgnore", "callbackErrorsSubject", "callbackErrorsContext"], [3, "caseId", "displayMode"], [1, "grid-row"], [1, "column-one-half"], [3, "caseDetails"], ["class", "case-viewer-controls", 4, "ngIf"], ["class", "column-one-half", 4, "ngIf"], ["class", "grid-row", 4, "ngIf"], [1, "column-full"], [4, "ngIf"], ["role", "group", "aria-labelledby", "edit-case-event_error-summary-heading", "tabindex", "-1", 1, "error-summary"], ["id", "edit-case-event_error-summary-heading", 1, "heading-h1", "error-summary-heading"], ["id", "edit-case-event_error-summary-body", 1, "govuk-error-summary__body"], ["href", "get-help", "target", "_blank"], ["id", "edit-case-event_error-summary-heading", 1, "heading-h2", "error-summary-heading"], ["class", "error-summary-list", 4, "ngIf"], [1, "error-summary-list"], [4, "ngFor", "ngForOf"], [1, "case-viewer-controls"], ["id", "case-viewer-control-print", "routerLink", "print", 1, "button", "button-secondary"], [3, "isDisabled", "triggers", "triggerText", "onTriggerChange", "onTriggerSubmit"], [3, "notificationBannerConfig", "linkClicked"], ["animationDuration", "0ms", 3, "disableRipple", "selectedIndex", "selectedIndexChange"], ["tabGroup", ""], [3, "id", "label", 4, "ngFor", "ngForOf"], [3, "id", "label"], ["matTabContent", ""], ["aria-describedby", "case viewer table"], ["ccdLabelSubstitutor", "", 3, "caseField", "contextFields", "hidden"], [3, "ngSwitch"], [4, "ngSwitchCase"], ["class", "compound-field", 4, "ngSwitchCase"], ["id", "case-viewer-field-label", 4, "ngIf"], ["scope", "col", 3, "id"], [1, "text-16"], [3, "topLevelFormGroup", "caseField", "caseReference", "markdownUseHrefAsRouterLink"], ["id", "case-viewer-field-label"], [1, "case-viewer-label", "text-16"], [1, "compound-field"]], template: function CaseFullAccessViewComponent_Template(rf, ctx) {
             if (rf & 1) {
                 i0__namespace.ɵɵtemplate(0, CaseFullAccessViewComponent_div_0_Template, 10, 0, "div", 0);
                 i0__namespace.ɵɵtemplate(1, CaseFullAccessViewComponent_div_1_Template, 6, 2, "div", 0);
@@ -31418,10 +31294,9 @@
                 args: [{
                         selector: 'ccd-case-full-access-view',
                         templateUrl: './case-full-access-view.component.html',
-                        styleUrls: ['./case-full-access-view.component.scss'],
-                        providers: [CaseReferencePipe]
+                        styleUrls: ['./case-full-access-view.component.scss']
                     }]
-            }], function () { return [{ type: i0__namespace.NgZone }, { type: i1__namespace$1.ActivatedRoute }, { type: i1__namespace$1.Router }, { type: NavigationNotifierService }, { type: OrderService }, { type: ActivityPollingService }, { type: i1__namespace$3.MatDialog }, { type: AlertService }, { type: DraftService }, { type: ErrorNotifierService }, { type: ConvertHrefToRouterService }, { type: i1__namespace.Location }, { type: i0__namespace.ChangeDetectorRef }, { type: SessionStorageService }, { type: i3__namespace$2.Title }, { type: CaseReferencePipe }]; }, { hasPrint: [{
+            }], function () { return [{ type: i0__namespace.NgZone }, { type: i1__namespace$1.ActivatedRoute }, { type: i1__namespace$1.Router }, { type: NavigationNotifierService }, { type: OrderService }, { type: ActivityPollingService }, { type: i1__namespace$3.MatDialog }, { type: AlertService }, { type: DraftService }, { type: ErrorNotifierService }, { type: ConvertHrefToRouterService }, { type: i1__namespace.Location }, { type: i0__namespace.ChangeDetectorRef }, { type: SessionStorageService }]; }, { hasPrint: [{
                     type: i0.Input
                 }], hasEventSelector: [{
                     type: i0.Input
@@ -31640,10 +31515,11 @@
         }
     }
     var CaseViewerComponent = /** @class */ (function () {
-        function CaseViewerComponent(route, caseNotifier, appConfig) {
+        function CaseViewerComponent(route, caseNotifier, appConfig, orderService) {
             this.route = route;
             this.caseNotifier = caseNotifier;
             this.appConfig = appConfig;
+            this.orderService = orderService;
             this.hasPrint = true;
             this.hasEventSelector = true;
             this.prependedTabs = [];
@@ -31659,20 +31535,22 @@
         };
         CaseViewerComponent.prototype.loadCaseDetails = function () {
             var _this = this;
-            if (!this.route.snapshot.data.case) {
+            if (this.route.snapshot.data.case) {
+                this.caseDetails = this.route.snapshot.data.case;
+                this.caseDetails.tabs = this.orderService.sort(this.caseDetails.tabs);
+                this.caseDetails.tabs = this.suffixDuplicateTabs(this.caseDetails.tabs);
+                this.setUserAccessType(this.caseDetails);
+            }
+            else {
                 this.caseSubscription = this.caseNotifier.caseView.subscribe(function (caseDetails) {
                     _this.caseDetails = caseDetails;
                     _this.setUserAccessType(_this.caseDetails);
                 });
             }
-            else {
-                this.caseDetails = this.route.snapshot.data.case;
-                this.setUserAccessType(this.caseDetails);
-            }
         };
         CaseViewerComponent.prototype.setUserAccessType = function (caseDetails) {
             if (caseDetails && Array.isArray(caseDetails.metadataFields)) {
-                var accessProcess = caseDetails.metadataFields.find(function (metadataField) { return metadataField.id === CaseViewerComponent.METADATA_FIELD_ACCESS_PROCEES_ID; });
+                var accessProcess = caseDetails.metadataFields.find(function (metadataField) { return metadataField.id === CaseViewerComponent.METADATA_FIELD_ACCESS_PROCESS_ID; });
                 var accessGranted = caseDetails.metadataFields.find(function (metadataField) { return metadataField.id === CaseViewerComponent.METADATA_FIELD_ACCESS_GRANTED_ID; });
                 this.accessGranted = accessGranted ? accessGranted.value !== CaseViewerComponent.BASIC_USER_ACCESS_TYPES : false;
                 this.userAccessType = accessProcess ? accessProcess.value : null;
@@ -31687,14 +31565,30 @@
                 !this.accessGranted ? CaseViewerComponent.NON_STANDARD_USER_ACCESS_TYPES.indexOf(this.userAccessType) === -1 : true
                 : true;
         };
+        CaseViewerComponent.prototype.suffixDuplicateTabs = function (tabs) {
+            var count = {};
+            var firstOccurences = {};
+            var item;
+            var itemCount;
+            for (var i = 0, c = tabs.length; i < c; i++) {
+                item = tabs[i].label;
+                itemCount = count[item];
+                itemCount = count[item] = (itemCount == null ? 1 : itemCount + 1);
+                if (count[item] > 1)
+                    tabs[i].label = tabs[i].label + Array(count[item] - 1).fill('_').join('');
+                else
+                    firstOccurences[item] = i;
+            }
+            return tabs;
+        };
         return CaseViewerComponent;
     }());
-    CaseViewerComponent.METADATA_FIELD_ACCESS_PROCEES_ID = '[ACCESS_PROCESS]';
+    CaseViewerComponent.METADATA_FIELD_ACCESS_PROCESS_ID = '[ACCESS_PROCESS]';
     CaseViewerComponent.METADATA_FIELD_ACCESS_GRANTED_ID = '[ACCESS_GRANTED]';
     CaseViewerComponent.NON_STANDARD_USER_ACCESS_TYPES = ['CHALLENGED', 'SPECIFIC'];
     CaseViewerComponent.BASIC_USER_ACCESS_TYPES = 'BASIC';
-    CaseViewerComponent.ɵfac = function CaseViewerComponent_Factory(t) { return new (t || CaseViewerComponent)(i0__namespace.ɵɵdirectiveInject(i1__namespace$1.ActivatedRoute), i0__namespace.ɵɵdirectiveInject(CaseNotifier), i0__namespace.ɵɵdirectiveInject(AbstractAppConfig)); };
-    CaseViewerComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: CaseViewerComponent, selectors: [["ccd-case-viewer"]], inputs: { hasPrint: "hasPrint", hasEventSelector: "hasEventSelector", prependedTabs: "prependedTabs", appendedTabs: "appendedTabs", caseDetails: "caseDetails" }, decls: 1, vars: 1, consts: [[4, "ngIf"], [3, "accessType", "caseDetails", 4, "ngIf"], [3, "caseDetails", "hasPrint", "hasEventSelector", "prependedTabs", "appendedTabs", 4, "ngIf"], [3, "accessType", "caseDetails"], [3, "caseDetails", "hasPrint", "hasEventSelector", "prependedTabs", "appendedTabs"]], template: function CaseViewerComponent_Template(rf, ctx) {
+    CaseViewerComponent.ɵfac = function CaseViewerComponent_Factory(t) { return new (t || CaseViewerComponent)(i0__namespace.ɵɵdirectiveInject(i1__namespace$1.ActivatedRoute), i0__namespace.ɵɵdirectiveInject(CaseNotifier), i0__namespace.ɵɵdirectiveInject(AbstractAppConfig), i0__namespace.ɵɵdirectiveInject(OrderService)); };
+    CaseViewerComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: CaseViewerComponent, selectors: [["ccd-case-viewer"]], inputs: { hasPrint: "hasPrint", hasEventSelector: "hasEventSelector", prependedTabs: "prependedTabs", appendedTabs: "appendedTabs" }, decls: 1, vars: 1, consts: [[4, "ngIf"], [3, "accessType", "caseDetails", 4, "ngIf"], [3, "caseDetails", "hasPrint", "hasEventSelector", "prependedTabs", "appendedTabs", 4, "ngIf"], [3, "accessType", "caseDetails"], [3, "caseDetails", "hasPrint", "hasEventSelector", "prependedTabs", "appendedTabs"]], template: function CaseViewerComponent_Template(rf, ctx) {
             if (rf & 1) {
                 i0__namespace.ɵɵtemplate(0, CaseViewerComponent_div_0_Template, 3, 2, "div", 0);
             }
@@ -31709,7 +31603,7 @@
                         selector: 'ccd-case-viewer',
                         templateUrl: './case-viewer.component.html'
                     }]
-            }], function () { return [{ type: i1__namespace$1.ActivatedRoute }, { type: CaseNotifier }, { type: AbstractAppConfig }]; }, { hasPrint: [{
+            }], function () { return [{ type: i1__namespace$1.ActivatedRoute }, { type: CaseNotifier }, { type: AbstractAppConfig }, { type: OrderService }]; }, { hasPrint: [{
                     type: i0.Input
                 }], hasEventSelector: [{
                     type: i0.Input
@@ -31717,8 +31611,6 @@
                     type: i0.Input
                 }], appendedTabs: [{
                     type: i0.Input
-                }], caseDetails: [{
-                    type: i0.Input
                 }] });
     })();
 
@@ -36268,9 +36160,6 @@
     exports.Profile = Profile;
     exports.ProfileNotifier = ProfileNotifier;
     exports.ProfileService = ProfileService;
-    exports.QueryCreateComponent = QueryCreateComponent;
-    exports.QueryDetailComponent = QueryDetailComponent;
-    exports.QueryListComponent = QueryListComponent;
     exports.ReadCaseFlagFieldComponent = ReadCaseFlagFieldComponent;
     exports.ReadCaseLinkFieldComponent = ReadCaseLinkFieldComponent;
     exports.ReadCollectionFieldComponent = ReadCollectionFieldComponent;
@@ -36298,7 +36187,6 @@
     exports.ReadOrganisationFieldRawComponent = ReadOrganisationFieldRawComponent;
     exports.ReadOrganisationFieldTableComponent = ReadOrganisationFieldTableComponent;
     exports.ReadPhoneUKFieldComponent = ReadPhoneUKFieldComponent;
-    exports.ReadQueryManagementFieldComponent = ReadQueryManagementFieldComponent;
     exports.ReadTextAreaFieldComponent = ReadTextAreaFieldComponent;
     exports.ReadTextFieldComponent = ReadTextFieldComponent;
     exports.ReadYesNoFieldComponent = ReadYesNoFieldComponent;
@@ -36373,7 +36261,6 @@
     exports.WriteOrganisationComplexFieldComponent = WriteOrganisationComplexFieldComponent;
     exports.WriteOrganisationFieldComponent = WriteOrganisationFieldComponent;
     exports.WritePhoneUKFieldComponent = WritePhoneUKFieldComponent;
-    exports.WriteQueryManagementFieldComponent = WriteQueryManagementFieldComponent;
     exports.WriteTextAreaFieldComponent = WriteTextAreaFieldComponent;
     exports.WriteTextFieldComponent = WriteTextFieldComponent;
     exports.WriteYesNoFieldComponent = WriteYesNoFieldComponent;
@@ -36392,7 +36279,6 @@
     exports.editorRouting = editorRouting;
     exports.initDialog = initDialog;
     exports.newCaseField = newCaseField;
-    exports.partyMessagesMockData = partyMessagesMockData;
     exports.textFieldType = textFieldType;
     exports.viewerRouting = viewerRouting;