@hmcts/ccd-case-ui-toolkit 6.15.0-g → 6.16.0-EXUI-343

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

@@ -1036,22 +1036,22 @@
             }
         };
         DateInputComponent.prototype.dayId = function () {
-            return this.id + '-day';
+            return this.id + "-day";
         };
         DateInputComponent.prototype.monthId = function () {
-            return this.id + '-month';
+            return this.id + "-month";
         };
         DateInputComponent.prototype.yearId = function () {
-            return this.id + '-year';
+            return this.id + "-year";
         };
         DateInputComponent.prototype.hourId = function () {
-            return this.id + '-hour';
+            return this.id + "-hour";
         };
         DateInputComponent.prototype.minuteId = function () {
-            return this.id + '-minute';
+            return this.id + "-minute";
         };
         DateInputComponent.prototype.secondId = function () {
-            return this.id + '-second';
+            return this.id + "-second";
         };
         DateInputComponent.prototype.viewValue = function () {
             if (this.day || this.month || this.year || this.hour || this.minute || this.second) {
@@ -1066,7 +1066,7 @@
                         this.minute ? this.pad(this.minute) : '',
                         this.second ? this.pad(this.second) : ''
                     ].join(':');
-                    return date + 'T' + time + '.000';
+                    return date + "T" + time + ".000";
                 }
                 else {
                     return date;
@@ -2131,7 +2131,7 @@
         });
         ActivityService.handleHttpError = function (response) {
             var error = HttpErrorService.convertToHttpError(response);
-            if (response.status && response.status !== error.status) {
+            if ((response === null || response === void 0 ? void 0 : response.status) !== error.status) {
                 error.status = response.status;
             }
             return error;
@@ -2139,12 +2139,11 @@
         ActivityService.prototype.getOptions = function () {
             var userDetails = JSON.parse(this.sessionStorageService.getItem('userDetails'));
             var headers = new i1$2.HttpHeaders().set('Content-Type', 'application/json').set('Authorization', userDetails.token);
-            var options = {
+            return {
                 headers: headers,
                 withCredentials: true,
                 observe: 'body',
             };
-            return options;
         };
         ActivityService.prototype.getActivities = function () {
             var caseId = [];
@@ -2153,41 +2152,33 @@
             }
             try {
                 var options = this.getOptions();
-                var url = this.activityUrl() + ("/cases/" + caseId.join(',') + "/activity");
+                var url = this.activityUrl() + "/cases/" + caseId.join(',') + "/activity";
                 return this.http
                     .get(url, options, false, ActivityService.handleHttpError)
                     .pipe(operators.map(function (response) { return response; }));
             }
             catch (error) {
-                console.log('user may not be authenticated.' + error);
+                console.log("user may not be authenticated." + error);
             }
         };
         ActivityService.prototype.postActivity = function (caseId, activity) {
             try {
                 var options = this.getOptions();
-                var url = this.activityUrl() + ("/cases/" + caseId + "/activity");
+                var url = this.activityUrl() + "/cases/" + caseId + "/activity";
                 var body = { activity: activity };
                 return this.http
                     .post(url, body, options, false)
                     .pipe(operators.map(function (response) { return response; }));
             }
             catch (error) {
-                console.log('user may not be authenticated.' + error);
+                console.log("user may not be authenticated." + error);
             }
         };
         ActivityService.prototype.verifyUserIsAuthorized = function () {
             var _this = this;
-            if (this.sessionStorageService.getItem('userDetails') === undefined) {
-                return;
-            }
-            if (this.activityUrl() && this.userAuthorised === undefined) {
+            if (this.sessionStorageService.getItem('userDetails') && this.activityUrl() && this.userAuthorised === undefined) {
                 this.getActivities(ActivityService.DUMMY_CASE_REFERENCE).subscribe(function () { return _this.userAuthorised = true; }, function (error) {
-                    if ([401, 403].indexOf(error.status) > -1) {
-                        _this.userAuthorised = false;
-                    }
-                    else {
-                        _this.userAuthorised = true;
-                    }
+                    _this.userAuthorised = [401, 403].indexOf(error.status) <= -1;
                 });
             }
         };
@@ -2300,7 +2291,7 @@
                         requests.get(activity.caseId).next(activity);
                     });
                 }, function (err) {
-                    console.log('error: ' + err);
+                    console.log("error: " + err);
                     Array.from(requests.values()).forEach(function (subject) { return subject.error(err); });
                 }); });
             });
@@ -2440,9 +2431,9 @@
         };
         ActivityComponent.prototype.generateDescription = function (prefix, suffix, namesArray, unknownCount) {
             var resultText = prefix;
-            resultText += namesArray.map(function (activityInfo) { return activityInfo.forename + ' ' + activityInfo.surname; }).join(', ');
+            resultText += namesArray.map(function (activityInfo) { return activityInfo.forename + " " + activityInfo.surname; }).join(', ');
             if (unknownCount > 0) {
-                resultText += (namesArray.length > 0 ? ' and ' + unknownCount + ' other' : unknownCount + ' user');
+                resultText += (namesArray.length > 0 ? " and " + unknownCount + " other" : unknownCount + " user");
                 resultText += (unknownCount > 1 ? 's' : '');
             }
             else {
@@ -2450,10 +2441,10 @@
             }
             if (suffix.length > 0) {
                 if (namesArray.length + unknownCount > 1) {
-                    resultText += ' are ' + suffix;
+                    resultText += " are " + suffix;
                 }
                 else {
-                    resultText += ' is ' + suffix;
+                    resultText += " is " + suffix;
                 }
             }
             return resultText;
@@ -2792,7 +2783,7 @@
                             break;
                         case 'n':
                         case 'N':
-                            maybePush(result, '***' + c + '***', inQuote); // No way to support A - millisec of day, n - nano of second, N - nano of Day
+                            maybePush(result, "***" + c + "***", inQuote); // No way to support A - millisec of day, n - nano of second, N - nano of Day
                             break;
                         case 'V':
                         case 'O':
@@ -2926,9 +2917,9 @@
                         resultDate = offsetDate.getDate() + " " + DatePipe.MONTHS[offsetDate.getMonth()] + " " + offsetDate.getFullYear();
                         if (match[4] && match[5] && match[6] && format !== 'short') {
                             resultDate += ', ';
-                            resultDate += this.getHour(offsetDate.getHours().toString()) + ':';
-                            resultDate += this.pad(offsetDate.getMinutes()) + ':';
-                            resultDate += this.pad(offsetDate.getSeconds()) + ' ';
+                            resultDate += this.getHour(offsetDate.getHours().toString()) + ":";
+                            resultDate += this.pad(offsetDate.getMinutes()) + ":";
+                            resultDate += this.pad(offsetDate.getSeconds()) + " ";
                             resultDate += (this.toInt(offsetDate.getHours().toString()) >= 12) ? 'PM' : 'AM';
                         }
                     }
@@ -3303,6 +3294,7 @@
             }], null, null);
     })();
 
+    // tslint:disable:variable-name
     var AddressModel = /** @class */ (function () {
         function AddressModel() {
             this.AddressLine1 = '';
@@ -3613,6 +3605,7 @@
         __metadata("design:type", Array)
     ], CaseEventTrigger.prototype, "wizard_pages", void 0);
 
+    // tslint:disable:variable-name
     var CaseViewEvent = /** @class */ (function () {
         function CaseViewEvent() {
         }
@@ -3657,6 +3650,7 @@
         __metadata("design:type", Array)
     ], CaseType.prototype, "case_fields", void 0);
 
+    // tslint:disable:variable-name
     var EventCaseField = /** @class */ (function () {
         function EventCaseField() {
         }
@@ -3707,6 +3701,7 @@
         return CasePrintDocument;
     }());
 
+    // tslint:disable:variable-name
     var HRef = /** @class */ (function () {
         function HRef() {
         }
@@ -3744,25 +3739,25 @@
         OrganisationConverter.toSimpleAddress = function (organisationModel) {
             var simpleAddress = '';
             if (organisationModel.addressLine1) {
-                simpleAddress += organisationModel.addressLine1 + '<br>';
+                simpleAddress += organisationModel.addressLine1 + "<br>";
             }
             if (organisationModel.addressLine2) {
-                simpleAddress += organisationModel.addressLine2 + '<br>';
+                simpleAddress += organisationModel.addressLine2 + "<br>";
             }
             if (organisationModel.addressLine3) {
-                simpleAddress += organisationModel.addressLine3 + '<br>';
+                simpleAddress += organisationModel.addressLine3 + "<br>";
             }
             if (organisationModel.townCity) {
-                simpleAddress += organisationModel.townCity + '<br>';
+                simpleAddress += organisationModel.townCity + "<br>";
             }
             if (organisationModel.county) {
-                simpleAddress += organisationModel.county + '<br>';
+                simpleAddress += organisationModel.county + "<br>";
             }
             if (organisationModel.country) {
-                simpleAddress += organisationModel.country + '<br>';
+                simpleAddress += organisationModel.country + "<br>";
             }
             if (organisationModel.postCode) {
-                simpleAddress += organisationModel.postCode + '<br>';
+                simpleAddress += organisationModel.postCode + "<br>";
             }
             return simpleAddress;
         };
@@ -3875,12 +3870,14 @@
         __metadata("design:type", Array)
     ], SearchResultView.prototype, "results", void 0);
 
+    // tslint:disable:variable-name
     var CaseDetails = /** @class */ (function () {
         function CaseDetails() {
         }
         return CaseDetails;
     }());
 
+    // tslint:disable:variable-name
     var CaseEventData = /** @class */ (function () {
         function CaseEventData() {
         }
@@ -3888,12 +3885,7 @@
     }());
 
     var WorkbasketInputModel = /** @class */ (function () {
-        function WorkbasketInputModel(label, order, field, metadata, display_context_parameter) {
-            this.label = label;
-            this.order = order;
-            this.field = field;
-            this.metadata = metadata;
-            this.display_context_parameter = display_context_parameter;
+        function WorkbasketInputModel() {
         }
         return WorkbasketInputModel;
     }());
@@ -3941,9 +3933,9 @@
             });
             return valueMap;
         };
-        FieldsUtils.getType = function (elem) {
-            return Object.prototype.toString.call(elem).slice(8, -1);
-        };
+        // public static getType(elem: any): string {
+        //   return Object.prototype.toString.call(elem).slice(8, -1);
+        // }
         FieldsUtils.isObject = function (elem) {
             return typeof elem === 'object' && elem !== null;
         };
@@ -4144,6 +4136,13 @@
             }
             return caseField.field_type.type === 'ComponentLauncher';
         };
+        FieldsUtils.isLinkedCasesCaseField = function (caseField) {
+            return FieldsUtils.isComponentLauncherCaseField(caseField) &&
+                caseField.id === 'LinkedCasesComponentLauncher';
+        };
+        FieldsUtils.containsLinkedCasesCaseField = function (caseFields) {
+            return caseFields === null || caseFields === void 0 ? void 0 : caseFields.some(function (caseField) { return FieldsUtils.isLinkedCasesCaseField(caseField); });
+        };
         FieldsUtils.isFlagsFieldType = function (fieldType) {
             if (!fieldType) {
                 return false;
@@ -4452,6 +4451,7 @@
                 var elements = (result[field.id] || field.value);
                 if (elements) {
                     elements.forEach(function (elem) {
+                        // tslint:disable-next-line:switch-default
                         switch (field.field_type.collection_field_type.type) {
                             case 'MoneyGBP': {
                                 elem.value = FieldsUtils.getMoneyGBP(elem.value);
@@ -4501,7 +4501,6 @@
             if (!condition) {
                 return null;
             }
-            ;
             condition = condition.replace(/CONTAINS/g, ' CONTAINS');
             return peg.parse(condition.trim(), {});
         };
@@ -4515,14 +4514,12 @@
             if (!conditions || conditions.length === 0) {
                 return true;
             }
-            ;
             var validJoinComparators = ['AND', 'OR'];
-            var result = conditions.reduce(function (accumulator, condition, index) {
+            return conditions.reduce(function (accumulator, condition, index) {
                 var isJoinComparator = function (comparator) { return (typeof comparator === 'string' && validJoinComparators.indexOf(comparator) !== -1); };
                 if (isJoinComparator(condition)) {
                     return accumulator;
                 }
-                ;
                 var currentConditionResult = true;
                 if (Array.isArray(condition)) {
                     currentConditionResult = _this.evaluate(fields, condition);
@@ -4539,9 +4536,9 @@
                 }
                 return currentConditionResult;
             }, true);
-            return result;
         };
         ConditionParser.evaluateJoin = function (leftResult, comparator, rightResult) {
+            // tslint:disable-next-line:switch-default
             switch (comparator) {
                 case 'OR': return leftResult || rightResult;
                 case 'AND': return leftResult && rightResult;
@@ -4631,8 +4628,7 @@
             }
         };
         ConditionParser.unquoted = function (str) {
-            var res = str.replace(/^"|"$/g, '');
-            return res;
+            return str.replace(/^"|"$/g, '');
         };
         ConditionParser.findValueForComplexCondition = function (fields, head, tail, path) {
             if (!fields) {
@@ -4746,8 +4742,8 @@
                 if (originalCondition.indexOf(condition.fieldReference) > -1) {
                     if (this.processedList && this.processedList.indexOf(condition.fieldReference) === -1) {
                         this.processedList.push(condition.fieldReference);
-                        var regularExp = new RegExp('(\\b)' + condition.fieldReference + '(?=[^"]*(?:"[^"]*"[^"]*)*$)(\\b)', 'g');
-                        return originalCondition.replace(regularExp, pathPrefix + '.' + condition.fieldReference);
+                        var regularExp = new RegExp("(\\b)" + condition.fieldReference + "(?=[^\"]*(?:\"[^\"]*\"[^\"]*)*$)(\\b)", 'g');
+                        return originalCondition.replace(regularExp, pathPrefix + "." + condition.fieldReference);
                     }
                     else {
                         return originalCondition;
@@ -4826,6 +4822,7 @@
                                 }
                                 // Consider what type of field this is.
                                 var ft = caseField.field_type;
+                                // tslint:disable-next-line:switch-default
                                 switch (ft.type) {
                                     case 'Collection':
                                         if (ft.collection_field_type.type === 'Complex' && ft.collection_field_type.complex_fields) {
@@ -5316,14 +5313,14 @@
             var formFields = form.getRawValue();
             var currentPage = wizard.getPage(currentPageId, this.fieldsUtils.buildCanShowPredicate(eventTrigger, form));
             currentPage.wizard_page_fields.forEach(function (wpf) {
-                var case_field = _this.findCaseFieldByWizardPageFieldId(currentPage, wpf);
-                if (_this.hasShowConditionField(case_field, formFields)) {
-                    var condition = new ShowCondition(case_field.show_condition);
-                    if (_this.isHidden(condition, formFields.data) && !(_this.isReadonly(case_field))) {
-                        _this.resetField(form, case_field);
+                var caseField = _this.findCaseFieldByWizardPageFieldId(currentPage, wpf);
+                if (_this.hasShowConditionField(caseField, formFields)) {
+                    var condition = new ShowCondition(caseField.show_condition);
+                    if (_this.isHidden(condition, formFields.data) && !(_this.isReadonly(caseField))) {
+                        _this.resetField(form, caseField);
                     }
                 }
-                _this.retainHiddenValueByFieldType(case_field, form);
+                _this.retainHiddenValueByFieldType(caseField, form);
             });
         };
         FieldsPurger.prototype.retainHiddenValueByFieldType = function (field, form) {
@@ -5354,13 +5351,13 @@
         FieldsPurger.prototype.hasShowConditionPage = function (wizardPage, formFields) {
             return wizardPage.show_condition && formFields[this.getShowConditionKey(wizardPage.show_condition)];
         };
-        FieldsPurger.prototype.hasShowConditionField = function (case_field, formFields) {
-            return case_field.show_condition && formFields.data[this.getShowConditionKey(case_field.show_condition)];
+        FieldsPurger.prototype.hasShowConditionField = function (caseField, formFields) {
+            return caseField.show_condition && formFields.data[this.getShowConditionKey(caseField.show_condition)];
         };
-        FieldsPurger.prototype.getShowConditionKey = function (show_condition) {
+        FieldsPurger.prototype.getShowConditionKey = function (showCondition) {
             // Need to allow for negated conditions, i.e. !=, as well as regular ones (=)
             // Also need to allow for conditions specified using the "CONTAINS" keyword
-            return show_condition.split(/!=|=|CONTAINS/)[0];
+            return showCondition.split(/!=|=|CONTAINS/)[0];
         };
         FieldsPurger.prototype.resetField = function (form, field) {
             var e_1, _a;
@@ -5456,8 +5453,8 @@
         FieldsPurger.prototype.resetPage = function (form, wizardPage) {
             var _this = this;
             wizardPage.wizard_page_fields.forEach(function (wpf) {
-                var case_field = _this.findCaseFieldByWizardPageFieldId(wizardPage, wpf);
-                _this.resetField(form, case_field);
+                var caseField = _this.findCaseFieldByWizardPageFieldId(wizardPage, wpf);
+                _this.resetField(form, caseField);
             });
         };
         FieldsPurger.prototype.getType = function (elem) {
@@ -5467,8 +5464,8 @@
             return this.getType(elem) === 'Object';
         };
         // TODO: call isReadOnly on CaseFields once we make it available
-        FieldsPurger.prototype.isReadonly = function (case_field) {
-            return case_field.display_context.toUpperCase() === 'READONLY';
+        FieldsPurger.prototype.isReadonly = function (caseField) {
+            return caseField.display_context.toUpperCase() === 'READONLY';
         };
         /**
          * Deletes a field value by setting the value of the corresponding {@link FormControl} to null (or an empty array
@@ -5655,6 +5652,7 @@
                 return;
             }
             caseFields.forEach(function (caseField) {
+                // tslint:disable-next-line:switch-default
                 switch (caseField.field_type.type) {
                     case FieldTypeSanitiser.FIELD_TYPE_DYNAMIC_MULTISELECT_LIST:
                         _this.convertArrayToDynamicListOutput(caseField, data);
@@ -6363,7 +6361,6 @@
                             });
                         }
                     }
-                    ;
                 });
             }
         };
@@ -6802,7 +6799,7 @@
             return addressModel;
         };
         AddressParser.prototype.parseAddressLine1 = function (classification, address) {
-            var addressLine = '';
+            var addressLine;
             if (classification === AddressType.RD06) {
                 addressLine =
                     address.SUB_BUILDING_NAME + " " + address.ORGANISATION_NAME + " " + address.DEPARTMENT_NAME + " " + address.PO_BOX_NUMBER;
@@ -6815,7 +6812,7 @@
             return this.removeNonAddressValues(addressLine);
         };
         AddressParser.prototype.parseAddressLine2 = function (classification, address) {
-            var addressLine = '';
+            var addressLine;
             if (classification === AddressType.RD06) {
                 addressLine = address.BUILDING_NAME + " ";
             }
@@ -6826,7 +6823,7 @@
             return this.removeNonAddressValues(addressLine);
         };
         AddressParser.prototype.parseAddressLine3 = function (classification, address) {
-            var addressLine = '';
+            var addressLine;
             if (classification === AddressType.RD06) {
                 addressLine =
                     address.BUILDING_NUMBER + " " + address.THOROUGHFARE_NAME;
@@ -6854,7 +6851,7 @@
             return value.replace(new RegExp('^,', 'gi'), '');
         };
         AddressParser.prototype.prefixWithCommaIfPresent = function (value) {
-            return value ? ', ' + value : value;
+            return value ? ", " + value : value;
         };
         return AddressParser;
     }());
@@ -7104,7 +7101,7 @@
                 if (flagType) {
                     url += "?flag-type=" + flagType;
                 }
-                if (welshRequired != null) {
+                if (typeof welshRequired === 'boolean') {
                     // Check if flag-type has been added to the query string; if so, append welsh-required with '&'
                     url.indexOf('?') > -1 ? url += '&' : url += '?';
                     welshRequired ? url += 'welsh-required=Y' : url += 'welsh-required=N';
@@ -7710,18 +7707,6 @@
             }], null, null);
     })();
 
-    var HasLoadingState = /** @class */ (function () {
-        function HasLoadingState() {
-        }
-        Object.defineProperty(HasLoadingState.prototype, "isLoading", {
-            get: function () {
-                return;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        return HasLoadingState;
-    }());
     var LoadingService = /** @class */ (function () {
         function LoadingService() {
             this.registered = new Map();
@@ -7746,7 +7731,7 @@
         };
         LoadingService.prototype.generateToken = function () {
             var timestamp = window.performance.now();
-            return 'toolkit-loading-' + timestamp; // format: [source-library]-[unique incrementing number]
+            return "toolkit-loading-" + timestamp; // format: [source-library]-[unique incrementing number]
         };
         return LoadingService;
     }());
@@ -7767,10 +7752,7 @@
         }
         SearchService.prototype.search = function (jurisdictionId, caseTypeId, metaCriteria, caseCriteria, view) {
             var _this = this;
-            var url = this.appConfig.getApiUrl() + "/caseworkers/:uid"
-                + ("/jurisdictions/" + jurisdictionId)
-                + ("/case-types/" + caseTypeId)
-                + "/cases";
+            var url = this.appConfig.getApiUrl() + "/caseworkers/:uid/jurisdictions/" + jurisdictionId + "/case-types/" + caseTypeId + "/cases";
             var options = this.requestOptionsBuilder.buildOptions(metaCriteria, caseCriteria, view);
             var loadingToken = this.loadingService.register();
             return this.httpService
@@ -7779,15 +7761,14 @@
         };
         SearchService.prototype.searchCasesByIds = function (caseTypeId, filter, view, sort) {
             var _this = this;
-            var url = this.appConfig.getCaseDataUrl() +
-                ("/internal/searchCases?ctid=" + caseTypeId + "&use_case=" + view);
+            var url = this.appConfig.getCaseDataUrl() + "/internal/searchCases?ctid=" + caseTypeId + "&use_case=" + view;
             var body = Object.assign(Object.assign({ sort: sort }, filter), { size: this.appConfig.getPaginationPageSize() });
             var loadingToken = this.loadingService.register();
             return this.httpService.post(url, body).pipe(operators.map(function (response) { return response; }), operators.finalize(function () { return _this.loadingService.unregister(loadingToken); }));
         };
         SearchService.prototype.searchCases = function (caseTypeId, metaCriteria, caseCriteria, view, sort) {
             var _this = this;
-            var url = this.appConfig.getCaseDataUrl() + ("/internal/searchCases?ctid=" + caseTypeId + "&use_case=" + view);
+            var url = this.appConfig.getCaseDataUrl() + "/internal/searchCases?ctid=" + caseTypeId + "&use_case=" + view;
             var options = this.requestOptionsBuilder.buildOptions(metaCriteria, caseCriteria, view);
             var body = {
                 sort: sort,
@@ -7832,9 +7813,8 @@
         return SearchService;
     }());
     SearchService.V2_MEDIATYPE_SEARCH_INPUTS = 'application/vnd.uk.gov.hmcts.ccd-data-store-api.ui-search-input-details.v2+json;charset=UTF-8';
-    SearchService.VIEW_SEARCH = 'SEARCH';
+    // public static readonly VIEW_SEARCH = 'SEARCH';
     SearchService.VIEW_WORKBASKET = 'WORKBASKET';
-    SearchService.FIELD_PREFIX = 'case.';
     SearchService.ɵfac = function SearchService_Factory(t) { return new (t || SearchService)(i0__namespace.ɵɵinject(AbstractAppConfig), i0__namespace.ɵɵinject(HttpService), i0__namespace.ɵɵinject(RequestOptionsBuilder), i0__namespace.ɵɵinject(LoadingService)); };
     SearchService.ɵprov = i0__namespace.ɵɵdefineInjectable({ token: SearchService, factory: SearchService.ɵfac });
     (function () {
@@ -7964,17 +7944,12 @@
             this.appConfig = appConfig;
         }
         DefinitionsService.prototype.getCaseTypes = function (jurisdictionId, access) {
-            var url = this.appConfig.getApiUrl()
-                + "/caseworkers/:uid"
-                + ("/jurisdictions/" + jurisdictionId)
-                + ("/case-types?access=" + access);
+            var url = this.appConfig.getApiUrl() + "/caseworkers/:uid/jurisdictions/" + jurisdictionId + "/case-types?access=" + access;
             return this.http
                 .get(url).pipe(operators.map(function (response) { return response; }));
         };
         DefinitionsService.prototype.getJurisdictions = function (access) {
-            var url = this.appConfig.getApiUrl()
-                + "/caseworkers/:uid"
-                + ("/jurisdictions?access=" + access);
+            var url = this.appConfig.getApiUrl() + "/caseworkers/:uid/jurisdictions?access=" + access;
             return this.http
                 .get(url)
                 .pipe(operators.map(function (response) { return response; }));
@@ -8056,8 +8031,8 @@
                 compare: function (a, b) {
                     var fieldA = a.case_fields[fieldId];
                     var fieldB = b.case_fields[fieldId];
-                    fieldA = util.isUndefined(fieldA) || fieldA == null ? '' : fieldA.toLowerCase();
-                    fieldB = util.isUndefined(fieldB) || fieldB == null ? '' : fieldB.toLowerCase();
+                    fieldA = util.isUndefined(fieldA) || fieldA === null ? '' : fieldA.toLowerCase();
+                    fieldB = util.isUndefined(fieldB) || fieldB === null ? '' : fieldB.toLowerCase();
                     return fieldA === fieldB ? 0 : fieldA > fieldB ? 1 : -1;
                 }
             };
@@ -8067,8 +8042,8 @@
                 compare: function (a, b) {
                     var fieldA = a.case_fields[fieldId];
                     var fieldB = b.case_fields[fieldId];
-                    fieldA = util.isUndefined(fieldA) || fieldA == null ? '' : fieldA.join().toLowerCase();
-                    fieldB = util.isUndefined(fieldB) || fieldB == null ? '' : fieldB.join().toLowerCase();
+                    fieldA = util.isUndefined(fieldA) || fieldA === null ? '' : fieldA.join().toLowerCase();
+                    fieldB = util.isUndefined(fieldB) || fieldB === null ? '' : fieldB.join().toLowerCase();
                     return fieldA === fieldB ? 0 : fieldA > fieldB ? 1 : -1;
                 }
             };
@@ -8326,31 +8301,31 @@
         };
         WizardPageFieldToCaseFieldMapper.prototype.processComplexFieldOverride = function (override, caseField, caseFields) {
             var caseFieldIds = override.complex_field_element_id.split('.');
-            var case_field_leaf;
+            var caseFieldLeaf;
             var children = this.getCaseFieldChildren(caseField);
             if (children.length > 0) {
                 var _a = __read(caseFieldIds), _ = _a[0], tail = _a.slice(1);
-                case_field_leaf = this.getCaseFieldLeaf(tail, children);
+                caseFieldLeaf = this.getCaseFieldLeaf(tail, children);
             }
             else {
-                case_field_leaf = this.getCaseFieldLeaf(caseFieldIds, caseFields);
+                caseFieldLeaf = this.getCaseFieldLeaf(caseFieldIds, caseFields);
             }
             if (override.display_context !== 'HIDDEN') {
-                case_field_leaf.hidden = false;
-                case_field_leaf.display_context = override.display_context;
+                caseFieldLeaf.hidden = false;
+                caseFieldLeaf.display_context = override.display_context;
                 if (override.label && override.label.length > 0) {
-                    case_field_leaf.label = override.label;
+                    caseFieldLeaf.label = override.label;
                 }
                 if (override.hint_text && override.hint_text.length > 0) {
-                    case_field_leaf.hint_text = override.hint_text;
+                    caseFieldLeaf.hint_text = override.hint_text;
                 }
                 if (override.show_condition && override.show_condition.length > 0) {
-                    case_field_leaf.show_condition = override.show_condition;
+                    caseFieldLeaf.show_condition = override.show_condition;
                 }
             }
             else {
-                case_field_leaf.hidden = true;
-                case_field_leaf.display_context = override.display_context;
+                caseFieldLeaf.hidden = true;
+                caseFieldLeaf.display_context = override.display_context;
             }
         };
         WizardPageFieldToCaseFieldMapper.prototype.fixShowConditionPath = function (caseField, pathPrefix) {
@@ -8364,7 +8339,7 @@
             });
         };
         WizardPageFieldToCaseFieldMapper.prototype.preparePathPrefix = function (pathPrefix, caseField) {
-            return pathPrefix.length === 0 ? caseField : pathPrefix + '.' + caseField;
+            return pathPrefix.length === 0 ? caseField : pathPrefix + "." + caseField;
         };
         WizardPageFieldToCaseFieldMapper.prototype.getCaseFieldLeaf = function (caseFieldId, caseFields) {
             var _a = __read(caseFieldId), head = _a[0], tail = _a.slice(1);
@@ -8421,223 +8396,13 @@
             }], null, null);
     })();
 
-    var MULTIPLE_TASKS_FOUND = 'More than one task found!';
-    var WorkAllocationService = /** @class */ (function () {
-        function WorkAllocationService(http, appConfig, errorService, alertService, sessionStorageService) {
-            this.http = http;
-            this.appConfig = appConfig;
-            this.errorService = errorService;
-            this.alertService = alertService;
-            this.sessionStorageService = sessionStorageService;
-            // Check to see if work allocation is enabled
-        }
-        /**
-         * Call the API to get tasks matching the search criteria.
-         * @param searchRequest The search parameters that specify which tasks to match.
-         */
-        WorkAllocationService.prototype.searchTasks = function (searchRequest) {
-            var _this = this;
-            // Do not need to check if WA enabled as parent method will do that
-            var url = this.appConfig.getWorkAllocationApiUrl() + "/searchForCompletable";
-            return this.http
-                .post(url, { searchRequest: searchRequest }, null, false)
-                .pipe(operators.map(function (response) { return response; }), operators.catchError(function (error) {
-                _this.errorService.setError(error);
-                // explicitly eat away 401 error and 400 error
-                if (error && error.status && (error.status === 401 || error.status === 400)) {
-                    // do nothing
-                    console.log('error status 401 or 400', error);
-                }
-                else {
-                    return rxjs.throwError(error);
-                }
-            }));
-        };
-        WorkAllocationService.prototype.isWAEnabled = function (jurisdiction, caseType) {
-            this.features = this.appConfig.getWAServiceConfig();
-            var enabled = false;
-            if (!jurisdiction || !caseType) {
-                var caseInfo = JSON.parse(this.sessionStorageService.getItem('caseInfo'));
-                jurisdiction = caseInfo.jurisdiction;
-                caseType = caseInfo.caseType;
-            }
-            if (!this.features || !this.features.configurations) {
-                return false;
-            }
-            this.features.configurations.forEach(function (serviceConfig) {
-                if (serviceConfig.serviceName === jurisdiction && (serviceConfig.caseTypes.indexOf(caseType) !== -1)) {
-                    enabled = true;
-                }
-            });
-            return enabled;
-        };
-        /**
-         * Call the API to assign a task.
-         * @param taskId specifies which task should be assigned.
-         * @param userId specifies the user the task should be assigned to.
-         */
-        WorkAllocationService.prototype.assignTask = function (taskId, userId) {
-            var _this = this;
-            if (!this.isWAEnabled()) {
-                return rxjs.of(null);
-            }
-            var url = this.appConfig.getWorkAllocationApiUrl() + "/task/" + taskId + "/assign";
-            return this.http
-                .post(url, { userId: userId })
-                .pipe(operators.catchError(function (error) {
-                _this.errorService.setError(error);
-                return rxjs.throwError(error);
-            }));
-        };
-        /**
-         * Call the API to complete a task.
-         * @param taskId specifies which task should be completed.
-         */
-        WorkAllocationService.prototype.completeTask = function (taskId) {
-            var _this = this;
-            if (!this.isWAEnabled()) {
-                return rxjs.of(null);
-            }
-            var url = this.appConfig.getWorkAllocationApiUrl() + "/task/" + taskId + "/complete";
-            return this.http
-                .post(url, {})
-                .pipe(operators.catchError(function (error) {
-                _this.errorService.setError(error);
-                // this will subscribe to get the user details and decide whether to display an error message
-                _this.http.get(_this.appConfig.getUserInfoApiUrl()).pipe(operators.map(function (response) { return response; })).subscribe(function (response) {
-                    _this.handleTaskCompletionError(response);
-                });
-                return rxjs.throwError(error);
-            }));
-        };
-        /**
-         * Call the API to assign and complete a task.
-         * @param taskId specifies which task should be completed.
-         */
-        WorkAllocationService.prototype.assignAndCompleteTask = function (taskId) {
-            var _this = this;
-            if (!this.isWAEnabled()) {
-                return rxjs.of(null);
-            }
-            var url = this.appConfig.getWorkAllocationApiUrl() + "/task/" + taskId + "/complete";
-            return this.http
-                .post(url, {
-                completion_options: {
-                    assign_and_complete: true
-                }
-            })
-                .pipe(operators.catchError(function (error) {
-                _this.errorService.setError(error);
-                // this will subscribe to get the user details and decide whether to display an error message
-                _this.http.get(_this.appConfig.getUserInfoApiUrl()).pipe(operators.map(function (response) { return response; })).subscribe(function (response) {
-                    _this.handleTaskCompletionError(response);
-                });
-                return rxjs.throwError(error);
-            }));
-        };
-        /**
-         * Handles the response from the observable to get the user details when task is completed.
-         * @param response is the response given from the observable which contains the user detaild.
-         */
-        WorkAllocationService.prototype.handleTaskCompletionError = function (response) {
-            var userDetails = response;
-            if (this.userIsCaseworker(userDetails.userInfo.roles)) {
-                // when submitting the completion of task if not yet rendered cases/case confirm then preserve the alert for re-rendering
-                this.alertService.setPreserveAlerts(true, ['cases/case', 'submit']);
-                this.alertService.warning('A task could not be completed successfully. Please complete the task associated with the case manually.');
-            }
-        };
-        /**
-         * Returns true if the user's role is equivalent to a caseworker.
-         * @param roles is the list of roles found from the current user.
-         */
-        WorkAllocationService.prototype.userIsCaseworker = function (roles) {
-            var lowerCaseRoles = roles.map(function (role) { return role.toLowerCase(); });
-            // When/if lib & target permanently change to es2016, replace indexOf with includes
-            return (lowerCaseRoles.indexOf(WorkAllocationService.iACCaseOfficer) !== -1)
-                || (lowerCaseRoles.indexOf(WorkAllocationService.iACAdmOfficer) !== -1);
-        };
-        /**
-         * Look for open tasks for a case and event combination. There are 5 possible scenarios:
-         *   1. No tasks found                              => Success.
-         *   2. One task found => Mark as done              => Success.
-         *   3. One task found => Mark as done throws error => Failure.
-         *   4. More than one task found                    => Failure.
-         *   5. Search call throws an error                 => Failure.
-         * @param ccdId The ID of the case to find tasks for.
-         * @param eventId The ID of the event to find tasks for.
-         */
-        WorkAllocationService.prototype.completeAppropriateTask = function (ccdId, eventId, jurisdiction, caseTypeId) {
-            var _this = this;
-            if (!this.isWAEnabled(jurisdiction, caseTypeId)) {
-                return rxjs.of(null);
-            }
-            var taskSearchParameter = {
-                ccdId: ccdId,
-                eventId: eventId,
-                jurisdiction: jurisdiction,
-                caseTypeId: caseTypeId
-            };
-            return this.searchTasks(taskSearchParameter)
-                .pipe(operators.map(function (response) {
-                var tasks = response.tasks;
-                if (tasks && tasks.length > 0) {
-                    if (tasks.length === 1) {
-                        _this.completeTask(tasks[0].id).subscribe();
-                    }
-                    else {
-                        // This is a problem. Throw an appropriate error.
-                        throw new Error(MULTIPLE_TASKS_FOUND);
-                    }
-                }
-                return true; // All good. Nothing to see here.
-            }), operators.catchError(function (error) {
-                // Simply rethrow it.
-                return rxjs.throwError(error);
-            }));
-        };
-        /**
-         * Return tasks for case and event.
-         */
-        WorkAllocationService.prototype.getTasksByCaseIdAndEventId = function (eventId, caseId, caseType, jurisdiction) {
-            var defaultPayload = {
-                task_required_for_event: false,
-                tasks: []
-            };
-            if (!this.isWAEnabled()) {
-                return rxjs.of(defaultPayload);
-            }
-            return this.http.get(this.appConfig.getWorkAllocationApiUrl() + "/case/tasks/" + caseId + "/event/" + eventId + "/caseType/" + caseType + "/jurisdiction/" + jurisdiction);
-        };
-        /**
-         * Call the API to get a task
-         */
-        WorkAllocationService.prototype.getTask = function (taskId) {
-            if (!this.isWAEnabled()) {
-                return rxjs.of({ task: null });
-            }
-            return this.http.get(this.appConfig.getWorkAllocationApiUrl() + "/task/" + taskId);
-        };
-        return WorkAllocationService;
-    }());
-    WorkAllocationService.iACCaseOfficer = 'caseworker-ia-caseofficer';
-    WorkAllocationService.iACAdmOfficer = 'caseworker-ia-admofficer';
-    WorkAllocationService.ɵfac = function WorkAllocationService_Factory(t) { return new (t || WorkAllocationService)(i0__namespace.ɵɵinject(HttpService), i0__namespace.ɵɵinject(AbstractAppConfig), i0__namespace.ɵɵinject(HttpErrorService), i0__namespace.ɵɵinject(AlertService), i0__namespace.ɵɵinject(SessionStorageService)); };
-    WorkAllocationService.ɵprov = i0__namespace.ɵɵdefineInjectable({ token: WorkAllocationService, factory: WorkAllocationService.ɵfac });
-    (function () {
-        (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(WorkAllocationService, [{
-                type: i0.Injectable
-            }], function () { return [{ type: HttpService }, { type: AbstractAppConfig }, { type: HttpErrorService }, { type: AlertService }, { type: SessionStorageService }]; }, null);
-    })();
-
     var CasesService = /** @class */ (function () {
-        function CasesService(http, appConfig, orderService, errorService, wizardPageFieldToCaseFieldMapper, workAllocationService, loadingService, sessionStorageService) {
+        function CasesService(http, appConfig, orderService, errorService, wizardPageFieldToCaseFieldMapper, loadingService, sessionStorageService) {
             this.http = http;
             this.appConfig = appConfig;
             this.orderService = orderService;
             this.errorService = errorService;
             this.wizardPageFieldToCaseFieldMapper = wizardPageFieldToCaseFieldMapper;
-            this.workAllocationService = workAllocationService;
             this.loadingService = loadingService;
             this.sessionStorageService = sessionStorageService;
             this.get = this.getCaseView;
@@ -8656,11 +8421,7 @@
         };
         CasesService.prototype.getCaseView = function (jurisdictionId, caseTypeId, caseId) {
             var _this = this;
-            var url = this.appConfig.getApiUrl()
-                + "/caseworkers/:uid"
-                + ("/jurisdictions/" + jurisdictionId)
-                + ("/case-types/" + caseTypeId)
-                + ("/cases/" + caseId);
+            var url = this.appConfig.getApiUrl() + "/caseworkers/:uid/jurisdictions/" + jurisdictionId + "/case-types/" + caseTypeId + "/cases/" + caseId;
             var loadingToken = this.loadingService.register();
             return this.http
                 .get(url)
@@ -8712,7 +8473,7 @@
         CasesService.prototype.createEvent = function (caseDetails, eventData) {
             var _this = this;
             var caseId = caseDetails.case_id;
-            var url = this.appConfig.getCaseDataUrl() + ("/cases/" + caseId + "/events");
+            var url = this.appConfig.getCaseDataUrl() + "/cases/" + caseId + "/events";
             var headers = new i1$2.HttpHeaders()
                 .set('experimental', 'true')
                 .set('Accept', CasesService.V2_MEDIATYPE_CREATE_EVENT)
@@ -8726,9 +8487,8 @@
         };
         CasesService.prototype.validateCase = function (ctid, eventData, pageId) {
             var _this = this;
-            var pageIdString = pageId ? '?pageId=' + pageId : '';
-            var url = this.appConfig.getCaseDataUrl()
-                + ("/case-types/" + ctid + "/validate" + pageIdString);
+            var pageIdString = pageId ? "?pageId=" + pageId : '';
+            var url = this.appConfig.getCaseDataUrl() + "/case-types/" + ctid + "/validate" + pageIdString;
             var headers = new i1$2.HttpHeaders()
                 .set('experimental', 'true')
                 .set('Accept', CasesService.V2_MEDIATYPE_CASE_DATA_VALIDATE)
@@ -8746,8 +8506,7 @@
             if (eventData.ignore_warning) {
                 ignoreWarning = 'true';
             }
-            var url = this.appConfig.getCaseDataUrl()
-                + ("/case-types/" + ctid + "/cases?ignore-warning=" + ignoreWarning);
+            var url = this.appConfig.getCaseDataUrl() + "/case-types/" + ctid + "/cases?ignore-warning=" + ignoreWarning;
             var headers = new i1$2.HttpHeaders()
                 .set('experimental', 'true')
                 .set('Accept', CasesService.V2_MEDIATYPE_CREATE_CASE)
@@ -8761,9 +8520,7 @@
         };
         CasesService.prototype.getPrintDocuments = function (caseId) {
             var _this = this;
-            var url = this.appConfig.getCaseDataUrl()
-                + ("/cases/" + caseId)
-                + "/documents";
+            var url = this.appConfig.getCaseDataUrl() + "/cases/" + caseId + "/documents";
             var headers = new i1$2.HttpHeaders()
                 .set('experimental', 'true')
                 .set('Accept', CasesService.V2_MEDIATYPE_CASE_DOCUMENTS)
@@ -8872,12 +8629,12 @@
     CasesService.V2_MEDIATYPE_CREATE_EVENT = 'application/vnd.uk.gov.hmcts.ccd-data-store-api.create-event.v2+json;charset=UTF-8';
     CasesService.V2_MEDIATYPE_CREATE_CASE = 'application/vnd.uk.gov.hmcts.ccd-data-store-api.create-case.v2+json;charset=UTF-8';
     CasesService.PUI_CASE_MANAGER = 'pui-case-manager';
-    CasesService.ɵfac = function CasesService_Factory(t) { return new (t || CasesService)(i0__namespace.ɵɵinject(HttpService), i0__namespace.ɵɵinject(AbstractAppConfig), i0__namespace.ɵɵinject(OrderService), i0__namespace.ɵɵinject(HttpErrorService), i0__namespace.ɵɵinject(WizardPageFieldToCaseFieldMapper), i0__namespace.ɵɵinject(WorkAllocationService), i0__namespace.ɵɵinject(LoadingService), i0__namespace.ɵɵinject(SessionStorageService)); };
+    CasesService.ɵfac = function CasesService_Factory(t) { return new (t || CasesService)(i0__namespace.ɵɵinject(HttpService), i0__namespace.ɵɵinject(AbstractAppConfig), i0__namespace.ɵɵinject(OrderService), i0__namespace.ɵɵinject(HttpErrorService), i0__namespace.ɵɵinject(WizardPageFieldToCaseFieldMapper), i0__namespace.ɵɵinject(LoadingService), i0__namespace.ɵɵinject(SessionStorageService)); };
     CasesService.ɵprov = i0__namespace.ɵɵdefineInjectable({ token: CasesService, factory: CasesService.ɵfac });
     (function () {
         (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(CasesService, [{
                 type: i0.Injectable
-            }], function () { return [{ type: HttpService }, { type: AbstractAppConfig }, { type: OrderService }, { type: HttpErrorService }, { type: WizardPageFieldToCaseFieldMapper }, { type: WorkAllocationService }, { type: LoadingService }, { type: SessionStorageService }]; }, null);
+            }], function () { return [{ type: HttpService }, { type: AbstractAppConfig }, { type: OrderService }, { type: HttpErrorService }, { type: WizardPageFieldToCaseFieldMapper }, { type: LoadingService }, { type: SessionStorageService }]; }, null);
     })();
 
     var EventTriggerService = /** @class */ (function () {
@@ -9528,7 +9285,7 @@
         PageValidationService.prototype.isHidden = function (caseField, editForm, path) {
             var formFields = editForm.getRawValue();
             var condition = ShowCondition.getInstance(caseField.show_condition);
-            if (path && path.indexOf('_' + caseField.id + '_') === -1) {
+            if (path && path.indexOf("_" + caseField.id + "_") === -1) {
                 path = "" + path + caseField.id;
             }
             return !condition.match(formFields.data, path);
@@ -9560,8 +9317,217 @@
             }], function () { return [{ type: CaseFieldService }]; }, null);
     })();
 
+    var MULTIPLE_TASKS_FOUND = 'More than one task found!';
+    var WorkAllocationService = /** @class */ (function () {
+        function WorkAllocationService(http, appConfig, errorService, alertService, sessionStorageService) {
+            this.http = http;
+            this.appConfig = appConfig;
+            this.errorService = errorService;
+            this.alertService = alertService;
+            this.sessionStorageService = sessionStorageService;
+            // Check to see if work allocation is enabled
+        }
+        /**
+         * Call the API to get tasks matching the search criteria.
+         * @param searchRequest The search parameters that specify which tasks to match.
+         */
+        WorkAllocationService.prototype.searchTasks = function (searchRequest) {
+            var _this = this;
+            // Do not need to check if WA enabled as parent method will do that
+            var url = this.appConfig.getWorkAllocationApiUrl() + "/searchForCompletable";
+            return this.http
+                .post(url, { searchRequest: searchRequest }, null, false)
+                .pipe(operators.map(function (response) { return response; }), operators.catchError(function (error) {
+                _this.errorService.setError(error);
+                // explicitly eat away 401 error and 400 error
+                if (error && error.status && (error.status === 401 || error.status === 400)) {
+                    // do nothing
+                    console.log('error status 401 or 400', error);
+                }
+                else {
+                    return rxjs.throwError(error);
+                }
+            }));
+        };
+        WorkAllocationService.prototype.isWAEnabled = function (jurisdiction, caseType) {
+            this.features = this.appConfig.getWAServiceConfig();
+            var enabled = false;
+            if (!jurisdiction || !caseType) {
+                var caseInfo = JSON.parse(this.sessionStorageService.getItem('caseInfo'));
+                jurisdiction = caseInfo.jurisdiction;
+                caseType = caseInfo.caseType;
+            }
+            if (!this.features || !this.features.configurations) {
+                return false;
+            }
+            this.features.configurations.forEach(function (serviceConfig) {
+                if (serviceConfig.serviceName === jurisdiction && (serviceConfig.caseTypes.indexOf(caseType) !== -1)) {
+                    enabled = true;
+                }
+            });
+            return enabled;
+        };
+        /**
+         * Call the API to assign a task.
+         * @param taskId specifies which task should be assigned.
+         * @param userId specifies the user the task should be assigned to.
+         */
+        WorkAllocationService.prototype.assignTask = function (taskId, userId) {
+            var _this = this;
+            if (!this.isWAEnabled()) {
+                return rxjs.of(null);
+            }
+            var url = this.appConfig.getWorkAllocationApiUrl() + "/task/" + taskId + "/assign";
+            return this.http
+                .post(url, { userId: userId })
+                .pipe(operators.catchError(function (error) {
+                _this.errorService.setError(error);
+                return rxjs.throwError(error);
+            }));
+        };
+        /**
+         * Call the API to complete a task.
+         * @param taskId specifies which task should be completed.
+         */
+        WorkAllocationService.prototype.completeTask = function (taskId) {
+            var _this = this;
+            if (!this.isWAEnabled()) {
+                return rxjs.of(null);
+            }
+            var url = this.appConfig.getWorkAllocationApiUrl() + "/task/" + taskId + "/complete";
+            return this.http
+                .post(url, {})
+                .pipe(operators.catchError(function (error) {
+                _this.errorService.setError(error);
+                // this will subscribe to get the user details and decide whether to display an error message
+                _this.http.get(_this.appConfig.getUserInfoApiUrl()).pipe(operators.map(function (response) { return response; })).subscribe(function (response) {
+                    _this.handleTaskCompletionError(response);
+                });
+                return rxjs.throwError(error);
+            }));
+        };
+        /**
+         * Call the API to assign and complete a task.
+         * @param taskId specifies which task should be completed.
+         */
+        WorkAllocationService.prototype.assignAndCompleteTask = function (taskId) {
+            var _this = this;
+            if (!this.isWAEnabled()) {
+                return rxjs.of(null);
+            }
+            var url = this.appConfig.getWorkAllocationApiUrl() + "/task/" + taskId + "/complete";
+            return this.http
+                .post(url, {
+                completion_options: {
+                    assign_and_complete: true
+                }
+            })
+                .pipe(operators.catchError(function (error) {
+                _this.errorService.setError(error);
+                // this will subscribe to get the user details and decide whether to display an error message
+                _this.http.get(_this.appConfig.getUserInfoApiUrl()).pipe(operators.map(function (response) { return response; })).subscribe(function (response) {
+                    _this.handleTaskCompletionError(response);
+                });
+                return rxjs.throwError(error);
+            }));
+        };
+        /**
+         * Handles the response from the observable to get the user details when task is completed.
+         * @param response is the response given from the observable which contains the user detaild.
+         */
+        WorkAllocationService.prototype.handleTaskCompletionError = function (response) {
+            var userDetails = response;
+            if (this.userIsCaseworker(userDetails.userInfo.roles)) {
+                // when submitting the completion of task if not yet rendered cases/case confirm then preserve the alert for re-rendering
+                this.alertService.setPreserveAlerts(true, ['cases/case', 'submit']);
+                this.alertService.warning('A task could not be completed successfully. Please complete the task associated with the case manually.');
+            }
+        };
+        /**
+         * Returns true if the user's role is equivalent to a caseworker.
+         * @param roles is the list of roles found from the current user.
+         */
+        WorkAllocationService.prototype.userIsCaseworker = function (roles) {
+            var lowerCaseRoles = roles.map(function (role) { return role.toLowerCase(); });
+            // When/if lib & target permanently change to es2016, replace indexOf with includes
+            return (lowerCaseRoles.indexOf(WorkAllocationService.iACCaseOfficer) !== -1)
+                || (lowerCaseRoles.indexOf(WorkAllocationService.iACAdmOfficer) !== -1);
+        };
+        /**
+         * Look for open tasks for a case and event combination. There are 5 possible scenarios:
+         *   1. No tasks found                              => Success.
+         *   2. One task found => Mark as done              => Success.
+         *   3. One task found => Mark as done throws error => Failure.
+         *   4. More than one task found                    => Failure.
+         *   5. Search call throws an error                 => Failure.
+         * @param ccdId The ID of the case to find tasks for.
+         * @param eventId The ID of the event to find tasks for.
+         */
+        WorkAllocationService.prototype.completeAppropriateTask = function (ccdId, eventId, jurisdiction, caseTypeId) {
+            var _this = this;
+            if (!this.isWAEnabled(jurisdiction, caseTypeId)) {
+                return rxjs.of(null);
+            }
+            var taskSearchParameter = {
+                ccdId: ccdId,
+                eventId: eventId,
+                jurisdiction: jurisdiction,
+                caseTypeId: caseTypeId
+            };
+            return this.searchTasks(taskSearchParameter)
+                .pipe(operators.map(function (response) {
+                var tasks = response.tasks;
+                if (tasks && tasks.length > 0) {
+                    if (tasks.length === 1) {
+                        _this.completeTask(tasks[0].id).subscribe();
+                    }
+                    else {
+                        // This is a problem. Throw an appropriate error.
+                        throw new Error(MULTIPLE_TASKS_FOUND);
+                    }
+                }
+                return true; // All good. Nothing to see here.
+            }), operators.catchError(function (error) {
+                // Simply rethrow it.
+                return rxjs.throwError(error);
+            }));
+        };
+        /**
+         * Return tasks for case and event.
+         */
+        WorkAllocationService.prototype.getTasksByCaseIdAndEventId = function (eventId, caseId, caseType, jurisdiction) {
+            var defaultPayload = {
+                task_required_for_event: false,
+                tasks: []
+            };
+            if (!this.isWAEnabled()) {
+                return rxjs.of(defaultPayload);
+            }
+            return this.http.get(this.appConfig.getWorkAllocationApiUrl() + "/case/tasks/" + caseId + "/event/" + eventId + "/caseType/" + caseType + "/jurisdiction/" + jurisdiction);
+        };
+        /**
+         * Call the API to get a task
+         */
+        WorkAllocationService.prototype.getTask = function (taskId) {
+            if (!this.isWAEnabled()) {
+                return rxjs.of({ task: null });
+            }
+            return this.http.get(this.appConfig.getWorkAllocationApiUrl() + "/task/" + taskId);
+        };
+        return WorkAllocationService;
+    }());
+    WorkAllocationService.iACCaseOfficer = 'caseworker-ia-caseofficer';
+    WorkAllocationService.iACAdmOfficer = 'caseworker-ia-admofficer';
+    WorkAllocationService.ɵfac = function WorkAllocationService_Factory(t) { return new (t || WorkAllocationService)(i0__namespace.ɵɵinject(HttpService), i0__namespace.ɵɵinject(AbstractAppConfig), i0__namespace.ɵɵinject(HttpErrorService), i0__namespace.ɵɵinject(AlertService), i0__namespace.ɵɵinject(SessionStorageService)); };
+    WorkAllocationService.ɵprov = i0__namespace.ɵɵdefineInjectable({ token: WorkAllocationService, factory: WorkAllocationService.ɵfac });
+    (function () {
+        (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(WorkAllocationService, [{
+                type: i0.Injectable
+            }], function () { return [{ type: HttpService }, { type: AbstractAppConfig }, { type: HttpErrorService }, { type: AlertService }, { type: SessionStorageService }]; }, null);
+    })();
+
     var CaseEditComponent = /** @class */ (function () {
-        function CaseEditComponent(fb, caseNotifier, router, route, fieldsUtils, fieldsPurger, registrarService, wizardFactory, sessionStorageService, windowsService, formValueService, formErrorService) {
+        function CaseEditComponent(fb, caseNotifier, router, route, fieldsUtils, fieldsPurger, registrarService, wizardFactory, sessionStorageService, windowsService, formValueService, formErrorService, loadingService) {
             this.fb = fb;
             this.caseNotifier = caseNotifier;
             this.router = router;
@@ -9574,6 +9540,7 @@
             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;
@@ -9644,7 +9611,7 @@
                 form: this.form,
             });
             /* istanbul ignore else */
-            if (!nextPage && !this.eventTrigger.show_summary) {
+            if (!nextPage && !this.eventTrigger.show_summary && !this.eventTrigger.show_event_notes) {
                 this.submitForm({
                     eventTrigger: this.eventTrigger,
                     form: this.form,
@@ -9714,7 +9681,8 @@
                 });
                 this.caseSubmit({ form: form,
                     caseEventData: caseEventData,
-                    submit: submit });
+                    submit: submit
+                });
             }
         };
         CaseEditComponent.prototype.getCaseId = function (caseDetails) {
@@ -9856,13 +9824,18 @@
         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())) {
-                    _this.confirm(confirmation);
+                    // Add finally to fix sonar bug
+                    _this.confirm(confirmation).finally();
                 }
                 else {
                     _this.emitSubmitted(response);
@@ -9908,7 +9881,7 @@
     }());
     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(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)); };
+    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");
@@ -9923,7 +9896,7 @@
                         styleUrls: ['../case-edit.scss'],
                         providers: [GreyBarService]
                     }]
-            }], 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 }]; }, { 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
@@ -10318,14 +10291,14 @@
             this.title$ = new rxjs.BehaviorSubject(null);
             this.formValidationErrors$ = new rxjs.BehaviorSubject([]);
             this.editForm$ = new rxjs.BehaviorSubject(null);
-            this.linkError$ = new rxjs.BehaviorSubject(null);
+            this.isLinkedCasesJourneyAtFinalStep$ = new rxjs.BehaviorSubject(null);
             this.eventTriggerName$ = new rxjs.BehaviorSubject(null);
             this.triggerSubmitEvent$ = new rxjs.BehaviorSubject(null);
             this.caseDetails$ = this.details$.asObservable();
             this.caseTitle$ = this.title$.asObservable();
             this.caseEditForm$ = this.editForm$.asObservable();
             this.caseFormValidationErrors$ = this.formValidationErrors$.asObservable();
-            this.caseLinkError$ = this.linkError$.asObservable();
+            this.caseIsLinkedCasesJourneyAtFinalStep$ = this.isLinkedCasesJourneyAtFinalStep$.asObservable();
             this.caseEventTriggerName$ = this.eventTriggerName$.asObservable();
             this.caseTriggerSubmitEvent$ = this.triggerSubmitEvent$.asObservable();
         }
@@ -10338,9 +10311,6 @@
         CaseEditDataService.prototype.setCaseEventTriggerName = function (triggerName) {
             this.eventTriggerName$.next(triggerName);
         };
-        CaseEditDataService.prototype.setCaseLinkError = function (error) {
-            this.linkError$.next(error);
-        };
         CaseEditDataService.prototype.setFormValidationErrors = function (validationErrors) {
             this.formValidationErrors$.next(validationErrors);
         };
@@ -10350,8 +10320,8 @@
         CaseEditDataService.prototype.clearFormValidationErrors = function () {
             this.formValidationErrors$.next([]);
         };
-        CaseEditDataService.prototype.clearCaseLinkError = function () {
-            this.linkError$.next(null);
+        CaseEditDataService.prototype.setLinkedCasesJourneyAtFinalStep = function (isAtFinalStep) {
+            this.isLinkedCasesJourneyAtFinalStep$.next(isAtFinalStep);
         };
         CaseEditDataService.prototype.addFormValidationError = function (validationError) {
             this.formValidationErrors$.next(this.formValidationErrors$.getValue().concat([validationError]));
@@ -10383,24 +10353,19 @@
             }], 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", 11);
             i0__namespace.ɵɵtext(1);
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
-            var ctx_r10 = i0__namespace.ɵɵnextContext(2);
+            var ctx_r9 = i0__namespace.ɵɵnextContext(2);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵtextInterpolate(ctx_r10.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", 12);
@@ -10412,44 +10377,44 @@
             i0__namespace.ɵɵelementContainerEnd();
         }
         if (rf & 2) {
-            var ctx_r11 = i0__namespace.ɵɵnextContext(2);
+            var ctx_r10 = i0__namespace.ɵɵnextContext(2);
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵtextInterpolate(ctx_r11.eventTrigger.name);
+            i0__namespace.ɵɵtextInterpolate(ctx_r10.eventTrigger.name);
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵtextInterpolate(ctx_r11.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", 10);
-            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", 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", 15);
             i0__namespace.ɵɵtext(1);
@@ -10457,28 +10422,28 @@
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
-            var ctx_r12 = i0__namespace.ɵɵnextContext(2);
+            var ctx_r11 = i0__namespace.ɵɵnextContext(2);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵtextInterpolate1("#", i0__namespace.ɵɵpipeBind1(2, 1, ctx_r12.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", 14);
+            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 _r16_1 = i0__namespace.ɵɵgetCurrentView();
+            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", 21);
-            i0__namespace.ɵɵlistener("click", function CaseEditPageComponent_div_7_div_3_Template_a_click_3_listener() { i0__namespace.ɵɵrestoreView(_r16_1); var validationError_r14 = ctx.$implicit; var ctx_r15 = i0__namespace.ɵɵnextContext(2); return ctx_r15.navigateToErrorElement(validationError_r14.id); });
+            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();
@@ -10486,39 +10451,39 @@
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
-            var validationError_r14 = ctx.$implicit;
+            var validationError_r13 = ctx.$implicit;
             i0__namespace.ɵɵadvance(4);
-            i0__namespace.ɵɵtextInterpolate(validationError_r14.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", 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", 18);
+            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);
+            i0__namespace.ɵɵproperty("ngForOf", ctx_r6.validationErrors);
         }
     }
-    function CaseEditPageComponent_form_11_ccd_case_edit_form_3_Template(rf, ctx) {
+    function CaseEditPageComponent_form_10_ccd_case_edit_form_3_Template(rf, ctx) {
         if (rf & 1) {
-            var _r20_1 = i0__namespace.ɵɵgetCurrentView();
+            var _r19_1 = i0__namespace.ɵɵgetCurrentView();
             i0__namespace.ɵɵelementStart(0, "ccd-case-edit-form", 32);
-            i0__namespace.ɵɵlistener("valuesChanged", function CaseEditPageComponent_form_11_ccd_case_edit_form_3_Template_ccd_case_edit_form_valuesChanged_0_listener($event) { i0__namespace.ɵɵrestoreView(_r20_1); var ctx_r19 = i0__namespace.ɵɵnextContext(2); return ctx_r19.applyValuesChanged($event); });
+            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_r17 = i0__namespace.ɵɵnextContext(2);
-            i0__namespace.ɵɵproperty("fields", ctx_r17.currentPage.getCol1Fields())("formGroup", ctx_r17.editForm.controls["data"])("caseFields", ctx_r17.caseFields)("pageChangeSubject", ctx_r17.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_11_div_4_Template(rf, ctx) {
+    function CaseEditPageComponent_form_10_div_4_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "div", 33);
             i0__namespace.ɵɵelementStart(1, "div", 34);
@@ -10530,26 +10495,26 @@
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
-            var ctx_r18 = i0__namespace.ɵɵnextContext(2);
+            var ctx_r17 = i0__namespace.ɵɵnextContext(2);
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵproperty("fields", ctx_r18.currentPage.getCol1Fields())("formGroup", ctx_r18.editForm.controls["data"])("caseFields", ctx_r18.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_r18.currentPage.getCol2Fields())("formGroup", ctx_r18.editForm.controls["data"])("caseFields", ctx_r18.caseFields);
+            i0__namespace.ɵɵproperty("fields", ctx_r17.currentPage.getCol2Fields())("formGroup", ctx_r17.editForm.controls["data"])("caseFields", ctx_r17.caseFields);
         }
     }
-    function CaseEditPageComponent_form_11_Template(rf, ctx) {
+    function CaseEditPageComponent_form_10_Template(rf, ctx) {
         if (rf & 1) {
-            var _r22_1 = i0__namespace.ɵɵgetCurrentView();
+            var _r21_1 = i0__namespace.ɵɵgetCurrentView();
             i0__namespace.ɵɵelementStart(0, "form", 22);
-            i0__namespace.ɵɵlistener("submit", function CaseEditPageComponent_form_11_Template_form_submit_0_listener() { i0__namespace.ɵɵrestoreView(_r22_1); var ctx_r21 = i0__namespace.ɵɵnextContext(); return ctx_r21.submit(); });
+            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_11_ccd_case_edit_form_3_Template, 1, 4, "ccd-case-edit-form", 25);
-            i0__namespace.ɵɵtemplate(4, CaseEditPageComponent_form_11_div_4_Template, 5, 6, "div", 26);
+            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_11_Template_button_click_6_listener() { i0__namespace.ɵɵrestoreView(_r22_1); var ctx_r23 = i0__namespace.ɵɵnextContext(); return ctx_r23.toPreviousPage(); });
+            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();
@@ -10559,43 +10524,43 @@
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementStart(11, "p", 30);
             i0__namespace.ɵɵelementStart(12, "a", 31);
-            i0__namespace.ɵɵlistener("click", function CaseEditPageComponent_form_11_Template_a_click_12_listener() { i0__namespace.ɵɵrestoreView(_r22_1); var ctx_r24 = i0__namespace.ɵɵnextContext(); return ctx_r24.cancel(); });
+            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_r8 = i0__namespace.ɵɵnextContext();
-            i0__namespace.ɵɵproperty("formGroup", ctx_r8.editForm);
+            var ctx_r7 = i0__namespace.ɵɵnextContext();
+            i0__namespace.ɵɵproperty("formGroup", ctx_r7.editForm);
             i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵproperty("ngIf", !ctx_r8.currentPage.isMultiColumn());
+            i0__namespace.ɵɵproperty("ngIf", !ctx_r7.currentPage.isMultiColumn());
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("ngIf", ctx_r8.currentPage.isMultiColumn());
+            i0__namespace.ɵɵproperty("ngIf", ctx_r7.currentPage.isMultiColumn());
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵproperty("disabled", !i0__namespace.ɵɵpipeBind1(7, 7, ctx_r8.hasPreviousPage$));
+            i0__namespace.ɵɵproperty("disabled", !i0__namespace.ɵɵpipeBind1(7, 7, ctx_r7.hasPreviousPage$));
             i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵproperty("disabled", ctx_r8.submitting());
+            i0__namespace.ɵɵproperty("disabled", ctx_r7.submitting());
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵtextInterpolate(ctx_r8.triggerText);
+            i0__namespace.ɵɵtextInterpolate(ctx_r7.triggerText);
             i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵtextInterpolate(ctx_r8.getCancelText());
+            i0__namespace.ɵɵtextInterpolate(ctx_r7.getCancelText());
         }
     }
-    function CaseEditPageComponent_ccd_case_event_completion_12_Template(rf, ctx) {
+    function CaseEditPageComponent_ccd_case_event_completion_11_Template(rf, ctx) {
         if (rf & 1) {
-            var _r26_1 = i0__namespace.ɵɵgetCurrentView();
+            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_12_Template_ccd_case_event_completion_eventCanBeCompleted_0_listener($event) { i0__namespace.ɵɵrestoreView(_r26_1); var ctx_r25 = i0__namespace.ɵɵnextContext(); return ctx_r25.onEventCanBeCompleted($event); });
+            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_r9 = i0__namespace.ɵɵnextContext();
-            i0__namespace.ɵɵproperty("eventCompletionParams", ctx_r9.caseEdit.eventCompletionParams);
+            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;
@@ -10605,6 +10570,7 @@
             this.dialog = dialog;
             this.caseFieldService = caseFieldService;
             this.caseEditDataService = caseEditDataService;
+            this.loadingService = loadingService;
             this.triggerTextStart = CaseEditPageComponent.TRIGGER_TEXT_START;
             this.triggerTextIgnoreWarnings = CaseEditPageComponent.TRIGGER_TEXT_CONTINUE;
             this.formValuesChanged = false;
@@ -10650,11 +10616,15 @@
                     }
                     _this.hasPreviousPage$.next(_this.caseEdit.hasPrevious((_b = _this.currentPage) === null || _b === void 0 ? void 0 : _b.id));
                 }
+                _this.triggerText = _this.getTriggerText();
             });
             CaseEditPageComponent.setFocusToTop();
             this.caseEditDataService.caseEditForm$.subscribe({
                 next: function (editForm) { return _this.editForm = editForm; }
             });
+            this.caseEditDataService.caseIsLinkedCasesJourneyAtFinalStep$.subscribe({
+                next: function (isLinkedCasesJourneyAtFinalStep) { return _this.isLinkedCasesJourneyAtFinalStep = isLinkedCasesJourneyAtFinalStep; }
+            });
             this.caseEditDataService.caseTriggerSubmitEvent$.subscribe({
                 next: function (state) {
                     if (state) {
@@ -10663,7 +10633,6 @@
                     }
                 }
             });
-            this.triggerText = this.getTriggerText();
         };
         CaseEditPageComponent.prototype.ngAfterViewChecked = function () {
             this.cdRef.detectChanges();
@@ -10675,7 +10644,11 @@
             return this.caseEdit.first();
         };
         CaseEditPageComponent.prototype.currentPageIsNotValid = function () {
-            return !this.pageValidationService.isPageValid(this.currentPage, this.editForm);
+            return !this.pageValidationService.isPageValid(this.currentPage, this.editForm) ||
+                (this.isLinkedCasesJourney() && !this.isLinkedCasesJourneyAtFinalStep);
+        };
+        CaseEditPageComponent.prototype.isLinkedCasesJourney = function () {
+            return FieldsUtils.containsLinkedCasesCaseField(this.currentPage.case_fields);
         };
         /**
          * caseEventData.event_data contains all the values from the previous pages so we set caseEventData.data = caseEventData.event_data
@@ -10702,7 +10675,7 @@
                     var label = casefield.label || 'Field';
                     var id_1 = casefield.id;
                     if (fieldElement['component'] && fieldElement['component'].parent) {
-                        if (fieldElement['component'].idPrefix.indexOf('_' + id_1 + '_') === -1) {
+                        if (fieldElement['component'].idPrefix.indexOf("_" + id_1 + "_") === -1) {
                             id_1 = "" + fieldElement['component'].idPrefix + id_1;
                         }
                         else {
@@ -10777,14 +10750,26 @@
             var _this = this;
             this.caseEditDataService.clearFormValidationErrors();
             if (this.currentPageIsNotValid()) {
-                this.generateErrorMessage(this.currentPage.case_fields);
+                // The generateErrorMessage method filters out the hidden fields.
+                // The error message for LinkedCases journey will never get displayed because the
+                // LinkedCases is configured with ComponentLauncher field as visible and caseLinks field as hidden.
+                if (this.isLinkedCasesJourney()) {
+                    this.validationErrors.push({ id: 'next-button', message: 'Please select Next to go to the next page' });
+                    CaseEditPageComponent.scrollToTop();
+                }
+                else {
+                    this.generateErrorMessage(this.currentPage.case_fields);
+                }
             }
             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) {
@@ -10793,7 +10778,6 @@
                     _this.saveDraft();
                     _this.next();
                 }, function (error) {
-                    _this.showSpinner = false;
                     _this.handleError(error);
                 });
                 CaseEditPageComponent.scrollToTop();
@@ -10870,12 +10854,11 @@
             }
         };
         CaseEditPageComponent.prototype.callbackErrorsNotify = function (errorContext) {
-            this.caseEdit.ignoreWarning = errorContext.ignore_warning;
-            this.triggerText = errorContext.trigger_text;
+            this.caseEdit.ignoreWarning = errorContext.ignoreWarning;
+            this.triggerText = errorContext.triggerText;
         };
         CaseEditPageComponent.prototype.next = function () {
             if (this.canNavigateToSummaryPage()) {
-                this.showSpinner = false;
                 this.caseEdit.isSubmitting = false;
             }
             this.resetErrors();
@@ -11074,32 +11057,29 @@
     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"], [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) {
+    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.ɵɵelement(8, "ccd-case-edit-generic-errors", 5);
-                i0__namespace.ɵɵelementStart(9, "ccd-callback-errors", 6);
-                i0__namespace.ɵɵlistener("callbackErrorsContext", function CaseEditPageComponent_Template_ccd_callback_errors_callbackErrorsContext_9_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(10, "div", 7);
-                i0__namespace.ɵɵtemplate(11, CaseEditPageComponent_form_11_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(12, CaseEditPageComponent_ccd_case_event_completion_12_Template, 1, 1, "ccd-case-event-completion", 9);
+                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);
@@ -11120,7 +11100,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 () {
@@ -11240,12 +11220,12 @@
         CallbackErrorsComponent.prototype.buildCallbackErrorsContext = function () {
             var errorContext = new CallbackErrorsContext();
             if (this.hasWarnings() && !this.hasErrors() && !this.hasInvalidData()) {
-                errorContext.ignore_warning = true;
-                errorContext.trigger_text = this.triggerTextIgnore;
+                errorContext.ignoreWarning = true;
+                errorContext.triggerText = this.triggerTextIgnore;
             }
             else {
-                errorContext.ignore_warning = false;
-                errorContext.trigger_text = this.triggerTextContinue;
+                errorContext.ignoreWarning = false;
+                errorContext.triggerText = this.triggerTextContinue;
             }
             return errorContext;
         };
@@ -11290,7 +11270,7 @@
 
     var AddressOption = /** @class */ (function () {
         function AddressOption(addressModel, description) {
-            if (description == null) {
+            if (description === null) {
                 this.value = addressModel;
                 this.description = this.getDescription();
             }
@@ -11299,13 +11279,10 @@
             }
         }
         AddressOption.prototype.getDescription = function () {
-            return this.removeInitialCommaIfPresent((this.value.AddressLine1 === undefined ? '' : this.value.AddressLine1)
-                + this.prefixWithCommaIfPresent(this.value.AddressLine2)
-                + this.prefixWithCommaIfPresent(this.value.AddressLine3)
-                + ', ' + this.value.PostTown);
+            return this.removeInitialCommaIfPresent("" + (this.value.AddressLine1 === undefined ? '' : this.value.AddressLine1) + this.prefixWithCommaIfPresent(this.value.AddressLine2) + this.prefixWithCommaIfPresent(this.value.AddressLine3) + ", " + this.value.PostTown);
         };
         AddressOption.prototype.prefixWithCommaIfPresent = function (value) {
-            return value ? ', ' + value : value;
+            return value ? ", " + value : value;
         };
         AddressOption.prototype.removeInitialCommaIfPresent = function (value) {
             return value.replace(new RegExp('^,', 'gi'), '');
@@ -11449,7 +11426,7 @@
                 this.missingPostcode = false;
                 var postcode_1 = this.postcode.value;
                 this.caseField.value = null;
-                this.addressOptions = new Array();
+                this.addressOptions = [];
                 this.addressesService.getAddressesForPostcode(postcode_1.replace(' ', '').toUpperCase()).subscribe(function (result) {
                     result.forEach(function (address) {
                         _this.addressOptions.push(new AddressOption(address, null));
@@ -11492,7 +11469,7 @@
             var hasAddress = false;
             if (address) {
                 Object.keys(address).forEach(function (key) {
-                    if (address[key] != null) {
+                    if (address[key] !== null) {
                         hasAddress = true;
                     }
                 });
@@ -11515,7 +11492,7 @@
         };
         WriteAddressFieldComponent.prototype.defaultLabel = function (numberOfAddresses) {
             return numberOfAddresses === 0 ? 'No address found'
-                : numberOfAddresses + (numberOfAddresses === 1 ? ' address ' : ' addresses ') + 'found';
+                : "" + numberOfAddresses + (numberOfAddresses === 1 ? ' address ' : ' addresses ') + "found";
         };
         WriteAddressFieldComponent.prototype.setFormValue = function () {
             if (this.writeComplexFieldComponent.complexGroup) {
@@ -13129,7 +13106,7 @@
             }
         };
         WriteCollectionFieldComponent.prototype.buildCaseField = function (item, index, isNew) {
-            var e_1, _a;
+            var e_1, _c;
             if (isNew === void 0) { isNew = false; }
             /**
              * What follow is code that makes me want to go jump in the shower!
@@ -13165,8 +13142,8 @@
                 if (!value) {
                     value = new i2.FormGroup({});
                     try {
-                        for (var _b = __values(Object.keys(group.controls)), _c = _b.next(); !_c.done; _c = _b.next()) {
-                            var key = _c.value;
+                        for (var _d = __values(Object.keys(group.controls)), _e = _d.next(); !_e.done; _e = _d.next()) {
+                            var key = _e.value;
                             value.addControl(key, group.get(key));
                             // DON'T remove the control for this key from the outer group or it
                             // goes awry. So DON'T uncomment the below line!
@@ -13176,7 +13153,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; }
                     }
@@ -13307,6 +13284,7 @@
             this.formArray.removeAt(index);
         };
         WriteCollectionFieldComponent.prototype.resetIds = function (index) {
+            var _a, _b;
             for (var i = index; i < this.collItems.length; i++) {
                 var counter = i + 1;
                 if (this.collItems[i].index && this.collItems[i].index === counter) {
@@ -13316,16 +13294,15 @@
                     && this.collItems[i].caseField.id === counter.toString()) {
                     this.collItems[i].caseField.id = i.toString();
                 }
-                var idPrefix1 = this.collItems[i].prefix ? this.collItems[i].prefix.replace('_' + counter.toString(), '_' + i.toString()) : '';
-                var idPrefix1Current = idPrefix1.replace('_' + i.toString(), '_' + counter.toString());
+                var idPrefix1 = this.collItems[i].prefix ? this.collItems[i].prefix.replace("_" + counter.toString(), "_" + i.toString()) : '';
+                var idPrefix1Current = idPrefix1.replace("_" + i.toString(), "_" + counter.toString());
                 if (this.collItems[i].prefix && this.collItems[i].prefix === idPrefix1Current) {
                     this.collItems[i].prefix = idPrefix1;
                 }
-                var idPrefixAvailable = this.collItems[i].container && this.collItems[i].container['component']
-                    && this.collItems[i].container['component'].idPrefix ? true : false;
+                var idPrefixAvailable = !!((_b = (_a = this.collItems[i].container) === null || _a === void 0 ? void 0 : _a['component']) === null || _b === void 0 ? void 0 : _b.idPrefix);
                 var idPrefix2 = idPrefixAvailable ?
-                    this.collItems[i].container['component'].idPrefix.replace('_' + counter.toString(), '_' + i.toString()) : '';
-                var idPrefix2current = idPrefix2.replace('_' + i.toString(), '_' + counter.toString());
+                    this.collItems[i].container['component'].idPrefix.replace("_" + counter.toString(), "_" + i.toString()) : '';
+                var idPrefix2current = idPrefix2.replace("_" + i.toString(), "_" + counter.toString());
                 if (idPrefixAvailable && this.collItems[i].container['component'].idPrefix === idPrefix2current) {
                     this.collItems[i].container['component'].idPrefix = idPrefix2;
                 }
@@ -14681,6 +14658,257 @@
             }], null, null);
     })();
 
+    var FixedListPipe = /** @class */ (function () {
+        function FixedListPipe() {
+        }
+        FixedListPipe.prototype.transform = function (value, items) {
+            if (!!items) {
+                var item = items.find(function (i) { return i.code === value; });
+                return item ? item.label : FixedListPipe.EMPTY;
+            }
+            else {
+                return FixedListPipe.EMPTY;
+            }
+        };
+        return FixedListPipe;
+    }());
+    FixedListPipe.EMPTY = '';
+    FixedListPipe.ɵfac = function FixedListPipe_Factory(t) { return new (t || FixedListPipe)(); };
+    FixedListPipe.ɵpipe = i0__namespace.ɵɵdefinePipe({ name: "ccdFixedList", type: FixedListPipe, pure: true });
+    (function () {
+        (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(FixedListPipe, [{
+                type: i0.Pipe,
+                args: [{
+                        name: 'ccdFixedList'
+                    }]
+            }], null, null);
+    })();
+
+    function ReadDynamicMultiSelectListFieldComponent_div_0_Template(rf, ctx) {
+        if (rf & 1) {
+            i0__namespace.ɵɵelementStart(0, "div");
+            i0__namespace.ɵɵtext(1);
+            i0__namespace.ɵɵpipe(2, "ccdFixedList");
+            i0__namespace.ɵɵelementEnd();
+        }
+        if (rf & 2) {
+            var value_r1 = ctx.$implicit;
+            var ctx_r0 = i0__namespace.ɵɵnextContext();
+            i0__namespace.ɵɵadvance(1);
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind2(2, 1, value_r1.code, ctx_r0.caseField.list_items), "\n");
+        }
+    }
+    var ReadDynamicMultiSelectListFieldComponent = /** @class */ (function (_super) {
+        __extends(ReadDynamicMultiSelectListFieldComponent, _super);
+        function ReadDynamicMultiSelectListFieldComponent() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        ReadDynamicMultiSelectListFieldComponent.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) {
+                this.caseField.list_items = this.caseField.formatted_value.list_items;
+            }
+            if (!this.caseField.value && this.caseField.formatted_value && this.caseField.formatted_value.value) {
+                this.caseField.value = this.caseField.formatted_value.value;
+            }
+            _super.prototype.ngOnInit.call(this);
+        };
+        return ReadDynamicMultiSelectListFieldComponent;
+    }(AbstractFieldReadComponent));
+    ReadDynamicMultiSelectListFieldComponent.ɵfac = function ReadDynamicMultiSelectListFieldComponent_Factory(t) { return ɵReadDynamicMultiSelectListFieldComponent_BaseFactory(t || ReadDynamicMultiSelectListFieldComponent); };
+    ReadDynamicMultiSelectListFieldComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: ReadDynamicMultiSelectListFieldComponent, selectors: [["ccd-read-dynamic-multi-select-list-field"]], features: [i0__namespace.ɵɵInheritDefinitionFeature], decls: 1, vars: 1, consts: [[4, "ngFor", "ngForOf"]], template: function ReadDynamicMultiSelectListFieldComponent_Template(rf, ctx) {
+            if (rf & 1) {
+                i0__namespace.ɵɵtemplate(0, ReadDynamicMultiSelectListFieldComponent_div_0_Template, 3, 4, "div", 0);
+            }
+            if (rf & 2) {
+                i0__namespace.ɵɵproperty("ngForOf", ctx.caseField.value);
+            }
+        }, directives: [i1__namespace.NgForOf], pipes: [FixedListPipe], styles: [".multi-select-list-field-table[_ngcontent-%COMP%]   tr[_ngcontent-%COMP%] > td[_ngcontent-%COMP%]{padding:5px 0}.multi-select-list-field-table[_ngcontent-%COMP%]   tr[_ngcontent-%COMP%]:last-child > td[_ngcontent-%COMP%]{border-bottom:none}.multi-select-list-field-table[_ngcontent-%COMP%]   td.collection-actions[_ngcontent-%COMP%]{width:1px;white-space:nowrap}"] });
+    var ɵReadDynamicMultiSelectListFieldComponent_BaseFactory = /*@__PURE__*/ i0__namespace.ɵɵgetInheritedFactory(ReadDynamicMultiSelectListFieldComponent);
+    (function () {
+        (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(ReadDynamicMultiSelectListFieldComponent, [{
+                type: i0.Component,
+                args: [{
+                        selector: 'ccd-read-dynamic-multi-select-list-field',
+                        templateUrl: './read-dynamic-multi-select-list-field.html',
+                        styleUrls: ['./read-dynamic-multi-select-list-field.component.scss']
+                    }]
+            }], null, null);
+    })();
+
+    function WriteDynamicMultiSelectListFieldComponent_span_3_Template(rf, ctx) {
+        if (rf & 1) {
+            i0__namespace.ɵɵelementStart(0, "span", 5);
+            i0__namespace.ɵɵtext(1);
+            i0__namespace.ɵɵpipe(2, "ccdFieldLabel");
+            i0__namespace.ɵɵelementEnd();
+        }
+        if (rf & 2) {
+            var ctx_r0 = i0__namespace.ɵɵnextContext();
+            i0__namespace.ɵɵadvance(1);
+            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(2, 1, ctx_r0.caseField));
+        }
+    }
+    function WriteDynamicMultiSelectListFieldComponent_span_4_Template(rf, ctx) {
+        if (rf & 1) {
+            i0__namespace.ɵɵelementStart(0, "span", 6);
+            i0__namespace.ɵɵtext(1);
+            i0__namespace.ɵɵelementEnd();
+        }
+        if (rf & 2) {
+            var ctx_r1 = i0__namespace.ɵɵnextContext();
+            i0__namespace.ɵɵadvance(1);
+            i0__namespace.ɵɵtextInterpolate(ctx_r1.caseField.hint_text);
+        }
+    }
+    function WriteDynamicMultiSelectListFieldComponent_span_5_Template(rf, ctx) {
+        if (rf & 1) {
+            i0__namespace.ɵɵelementStart(0, "span", 7);
+            i0__namespace.ɵɵtext(1);
+            i0__namespace.ɵɵpipe(2, "ccdFirstError");
+            i0__namespace.ɵɵelementEnd();
+        }
+        if (rf & 2) {
+            var ctx_r2 = i0__namespace.ɵɵnextContext();
+            i0__namespace.ɵɵadvance(1);
+            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(2, 1, ctx_r2.checkboxes.errors));
+        }
+    }
+    function WriteDynamicMultiSelectListFieldComponent_ng_container_6_Template(rf, ctx) {
+        if (rf & 1) {
+            var _r6_1 = i0__namespace.ɵɵgetCurrentView();
+            i0__namespace.ɵɵelementContainerStart(0);
+            i0__namespace.ɵɵelementStart(1, "div", 8);
+            i0__namespace.ɵɵelementStart(2, "input", 9);
+            i0__namespace.ɵɵlistener("change", function WriteDynamicMultiSelectListFieldComponent_ng_container_6_Template_input_change_2_listener($event) { i0__namespace.ɵɵrestoreView(_r6_1); var ctx_r5 = i0__namespace.ɵɵnextContext(); return ctx_r5.onCheckChange($event); });
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementStart(3, "label", 10);
+            i0__namespace.ɵɵtext(4);
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementContainerEnd();
+        }
+        if (rf & 2) {
+            var checkbox_r4 = ctx.$implicit;
+            var ctx_r3 = i0__namespace.ɵɵnextContext();
+            i0__namespace.ɵɵadvance(2);
+            i0__namespace.ɵɵpropertyInterpolate("id", ctx_r3.createElementId(checkbox_r4.code));
+            i0__namespace.ɵɵpropertyInterpolate("name", ctx_r3.id());
+            i0__namespace.ɵɵproperty("value", checkbox_r4.code)("checked", ctx_r3.isSelected(checkbox_r4.code));
+            i0__namespace.ɵɵadvance(1);
+            i0__namespace.ɵɵpropertyInterpolate("for", ctx_r3.createElementId(checkbox_r4.code));
+            i0__namespace.ɵɵadvance(1);
+            i0__namespace.ɵɵtextInterpolate(checkbox_r4.label);
+        }
+    }
+    var _c0$L = function (a0) { return { "error": a0 }; };
+    var WriteDynamicMultiSelectListFieldComponent = /** @class */ (function (_super) {
+        __extends(WriteDynamicMultiSelectListFieldComponent, _super);
+        function WriteDynamicMultiSelectListFieldComponent() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        WriteDynamicMultiSelectListFieldComponent.prototype.ngOnInit = function () {
+            var _this = this;
+            this.checkboxes = new i2.FormArray([]);
+            this.setInitialCaseList();
+            this.setInitialCaseFieldValue();
+            // Initialise array with existing values
+            if (this.caseField.value && Array.isArray(this.caseField.value)) {
+                var values = this.caseField.value;
+                values.forEach(function (value) {
+                    _this.checkboxes.push(new i2.FormControl(value));
+                });
+            }
+            this.dynamicListFormControl = this.registerControl(new i2.FormControl(this.checkboxes.value));
+            this.dynamicListFormControl.setValue(this.checkboxes.value);
+        };
+        WriteDynamicMultiSelectListFieldComponent.prototype.onCheckChange = function (event) {
+            var _this = this;
+            var target = event.target;
+            if (!target || !target.value) {
+                return;
+            }
+            var selectedListItem = this.getValueListItem(target.value);
+            if (!this.isSelected(target.value)) {
+                // Add a new control in the FormArray
+                this.checkboxes.push(new i2.FormControl(selectedListItem));
+            }
+            else {
+                // Remove the control from the FormArray
+                this.checkboxes.controls.forEach(function (ctrl, i) {
+                    if (ctrl.value.code === target.value) {
+                        _this.checkboxes.removeAt(i);
+                    }
+                });
+            }
+            this.dynamicListFormControl.setValue(this.checkboxes.value);
+        };
+        WriteDynamicMultiSelectListFieldComponent.prototype.isSelected = function (code) {
+            if (this.checkboxes && this.checkboxes.controls) {
+                return this.checkboxes.controls.find(function (control) { return control.value.code === code; });
+            }
+        };
+        WriteDynamicMultiSelectListFieldComponent.prototype.getValueListItem = function (value) {
+            return this.caseField.list_items.find(function (i) { return i.code === value; });
+        };
+        WriteDynamicMultiSelectListFieldComponent.prototype.setInitialCaseList = function () {
+            var hasListItems = this.caseField.list_items && this.caseField.list_items.length > 0;
+            var hasFormattedListItems = this.caseField.formatted_value && this.caseField.formatted_value.list_items.length > 0;
+            if (!hasListItems && hasFormattedListItems) {
+                this.caseField.list_items = this.caseField.formatted_value.list_items;
+            }
+        };
+        WriteDynamicMultiSelectListFieldComponent.prototype.setInitialCaseFieldValue = function () {
+            if (!this.caseField.value && this.caseField.formatted_value && this.caseField.formatted_value.value) {
+                this.caseField.value = this.caseField.formatted_value.value;
+            }
+            var isNull = this.caseField.value === undefined || this.caseField.value === '';
+            if (isNull || !Array.isArray(this.caseField.value)) {
+                this.caseField.value = [];
+            }
+        };
+        return WriteDynamicMultiSelectListFieldComponent;
+    }(AbstractFieldWriteComponent));
+    WriteDynamicMultiSelectListFieldComponent.ɵfac = function WriteDynamicMultiSelectListFieldComponent_Factory(t) { return ɵWriteDynamicMultiSelectListFieldComponent_BaseFactory(t || WriteDynamicMultiSelectListFieldComponent); };
+    WriteDynamicMultiSelectListFieldComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: WriteDynamicMultiSelectListFieldComponent, selectors: [["ccd-write-dynamic-multi-select-list-field"]], features: [i0__namespace.ɵɵInheritDefinitionFeature], decls: 7, vars: 8, consts: [[1, "form-group", "bottom-30", 3, "ngClass", "id"], ["class", "form-label", 4, "ngIf"], ["class", "form-hint", 4, "ngIf"], ["class", "error-message", 4, "ngIf"], [4, "ngFor", "ngForOf"], [1, "form-label"], [1, "form-hint"], [1, "error-message"], [1, "multiple-choice"], ["type", "checkbox", 1, "form-control", 3, "id", "name", "value", "checked", "change"], [1, "form-label", 3, "for"]], template: function WriteDynamicMultiSelectListFieldComponent_Template(rf, ctx) {
+            if (rf & 1) {
+                i0__namespace.ɵɵelementStart(0, "div", 0);
+                i0__namespace.ɵɵelementStart(1, "fieldset");
+                i0__namespace.ɵɵelementStart(2, "legend");
+                i0__namespace.ɵɵtemplate(3, WriteDynamicMultiSelectListFieldComponent_span_3_Template, 3, 3, "span", 1);
+                i0__namespace.ɵɵtemplate(4, WriteDynamicMultiSelectListFieldComponent_span_4_Template, 2, 1, "span", 2);
+                i0__namespace.ɵɵtemplate(5, WriteDynamicMultiSelectListFieldComponent_span_5_Template, 3, 3, "span", 3);
+                i0__namespace.ɵɵelementEnd();
+                i0__namespace.ɵɵtemplate(6, WriteDynamicMultiSelectListFieldComponent_ng_container_6_Template, 5, 6, "ng-container", 4);
+                i0__namespace.ɵɵelementEnd();
+                i0__namespace.ɵɵelementEnd();
+            }
+            if (rf & 2) {
+                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(6, _c0$L, !ctx.checkboxes.valid && ctx.checkboxes.touched))("id", ctx.id());
+                i0__namespace.ɵɵadvance(3);
+                i0__namespace.ɵɵproperty("ngIf", ctx.caseField.label);
+                i0__namespace.ɵɵadvance(1);
+                i0__namespace.ɵɵproperty("ngIf", ctx.caseField.hint_text);
+                i0__namespace.ɵɵadvance(1);
+                i0__namespace.ɵɵproperty("ngIf", ctx.checkboxes.errors && ctx.checkboxes.touched);
+                i0__namespace.ɵɵadvance(1);
+                i0__namespace.ɵɵproperty("ngForOf", ctx.caseField.list_items);
+            }
+        }, directives: [i1__namespace.NgClass, i1__namespace.NgIf, i1__namespace.NgForOf], pipes: [FieldLabelPipe, FirstErrorPipe], encapsulation: 2 });
+    var ɵWriteDynamicMultiSelectListFieldComponent_BaseFactory = /*@__PURE__*/ i0__namespace.ɵɵgetInheritedFactory(WriteDynamicMultiSelectListFieldComponent);
+    (function () {
+        (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(WriteDynamicMultiSelectListFieldComponent, [{
+                type: i0.Component,
+                args: [{
+                        selector: 'ccd-write-dynamic-multi-select-list-field',
+                        templateUrl: './write-dynamic-multi-select-list-field.html'
+                    }]
+            }], null, null);
+    })();
+
     var DynamicRadioListPipe = /** @class */ (function () {
         function DynamicRadioListPipe() {
         }
@@ -14801,7 +15029,7 @@
             i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(2, 1, ctx_r3.dynamicRadioListControl.errors));
         }
     }
-    var _c0$L = function (a0) { return { selected: a0 }; };
+    var _c0$K = function (a0) { return { selected: a0 }; };
     function WriteDynamicRadioListFieldComponent_div_9_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "div", 10);
@@ -14814,7 +15042,7 @@
         if (rf & 2) {
             var radioButton_r5 = ctx.$implicit;
             var ctx_r4 = i0__namespace.ɵɵnextContext();
-            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(7, _c0$L, ctx_r4.dynamicRadioListControl.value === radioButton_r5.code));
+            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.ɵɵadvance(1);
@@ -14978,7 +15206,7 @@
             i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind2(2, 1, ctx_r2.emailControl.errors, ctx_r2.caseField.label));
         }
     }
-    var _c0$K = function (a0) { return { "form-group-error": a0 }; };
+    var _c0$J = function (a0) { return { "form-group-error": a0 }; };
     var _c1$h = function (a0) { return { "govuk-input--error": a0 }; };
     var WriteEmailFieldComponent = /** @class */ (function (_super) {
         __extends(WriteEmailFieldComponent, _super);
@@ -15003,7 +15231,7 @@
                 i0__namespace.ɵɵelementEnd();
             }
             if (rf & 2) {
-                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(8, _c0$K, !ctx.emailControl.valid && (ctx.emailControl.dirty || ctx.emailControl.touched)));
+                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(8, _c0$J, !ctx.emailControl.valid && (ctx.emailControl.dirty || ctx.emailControl.touched)));
                 i0__namespace.ɵɵadvance(1);
                 i0__namespace.ɵɵproperty("for", ctx.id());
                 i0__namespace.ɵɵadvance(1);
@@ -15027,32 +15255,6 @@
             }], null, null);
     })();
 
-    var FixedListPipe = /** @class */ (function () {
-        function FixedListPipe() {
-        }
-        FixedListPipe.prototype.transform = function (value, items) {
-            if (!!items) {
-                var item = items.find(function (i) { return i.code === value; });
-                return item ? item.label : FixedListPipe.EMPTY;
-            }
-            else {
-                return FixedListPipe.EMPTY;
-            }
-        };
-        return FixedListPipe;
-    }());
-    FixedListPipe.EMPTY = '';
-    FixedListPipe.ɵfac = function FixedListPipe_Factory(t) { return new (t || FixedListPipe)(); };
-    FixedListPipe.ɵpipe = i0__namespace.ɵɵdefinePipe({ name: "ccdFixedList", type: FixedListPipe, pure: true });
-    (function () {
-        (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(FixedListPipe, [{
-                type: i0.Pipe,
-                args: [{
-                        name: 'ccdFixedList'
-                    }]
-            }], null, null);
-    })();
-
     var ReadFixedListFieldComponent = /** @class */ (function (_super) {
         __extends(ReadFixedListFieldComponent, _super);
         function ReadFixedListFieldComponent() {
@@ -15135,7 +15337,7 @@
             i0__namespace.ɵɵtextInterpolate(type_r4.label);
         }
     }
-    var _c0$J = function (a0) { return { "form-group-error": a0 }; };
+    var _c0$I = function (a0) { return { "form-group-error": a0 }; };
     var WriteFixedListFieldComponent = /** @class */ (function (_super) {
         __extends(WriteFixedListFieldComponent, _super);
         function WriteFixedListFieldComponent() {
@@ -15184,7 +15386,7 @@
                 i0__namespace.ɵɵelementEnd();
             }
             if (rf & 2) {
-                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(9, _c0$J, !ctx.fixedListFormControl.valid && (ctx.fixedListFormControl.dirty || ctx.fixedListFormControl.touched)));
+                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(9, _c0$I, !ctx.fixedListFormControl.valid && (ctx.fixedListFormControl.dirty || ctx.fixedListFormControl.touched)));
                 i0__namespace.ɵɵadvance(1);
                 i0__namespace.ɵɵproperty("for", ctx.id());
                 i0__namespace.ɵɵadvance(1);
@@ -15302,7 +15504,7 @@
             i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind2(2, 1, ctx_r2.fixedRadioListControl.errors, ctx_r2.caseField.label));
         }
     }
-    var _c0$I = function (a0) { return { selected: a0 }; };
+    var _c0$H = function (a0) { return { selected: a0 }; };
     function WriteFixedRadioListFieldComponent_div_8_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "div", 9);
@@ -15315,7 +15517,7 @@
         if (rf & 2) {
             var radioButton_r4 = ctx.$implicit;
             var ctx_r3 = i0__namespace.ɵɵnextContext();
-            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(7, _c0$I, ctx_r3.fixedRadioListControl.value === radioButton_r4.code));
+            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(7, _c0$H, ctx_r3.fixedRadioListControl.value === radioButton_r4.code));
             i0__namespace.ɵɵadvance(1);
             i0__namespace.ɵɵproperty("id", ctx_r3.id() + "-" + radioButton_r4.code)("name", ctx_r3.id())("formControl", ctx_r3.fixedRadioListControl)("value", radioButton_r4.code);
             i0__namespace.ɵɵadvance(1);
@@ -15485,7 +15687,7 @@
             i0__namespace.ɵɵtextInterpolate1(" ", ctx_r1.caseField.hint_text, " ");
         }
     }
-    var _c0$H = function (a0) { return { "hide-autocomplete": a0 }; };
+    var _c0$G = function (a0) { return { "hide-autocomplete": a0 }; };
     function WriteJudicialUserFieldComponent_mat_option_7_Template(rf, ctx) {
         if (rf & 1) {
             var _r7_1 = i0__namespace.ɵɵgetCurrentView();
@@ -15497,7 +15699,7 @@
         if (rf & 2) {
             var judicialUser_r5 = ctx.$implicit;
             var ctx_r3 = i0__namespace.ɵɵnextContext();
-            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(4, _c0$H, !ctx_r3.showAutocomplete))("value", judicialUser_r5.idamId);
+            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(4, _c0$G, !ctx_r3.showAutocomplete))("value", judicialUser_r5.idamId);
             i0__namespace.ɵɵadvance(1);
             i0__namespace.ɵɵtextInterpolate2(" ", judicialUser_r5.fullName, " (", judicialUser_r5.emailId, ") ");
         }
@@ -15763,7 +15965,7 @@
                             casesResponse.push(_this.mapResponse(result));
                         });
                     });
-                    var caseLinks = casesResponse.map(function (item) {
+                    _this.linkedCases = casesResponse.map(function (item) {
                         return {
                             caseReference: item.caseReference,
                             caseName: item.caseName,
@@ -15777,7 +15979,6 @@
                             }),
                         };
                     });
-                    _this.linkedCases = caseLinks;
                     _this.serverLinkedApiError = null;
                 }, function (err) {
                     _this.serverLinkedApiError = {
@@ -15932,9 +16133,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;
     }());
@@ -16314,7 +16513,7 @@
             i0__namespace.ɵɵtextInterpolate1(" ", ctx_r13.caseReasonCommentsError, " ");
         }
     }
-    var _c0$G = function (a0) { return { "govuk-form-group--error": a0 }; };
+    var _c0$F = function (a0) { return { "govuk-form-group--error": a0 }; };
     function LinkCasesComponent_div_8_div_14_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "div", 35);
@@ -16332,7 +16531,7 @@
         }
         if (rf & 2) {
             var ctx_r7 = i0__namespace.ɵɵnextContext(2);
-            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(2, _c0$G, !!ctx_r7.caseReasonCommentsError));
+            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(2, _c0$F, !!ctx_r7.caseReasonCommentsError));
             i0__namespace.ɵɵadvance(3);
             i0__namespace.ɵɵproperty("ngIf", ctx_r7.caseReasonCommentsError);
         }
@@ -16389,11 +16588,11 @@
             var ctx_r0 = i0__namespace.ɵɵnextContext();
             i0__namespace.ɵɵproperty("formGroup", ctx_r0.linkCaseForm);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(8, _c0$G, !!ctx_r0.caseNumberError));
+            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(8, _c0$F, !!ctx_r0.caseNumberError));
             i0__namespace.ɵɵadvance(3);
             i0__namespace.ɵɵproperty("ngIf", ctx_r0.caseNumberError);
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(10, _c0$G, !!ctx_r0.caseReasonError));
+            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(10, _c0$F, !!ctx_r0.caseReasonError));
             i0__namespace.ɵɵadvance(5);
             i0__namespace.ɵɵproperty("ngIf", ctx_r0.caseReasonError);
             i0__namespace.ɵɵadvance(2);
@@ -16827,7 +17026,7 @@
                 i0__namespace.ɵɵadvance(4);
                 i0__namespace.ɵɵproperty("ngIf", ctx.linkCaseForm);
                 i0__namespace.ɵɵadvance(4);
-                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(9, _c0$G, !!ctx.noSelectedCaseError));
+                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(9, _c0$F, !!ctx.noSelectedCaseError));
                 i0__namespace.ɵɵadvance(1);
                 i0__namespace.ɵɵproperty("ngIf", ctx.noSelectedCaseError);
                 i0__namespace.ɵɵadvance(18);
@@ -17308,6 +17507,7 @@
                     searchCases.forEach(function (response) {
                         casesResponse.push(_this.mapResponse(response));
                     });
+                    casesResponse = _this.sortReasonCodes(casesResponse);
                     _this.linkedCasesFromResponse = _this.sortLinkedCasesByReasonCode(casesResponse);
                     _this.isLoaded = true;
                     var caseLinks = _this.linkedCasesFromResponse.map(function (item) {
@@ -17333,6 +17533,30 @@
                 });
             }
         };
+        LinkedCasesToTableComponent.prototype.sortReasonCodes = function (searchCasesResponse) {
+            var _this = this;
+            searchCasesResponse.forEach(function (item) {
+                var _a;
+                if ((_a = item === null || item === void 0 ? void 0 : item.reasons) === null || _a === void 0 ? void 0 : _a.length) {
+                    item.reasons.forEach(function (reason) {
+                        reason.sortOrder = _this.getReasonSortOrder(reason.value.Reason);
+                    });
+                    item.reasons = item.reasons.sort(function (a, b) { return a.sortOrder - b.sortOrder; });
+                    item.sortOrder = item.reasons[0].sortOrder;
+                }
+            });
+            searchCasesResponse = searchCasesResponse === null || searchCasesResponse === void 0 ? void 0 : searchCasesResponse.sort(function (a, b) { return a.sortOrder - b.sortOrder; });
+            return searchCasesResponse;
+        };
+        LinkedCasesToTableComponent.prototype.getReasonSortOrder = function (reasonCode) {
+            if (reasonCode === LinkedCasesToTableComponent.CASE_PROGRESS_REASON_CODE) {
+                return 1;
+            }
+            else if (reasonCode === LinkedCasesToTableComponent.CASE_CONSOLIDATED_REASON_CODE) {
+                return 2;
+            }
+            return 3;
+        };
         LinkedCasesToTableComponent.prototype.searchCasesByCaseIds = function (searchCasesResponse) {
             return rxjs.forkJoin(searchCasesResponse);
         };
@@ -17425,9 +17649,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;
     }());
@@ -17511,7 +17733,7 @@
             i0__namespace.ɵɵtextInterpolate2(" ", case_r4.caseName, " ", i0__namespace.ɵɵpipeBind1(4, 6, case_r4.caseReference), " ");
         }
     }
-    var _c0$F = function (a0) { return { "govuk-form-group--error": a0 }; };
+    var _c0$E = function (a0) { return { "govuk-form-group--error": a0 }; };
     function UnLinkCasesComponent_div_0_div_4_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "div", 7);
@@ -17523,7 +17745,7 @@
         }
         if (rf & 2) {
             var ctx_r1 = i0__namespace.ɵɵnextContext(2);
-            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(4, _c0$F, ctx_r1.unlinkErrorMessage))("formGroup", ctx_r1.unlinkCaseForm);
+            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(4, _c0$E, ctx_r1.unlinkErrorMessage))("formGroup", ctx_r1.unlinkCaseForm);
             i0__namespace.ɵɵadvance(1);
             i0__namespace.ɵɵproperty("ngIf", ctx_r1.unlinkErrorMessage);
             i0__namespace.ɵɵadvance(2);
@@ -17699,6 +17921,7 @@
                 }] });
     })();
 
+    // tslint:disable:variable-name
     var LinkCaseReason = /** @class */ (function () {
         function LinkCaseReason() {
         }
@@ -17857,7 +18080,7 @@
                 this.caseField = (_a = tab === null || tab === void 0 ? void 0 : tab.fields) === null || _a === void 0 ? void 0 : _a.find(function (field) { return field.id === 'caseLinks'; });
             }
             this.isServerJurisdictionError = this.linkedCasesService.serverJurisdictionError || false;
-            var reasonCodeAPIurl = this.appConfig.getRDCommonDataApiUrl() + '/lov/categories/CaseLinkingReasonCode';
+            var reasonCodeAPIurl = this.appConfig.getRDCommonDataApiUrl() + "/lov/categories/CaseLinkingReasonCode";
             this.commonDataService.getRefData(reasonCodeAPIurl).subscribe({
                 next: function (reasons) {
                     _this.reasonListLoaded = true;
@@ -17892,9 +18115,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;
@@ -17964,87 +18185,52 @@
             }], function () { return [{ type: i1__namespace$1.ActivatedRoute }, { type: i1__namespace$1.Router }, { type: LinkedCasesService }, { type: AbstractAppConfig }, { type: CommonDataService }]; }, null);
     })();
 
-    function WriteLinkedCasesFieldComponent_div_0_div_3_Template(rf, ctx) {
-        if (rf & 1) {
-            var _r9_1 = i0__namespace.ɵɵgetCurrentView();
-            i0__namespace.ɵɵelementStart(0, "div", 7);
-            i0__namespace.ɵɵelementStart(1, "ul", 8);
-            i0__namespace.ɵɵelementStart(2, "li");
-            i0__namespace.ɵɵelementStart(3, "a", 9);
-            i0__namespace.ɵɵlistener("click", function WriteLinkedCasesFieldComponent_div_0_div_3_Template_a_click_3_listener() { i0__namespace.ɵɵrestoreView(_r9_1); var errorMessage_r7 = ctx.$implicit; var ctx_r8 = i0__namespace.ɵɵnextContext(2); return ctx_r8.navigateToErrorElement(errorMessage_r7.fieldId); });
-            i0__namespace.ɵɵtext(4);
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementEnd();
-        }
-        if (rf & 2) {
-            var errorMessage_r7 = ctx.$implicit;
-            i0__namespace.ɵɵadvance(4);
-            i0__namespace.ɵɵtextInterpolate(errorMessage_r7.description);
-        }
-    }
-    function WriteLinkedCasesFieldComponent_div_0_Template(rf, ctx) {
+    function WriteLinkedCasesFieldComponent_ng_container_2_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "div", 4);
-            i0__namespace.ɵɵelementStart(1, "h2", 5);
-            i0__namespace.ɵɵtext(2, " There is a problem ");
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵtemplate(3, WriteLinkedCasesFieldComponent_div_0_div_3_Template, 5, 1, "div", 6);
+            var _r6_1 = i0__namespace.ɵɵgetCurrentView();
+            i0__namespace.ɵɵelementContainerStart(0);
+            i0__namespace.ɵɵelementStart(1, "ccd-linked-cases-before-you-start", 3);
+            i0__namespace.ɵɵlistener("linkedCasesStateEmitter", function WriteLinkedCasesFieldComponent_ng_container_2_Template_ccd_linked_cases_before_you_start_linkedCasesStateEmitter_1_listener($event) { i0__namespace.ɵɵrestoreView(_r6_1); var ctx_r5 = i0__namespace.ɵɵnextContext(); return ctx_r5.onLinkedCasesStateEmitted($event); });
             i0__namespace.ɵɵelementEnd();
-        }
-        if (rf & 2) {
-            var ctx_r0 = i0__namespace.ɵɵnextContext();
-            i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵproperty("ngForOf", ctx_r0.errorMessages);
+            i0__namespace.ɵɵelementContainerEnd();
         }
     }
     function WriteLinkedCasesFieldComponent_ng_container_3_Template(rf, ctx) {
         if (rf & 1) {
-            var _r11_1 = i0__namespace.ɵɵgetCurrentView();
+            var _r8_1 = i0__namespace.ɵɵgetCurrentView();
             i0__namespace.ɵɵelementContainerStart(0);
-            i0__namespace.ɵɵelementStart(1, "ccd-linked-cases-before-you-start", 10);
-            i0__namespace.ɵɵlistener("linkedCasesStateEmitter", function WriteLinkedCasesFieldComponent_ng_container_3_Template_ccd_linked_cases_before_you_start_linkedCasesStateEmitter_1_listener($event) { i0__namespace.ɵɵrestoreView(_r11_1); var ctx_r10 = i0__namespace.ɵɵnextContext(); return ctx_r10.onLinkedCasesStateEmitted($event); });
+            i0__namespace.ɵɵelementStart(1, "ccd-no-linked-cases", 3);
+            i0__namespace.ɵɵlistener("linkedCasesStateEmitter", function WriteLinkedCasesFieldComponent_ng_container_3_Template_ccd_no_linked_cases_linkedCasesStateEmitter_1_listener($event) { i0__namespace.ɵɵrestoreView(_r8_1); var ctx_r7 = i0__namespace.ɵɵnextContext(); return ctx_r7.onLinkedCasesStateEmitted($event); });
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementContainerEnd();
         }
     }
     function WriteLinkedCasesFieldComponent_ng_container_4_Template(rf, ctx) {
         if (rf & 1) {
-            var _r13_1 = i0__namespace.ɵɵgetCurrentView();
+            var _r10_1 = i0__namespace.ɵɵgetCurrentView();
             i0__namespace.ɵɵelementContainerStart(0);
-            i0__namespace.ɵɵelementStart(1, "ccd-no-linked-cases", 10);
-            i0__namespace.ɵɵlistener("linkedCasesStateEmitter", function WriteLinkedCasesFieldComponent_ng_container_4_Template_ccd_no_linked_cases_linkedCasesStateEmitter_1_listener($event) { i0__namespace.ɵɵrestoreView(_r13_1); var ctx_r12 = i0__namespace.ɵɵnextContext(); return ctx_r12.onLinkedCasesStateEmitted($event); });
+            i0__namespace.ɵɵelementStart(1, "ccd-link-cases", 3);
+            i0__namespace.ɵɵlistener("linkedCasesStateEmitter", function WriteLinkedCasesFieldComponent_ng_container_4_Template_ccd_link_cases_linkedCasesStateEmitter_1_listener($event) { i0__namespace.ɵɵrestoreView(_r10_1); var ctx_r9 = i0__namespace.ɵɵnextContext(); return ctx_r9.onLinkedCasesStateEmitted($event); });
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementContainerEnd();
         }
     }
     function WriteLinkedCasesFieldComponent_ng_container_5_Template(rf, ctx) {
         if (rf & 1) {
-            var _r15_1 = i0__namespace.ɵɵgetCurrentView();
+            var _r12_1 = i0__namespace.ɵɵgetCurrentView();
             i0__namespace.ɵɵelementContainerStart(0);
-            i0__namespace.ɵɵelementStart(1, "ccd-link-cases", 10);
-            i0__namespace.ɵɵlistener("linkedCasesStateEmitter", function WriteLinkedCasesFieldComponent_ng_container_5_Template_ccd_link_cases_linkedCasesStateEmitter_1_listener($event) { i0__namespace.ɵɵrestoreView(_r15_1); var ctx_r14 = i0__namespace.ɵɵnextContext(); return ctx_r14.onLinkedCasesStateEmitted($event); });
+            i0__namespace.ɵɵelementStart(1, "ccd-unlink-cases", 3);
+            i0__namespace.ɵɵlistener("linkedCasesStateEmitter", function WriteLinkedCasesFieldComponent_ng_container_5_Template_ccd_unlink_cases_linkedCasesStateEmitter_1_listener($event) { i0__namespace.ɵɵrestoreView(_r12_1); var ctx_r11 = i0__namespace.ɵɵnextContext(); return ctx_r11.onLinkedCasesStateEmitted($event); });
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementContainerEnd();
         }
     }
     function WriteLinkedCasesFieldComponent_ng_container_6_Template(rf, ctx) {
         if (rf & 1) {
-            var _r17_1 = i0__namespace.ɵɵgetCurrentView();
-            i0__namespace.ɵɵelementContainerStart(0);
-            i0__namespace.ɵɵelementStart(1, "ccd-unlink-cases", 10);
-            i0__namespace.ɵɵlistener("linkedCasesStateEmitter", function WriteLinkedCasesFieldComponent_ng_container_6_Template_ccd_unlink_cases_linkedCasesStateEmitter_1_listener($event) { i0__namespace.ɵɵrestoreView(_r17_1); var ctx_r16 = i0__namespace.ɵɵnextContext(); return ctx_r16.onLinkedCasesStateEmitted($event); });
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementContainerEnd();
-        }
-    }
-    function WriteLinkedCasesFieldComponent_ng_container_7_Template(rf, ctx) {
-        if (rf & 1) {
-            var _r19_1 = i0__namespace.ɵɵgetCurrentView();
+            var _r14_1 = i0__namespace.ɵɵgetCurrentView();
             i0__namespace.ɵɵelementContainerStart(0);
-            i0__namespace.ɵɵelementStart(1, "ccd-linked-cases-check-your-answers", 10);
-            i0__namespace.ɵɵlistener("linkedCasesStateEmitter", function WriteLinkedCasesFieldComponent_ng_container_7_Template_ccd_linked_cases_check_your_answers_linkedCasesStateEmitter_1_listener($event) { i0__namespace.ɵɵrestoreView(_r19_1); var ctx_r18 = i0__namespace.ɵɵnextContext(); return ctx_r18.onLinkedCasesStateEmitted($event); });
+            i0__namespace.ɵɵelementStart(1, "ccd-linked-cases-check-your-answers", 3);
+            i0__namespace.ɵɵlistener("linkedCasesStateEmitter", function WriteLinkedCasesFieldComponent_ng_container_6_Template_ccd_linked_cases_check_your_answers_linkedCasesStateEmitter_1_listener($event) { i0__namespace.ɵɵrestoreView(_r14_1); var ctx_r13 = i0__namespace.ɵɵnextContext(); return ctx_r13.onLinkedCasesStateEmitted($event); });
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementContainerEnd();
         }
@@ -18061,11 +18247,13 @@
             _this.linkedCasesPages = exports.LinkedCasesPages;
             _this.linkedCasesEventTriggers = exports.LinkedCasesEventTriggers;
             _this.linkedCases = [];
-            _this.errorMessages = [];
             return _this;
         }
         WriteLinkedCasesFieldComponent.prototype.ngOnInit = function () {
             var _this = this;
+            // This is required to enable Continue button validation
+            // Continue button should be enabled only at check your answers page
+            this.caseEditDataService.setLinkedCasesJourneyAtFinalStep(false);
             // Clear validation errors
             this.caseEditDataService.clearFormValidationErrors();
             // Get linked case reasons from ref data
@@ -18102,11 +18290,10 @@
         };
         WriteLinkedCasesFieldComponent.prototype.onLinkedCasesStateEmitted = function (linkedCasesState) {
             var _this = this;
-            this.errorMessages = [];
+            // Clear validation errors
             this.caseEditDataService.clearFormValidationErrors();
             if (linkedCasesState.navigateToNextPage) {
                 this.linkedCasesPage = this.getNextPage(linkedCasesState);
-                this.setContinueButtonValidationErrorMessage();
                 this.proceedToNextPage();
             }
             else {
@@ -18119,7 +18306,7 @@
         };
         WriteLinkedCasesFieldComponent.prototype.getLinkedCaseReasons = function () {
             var _this = this;
-            var reasonCodeAPIurl = this.appConfig.getRDCommonDataApiUrl() + '/lov/categories/CaseLinkingReasonCode';
+            var reasonCodeAPIurl = this.appConfig.getRDCommonDataApiUrl() + "/lov/categories/CaseLinkingReasonCode";
             this.commonDataService.getRefData(reasonCodeAPIurl).subscribe({
                 next: function (reasons) {
                     // Sort in ascending order
@@ -18130,27 +18317,19 @@
                 }
             });
         };
-        WriteLinkedCasesFieldComponent.prototype.setContinueButtonValidationErrorMessage = function () {
-            var errorMessage = this.linkedCasesService.isLinkedCasesEventTrigger
-                ? exports.LinkedCasesErrorMessages.LinkCasesNavigationError
-                : exports.LinkedCasesErrorMessages.UnlinkCasesNavigationError;
-            var buttonId = this.linkedCasesService.linkedCases.length === 0
-                ? 'back-button'
-                : 'next-button';
-            this.caseEditDataService.setCaseLinkError({
-                componentId: buttonId,
-                errorMessage: errorMessage
-            });
-        };
         WriteLinkedCasesFieldComponent.prototype.proceedToNextPage = function () {
             if (this.isAtFinalPage()) {
                 // Continue button event must be allowed in final page
-                this.caseEditDataService.clearCaseLinkError();
+                this.caseEditDataService.setLinkedCasesJourneyAtFinalStep(true);
                 // Trigger validation to clear the "notAtFinalPage" error if now at the final state
                 this.formGroup.updateValueAndValidity();
                 // update form value
                 this.submitLinkedCases();
             }
+            else {
+                // Continue button event must not be allowed if not in final page
+                this.caseEditDataService.setLinkedCasesJourneyAtFinalStep(false);
+            }
         };
         WriteLinkedCasesFieldComponent.prototype.submitLinkedCases = function () {
             if (!this.linkedCasesService.isLinkedCasesEventTrigger) {
@@ -18178,11 +18357,10 @@
             var _this = this;
             this.casesService.getCaseViewV2(this.linkedCasesService.caseId).subscribe(function (caseView) {
                 var caseViewFiltered = caseView.tabs.filter(function (tab) {
-                    var linkField = tab.fields.some(function (_b) {
+                    return tab.fields.some(function (_b) {
                         var field_type = _b.field_type;
                         return field_type && field_type.collection_field_type && field_type.collection_field_type.id === 'CaseLink';
                     });
-                    return linkField;
                 });
                 if (caseViewFiltered) {
                     var caseLinkFieldValue = caseViewFiltered.map(function (filtered) { var _a; return ((_a = filtered.fields) === null || _a === void 0 ? void 0 : _a.length) > 0 && filtered.fields.filter(function (field) { return field.id === 'caseLinks'; })[0].value; });
@@ -18195,38 +18373,24 @@
                         && !_this.linkedCasesService.serverLinkedApiError)
                     ? exports.LinkedCasesPages.BEFORE_YOU_START
                     : exports.LinkedCasesPages.NO_LINKED_CASES;
-                // Initialise the error to be displayed when clicked on Continue button
-                _this.setContinueButtonValidationErrorMessage();
             });
         };
-        WriteLinkedCasesFieldComponent.prototype.navigateToErrorElement = function (elementId) {
-            if (elementId) {
-                var htmlElement = document.getElementById(elementId);
-                if (htmlElement) {
-                    htmlElement.scrollIntoView({ behavior: 'smooth', block: 'center' });
-                    htmlElement.focus();
-                }
-            }
-        };
         return WriteLinkedCasesFieldComponent;
     }(AbstractFieldWriteComponent));
     WriteLinkedCasesFieldComponent.ɵfac = function WriteLinkedCasesFieldComponent_Factory(t) { return new (t || WriteLinkedCasesFieldComponent)(i0__namespace.ɵɵdirectiveInject(AbstractAppConfig), i0__namespace.ɵɵdirectiveInject(CommonDataService), i0__namespace.ɵɵdirectiveInject(CasesService), i0__namespace.ɵɵdirectiveInject(LinkedCasesService), i0__namespace.ɵɵdirectiveInject(CaseEditDataService)); };
-    WriteLinkedCasesFieldComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: WriteLinkedCasesFieldComponent, selectors: [["ccd-write-linked-cases-field"]], features: [i0__namespace.ɵɵInheritDefinitionFeature], decls: 8, vars: 8, consts: [["class", "govuk-error-summary", "aria-labelledby", "error-summary-title", "role", "alert", "tabindex", "-1", "data-module", "govuk-error-summary", 4, "ngIf"], [1, "form-group", "govuk-!-margin-bottom-2", 3, "formGroup"], [1, "govuk-form-group", 3, "ngSwitch"], [4, "ngSwitchCase"], ["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"], [3, "linkedCasesStateEmitter"]], template: function WriteLinkedCasesFieldComponent_Template(rf, ctx) {
+    WriteLinkedCasesFieldComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: WriteLinkedCasesFieldComponent, selectors: [["ccd-write-linked-cases-field"]], features: [i0__namespace.ɵɵInheritDefinitionFeature], decls: 7, vars: 7, consts: [[1, "form-group", "govuk-!-margin-bottom-2", 3, "formGroup"], [1, "govuk-form-group", 3, "ngSwitch"], [4, "ngSwitchCase"], [3, "linkedCasesStateEmitter"]], template: function WriteLinkedCasesFieldComponent_Template(rf, ctx) {
             if (rf & 1) {
-                i0__namespace.ɵɵtemplate(0, WriteLinkedCasesFieldComponent_div_0_Template, 4, 1, "div", 0);
+                i0__namespace.ɵɵelementStart(0, "div", 0);
                 i0__namespace.ɵɵelementStart(1, "div", 1);
-                i0__namespace.ɵɵelementStart(2, "div", 2);
-                i0__namespace.ɵɵtemplate(3, WriteLinkedCasesFieldComponent_ng_container_3_Template, 2, 0, "ng-container", 3);
-                i0__namespace.ɵɵtemplate(4, WriteLinkedCasesFieldComponent_ng_container_4_Template, 2, 0, "ng-container", 3);
-                i0__namespace.ɵɵtemplate(5, WriteLinkedCasesFieldComponent_ng_container_5_Template, 2, 0, "ng-container", 3);
-                i0__namespace.ɵɵtemplate(6, WriteLinkedCasesFieldComponent_ng_container_6_Template, 2, 0, "ng-container", 3);
-                i0__namespace.ɵɵtemplate(7, WriteLinkedCasesFieldComponent_ng_container_7_Template, 2, 0, "ng-container", 3);
+                i0__namespace.ɵɵtemplate(2, WriteLinkedCasesFieldComponent_ng_container_2_Template, 2, 0, "ng-container", 2);
+                i0__namespace.ɵɵtemplate(3, WriteLinkedCasesFieldComponent_ng_container_3_Template, 2, 0, "ng-container", 2);
+                i0__namespace.ɵɵtemplate(4, WriteLinkedCasesFieldComponent_ng_container_4_Template, 2, 0, "ng-container", 2);
+                i0__namespace.ɵɵtemplate(5, WriteLinkedCasesFieldComponent_ng_container_5_Template, 2, 0, "ng-container", 2);
+                i0__namespace.ɵɵtemplate(6, WriteLinkedCasesFieldComponent_ng_container_6_Template, 2, 0, "ng-container", 2);
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementEnd();
             }
             if (rf & 2) {
-                i0__namespace.ɵɵproperty("ngIf", ctx.errorMessages.length > 0);
-                i0__namespace.ɵɵadvance(1);
                 i0__namespace.ɵɵproperty("formGroup", ctx.formGroup);
                 i0__namespace.ɵɵadvance(1);
                 i0__namespace.ɵɵproperty("ngSwitch", ctx.linkedCasesPage);
@@ -18465,7 +18629,7 @@
             i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind2(2, 1, ctx_r2.moneyGbpControl.errors, ctx_r2.caseField.label));
         }
     }
-    var _c0$E = function (a0) { return { "form-group-error": a0 }; };
+    var _c0$D = function (a0) { return { "form-group-error": a0 }; };
     var WriteMoneyGbpFieldComponent = /** @class */ (function (_super) {
         __extends(WriteMoneyGbpFieldComponent, _super);
         function WriteMoneyGbpFieldComponent() {
@@ -18495,7 +18659,7 @@
                 i0__namespace.ɵɵelementEnd();
             }
             if (rf & 2) {
-                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(11, _c0$E, !ctx.moneyGbpControl.valid && (ctx.moneyGbpControl.dirty || ctx.moneyGbpControl.touched)));
+                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(11, _c0$D, !ctx.moneyGbpControl.valid && (ctx.moneyGbpControl.dirty || ctx.moneyGbpControl.touched)));
                 i0__namespace.ɵɵadvance(1);
                 i0__namespace.ɵɵproperty("for", ctx.id());
                 i0__namespace.ɵɵadvance(1);
@@ -18643,7 +18807,7 @@
             i0__namespace.ɵɵtextInterpolate(checkbox_r4.label);
         }
     }
-    var _c0$D = function (a0) { return { "error": a0 }; };
+    var _c0$C = function (a0) { return { "error": a0 }; };
     var WriteMultiSelectListFieldComponent = /** @class */ (function (_super) {
         __extends(WriteMultiSelectListFieldComponent, _super);
         function WriteMultiSelectListFieldComponent() {
@@ -18707,7 +18871,7 @@
                 i0__namespace.ɵɵelementEnd();
             }
             if (rf & 2) {
-                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(6, _c0$D, !ctx.checkboxes.valid && (ctx.checkboxes.dirty || ctx.checkboxes.touched)))("id", ctx.id());
+                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(6, _c0$C, !ctx.checkboxes.valid && (ctx.checkboxes.dirty || ctx.checkboxes.touched)))("id", ctx.id());
                 i0__namespace.ɵɵadvance(3);
                 i0__namespace.ɵɵproperty("ngIf", ctx.caseField.label);
                 i0__namespace.ɵɵadvance(1);
@@ -18798,7 +18962,7 @@
             i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind2(2, 1, ctx_r2.numberControl.errors, ctx_r2.caseField.label));
         }
     }
-    var _c0$C = function (a0) { return { "form-group-error": a0 }; };
+    var _c0$B = function (a0) { return { "form-group-error": a0 }; };
     var _c1$e = function (a0) { return { "govuk-input--error": a0 }; };
     var WriteNumberFieldComponent = /** @class */ (function (_super) {
         __extends(WriteNumberFieldComponent, _super);
@@ -18823,7 +18987,7 @@
                 i0__namespace.ɵɵelementEnd();
             }
             if (rf & 2) {
-                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(8, _c0$C, !ctx.numberControl.valid && ctx.numberControl.dirty));
+                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(8, _c0$B, !ctx.numberControl.valid && ctx.numberControl.dirty));
                 i0__namespace.ɵɵadvance(1);
                 i0__namespace.ɵɵproperty("for", ctx.id());
                 i0__namespace.ɵɵadvance(1);
@@ -19124,7 +19288,7 @@
             i0__namespace.ɵɵelementEnd();
         }
     }
-    var _c0$B = function (a0) { return { "scroll-container ": a0 }; };
+    var _c0$A = function (a0) { return { "scroll-container ": a0 }; };
     function WriteOrganisationFieldComponent_fieldset_3_div_14_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "div", 26);
@@ -19140,7 +19304,7 @@
             var ctx_r2 = i0__namespace.ɵɵnextContext(2);
             var tmp_0_0 = null;
             var tmp_2_0 = null;
-            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(11, _c0$B, ((tmp_0_0 = i0__namespace.ɵɵpipeBind1(1, 3, ctx_r2.simpleOrganisations$)) == null ? null : tmp_0_0.length) > 10));
+            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(11, _c0$A, ((tmp_0_0 = i0__namespace.ɵɵpipeBind1(1, 3, ctx_r2.simpleOrganisations$)) == null ? null : tmp_0_0.length) > 10));
             i0__namespace.ɵɵadvance(2);
             i0__namespace.ɵɵproperty("ngForOf", i0__namespace.ɵɵpipeBind1(3, 5, ctx_r2.simpleOrganisations$));
             i0__namespace.ɵɵadvance(2);
@@ -19547,231 +19711,6 @@
             }], function () { return [{ type: AbstractAppConfig }, { type: SessionStorageService }]; }, null);
     })();
 
-    function ReadDynamicMultiSelectListFieldComponent_div_0_Template(rf, ctx) {
-        if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "div");
-            i0__namespace.ɵɵtext(1);
-            i0__namespace.ɵɵpipe(2, "ccdFixedList");
-            i0__namespace.ɵɵelementEnd();
-        }
-        if (rf & 2) {
-            var value_r1 = ctx.$implicit;
-            var ctx_r0 = i0__namespace.ɵɵnextContext();
-            i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind2(2, 1, value_r1.code, ctx_r0.caseField.list_items), "\n");
-        }
-    }
-    var ReadDynamicMultiSelectListFieldComponent = /** @class */ (function (_super) {
-        __extends(ReadDynamicMultiSelectListFieldComponent, _super);
-        function ReadDynamicMultiSelectListFieldComponent() {
-            return _super !== null && _super.apply(this, arguments) || this;
-        }
-        ReadDynamicMultiSelectListFieldComponent.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) {
-                this.caseField.list_items = this.caseField.formatted_value.list_items;
-            }
-            if (!this.caseField.value && this.caseField.formatted_value && this.caseField.formatted_value.value) {
-                this.caseField.value = this.caseField.formatted_value.value;
-            }
-            _super.prototype.ngOnInit.call(this);
-        };
-        return ReadDynamicMultiSelectListFieldComponent;
-    }(AbstractFieldReadComponent));
-    ReadDynamicMultiSelectListFieldComponent.ɵfac = function ReadDynamicMultiSelectListFieldComponent_Factory(t) { return ɵReadDynamicMultiSelectListFieldComponent_BaseFactory(t || ReadDynamicMultiSelectListFieldComponent); };
-    ReadDynamicMultiSelectListFieldComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: ReadDynamicMultiSelectListFieldComponent, selectors: [["ccd-read-dynamic-multi-select-list-field"]], features: [i0__namespace.ɵɵInheritDefinitionFeature], decls: 1, vars: 1, consts: [[4, "ngFor", "ngForOf"]], template: function ReadDynamicMultiSelectListFieldComponent_Template(rf, ctx) {
-            if (rf & 1) {
-                i0__namespace.ɵɵtemplate(0, ReadDynamicMultiSelectListFieldComponent_div_0_Template, 3, 4, "div", 0);
-            }
-            if (rf & 2) {
-                i0__namespace.ɵɵproperty("ngForOf", ctx.caseField.value);
-            }
-        }, directives: [i1__namespace.NgForOf], pipes: [FixedListPipe], styles: [".multi-select-list-field-table[_ngcontent-%COMP%]   tr[_ngcontent-%COMP%] > td[_ngcontent-%COMP%]{padding:5px 0}.multi-select-list-field-table[_ngcontent-%COMP%]   tr[_ngcontent-%COMP%]:last-child > td[_ngcontent-%COMP%]{border-bottom:none}.multi-select-list-field-table[_ngcontent-%COMP%]   td.collection-actions[_ngcontent-%COMP%]{width:1px;white-space:nowrap}"] });
-    var ɵReadDynamicMultiSelectListFieldComponent_BaseFactory = /*@__PURE__*/ i0__namespace.ɵɵgetInheritedFactory(ReadDynamicMultiSelectListFieldComponent);
-    (function () {
-        (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(ReadDynamicMultiSelectListFieldComponent, [{
-                type: i0.Component,
-                args: [{
-                        selector: 'ccd-read-dynamic-multi-select-list-field',
-                        templateUrl: './read-dynamic-multi-select-list-field.html',
-                        styleUrls: ['./read-dynamic-multi-select-list-field.component.scss']
-                    }]
-            }], null, null);
-    })();
-
-    function WriteDynamicMultiSelectListFieldComponent_span_3_Template(rf, ctx) {
-        if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "span", 5);
-            i0__namespace.ɵɵtext(1);
-            i0__namespace.ɵɵpipe(2, "ccdFieldLabel");
-            i0__namespace.ɵɵelementEnd();
-        }
-        if (rf & 2) {
-            var ctx_r0 = i0__namespace.ɵɵnextContext();
-            i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(2, 1, ctx_r0.caseField));
-        }
-    }
-    function WriteDynamicMultiSelectListFieldComponent_span_4_Template(rf, ctx) {
-        if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "span", 6);
-            i0__namespace.ɵɵtext(1);
-            i0__namespace.ɵɵelementEnd();
-        }
-        if (rf & 2) {
-            var ctx_r1 = i0__namespace.ɵɵnextContext();
-            i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵtextInterpolate(ctx_r1.caseField.hint_text);
-        }
-    }
-    function WriteDynamicMultiSelectListFieldComponent_span_5_Template(rf, ctx) {
-        if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "span", 7);
-            i0__namespace.ɵɵtext(1);
-            i0__namespace.ɵɵpipe(2, "ccdFirstError");
-            i0__namespace.ɵɵelementEnd();
-        }
-        if (rf & 2) {
-            var ctx_r2 = i0__namespace.ɵɵnextContext();
-            i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(2, 1, ctx_r2.checkboxes.errors));
-        }
-    }
-    function WriteDynamicMultiSelectListFieldComponent_ng_container_6_Template(rf, ctx) {
-        if (rf & 1) {
-            var _r6_1 = i0__namespace.ɵɵgetCurrentView();
-            i0__namespace.ɵɵelementContainerStart(0);
-            i0__namespace.ɵɵelementStart(1, "div", 8);
-            i0__namespace.ɵɵelementStart(2, "input", 9);
-            i0__namespace.ɵɵlistener("change", function WriteDynamicMultiSelectListFieldComponent_ng_container_6_Template_input_change_2_listener($event) { i0__namespace.ɵɵrestoreView(_r6_1); var ctx_r5 = i0__namespace.ɵɵnextContext(); return ctx_r5.onCheckChange($event); });
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(3, "label", 10);
-            i0__namespace.ɵɵtext(4);
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementContainerEnd();
-        }
-        if (rf & 2) {
-            var checkbox_r4 = ctx.$implicit;
-            var ctx_r3 = i0__namespace.ɵɵnextContext();
-            i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵpropertyInterpolate("id", ctx_r3.createElementId(checkbox_r4.code));
-            i0__namespace.ɵɵpropertyInterpolate("name", ctx_r3.id());
-            i0__namespace.ɵɵproperty("value", checkbox_r4.code)("checked", ctx_r3.isSelected(checkbox_r4.code));
-            i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵpropertyInterpolate("for", ctx_r3.createElementId(checkbox_r4.code));
-            i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵtextInterpolate(checkbox_r4.label);
-        }
-    }
-    var _c0$A = function (a0) { return { "error": a0 }; };
-    var WriteDynamicMultiSelectListFieldComponent = /** @class */ (function (_super) {
-        __extends(WriteDynamicMultiSelectListFieldComponent, _super);
-        function WriteDynamicMultiSelectListFieldComponent() {
-            return _super !== null && _super.apply(this, arguments) || this;
-        }
-        WriteDynamicMultiSelectListFieldComponent.prototype.ngOnInit = function () {
-            var _this = this;
-            this.checkboxes = new i2.FormArray([]);
-            this.setInitialCaseList();
-            this.setInitialCaseFieldValue();
-            // Initialise array with existing values
-            if (this.caseField.value && Array.isArray(this.caseField.value)) {
-                var values = this.caseField.value;
-                values.forEach(function (value) {
-                    _this.checkboxes.push(new i2.FormControl(value));
-                });
-            }
-            this.dynamicListFormControl = this.registerControl(new i2.FormControl(this.checkboxes.value));
-            this.dynamicListFormControl.setValue(this.checkboxes.value);
-        };
-        WriteDynamicMultiSelectListFieldComponent.prototype.onCheckChange = function (event) {
-            var _this = this;
-            var target = event.target;
-            if (!target || !target.value) {
-                return;
-            }
-            var selectedListItem = this.getValueListItem(target.value);
-            if (!this.isSelected(target.value)) {
-                // Add a new control in the FormArray
-                this.checkboxes.push(new i2.FormControl(selectedListItem));
-            }
-            else {
-                // Remove the control from the FormArray
-                this.checkboxes.controls.forEach(function (ctrl, i) {
-                    if (ctrl.value.code === target.value) {
-                        _this.checkboxes.removeAt(i);
-                    }
-                });
-            }
-            this.dynamicListFormControl.setValue(this.checkboxes.value);
-        };
-        WriteDynamicMultiSelectListFieldComponent.prototype.isSelected = function (code) {
-            if (this.checkboxes && this.checkboxes.controls) {
-                return this.checkboxes.controls.find(function (control) { return control.value.code === code; });
-            }
-        };
-        WriteDynamicMultiSelectListFieldComponent.prototype.getValueListItem = function (value) {
-            return this.caseField.list_items.find(function (i) { return i.code === value; });
-        };
-        WriteDynamicMultiSelectListFieldComponent.prototype.setInitialCaseList = function () {
-            var hasListItems = this.caseField.list_items && this.caseField.list_items.length > 0;
-            var hasFormattedListItems = this.caseField.formatted_value && this.caseField.formatted_value.list_items.length > 0;
-            if (!hasListItems && hasFormattedListItems) {
-                this.caseField.list_items = this.caseField.formatted_value.list_items;
-            }
-        };
-        WriteDynamicMultiSelectListFieldComponent.prototype.setInitialCaseFieldValue = function () {
-            if (!this.caseField.value && this.caseField.formatted_value && this.caseField.formatted_value.value) {
-                this.caseField.value = this.caseField.formatted_value.value;
-            }
-            var isNull = this.caseField.value === undefined || this.caseField.value === '';
-            if (isNull || !Array.isArray(this.caseField.value)) {
-                this.caseField.value = [];
-            }
-        };
-        return WriteDynamicMultiSelectListFieldComponent;
-    }(AbstractFieldWriteComponent));
-    WriteDynamicMultiSelectListFieldComponent.ɵfac = function WriteDynamicMultiSelectListFieldComponent_Factory(t) { return ɵWriteDynamicMultiSelectListFieldComponent_BaseFactory(t || WriteDynamicMultiSelectListFieldComponent); };
-    WriteDynamicMultiSelectListFieldComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: WriteDynamicMultiSelectListFieldComponent, selectors: [["ccd-write-dynamic-multi-select-list-field"]], features: [i0__namespace.ɵɵInheritDefinitionFeature], decls: 7, vars: 8, consts: [[1, "form-group", "bottom-30", 3, "ngClass", "id"], ["class", "form-label", 4, "ngIf"], ["class", "form-hint", 4, "ngIf"], ["class", "error-message", 4, "ngIf"], [4, "ngFor", "ngForOf"], [1, "form-label"], [1, "form-hint"], [1, "error-message"], [1, "multiple-choice"], ["type", "checkbox", 1, "form-control", 3, "id", "name", "value", "checked", "change"], [1, "form-label", 3, "for"]], template: function WriteDynamicMultiSelectListFieldComponent_Template(rf, ctx) {
-            if (rf & 1) {
-                i0__namespace.ɵɵelementStart(0, "div", 0);
-                i0__namespace.ɵɵelementStart(1, "fieldset");
-                i0__namespace.ɵɵelementStart(2, "legend");
-                i0__namespace.ɵɵtemplate(3, WriteDynamicMultiSelectListFieldComponent_span_3_Template, 3, 3, "span", 1);
-                i0__namespace.ɵɵtemplate(4, WriteDynamicMultiSelectListFieldComponent_span_4_Template, 2, 1, "span", 2);
-                i0__namespace.ɵɵtemplate(5, WriteDynamicMultiSelectListFieldComponent_span_5_Template, 3, 3, "span", 3);
-                i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵtemplate(6, WriteDynamicMultiSelectListFieldComponent_ng_container_6_Template, 5, 6, "ng-container", 4);
-                i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementEnd();
-            }
-            if (rf & 2) {
-                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(6, _c0$A, !ctx.checkboxes.valid && ctx.checkboxes.touched))("id", ctx.id());
-                i0__namespace.ɵɵadvance(3);
-                i0__namespace.ɵɵproperty("ngIf", ctx.caseField.label);
-                i0__namespace.ɵɵadvance(1);
-                i0__namespace.ɵɵproperty("ngIf", ctx.caseField.hint_text);
-                i0__namespace.ɵɵadvance(1);
-                i0__namespace.ɵɵproperty("ngIf", ctx.checkboxes.errors && ctx.checkboxes.touched);
-                i0__namespace.ɵɵadvance(1);
-                i0__namespace.ɵɵproperty("ngForOf", ctx.caseField.list_items);
-            }
-        }, directives: [i1__namespace.NgClass, i1__namespace.NgIf, i1__namespace.NgForOf], pipes: [FieldLabelPipe, FirstErrorPipe], encapsulation: 2 });
-    var ɵWriteDynamicMultiSelectListFieldComponent_BaseFactory = /*@__PURE__*/ i0__namespace.ɵɵgetInheritedFactory(WriteDynamicMultiSelectListFieldComponent);
-    (function () {
-        (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(WriteDynamicMultiSelectListFieldComponent, [{
-                type: i0.Component,
-                args: [{
-                        selector: 'ccd-write-dynamic-multi-select-list-field',
-                        templateUrl: './write-dynamic-multi-select-list-field.html'
-                    }]
-            }], null, null);
-    })();
-
     var ReadPhoneUKFieldComponent = /** @class */ (function (_super) {
         __extends(ReadPhoneUKFieldComponent, _super);
         function ReadPhoneUKFieldComponent() {
@@ -19972,7 +19911,7 @@
         WriteTextAreaFieldComponent.prototype.autoGrow = function (event) {
             if (this.browserService.isIEOrEdge()) {
                 event.target.style.height = 'auto';
-                event.target.style.height = event.target.scrollHeight + 'px';
+                event.target.style.height = event.target.scrollHeight + "px";
                 event.target.scrollTop = event.target.scrollHeight;
             }
         };
@@ -20212,6 +20151,7 @@
             return YesNoService.EMPTY;
         };
         YesNoService.prototype.isYes = function (value) {
+            // tslint:disable-next-line:switch-default
             switch (typeof (value)) {
                 case 'boolean':
                     return value;
@@ -20221,6 +20161,7 @@
             return false;
         };
         YesNoService.prototype.isNo = function (value) {
+            // tslint:disable-next-line:switch-default
             switch (typeof (value)) {
                 case 'boolean':
                     return !value;
@@ -20957,7 +20898,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,
@@ -21194,6 +21135,7 @@
         return CaseFileViewCategory;
     }());
 
+    // tslint:disable:variable-name
     var CaseFileViewDocument = /** @class */ (function () {
         function CaseFileViewDocument() {
         }
@@ -22552,7 +22494,7 @@
             // is expected not to have a party name)
             if (this.flagsData) {
                 this.filteredFlagsData =
-                    this.flagsData.filter(function (f) { return f.flags.partyName != null || f.pathToFlagsFormGroup === _this.caseLevelCaseFlagsFieldId; });
+                    this.flagsData.filter(function (f) { return f.flags.partyName !== null || f.pathToFlagsFormGroup === _this.caseLevelCaseFlagsFieldId; });
             }
             // Add a FormControl for the selected flag location if there is at least one flags instance remaining after filtering
             if (this.filteredFlagsData && this.filteredFlagsData.length > 0) {
@@ -23849,18 +23791,19 @@
             field.value = { CaseReference: value };
             return field;
         };
-        ReadComplexFieldCollectionTableComponent.prototype.toCaseField = function (id, label, field_type, value) {
+        ReadComplexFieldCollectionTableComponent.prototype.toCaseField = function (id, label, fieldType, value) {
             return classTransformer.plainToClassFromExist(new CaseField(), {
                 id: id,
                 label: label,
                 display_context: 'READONLY',
                 value: value,
-                field_type: field_type
+                field_type: fieldType
             });
         };
         ReadComplexFieldCollectionTableComponent.prototype.sortRowsByColumns = function (column) {
             var shouldSortInAscendingOrder = this.columnsHorizontalLabel[column].sortOrder === SortOrder.UNSORTED
                 || this.columnsHorizontalLabel[column].sortOrder === SortOrder.DESCENDING;
+            // tslint:disable-next-line:switch-default
             switch (this.columnsHorizontalLabel[column].type.type) {
                 case 'Number':
                 case 'MoneyGBP': {
@@ -24986,6 +24929,7 @@
         return FeeValue;
     }());
 
+    // tslint:disable:variable-name
     var Fee = /** @class */ (function () {
         function Fee() {
         }
@@ -25691,7 +25635,7 @@
         function CcdPageFieldsPipe() {
         }
         CcdPageFieldsPipe.prototype.transform = function (page, dataFormGroup) {
-            var complex_fields = Object.keys(dataFormGroup.controls['data'].controls).map(function (key) {
+            var complexFields = Object.keys(dataFormGroup.controls['data'].controls).map(function (key) {
                 var control = dataFormGroup.controls['data'].get(key);
                 return control['caseField'];
             }).filter(function (field) {
@@ -25711,7 +25655,7 @@
                 field_type: {
                     id: page.id,
                     type: 'Complex',
-                    complex_fields: complex_fields
+                    complex_fields: complexFields
                 }
             });
         };
@@ -25890,11 +25834,11 @@
             }
             return childrenCaseFields;
         };
-        CollectionCreateCheckerService.prototype.isComplex = function (case_field) {
-            return case_field.field_type.type === 'Complex';
+        CollectionCreateCheckerService.prototype.isComplex = function (caseField) {
+            return caseField.field_type.type === 'Complex';
         };
-        CollectionCreateCheckerService.prototype.isCollection = function (case_field) {
-            return case_field.field_type.type === 'Collection';
+        CollectionCreateCheckerService.prototype.isCollection = function (caseField) {
+            return caseField.field_type.type === 'Collection';
         };
         CollectionCreateCheckerService.prototype.hasCreateAccess = function (caseField, role) {
             return !!caseField.acls.find(function (acl) { return acl.role === role && acl.create === true; });
@@ -26050,9 +25994,9 @@
             FileUploadStateService,
             FileUploadProgressGuard,
             WindowService,
-            LinkedCasesService,
             CommonDataService,
             JurisdictionService,
+            LinkedCasesService,
             { provide: i5.MAT_DATE_LOCALE, useValue: 'en-GB' }
         ], imports: [[
                 i1.CommonModule,
@@ -26394,9 +26338,9 @@
                             FileUploadStateService,
                             FileUploadProgressGuard,
                             WindowService,
-                            LinkedCasesService,
                             CommonDataService,
                             JurisdictionService,
+                            LinkedCasesService,
                             { provide: i5.MAT_DATE_LOCALE, useValue: 'en-GB' }
                         ],
                         entryComponents: [CaseFileViewFolderSelectorComponent]
@@ -26431,7 +26375,7 @@
         AddCommentsComponent,
         ManageCaseFlagsComponent,
         UpdateFlagComponent], []);
-    i0__namespace.ɵɵsetComponentScope(WriteLinkedCasesFieldComponent, [i1__namespace.NgIf, i1__namespace.NgForOf, i2__namespace.NgControlStatusGroup, i2__namespace.FormGroupDirective, i1__namespace.NgSwitch, i1__namespace.NgSwitchCase, BeforeYouStartComponent,
+    i0__namespace.ɵɵsetComponentScope(WriteLinkedCasesFieldComponent, [i2__namespace.NgControlStatusGroup, i2__namespace.FormGroupDirective, i1__namespace.NgSwitch, i1__namespace.NgSwitchCase, BeforeYouStartComponent,
         NoLinkedCasesComponent,
         LinkCasesComponent,
         UnLinkCasesComponent,
@@ -26881,8 +26825,8 @@
             this.caseEdit.navigateToPage(pageId);
         };
         CaseEditSubmitComponent.prototype.callbackErrorsNotify = function (errorContext) {
-            this.caseEdit.ignoreWarning = errorContext.ignore_warning;
-            this.triggerText = errorContext.trigger_text;
+            this.caseEdit.ignoreWarning = errorContext.ignoreWarning;
+            this.triggerText = errorContext.triggerText;
         };
         CaseEditSubmitComponent.prototype.summaryCaseField = function (field) {
             /* istanbul ignore else */
@@ -26958,7 +26902,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;
@@ -27603,6 +27547,7 @@
                     { provide: COMPONENT_PORTAL_INJECTION_TOKEN, useValue: this }
                 ]
             });
+            // tslint:disable-next-line:switch-default
             switch (portalType) {
                 case EventCompletionPortalTypes.TaskCancelled:
                     this.selectedComponentPortal = new i6$1.ComponentPortal(CaseEventCompletionTaskCancelledComponent, null, injector);
@@ -27791,7 +27736,7 @@
             }], 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, CaseEditGenericErrorsComponent, CallbackErrorsComponent, i2__namespace.ɵangular_packages_forms_forms_ba, i2__namespace.NgControlStatusGroup, i2__namespace.FormGroupDirective, CaseEditFormComponent,
+    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, 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]);
@@ -28140,36 +28085,36 @@
             this.screenReaderCurrentLabel = "You're on page";
             this.pageChange = new i0.EventEmitter();
             this.pageBoundsCorrection = new i0.EventEmitter();
-            this._directionLinks = true;
-            this._autoHide = false;
-            this._responsive = false;
+            this.pDirectionLinks = true;
+            this.pAutoHide = false;
+            this.pResponsive = false;
         }
         Object.defineProperty(PaginationComponent.prototype, "directionLinks", {
             get: function () {
-                return this._directionLinks;
+                return this.pDirectionLinks;
             },
             set: function (value) {
-                this._directionLinks = coerceToBoolean(value);
+                this.pDirectionLinks = coerceToBoolean(value);
             },
             enumerable: false,
             configurable: true
         });
         Object.defineProperty(PaginationComponent.prototype, "autoHide", {
             get: function () {
-                return this._autoHide;
+                return this.pAutoHide;
             },
             set: function (value) {
-                this._autoHide = coerceToBoolean(value);
+                this.pAutoHide = coerceToBoolean(value);
             },
             enumerable: false,
             configurable: true
         });
         Object.defineProperty(PaginationComponent.prototype, "responsive", {
             get: function () {
-                return this._responsive;
+                return this.pResponsive;
             },
             set: function (value) {
-                this._responsive = coerceToBoolean(value);
+                this.pResponsive = coerceToBoolean(value);
             },
             enumerable: false,
             configurable: true
@@ -28936,7 +28881,7 @@
                         var formValue = _this.windowService.getLocalStorage(FORM_GROUP_VAL_LOC_STORAGE);
                         workbasketInputs.forEach(function (item) {
                             if (item.field.elementPath) {
-                                item.field.id = item.field.id + '.' + item.field.elementPath;
+                                item.field.id = item.field.id + "." + item.field.elementPath;
                             }
                             item.field.label = item.label;
                             if (formValue) {
@@ -28988,7 +28933,7 @@
                                 var value = formGroupLS[key];
                                 // Clear the filter form group control values if it has a value in local storage
                                 // The regionList form group control value should be ignored as it always contain the latest value
-                                if (key !== REGION_LIST_AND_FRC_FILTER && value != null) {
+                                if (key !== REGION_LIST_AND_FRC_FILTER && value !== null) {
                                     this.formGroup.get(key).setValue(null);
                                 }
                             }
@@ -30117,7 +30062,7 @@
             this.eventTrigger = this.route.snapshot.data.eventTrigger;
             if (this.activityPollingService.isEnabled) {
                 this.ngZone.runOutsideAngular(function () {
-                    _this.activitySubscription = _this.postEditActivity().subscribe(function (_resolved) {
+                    _this.activitySubscription = _this.postEditActivity().subscribe(function () {
                         // console.log('Posted EDIT activity and result is: ' + JSON.stringify(_resolved));
                     });
                 });
@@ -30193,9 +30138,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]);
@@ -30793,9 +30736,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) {
@@ -30810,14 +30753,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) {
@@ -30831,12 +30774,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) {
@@ -30852,12 +30795,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);
@@ -30877,10 +30820,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) {
@@ -30899,8 +30842,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) {
@@ -30910,10 +30853,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("selectedIndexChange", function CaseFullAccessViewComponent_ng_container_12_Template_mat_tab_group_selectedIndexChange_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);
@@ -31093,8 +31036,8 @@
             return this.sortedTabs.length > 0 || this.prependedTabs.length > 0 || this.appendedTabs.length > 0;
         };
         CaseFullAccessViewComponent.prototype.callbackErrorsNotify = function (callbackErrorsContext) {
-            this.ignoreWarning = callbackErrorsContext.ignore_warning;
-            this.triggerText = callbackErrorsContext.trigger_text;
+            this.ignoreWarning = callbackErrorsContext.ignoreWarning;
+            this.triggerText = callbackErrorsContext.triggerText;
         };
         CaseFullAccessViewComponent.prototype.isDraft = function () {
             return Draft.isDraft(this.caseDetails.case_id);
@@ -31382,7 +31325,7 @@
          * or the empty string
          */
         PrintUrlPipe.prototype.transform = function (remoteUrl) {
-            if (remoteUrl && remoteUrl.length > 0) {
+            if ((remoteUrl === null || remoteUrl === void 0 ? void 0 : remoteUrl.length) > 0) {
                 var printServiceUrlPathname = void 0;
                 /**
                  * Check navigator.userAgent to see if the browser is IE or not. Check for either the browser name, "MSIE", or
@@ -31398,7 +31341,7 @@
                     printServiceUrlPathname = urlParser.pathname;
                     if (printServiceUrlPathname[0] !== '/') {
                         // Fix for IE11; it returns the pathname without leading slash
-                        printServiceUrlPathname = '/' + printServiceUrlPathname;
+                        printServiceUrlPathname = "/" + printServiceUrlPathname;
                     }
                 }
                 else {
@@ -31569,10 +31512,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 = [];
@@ -31588,23 +31532,25 @@
         };
         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 access_process = caseDetails.metadataFields.find(function (metadataField) { return metadataField.id === CaseViewerComponent.METADATA_FIELD_ACCESS_PROCEES_ID; });
-                var access_granted = caseDetails.metadataFields.find(function (metadataField) { return metadataField.id === CaseViewerComponent.METADATA_FIELD_ACCESS_GRANTED_ID; });
-                this.accessGranted = access_granted ? access_granted.value !== CaseViewerComponent.BASIC_USER_ACCESS_TYPES : false;
-                this.userAccessType = access_process ? access_process.value : null;
+                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;
             }
         };
         CaseViewerComponent.prototype.isDataLoaded = function () {
@@ -31616,14 +31562,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);
             }
@@ -31638,7 +31600,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
@@ -31646,8 +31608,6 @@
                     type: i0.Input
                 }], appendedTabs: [{
                     type: i0.Input
-                }], caseDetails: [{
-                    type: i0.Input
                 }] });
     })();
 
@@ -32900,11 +32860,11 @@
                 };
                 this.$roleAssignmentResponseSubscription = this.casesService.createChallengedAccessRequest(caseId_1, challengedAccessRequest)
                     .pipe(operators.switchMap(function () { return _this.caseNotifier.fetchAndRefresh(caseId_1); }))
-                    .subscribe(function (_response) {
+                    .subscribe(function () {
                     // Would have been nice to pass the caseId within state.data, but this isn't part of NavigationExtras until
                     // Angular 7.2!
                     _this.router.navigate(['success'], { relativeTo: _this.route });
-                }, function (_error) {
+                }, function () {
                     // Navigate to error page
                 });
             }
@@ -32918,7 +32878,7 @@
             }
         };
         CaseChallengedAccessRequestComponent.prototype.inputEmpty = function (input) {
-            return input.value == null || input.value.trim().length === 0;
+            return input.value === null || input.value.trim().length === 0;
         };
         return CaseChallengedAccessRequestComponent;
     }());
@@ -33542,11 +33502,11 @@
                 };
                 this.$roleAssignmentResponseSubscription = this.casesService.createSpecificAccessRequest(caseId_1, specificAccessRequest)
                     .pipe(operators.switchMap(function () { return _this.caseNotifier.fetchAndRefresh(caseId_1); }))
-                    .subscribe(function (_response) {
+                    .subscribe(function () {
                     // Would have been nice to pass the caseId within state.data, but this isn't part of NavigationExtras until
                     // Angular 7.2
                     _this.router.navigate(['success'], { relativeTo: _this.route });
-                }, function (_error) {
+                }, function () {
                     // Navigate to error page
                 });
             }
@@ -33561,7 +33521,7 @@
             }
         };
         CaseSpecificAccessRequestComponent.prototype.inputEmpty = function (input) {
-            return input.value == null || input.value.trim().length === 0;
+            return input.value === null || input.value.trim().length === 0;
         };
         return CaseSpecificAccessRequestComponent;
     }());
@@ -34462,7 +34422,7 @@
                 }
                 searchInputs.forEach(function (item) {
                     if (item.field.elementPath) {
-                        item.field.id = item.field.id + '.' + item.field.elementPath;
+                        item.field.id = item.field.id + "." + item.field.elementPath;
                     }
                     item.field.label = item.label;
                     if (formValueObject) {
@@ -34741,7 +34701,7 @@
         if (rf & 2) {
             var ctx_r3 = i0__namespace.ɵɵnextContext(2);
             i0__namespace.ɵɵadvance(6);
-            i0__namespace.ɵɵtextInterpolate1(" The total size of the result set is ", i0__namespace.ɵɵpipeBind1(7, 1, ctx_r3.paginationMetadata.total_results_count), ". Only the first 10,000 records are available for display. ");
+            i0__namespace.ɵɵtextInterpolate1(" The total size of the result set is ", i0__namespace.ɵɵpipeBind1(7, 1, ctx_r3.paginationMetadata.totalResultsCount), ". Only the first 10,000 records are available for display. ");
         }
     }
     function SearchResultComponent_table_0_div_5_Template(rf, ctx) {
@@ -35300,7 +35260,7 @@
         };
         Object.defineProperty(SearchResultComponent.prototype, "resultTotal", {
             get: function () {
-                var total = this.paginationMetadata.total_results_count;
+                var total = this.paginationMetadata.totalResultsCount;
                 var maximumResultReached = total >= this.PAGINATION_MAX_ITEM_RESULT;
                 this.paginationLimitEnforced = maximumResultReached;
                 return maximumResultReached ? this.PAGINATION_MAX_ITEM_RESULT : total;
@@ -35451,7 +35411,7 @@
             return col;
         };
         SearchResultComponent.prototype.hasResults = function () {
-            return this.resultView.results.length && this.paginationMetadata.total_pages_count;
+            return this.resultView.results.length && this.paginationMetadata.totalPagesCount;
         };
         SearchResultComponent.prototype.hasDrafts = function () {
             return this.resultView.hasDrafts();
@@ -35550,7 +35510,7 @@
             return ((currentPage - 1) * this.paginationPageSize) + this.resultView.results.length + this.getDraftsCountIfNotPageOne(currentPage);
         };
         SearchResultComponent.prototype.getTotalResults = function () {
-            var total = this.paginationMetadata.total_results_count + this.draftsCount;
+            var total = this.paginationMetadata.totalResultsCount + this.draftsCount;
             return total >= this.PAGINATION_MAX_ITEM_RESULT ? this.PAGINATION_MAX_ITEM_RESULT : total;
         };
         SearchResultComponent.prototype.prepareCaseLinkUrl = function (caseId) {
@@ -35708,6 +35668,7 @@
     })();
     i0__namespace.ɵɵsetComponentScope(SearchResultComponent, [i1__namespace.NgIf, i1__namespace.NgForOf, i1__namespace$1.RouterLinkWithHref, FieldReadComponent, LabelSubstitutorDirective, ActivityComponent, PaginationComponent], [i1__namespace.DecimalPipe, i1__namespace$6.PaginatePipe, CaseReferencePipe, SortSearchResultPipe]);
 
+    // tslint:disable:variable-name
     var ComplexFieldOverride = /** @class */ (function () {
         function ComplexFieldOverride() {
         }
@@ -35729,24 +35690,24 @@
             this.caseField.id = id;
             return this;
         };
-        CaseFieldBuilder.prototype.withFieldType = function (field_type) {
-            this.caseField.field_type = field_type;
+        CaseFieldBuilder.prototype.withFieldType = function (fieldType) {
+            this.caseField.field_type = fieldType;
             return this;
         };
-        CaseFieldBuilder.prototype.withDisplayContext = function (display_context) {
-            this.caseField.display_context = display_context;
+        CaseFieldBuilder.prototype.withDisplayContext = function (displayContext) {
+            this.caseField.display_context = displayContext;
             return this;
         };
-        CaseFieldBuilder.prototype.withDisplayContextParameter = function (display_context_parameter) {
-            this.caseField.display_context_parameter = display_context_parameter;
+        CaseFieldBuilder.prototype.withDisplayContextParameter = function (displayContextParameter) {
+            this.caseField.display_context_parameter = displayContextParameter;
             return this;
         };
         CaseFieldBuilder.prototype.withHidden = function (hidden) {
             this.caseField.hidden = hidden;
             return this;
         };
-        CaseFieldBuilder.prototype.withHintText = function (hint_text) {
-            this.caseField.hint_text = hint_text;
+        CaseFieldBuilder.prototype.withHintText = function (hintText) {
+            this.caseField.hint_text = hintText;
             return this;
         };
         CaseFieldBuilder.prototype.withLabel = function (label) {
@@ -35757,12 +35718,12 @@
             this.caseField.order = order;
             return this;
         };
-        CaseFieldBuilder.prototype.withSecurityLabel = function (security_label) {
-            this.caseField.security_label = security_label;
+        CaseFieldBuilder.prototype.withSecurityLabel = function (securityLabel) {
+            this.caseField.security_label = securityLabel;
             return this;
         };
-        CaseFieldBuilder.prototype.withShowCondition = function (show_condition) {
-            this.caseField.show_condition = show_condition;
+        CaseFieldBuilder.prototype.withShowCondition = function (showCondition) {
+            this.caseField.show_condition = showCondition;
             return this;
         };
         CaseFieldBuilder.prototype.withShowSummaryContentOption = function (option) {
@@ -35790,21 +35751,21 @@
             complex_fields: []
         };
     };
-    var createCaseEventTrigger = function (id, name, case_id, show_summary, case_fields, wizard_pages, can_save_draft) {
-        if (wizard_pages === void 0) { wizard_pages = []; }
-        if (can_save_draft === void 0) { can_save_draft = false; }
+    var createCaseEventTrigger = function (id, name, caseId, showSummary, caseFields, wizardPages, canSaveDraft) {
+        if (wizardPages === void 0) { wizardPages = []; }
+        if (canSaveDraft === void 0) { canSaveDraft = false; }
         var eventTrigger = new CaseEventTrigger();
         eventTrigger.id = id;
         eventTrigger.name = name;
-        eventTrigger.case_id = case_id;
-        eventTrigger.show_summary = show_summary;
-        eventTrigger.wizard_pages = wizard_pages;
+        eventTrigger.case_id = caseId;
+        eventTrigger.show_summary = showSummary;
+        eventTrigger.wizard_pages = wizardPages;
         eventTrigger.event_token = 'test-token';
-        eventTrigger.case_fields = case_fields;
-        eventTrigger.can_save_draft = can_save_draft;
+        eventTrigger.case_fields = caseFields;
+        eventTrigger.can_save_draft = canSaveDraft;
         return eventTrigger;
     };
-    var aCaseField = function (id, label, type, display_context, show_summary_content_option, typeComplexFields, retain_hidden_value, hidden) {
+    var aCaseField = function (id, label, type, displayContext, showSummaryContentOption, typeComplexFields, retainHiddenValue, hidden) {
         if (typeComplexFields === void 0) { typeComplexFields = []; }
         return ({
             id: id || 'personFirstName',
@@ -35813,10 +35774,10 @@
                 type: type || 'Text',
                 complex_fields: typeComplexFields || []
             },
-            display_context: display_context || 'OPTIONAL',
+            display_context: displayContext || 'OPTIONAL',
             label: label || 'First name',
-            show_summary_content_option: show_summary_content_option,
-            retain_hidden_value: retain_hidden_value || false,
+            show_summary_content_option: showSummaryContentOption,
+            retain_hidden_value: retainHiddenValue || false,
             hidden: hidden || false
         });
     };
@@ -35858,48 +35819,48 @@
         complexFieldOverride.display_context = 'HIDDEN';
         return complexFieldOverride;
     };
-    var createCaseField = function (id, label, hint, fieldType, display_context, order, show_condition, ACLs, hidden) {
+    var createCaseField = function (id, label, hint, fieldType, displayContext, order, showCondition, acls, hidden) {
         if (order === void 0) { order = undefined; }
-        if (show_condition === void 0) { show_condition = undefined; }
-        if (ACLs === void 0) { ACLs = undefined; }
+        if (showCondition === void 0) { showCondition = undefined; }
+        if (acls === void 0) { acls = undefined; }
         return CaseFieldBuilder.create()
             .withId(id || 'personFirstName')
             .withFieldType(fieldType || textFieldType())
-            .withDisplayContext(display_context || 'OPTIONAL')
+            .withDisplayContext(displayContext || 'OPTIONAL')
             .withLabel(label || 'First name')
             .withHintText(hint || 'First name hint text')
             .withShowSummaryContentOption(0)
             .withOrder(order)
-            .withShowCondition(show_condition || undefined)
-            .withACLs(ACLs)
+            .withShowCondition(showCondition || undefined)
+            .withACLs(acls)
             .withHidden(hidden || false)
             .build();
     };
-    var newCaseField = function (id, label, hint, fieldType, display_context, order) {
+    var newCaseField = function (id, label, hint, fieldType, displayContext, order) {
         if (order === void 0) { order = undefined; }
         return CaseFieldBuilder.create()
             .withId(id || 'personFirstName')
             .withFieldType(fieldType || textFieldType())
-            .withDisplayContext(display_context || 'OPTIONAL')
+            .withDisplayContext(displayContext || 'OPTIONAL')
             .withHintText(hint || 'First name hint text')
             .withLabel(label || 'First name')
             .withOrder(order)
             .withShowSummaryContentOption(0);
     };
-    var createFieldType = function (typeId, type, complex_fields, collection_field_type) {
-        if (complex_fields === void 0) { complex_fields = []; }
-        if (collection_field_type === void 0) { collection_field_type = undefined; }
+    var createFieldType = function (typeId, type, complexFields, collectionFieldType) {
+        if (complexFields === void 0) { complexFields = []; }
+        if (collectionFieldType === void 0) { collectionFieldType = undefined; }
         return {
             id: typeId || 'Text',
             type: type || 'Text',
-            complex_fields: complex_fields || [],
-            collection_field_type: collection_field_type || undefined
+            complex_fields: complexFields || [],
+            collection_field_type: collectionFieldType || undefined
         };
     };
     var createFixedListFieldType = function (typeId, fixedListItems) {
         if (fixedListItems === void 0) { fixedListItems = []; }
         return {
-            id: 'FixedList-' + typeId,
+            id: "FixedList-" + typeId,
             type: 'FixedList',
             fixed_list_items: fixedListItems || []
         };
@@ -35907,18 +35868,18 @@
     var createMultiSelectListFieldType = function (typeId, fixedListItems) {
         if (fixedListItems === void 0) { fixedListItems = []; }
         return {
-            id: 'MultiSelectList-' + typeId,
+            id: "MultiSelectList-" + typeId,
             type: 'MultiSelectList',
             fixed_list_items: fixedListItems || []
         };
     };
-    var createACL = function (role, create, read, update, _delete) {
+    var createACL = function (role, aclCreate, aclRead, aclUpdate, aclDelete) {
         return ({
             role: role || 'roleX',
-            create: create,
-            read: read,
-            update: update,
-            delete: _delete
+            create: aclCreate,
+            read: aclRead,
+            update: aclUpdate,
+            delete: aclDelete
         });
     };
 
@@ -36137,7 +36098,6 @@
     exports.FormatTranslatorService = FormatTranslatorService;
     exports.GreyBarService = GreyBarService;
     exports.HRef = HRef;
-    exports.HasLoadingState = HasLoadingState;
     exports.HeaderBarComponent = HeaderBarComponent;
     exports.HeadersModule = HeadersModule;
     exports.HttpError = HttpError;