@hmcts/ccd-case-ui-toolkit 6.13.10-eui-4157 → 6.13.10-exui-110

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

@@ -118,7 +118,7 @@
             i0__namespace.ɵɵtextInterpolate(ctx_r1.workhours);
         }
     }
-    var _c0$_ = [[["", "footerSolsNavLinks", ""]], [["", "footerCaseWorkerNavLinks", ""]]];
+    var _c0$$ = [[["", "footerSolsNavLinks", ""]], [["", "footerCaseWorkerNavLinks", ""]]];
     var _c1$s = ["[footerSolsNavLinks]", "[footerCaseWorkerNavLinks]"];
     var FooterComponent = /** @class */ (function () {
         function FooterComponent() {
@@ -128,7 +128,7 @@
     FooterComponent.ɵfac = function FooterComponent_Factory(t) { return new (t || FooterComponent)(); };
     FooterComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: FooterComponent, selectors: [["cut-footer-bar"]], inputs: { email: "email", isSolicitor: "isSolicitor", phone: "phone", workhours: "workhours" }, ngContentSelectors: _c1$s, decls: 4, vars: 4, consts: [["id", "footer", "role", "footer", 1, "group", "js-footer"], [1, "footer-wrapper"], ["class", "footer-meta", 4, "ngIf"], [1, "footer-meta"], [1, "footer-meta-inner"], [1, "open-government-licence"], [1, "logo"], ["href", "https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/", "rel", "license"], [1, "copyright"], ["href", "https://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/copyright-and-re-use/crown-copyright/"], [1, "title"], [1, "footer-text"], [1, "email"], [3, "href"], [1, "phone"], [1, "work-hours"]], template: function FooterComponent_Template(rf, ctx) {
             if (rf & 1) {
-                i0__namespace.ɵɵprojectionDef(_c0$_);
+                i0__namespace.ɵɵprojectionDef(_c0$$);
                 i0__namespace.ɵɵelementStart(0, "footer", 0);
                 i0__namespace.ɵɵelementStart(1, "div", 1);
                 i0__namespace.ɵɵtemplate(2, FooterComponent_div_2_Template, 15, 0, "div", 2);
@@ -207,7 +207,7 @@
             i0__namespace.ɵɵtextInterpolate(ctx_r2.title);
         }
     }
-    var _c0$Z = [[["", "headerNavigation", ""]]];
+    var _c0$_ = [[["", "headerNavigation", ""]]];
     var _c1$r = ["[headerNavigation]"];
     var HeaderBarComponent = /** @class */ (function () {
         function HeaderBarComponent() {
@@ -221,7 +221,7 @@
     HeaderBarComponent.ɵfac = function HeaderBarComponent_Factory(t) { return new (t || HeaderBarComponent)(); };
     HeaderBarComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: HeaderBarComponent, selectors: [["cut-header-bar"]], inputs: { title: "title", isSolicitor: "isSolicitor", username: "username" }, outputs: { signOutRequest: "signOutRequest" }, ngContentSelectors: _c1$r, decls: 15, vars: 8, consts: [["role", "banner", "id", "global-header", 1, "with-proposition"], [1, "header-wrapper"], [1, "header-global"], [4, "ngIf"], ["class", "global-header", 4, "ngIf"], [1, "header-proposition"], [1, "content"], ["href", "#proposition-links", 1, "js-header-toggle", "menu"], ["id", "proposition-menu", 4, "ngIf"], [1, "proposition-right"], ["id", "user-name"], ["id", "sign-out", "href", "javascript:void(0)", 3, "click"], ["href", "https://www.gov.uk", "title", "Go to the GOV.UK homepage", "id", "logo", 1, "content", 2, "margin-left", "0px"], ["src", "/img/gov.uk_logotype_crown_invert_trans.png?0.23.0", "width", "36", "height", "32", "alt", ""], [1, "global-header"], [1, "title"], ["id", "proposition-menu"], [1, "title-solicitor"], ["id", "proposition-name"]], template: function HeaderBarComponent_Template(rf, ctx) {
             if (rf & 1) {
-                i0__namespace.ɵɵprojectionDef(_c0$Z);
+                i0__namespace.ɵɵprojectionDef(_c0$_);
                 i0__namespace.ɵɵelementStart(0, "header", 0);
                 i0__namespace.ɵɵelementStart(1, "div", 1);
                 i0__namespace.ɵɵelementStart(2, "div", 2);
@@ -282,7 +282,7 @@
                 }] });
     })();
 
-    var _c0$Y = [[["", "leftNavLinks", ""]], [["", "rightNavLinks", ""]]];
+    var _c0$Z = [[["", "leftNavLinks", ""]], [["", "rightNavLinks", ""]]];
     var _c1$q = ["[leftNavLinks]", "[rightNavLinks]"];
     var NavigationComponent = /** @class */ (function () {
         function NavigationComponent() {
@@ -292,7 +292,7 @@
     NavigationComponent.ɵfac = function NavigationComponent_Factory(t) { return new (t || NavigationComponent)(); };
     NavigationComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: NavigationComponent, selectors: [["cut-nav-bar"]], inputs: { isSolicitor: "isSolicitor" }, ngContentSelectors: _c1$q, decls: 4, vars: 2, consts: [[1, "cut-nav-bar"]], template: function NavigationComponent_Template(rf, ctx) {
             if (rf & 1) {
-                i0__namespace.ɵɵprojectionDef(_c0$Y);
+                i0__namespace.ɵɵprojectionDef(_c0$Z);
                 i0__namespace.ɵɵelementStart(0, "div");
                 i0__namespace.ɵɵelementStart(1, "nav", 0);
                 i0__namespace.ɵɵprojection(2);
@@ -437,7 +437,7 @@
             }], null, null);
     })();
 
-    var _c0$X = [[["", "topBody", ""]], [["", "leftBody", ""]], [["", "rightBody", ""]]];
+    var _c0$Y = [[["", "topBody", ""]], [["", "leftBody", ""]], [["", "rightBody", ""]]];
     var _c1$p = ["[topBody]", "[leftBody]", "[rightBody]"];
     var BodyComponent = /** @class */ (function () {
         function BodyComponent() {
@@ -447,7 +447,7 @@
     BodyComponent.ɵfac = function BodyComponent_Factory(t) { return new (t || BodyComponent)(); };
     BodyComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: BodyComponent, selectors: [["cut-body"]], ngContentSelectors: _c1$p, decls: 4, vars: 0, consts: [[1, "global-display"]], template: function BodyComponent_Template(rf, ctx) {
             if (rf & 1) {
-                i0__namespace.ɵɵprojectionDef(_c0$X);
+                i0__namespace.ɵɵprojectionDef(_c0$Y);
                 i0__namespace.ɵɵelementStart(0, "div", 0);
                 i0__namespace.ɵɵprojection(1);
                 i0__namespace.ɵɵprojection(2, 1);
@@ -852,7 +852,7 @@
         return typeof state === "function" ? receiver === state : state.has(receiver);
     }
 
-    var _c0$W = function (a0) { return { "govuk-input--error": a0 }; };
+    var _c0$X = function (a0) { return { "govuk-input--error": a0 }; };
     function DateInputComponent_div_16_Template(rf, ctx) {
         if (rf & 1) {
             var _r8_1 = i0__namespace.ɵɵgetCurrentView();
@@ -870,7 +870,7 @@
             i0__namespace.ɵɵadvance(1);
             i0__namespace.ɵɵproperty("for", ctx_r3.hourId());
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵproperty("id", ctx_r3.hourId())("name", ctx_r3.hourId())("value", ctx_r3.displayHour)("ngClass", i0__namespace.ɵɵpureFunction1(5, _c0$W, ctx_r3.isInvalid));
+            i0__namespace.ɵɵproperty("id", ctx_r3.hourId())("name", ctx_r3.hourId())("value", ctx_r3.displayHour)("ngClass", i0__namespace.ɵɵpureFunction1(5, _c0$X, ctx_r3.isInvalid));
         }
     }
     function DateInputComponent_div_17_Template(rf, ctx) {
@@ -890,7 +890,7 @@
             i0__namespace.ɵɵadvance(1);
             i0__namespace.ɵɵproperty("for", ctx_r4.minuteId());
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵproperty("id", ctx_r4.minuteId())("name", ctx_r4.minuteId())("value", ctx_r4.displayMinute)("ngClass", i0__namespace.ɵɵpureFunction1(5, _c0$W, ctx_r4.isInvalid));
+            i0__namespace.ɵɵproperty("id", ctx_r4.minuteId())("name", ctx_r4.minuteId())("value", ctx_r4.displayMinute)("ngClass", i0__namespace.ɵɵpureFunction1(5, _c0$X, ctx_r4.isInvalid));
         }
     }
     function DateInputComponent_div_18_Template(rf, ctx) {
@@ -910,7 +910,7 @@
             i0__namespace.ɵɵadvance(1);
             i0__namespace.ɵɵproperty("for", ctx_r5.secondId());
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵproperty("id", ctx_r5.secondId())("name", ctx_r5.secondId())("value", ctx_r5.displaySecond)("ngClass", i0__namespace.ɵɵpureFunction1(5, _c0$W, ctx_r5.isInvalid));
+            i0__namespace.ɵɵproperty("id", ctx_r5.secondId())("name", ctx_r5.secondId())("value", ctx_r5.displaySecond)("ngClass", i0__namespace.ɵɵpureFunction1(5, _c0$X, ctx_r5.isInvalid));
         }
     }
     var DateInputComponent = /** @class */ (function () {
@@ -1144,15 +1144,15 @@
                 i0__namespace.ɵɵadvance(2);
                 i0__namespace.ɵɵproperty("for", ctx.dayId());
                 i0__namespace.ɵɵadvance(2);
-                i0__namespace.ɵɵproperty("id", ctx.dayId())("name", ctx.dayId())("value", ctx.displayDay)("ngClass", i0__namespace.ɵɵpureFunction1(18, _c0$W, ctx.isInvalid));
+                i0__namespace.ɵɵproperty("id", ctx.dayId())("name", ctx.dayId())("value", ctx.displayDay)("ngClass", i0__namespace.ɵɵpureFunction1(18, _c0$X, ctx.isInvalid));
                 i0__namespace.ɵɵadvance(3);
                 i0__namespace.ɵɵproperty("for", ctx.monthId());
                 i0__namespace.ɵɵadvance(2);
-                i0__namespace.ɵɵproperty("id", ctx.monthId())("name", ctx.monthId())("value", ctx.displayMonth)("ngClass", i0__namespace.ɵɵpureFunction1(20, _c0$W, ctx.isInvalid));
+                i0__namespace.ɵɵproperty("id", ctx.monthId())("name", ctx.monthId())("value", ctx.displayMonth)("ngClass", i0__namespace.ɵɵpureFunction1(20, _c0$X, ctx.isInvalid));
                 i0__namespace.ɵɵadvance(3);
                 i0__namespace.ɵɵproperty("for", ctx.yearId());
                 i0__namespace.ɵɵadvance(2);
-                i0__namespace.ɵɵproperty("id", ctx.yearId())("name", ctx.yearId())("value", ctx.displayYear)("ngClass", i0__namespace.ɵɵpureFunction1(22, _c0$W, ctx.isInvalid));
+                i0__namespace.ɵɵproperty("id", ctx.yearId())("name", ctx.yearId())("value", ctx.displayYear)("ngClass", i0__namespace.ɵɵpureFunction1(22, _c0$X, ctx.isInvalid));
                 i0__namespace.ɵɵadvance(2);
                 i0__namespace.ɵɵproperty("ngIf", ctx.isDateTime);
                 i0__namespace.ɵɵadvance(1);
@@ -1233,7 +1233,7 @@
             i0__namespace.ɵɵelementContainerEnd();
         }
     }
-    var _c0$V = ["*"];
+    var _c0$W = ["*"];
     exports.AlertMessageType = void 0;
     (function (AlertMessageType) {
         AlertMessageType["WARNING"] = "warning";
@@ -1254,7 +1254,7 @@
     AlertComponent.TYPE_ERROR = 'error';
     AlertComponent.TYPE_INFORMATION = 'information';
     AlertComponent.ɵfac = function AlertComponent_Factory(t) { return new (t || AlertComponent)(); };
-    AlertComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: AlertComponent, selectors: [["cut-alert"]], inputs: { type: "type", showIcon: "showIcon" }, ngContentSelectors: _c0$V, decls: 10, vars: 10, consts: [[1, "hmcts-banner"], [3, "ngSwitch"], [4, "ngSwitchCase"], [1, "hmcts-banner__message"], [1, "hmcts-banner__assistive"], ["fill", "currentColor", "role", "presentation", "focusable", "false", "xmlns", "http://www.w3.org/2000/svg", "viewBox", "0 0 25 25", "height", "25", "width", "25", 1, "hmcts-banner__icon"], ["d", "M13.6,15.4h-2.3v-4.5h2.3V15.4z M13.6,19.8h-2.3v-2.2h2.3V19.8z M0,23.2h25L12.5,2L0,23.2z"], ["d", "M25,6.2L8.7,23.2L0,14.1l4-4.2l4.7,4.9L21,2L25,6.2z"], ["d", "M13.7,18.5h-2.4v-2.4h2.4V18.5z M12.5,13.7c-0.7,0-1.2-0.5-1.2-1.2V7.7c0-0.7,0.5-1.2,1.2-1.2s1.2,0.5,1.2,1.2v4.8\n      C13.7,13.2,13.2,13.7,12.5,13.7z M12.5,0.5c-6.6,0-12,5.4-12,12s5.4,12,12,12s12-5.4,12-12S19.1,0.5,12.5,0.5z"]], template: function AlertComponent_Template(rf, ctx) {
+    AlertComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: AlertComponent, selectors: [["cut-alert"]], inputs: { type: "type", showIcon: "showIcon" }, ngContentSelectors: _c0$W, decls: 10, vars: 10, consts: [[1, "hmcts-banner"], [3, "ngSwitch"], [4, "ngSwitchCase"], [1, "hmcts-banner__message"], [1, "hmcts-banner__assistive"], ["fill", "currentColor", "role", "presentation", "focusable", "false", "xmlns", "http://www.w3.org/2000/svg", "viewBox", "0 0 25 25", "height", "25", "width", "25", 1, "hmcts-banner__icon"], ["d", "M13.6,15.4h-2.3v-4.5h2.3V15.4z M13.6,19.8h-2.3v-2.2h2.3V19.8z M0,23.2h25L12.5,2L0,23.2z"], ["d", "M25,6.2L8.7,23.2L0,14.1l4-4.2l4.7,4.9L21,2L25,6.2z"], ["d", "M13.7,18.5h-2.4v-2.4h2.4V18.5z M12.5,13.7c-0.7,0-1.2-0.5-1.2-1.2V7.7c0-0.7,0.5-1.2,1.2-1.2s1.2,0.5,1.2,1.2v4.8\n      C13.7,13.2,13.2,13.7,12.5,13.7z M12.5,0.5c-6.6,0-12,5.4-12,12s5.4,12,12,12s12-5.4,12-12S19.1,0.5,12.5,0.5z"]], template: function AlertComponent_Template(rf, ctx) {
             if (rf & 1) {
                 i0__namespace.ɵɵprojectionDef();
                 i0__namespace.ɵɵelementStart(0, "div", 0);
@@ -1529,7 +1529,7 @@
                 }] });
     })();
 
-    var _c0$U = function (a0) { return { "js-hidden": a0 }; };
+    var _c0$V = function (a0) { return { "js-hidden": a0 }; };
     var _c1$o = ["*"];
     var TabComponent = /** @class */ (function () {
         function TabComponent() {
@@ -1545,7 +1545,7 @@
                 i0__namespace.ɵɵelementEnd();
             }
             if (rf & 2) {
-                i0__namespace.ɵɵproperty("id", ctx.id)("ngClass", i0__namespace.ɵɵpureFunction1(3, _c0$U, !ctx.selected));
+                i0__namespace.ɵɵproperty("id", ctx.id)("ngClass", i0__namespace.ɵɵpureFunction1(3, _c0$V, !ctx.selected));
                 i0__namespace.ɵɵattribute("aria-hidden", !ctx.selected);
             }
         }, directives: [i1__namespace.NgClass], styles: [".tabs-toggle[_ngcontent-%COMP%]{display:block;padding:10px 15px 3px;margin-bottom:8px}.tabs-toggle[aria-selected=true][_ngcontent-%COMP%]{color:#0b0c0c;text-decoration:none;border-bottom:none}.tabs-toggle[_ngcontent-%COMP%]   a[_ngcontent-%COMP%]{color:#005ea5}@media (max-width:640px){.tabs-list[_ngcontent-%COMP%]{border-bottom:1px solid #bfc1c3;margin-left:-15px;margin-right:-15px}.tabs-toggle[_ngcontent-%COMP%]{border-top:1px solid #bfc1c3}.tabs-toggle[_ngcontent-%COMP%]:focus{color:#0b0c0c;outline:none}}@media (min-width:641px){.tabs-panel[_ngcontent-%COMP%]{border-top:1px solid #bfc1c3;clear:both;overflow:hidden}.tabs-list[_ngcontent-%COMP%]{float:left}.tabs-list-item[_ngcontent-%COMP%]{float:left;position:relative;bottom:-1px;padding-top:10px}.tabs-toggle[_ngcontent-%COMP%]{background-color:#dee0e2;border:1px solid transparent;float:left;margin:0 6px 0 0;text-decoration:none}.tabs-toggle[_ngcontent-%COMP%]:visited{color:#005ea5}.tabs-toggle-selected[_ngcontent-%COMP%], .tabs-toggle[aria-selected=true][_ngcontent-%COMP%]{background-color:#fff;border-bottom:0;border-color:#bfc1c3;padding-bottom:11px;margin-bottom:0;color:#0b0c0c}}"] });
@@ -1568,7 +1568,7 @@
                 }] });
     })();
 
-    var _c0$T = ["tab"];
+    var _c0$U = ["tab"];
     var _c1$n = function () { return ["."]; };
     var _c2$3 = function (a0) { return { "tabs-toggle-selected": a0 }; };
     function TabsComponent_li_2_Template(rf, ctx) {
@@ -1622,7 +1622,7 @@
             }
         }, viewQuery: function TabsComponent_Query(rf, ctx) {
             if (rf & 1) {
-                i0__namespace.ɵɵviewQuery(_c0$T, 1);
+                i0__namespace.ɵɵviewQuery(_c0$U, 1);
             }
             if (rf & 2) {
                 var _t = void 0;
@@ -1701,7 +1701,7 @@
             }], null, null);
     })();
 
-    var _c0$S = function (a0, a1) { return { caseLocked: a0, someoneViewing: a1 }; };
+    var _c0$T = function (a0, a1) { return { caseLocked: a0, someoneViewing: a1 }; };
     var ActivityBannerComponent = /** @class */ (function () {
         function ActivityBannerComponent() {
         }
@@ -1722,7 +1722,7 @@
                 i0__namespace.ɵɵelementEnd();
             }
             if (rf & 2) {
-                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction2(4, _c0$S, ctx.bannerType === "editor", ctx.bannerType === "viewer"));
+                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction2(4, _c0$T, ctx.bannerType === "editor", ctx.bannerType === "viewer"));
                 i0__namespace.ɵɵadvance(2);
                 i0__namespace.ɵɵpropertyInterpolate("alt", ctx.description);
                 i0__namespace.ɵɵpropertyInterpolate("src", ctx.imageLink, i0__namespace.ɵɵsanitizeUrl);
@@ -3360,9 +3360,12 @@
         }
         Object.defineProperty(CaseField.prototype, "value", {
             get: function () {
-                if (this.isDynamic()) {
+                if (this.field_type && (this.field_type.type === 'DynamicList' || this.field_type.type === 'DynamicRadioList')) {
                     return this._value && this._value.value ? this._value.value.code : this._value;
                 }
+                else if (this.field_type && this.field_type.type === 'DynamicMultiSelectList') {
+                    return this._value && this._value.value ? this._value.value : this._value;
+                }
                 else {
                     return this._value;
                 }
@@ -3452,7 +3455,7 @@
         };
         CaseField.prototype.isDynamic = function () {
             var _this = this;
-            var dynamicFieldTypes = ['DynamicList', 'DynamicRadioList'];
+            var dynamicFieldTypes = ['DynamicList', 'DynamicRadioList', 'DynamicMultiSelectList'];
             if (!this.field_type) {
                 return false;
             }
@@ -5653,6 +5656,9 @@
             }
             caseFields.forEach(function (caseField) {
                 switch (caseField.field_type.type) {
+                    case FieldTypeSanitiser.FIELD_TYPE_DYNAMIC_MULTISELECT_LIST:
+                        _this.convertArrayToDynamicListOutput(caseField, data);
+                        break;
                     case FieldTypeSanitiser.FIELD_TYPE_DYNAMIC_RADIO_LIST:
                     case FieldTypeSanitiser.FIELD_TYPE_DYNAMIC_LIST:
                         _this.convertStringToDynamicListOutput(caseField, data);
@@ -5670,6 +5676,17 @@
                 }
             });
         };
+        FieldTypeSanitiser.prototype.convertArrayToDynamicListOutput = function (field, data) {
+            var values = data[field.id];
+            if (Array.isArray(values)) {
+                var listItems = this.getListItems(field);
+                var matches = listItems.filter(function (item) { return values.map(function (v) { return v.code; }).indexOf(item.code) !== -1; });
+                data[field.id] = {
+                    value: matches,
+                    list_items: listItems
+                };
+            }
+        };
         FieldTypeSanitiser.prototype.convertStringToDynamicListOutput = function (field, data) {
             var stringValue = data[field.id];
             if (typeof stringValue === 'string') {
@@ -5700,6 +5717,7 @@
     FieldTypeSanitiser.FIELD_TYPE_COLLECTION = 'Collection';
     FieldTypeSanitiser.FIELD_TYPE_DYNAMIC_LIST = 'DynamicList';
     FieldTypeSanitiser.FIELD_TYPE_DYNAMIC_RADIO_LIST = 'DynamicRadioList';
+    FieldTypeSanitiser.FIELD_TYPE_DYNAMIC_MULTISELECT_LIST = 'DynamicMultiSelectList';
     FieldTypeSanitiser.ɵfac = function FieldTypeSanitiser_Factory(t) { return new (t || FieldTypeSanitiser)(); };
     FieldTypeSanitiser.ɵprov = i0__namespace.ɵɵdefineInjectable({ token: FieldTypeSanitiser, factory: FieldTypeSanitiser.ɵfac });
     (function () {
@@ -8403,13 +8421,223 @@
             }], 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, loadingService, sessionStorageService) {
+        function CasesService(http, appConfig, orderService, errorService, wizardPageFieldToCaseFieldMapper, workAllocationService, 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;
@@ -8644,12 +8872,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(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(WorkAllocationService), 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: LoadingService }, { type: SessionStorageService }]; }, null);
+            }], function () { return [{ type: HttpService }, { type: AbstractAppConfig }, { type: OrderService }, { type: HttpErrorService }, { type: WizardPageFieldToCaseFieldMapper }, { type: WorkAllocationService }, { type: LoadingService }, { type: SessionStorageService }]; }, null);
     })();
 
     var EventTriggerService = /** @class */ (function () {
@@ -9303,215 +9531,6 @@
             }], 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, router, route, fieldsUtils, fieldsPurger, registrarService, wizardFactory, sessionStorageService, windowsService) {
             this.fb = fb;
@@ -11011,7 +11030,7 @@
         return AddressOption;
     }());
 
-    var _c0$R = ["writeComplexFieldComponent"];
+    var _c0$S = ["writeComplexFieldComponent"];
     function WriteAddressFieldComponent_div_1_div_4_span_4_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "span", 14);
@@ -11225,7 +11244,7 @@
     WriteAddressFieldComponent.ɵfac = function WriteAddressFieldComponent_Factory(t) { return new (t || WriteAddressFieldComponent)(i0__namespace.ɵɵdirectiveInject(AddressesService), i0__namespace.ɵɵdirectiveInject(IsCompoundPipe)); };
     WriteAddressFieldComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: WriteAddressFieldComponent, selectors: [["ccd-write-address-field"]], viewQuery: function WriteAddressFieldComponent_Query(rf, ctx) {
             if (rf & 1) {
-                i0__namespace.ɵɵviewQuery(_c0$R, 1);
+                i0__namespace.ɵɵviewQuery(_c0$S, 1);
                 i0__namespace.ɵɵviewQuery(FocusElementDirective, 1);
             }
             if (rf & 2) {
@@ -11897,7 +11916,7 @@
             i0__namespace.ɵɵproperty("formGroup", ctx_r10.caseFlagParentFormGroup)("optional", ctx_r10.flagCommentsOptional);
         }
     }
-    var _c0$Q = function (a0) { return { "form-group-error": a0 }; };
+    var _c0$R = function (a0) { return { "form-group-error": a0 }; };
     function WriteCaseFlagFieldComponent_div_1_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "div", 8);
@@ -11918,7 +11937,7 @@
             i0__namespace.ɵɵadvance(1);
             i0__namespace.ɵɵproperty("ngSwitch", ctx_r1.fieldState);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(8, _c0$Q, ctx_r1.errorMessages.length > 0));
+            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(8, _c0$R, ctx_r1.errorMessages.length > 0));
             i0__namespace.ɵɵadvance(1);
             i0__namespace.ɵɵtextInterpolate1(" ", ctx_r1.createFlagCaption, " ");
             i0__namespace.ɵɵadvance(1);
@@ -12394,7 +12413,7 @@
             }], null, null);
     })();
 
-    var _c0$P = ["writeComplexFieldComponent"];
+    var _c0$Q = ["writeComplexFieldComponent"];
     function WriteCaseLinkFieldComponent_span_2_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "span", 6);
@@ -12499,7 +12518,7 @@
     WriteCaseLinkFieldComponent.ɵfac = function WriteCaseLinkFieldComponent_Factory(t) { return ɵWriteCaseLinkFieldComponent_BaseFactory(t || WriteCaseLinkFieldComponent); };
     WriteCaseLinkFieldComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: WriteCaseLinkFieldComponent, selectors: [["ccd-write-case-link-field"]], viewQuery: function WriteCaseLinkFieldComponent_Query(rf, ctx) {
             if (rf & 1) {
-                i0__namespace.ɵɵviewQuery(_c0$P, 1);
+                i0__namespace.ɵɵviewQuery(_c0$Q, 1);
             }
             if (rf & 2) {
                 var _t = void 0;
@@ -12544,7 +12563,7 @@
                 }] });
     })();
 
-    var _c0$O = function (a0, a1, a2, a3, a4, a5) { return { id: a0, label: a1, field_type: a2, display_context_parameter: a3, value: a4, hidden: a5 }; };
+    var _c0$P = function (a0, a1, a2, a3, a4, a5) { return { id: a0, label: a1, field_type: a2, display_context_parameter: a3, value: a4, hidden: a5 }; };
     function ReadCollectionFieldComponent_table_0_tbody_2_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "tbody");
@@ -12559,7 +12578,7 @@
         if (rf & 2) {
             var ctx_r1 = i0__namespace.ɵɵnextContext(2);
             i0__namespace.ɵɵadvance(4);
-            i0__namespace.ɵɵproperty("caseField", i0__namespace.ɵɵpureFunction6(3, _c0$O, ctx_r1.caseField.label, ctx_r1.caseField.label, ctx_r1.caseField.field_type.collection_field_type, ctx_r1.caseField.display_context_parameter, ctx_r1.caseField.value, ctx_r1.caseField.hidden))("context", ctx_r1.context)("topLevelFormGroup", ctx_r1.topLevelFormGroup);
+            i0__namespace.ɵɵproperty("caseField", i0__namespace.ɵɵpureFunction6(3, _c0$P, ctx_r1.caseField.label, ctx_r1.caseField.label, ctx_r1.caseField.field_type.collection_field_type, ctx_r1.caseField.display_context_parameter, ctx_r1.caseField.value, ctx_r1.caseField.hidden))("context", ctx_r1.context)("topLevelFormGroup", ctx_r1.topLevelFormGroup);
         }
     }
     var _c1$k = function (a0, a1, a2, a3, a4) { return { id: a0, label: a1, field_type: a2, value: a3, hidden: a4 }; };
@@ -12710,7 +12729,7 @@
             }], function () { return [{ type: i1__namespace$3.MatDialogRef }]; }, null);
     })();
 
-    var _c0$N = ["collectionItem"];
+    var _c0$O = ["collectionItem"];
     function WriteCollectionFieldComponent_h2_7_span_1_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "span", 9);
@@ -12952,6 +12971,11 @@
             // Manually resetting errors is required to prevent `ExpressionChangedAfterItHasBeenCheckedError`
             this.formArray.setErrors(null);
             var item = { value: null };
+            if (this.isCollectionDynamic()) {
+                item = Object.assign({}, this.caseField.value[this.caseField.value.length - 1]);
+                var key = Number(item['id'][item['id'].length - 1]) + 1;
+                item.id = item['id'].replace(/.$/, key.toString());
+            }
             this.caseField.value.push(item);
             var index = this.caseField.value.length - 1;
             var caseField = this.buildCaseField(item, index, true);
@@ -12974,6 +12998,12 @@
                 setTimeout(function () { return _this.focusLastItem(); });
             }
         };
+        WriteCollectionFieldComponent.prototype.isCollectionDynamic = function () {
+            if (!this.caseField.field_type || !this.caseField.field_type.collection_field_type) {
+                return false;
+            }
+            return this.caseField.field_type.collection_field_type.id === 'DynamicRadioList';
+        };
         WriteCollectionFieldComponent.prototype.newCaseField = function (id, item, index, isNew) {
             if (isNew === void 0) { isNew = false; }
             var isNotAuthorisedToUpdate = !isNew && this.isNotAuthorisedToUpdate(index);
@@ -13123,7 +13153,7 @@
     WriteCollectionFieldComponent.ɵfac = function WriteCollectionFieldComponent_Factory(t) { return new (t || WriteCollectionFieldComponent)(i0__namespace.ɵɵdirectiveInject(i1__namespace$3.MatDialog), i0__namespace.ɵɵdirectiveInject(i2__namespace$1.ScrollToService), i0__namespace.ɵɵdirectiveInject(ProfileNotifier)); };
     WriteCollectionFieldComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: WriteCollectionFieldComponent, selectors: [["ccd-write-collection-field"]], viewQuery: function WriteCollectionFieldComponent_Query(rf, ctx) {
             if (rf & 1) {
-                i0__namespace.ɵɵviewQuery(_c0$N, 1);
+                i0__namespace.ɵɵviewQuery(_c0$O, 1);
             }
             if (rf & 2) {
                 var _t = void 0;
@@ -13817,7 +13847,7 @@
             }], null, null);
     })();
 
-    var _c0$M = ["fileInput"];
+    var _c0$N = ["fileInput"];
     function WriteDocumentFieldComponent_span_6_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "span", 12);
@@ -14111,7 +14141,7 @@
     WriteDocumentFieldComponent.ɵfac = function WriteDocumentFieldComponent_Factory(t) { return new (t || WriteDocumentFieldComponent)(i0__namespace.ɵɵdirectiveInject(AbstractAppConfig), i0__namespace.ɵɵdirectiveInject(CaseNotifier), i0__namespace.ɵɵdirectiveInject(DocumentManagementService), i0__namespace.ɵɵdirectiveInject(i1__namespace$3.MatDialog), i0__namespace.ɵɵdirectiveInject(FileUploadStateService)); };
     WriteDocumentFieldComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: WriteDocumentFieldComponent, selectors: [["ccd-write-document-field"]], viewQuery: function WriteDocumentFieldComponent_Query(rf, ctx) {
             if (rf & 1) {
-                i0__namespace.ɵɵviewQuery(_c0$M, 1);
+                i0__namespace.ɵɵviewQuery(_c0$N, 1);
             }
             if (rf & 2) {
                 var _t = void 0;
@@ -14311,7 +14341,7 @@
             i0__namespace.ɵɵtextInterpolate(type_r5.label);
         }
     }
-    var _c0$L = function (a0) { return { "form-group-error": a0 }; };
+    var _c0$M = function (a0) { return { "form-group-error": a0 }; };
     var WriteDynamicListFieldComponent = /** @class */ (function (_super) {
         __extends(WriteDynamicListFieldComponent, _super);
         function WriteDynamicListFieldComponent() {
@@ -14360,7 +14390,7 @@
                 i0__namespace.ɵɵelementEnd();
             }
             if (rf & 2) {
-                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(10, _c0$L, !ctx.dynamicListFormControl.valid && (ctx.dynamicListFormControl.dirty || ctx.dynamicListFormControl.touched)));
+                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(10, _c0$M, !ctx.dynamicListFormControl.valid && (ctx.dynamicListFormControl.dirty || ctx.dynamicListFormControl.touched)));
                 i0__namespace.ɵɵadvance(1);
                 i0__namespace.ɵɵproperty("for", ctx.id());
                 i0__namespace.ɵɵadvance(1);
@@ -14510,7 +14540,7 @@
             i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(2, 1, ctx_r3.dynamicRadioListControl.errors));
         }
     }
-    var _c0$K = function (a0) { return { selected: a0 }; };
+    var _c0$L = function (a0) { return { selected: a0 }; };
     function WriteDynamicRadioListFieldComponent_div_9_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "div", 10);
@@ -14523,12 +14553,11 @@
         if (rf & 2) {
             var radioButton_r5 = ctx.$implicit;
             var ctx_r4 = i0__namespace.ɵɵnextContext();
-            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(7, _c0$K, ctx_r4.dynamicRadioListControl.value === radioButton_r5.code));
+            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(7, _c0$L, ctx_r4.dynamicRadioListControl.value === radioButton_r5.code));
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵpropertyInterpolate("name", ctx_r4.id());
-            i0__namespace.ɵɵproperty("id", ctx_r4.buildElementId(radioButton_r5.code))("formControl", ctx_r4.dynamicRadioListControl)("value", radioButton_r5.code);
+            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);
-            i0__namespace.ɵɵproperty("for", ctx_r4.buildElementId(radioButton_r5.code));
+            i0__namespace.ɵɵproperty("for", ctx_r4.createElementId(radioButton_r5.code));
             i0__namespace.ɵɵadvance(1);
             i0__namespace.ɵɵtextInterpolate(radioButton_r5.label);
         }
@@ -14557,8 +14586,8 @@
             this.dynamicRadioListControl = this.registerControl(new i2.FormControl(this.caseField.value));
             this.dynamicRadioListControl.setValue(this.caseField.value);
         };
-        WriteDynamicRadioListFieldComponent.prototype.buildElementId = function (name) {
-            return this.id() + "-" + name;
+        WriteDynamicRadioListFieldComponent.prototype.createElementId = function (name) {
+            return this.parent && this.parent.value ? this.parent.value.id + this.parent.value.value : _super.prototype.createElementId.call(this, name);
         };
         return WriteDynamicRadioListFieldComponent;
     }(AbstractFieldWriteComponent));
@@ -14688,7 +14717,7 @@
             i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind2(2, 1, ctx_r2.emailControl.errors, ctx_r2.caseField.label));
         }
     }
-    var _c0$J = function (a0) { return { "form-group-error": a0 }; };
+    var _c0$K = 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);
@@ -14713,7 +14742,7 @@
                 i0__namespace.ɵɵelementEnd();
             }
             if (rf & 2) {
-                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(8, _c0$J, !ctx.emailControl.valid && (ctx.emailControl.dirty || ctx.emailControl.touched)));
+                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(8, _c0$K, !ctx.emailControl.valid && (ctx.emailControl.dirty || ctx.emailControl.touched)));
                 i0__namespace.ɵɵadvance(1);
                 i0__namespace.ɵɵproperty("for", ctx.id());
                 i0__namespace.ɵɵadvance(1);
@@ -14845,7 +14874,7 @@
             i0__namespace.ɵɵtextInterpolate(type_r4.label);
         }
     }
-    var _c0$I = function (a0) { return { "form-group-error": a0 }; };
+    var _c0$J = function (a0) { return { "form-group-error": a0 }; };
     var WriteFixedListFieldComponent = /** @class */ (function (_super) {
         __extends(WriteFixedListFieldComponent, _super);
         function WriteFixedListFieldComponent() {
@@ -14894,7 +14923,7 @@
                 i0__namespace.ɵɵelementEnd();
             }
             if (rf & 2) {
-                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(9, _c0$I, !ctx.fixedListFormControl.valid && (ctx.fixedListFormControl.dirty || ctx.fixedListFormControl.touched)));
+                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(9, _c0$J, !ctx.fixedListFormControl.valid && (ctx.fixedListFormControl.dirty || ctx.fixedListFormControl.touched)));
                 i0__namespace.ɵɵadvance(1);
                 i0__namespace.ɵɵproperty("for", ctx.id());
                 i0__namespace.ɵɵadvance(1);
@@ -15012,7 +15041,7 @@
             i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind2(2, 1, ctx_r2.fixedRadioListControl.errors, ctx_r2.caseField.label));
         }
     }
-    var _c0$H = function (a0) { return { selected: a0 }; };
+    var _c0$I = function (a0) { return { selected: a0 }; };
     function WriteFixedRadioListFieldComponent_div_8_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "div", 9);
@@ -15025,7 +15054,7 @@
         if (rf & 2) {
             var radioButton_r4 = ctx.$implicit;
             var ctx_r3 = i0__namespace.ɵɵnextContext();
-            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(7, _c0$H, ctx_r3.fixedRadioListControl.value === radioButton_r4.code));
+            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(7, _c0$I, 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);
@@ -15195,7 +15224,7 @@
             i0__namespace.ɵɵtextInterpolate1(" ", ctx_r1.caseField.hint_text, " ");
         }
     }
-    var _c0$G = function (a0) { return { "hide-autocomplete": a0 }; };
+    var _c0$H = function (a0) { return { "hide-autocomplete": a0 }; };
     function WriteJudicialUserFieldComponent_mat_option_7_Template(rf, ctx) {
         if (rf & 1) {
             var _r7_1 = i0__namespace.ɵɵgetCurrentView();
@@ -15207,7 +15236,7 @@
         if (rf & 2) {
             var judicialUser_r5 = ctx.$implicit;
             var ctx_r3 = i0__namespace.ɵɵnextContext();
-            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(4, _c0$G, !ctx_r3.showAutocomplete))("value", judicialUser_r5.idamId);
+            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(4, _c0$H, !ctx_r3.showAutocomplete))("value", judicialUser_r5.idamId);
             i0__namespace.ɵɵadvance(1);
             i0__namespace.ɵɵtextInterpolate2(" ", judicialUser_r5.fullName, " (", judicialUser_r5.emailId, ") ");
         }
@@ -15997,7 +16026,7 @@
             i0__namespace.ɵɵtextInterpolate1(" ", ctx_r13.caseReasonCommentsError, " ");
         }
     }
-    var _c0$F = function (a0) { return { "govuk-form-group--error": a0 }; };
+    var _c0$G = 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);
@@ -16015,7 +16044,7 @@
         }
         if (rf & 2) {
             var ctx_r7 = i0__namespace.ɵɵnextContext(2);
-            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(2, _c0$F, !!ctx_r7.caseReasonCommentsError));
+            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(2, _c0$G, !!ctx_r7.caseReasonCommentsError));
             i0__namespace.ɵɵadvance(3);
             i0__namespace.ɵɵproperty("ngIf", ctx_r7.caseReasonCommentsError);
         }
@@ -16072,11 +16101,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$F, !!ctx_r0.caseNumberError));
+            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(8, _c0$G, !!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$F, !!ctx_r0.caseReasonError));
+            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(10, _c0$G, !!ctx_r0.caseReasonError));
             i0__namespace.ɵɵadvance(5);
             i0__namespace.ɵɵproperty("ngIf", ctx_r0.caseReasonError);
             i0__namespace.ɵɵadvance(2);
@@ -16510,7 +16539,7 @@
                 i0__namespace.ɵɵadvance(4);
                 i0__namespace.ɵɵproperty("ngIf", ctx.linkCaseForm);
                 i0__namespace.ɵɵadvance(4);
-                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(9, _c0$F, !!ctx.noSelectedCaseError));
+                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(9, _c0$G, !!ctx.noSelectedCaseError));
                 i0__namespace.ɵɵadvance(1);
                 i0__namespace.ɵɵproperty("ngIf", ctx.noSelectedCaseError);
                 i0__namespace.ɵɵadvance(18);
@@ -17194,7 +17223,7 @@
             i0__namespace.ɵɵtextInterpolate2(" ", case_r4.caseName, " ", i0__namespace.ɵɵpipeBind1(4, 6, case_r4.caseReference), " ");
         }
     }
-    var _c0$E = function (a0) { return { "govuk-form-group--error": a0 }; };
+    var _c0$F = 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);
@@ -17206,7 +17235,7 @@
         }
         if (rf & 2) {
             var ctx_r1 = i0__namespace.ɵɵnextContext(2);
-            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(4, _c0$E, ctx_r1.unlinkErrorMessage))("formGroup", ctx_r1.unlinkCaseForm);
+            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(4, _c0$F, ctx_r1.unlinkErrorMessage))("formGroup", ctx_r1.unlinkCaseForm);
             i0__namespace.ɵɵadvance(1);
             i0__namespace.ɵɵproperty("ngIf", ctx_r1.unlinkErrorMessage);
             i0__namespace.ɵɵadvance(2);
@@ -18148,7 +18177,7 @@
             i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind2(2, 1, ctx_r2.moneyGbpControl.errors, ctx_r2.caseField.label));
         }
     }
-    var _c0$D = function (a0) { return { "form-group-error": a0 }; };
+    var _c0$E = function (a0) { return { "form-group-error": a0 }; };
     var WriteMoneyGbpFieldComponent = /** @class */ (function (_super) {
         __extends(WriteMoneyGbpFieldComponent, _super);
         function WriteMoneyGbpFieldComponent() {
@@ -18178,7 +18207,7 @@
                 i0__namespace.ɵɵelementEnd();
             }
             if (rf & 2) {
-                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(11, _c0$D, !ctx.moneyGbpControl.valid && (ctx.moneyGbpControl.dirty || ctx.moneyGbpControl.touched)));
+                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(11, _c0$E, !ctx.moneyGbpControl.valid && (ctx.moneyGbpControl.dirty || ctx.moneyGbpControl.touched)));
                 i0__namespace.ɵɵadvance(1);
                 i0__namespace.ɵɵproperty("for", ctx.id());
                 i0__namespace.ɵɵadvance(1);
@@ -18326,7 +18355,7 @@
             i0__namespace.ɵɵtextInterpolate(checkbox_r4.label);
         }
     }
-    var _c0$C = function (a0) { return { "error": a0 }; };
+    var _c0$D = function (a0) { return { "error": a0 }; };
     var WriteMultiSelectListFieldComponent = /** @class */ (function (_super) {
         __extends(WriteMultiSelectListFieldComponent, _super);
         function WriteMultiSelectListFieldComponent() {
@@ -18390,7 +18419,7 @@
                 i0__namespace.ɵɵelementEnd();
             }
             if (rf & 2) {
-                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(6, _c0$C, !ctx.checkboxes.valid && (ctx.checkboxes.dirty || ctx.checkboxes.touched)))("id", ctx.id());
+                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(6, _c0$D, !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);
@@ -18481,7 +18510,7 @@
             i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind2(2, 1, ctx_r2.numberControl.errors, ctx_r2.caseField.label));
         }
     }
-    var _c0$B = function (a0) { return { "form-group-error": a0 }; };
+    var _c0$C = 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);
@@ -18506,7 +18535,7 @@
                 i0__namespace.ɵɵelementEnd();
             }
             if (rf & 2) {
-                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(8, _c0$B, !ctx.numberControl.valid && ctx.numberControl.dirty));
+                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(8, _c0$C, !ctx.numberControl.valid && ctx.numberControl.dirty));
                 i0__namespace.ɵɵadvance(1);
                 i0__namespace.ɵɵproperty("for", ctx.id());
                 i0__namespace.ɵɵadvance(1);
@@ -18807,7 +18836,7 @@
             i0__namespace.ɵɵelementEnd();
         }
     }
-    var _c0$A = function (a0) { return { "scroll-container ": a0 }; };
+    var _c0$B = function (a0) { return { "scroll-container ": a0 }; };
     function WriteOrganisationFieldComponent_fieldset_3_div_14_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "div", 26);
@@ -18823,7 +18852,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$A, ((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$B, ((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);
@@ -19227,6 +19256,231 @@
             }], 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() {
@@ -19889,6 +20143,8 @@
                     return write ? WriteFixedListFieldComponent : ReadFixedListFieldComponent;
                 case 'DynamicRadioList':
                     return write ? WriteDynamicRadioListFieldComponent : ReadDynamicRadioListFieldComponent;
+                case 'DynamicMultiSelectList':
+                    return write ? WriteDynamicMultiSelectListFieldComponent : ReadDynamicMultiSelectListFieldComponent;
                 case 'FixedRadioList':
                     return write ? WriteFixedRadioListFieldComponent : ReadFixedRadioListFieldComponent;
                 case 'Complex':
@@ -19958,7 +20214,7 @@
     })();
 
     var _c0$v = ["fieldContainer"];
-    var FIX_CASEFIELD_FOR$1 = ['FixedList', 'DynamicList'];
+    var FIX_CASEFIELD_FOR$1 = ['FixedList', 'DynamicList', 'DynamicMultiSelectList'];
     var FieldReadComponent = /** @class */ (function (_super) {
         __extends(FieldReadComponent, _super);
         function FieldReadComponent(resolver, paletteService) {
@@ -20048,7 +20304,7 @@
     })();
 
     var _c0$u = ["fieldContainer"];
-    var FIX_CASEFIELD_FOR = ['FixedList', 'DynamicList'];
+    var FIX_CASEFIELD_FOR = ['FixedList', 'DynamicList', 'DynamicMultiSelectList'];
     var FieldWriteComponent = /** @class */ (function (_super) {
         __extends(FieldWriteComponent, _super);
         function FieldWriteComponent(resolver, paletteService) {
@@ -25008,23 +25264,26 @@
                 || !ReadFieldsFilterPipe.isEmpty(value[field.id]);
         };
         ReadFieldsFilterPipe.getValue = function (field, values, index) {
-            var value;
-            if (index >= 0) {
-                value = values[index].value[field.id];
-            }
-            else {
-                value = values[field.id];
+            if (ReadFieldsFilterPipe.isEmpty(field.value)) {
+                var value = void 0;
+                if (index >= 0) {
+                    value = values[index].value[field.id];
+                }
+                else {
+                    value = values[field.id];
+                }
+                return value;
             }
-            return ReadFieldsFilterPipe.isEmpty(field.value) ? value : field.value;
+            return field.value;
         };
-        ReadFieldsFilterPipe.evaluateConditionalShow = function (field, formValue, path, formGroupAvaliable, fieldId) {
+        ReadFieldsFilterPipe.evaluateConditionalShow = function (field, formValue, path, formGroupAvailable, fieldId) {
             if (field.display_context === 'HIDDEN') {
                 field.hidden = true;
             }
             else if (field.show_condition) {
                 var cond = void 0;
-                if (fieldId && field.show_condition.indexOf(fieldId) > -1 && !formGroupAvaliable && !!Object.keys(formValue).length) {
-                    var search = fieldId + '.';
+                if (fieldId && field.show_condition.indexOf(fieldId + ".") > -1 && !formGroupAvailable && !!Object.keys(formValue).length) {
+                    var search = fieldId + ".";
                     var searchRegExp = new RegExp(search, 'g');
                     var replaceWith = '';
                     cond = ShowCondition.getInstance(field.show_condition.replace(searchRegExp, replaceWith));
@@ -25433,6 +25692,8 @@
         WriteDocumentFieldComponent,
         WriteDynamicListFieldComponent,
         WriteDynamicRadioListFieldComponent,
+        WriteDynamicMultiSelectListFieldComponent,
+        ReadDynamicMultiSelectListFieldComponent,
         WriteTextFieldComponent,
         WriteDateContainerFieldComponent,
         WriteTextAreaFieldComponent,
@@ -25462,6 +25723,13 @@
         CaseFileViewOverlayMenuComponent,
         CaseFileViewFolderDocumentActionsComponent,
         CaseFileViewFolderSelectorComponent,
+        // component for dynamic list
+        WriteDynamicMultiSelectListFieldComponent,
+        WriteDynamicRadioListFieldComponent,
+        WriteDynamicListFieldComponent,
+        ReadDynamicMultiSelectListFieldComponent,
+        ReadDynamicListFieldComponent,
+        ReadDynamicRadioListFieldComponent,
         LinkedCasesToTableComponent,
         LinkedCasesFromTableComponent,
         BeforeYouStartComponent,
@@ -25592,6 +25860,8 @@
                 WriteDocumentFieldComponent,
                 WriteDynamicListFieldComponent,
                 WriteDynamicRadioListFieldComponent,
+                WriteDynamicMultiSelectListFieldComponent,
+                ReadDynamicMultiSelectListFieldComponent,
                 WriteTextFieldComponent,
                 WriteDateContainerFieldComponent,
                 WriteTextAreaFieldComponent,
@@ -25621,6 +25891,13 @@
                 CaseFileViewOverlayMenuComponent,
                 CaseFileViewFolderDocumentActionsComponent,
                 CaseFileViewFolderSelectorComponent,
+                // component for dynamic list
+                WriteDynamicMultiSelectListFieldComponent,
+                WriteDynamicRadioListFieldComponent,
+                WriteDynamicListFieldComponent,
+                ReadDynamicMultiSelectListFieldComponent,
+                ReadDynamicListFieldComponent,
+                ReadDynamicRadioListFieldComponent,
                 LinkedCasesToTableComponent,
                 LinkedCasesFromTableComponent,
                 BeforeYouStartComponent,
@@ -25710,6 +25987,8 @@
                 WriteDocumentFieldComponent,
                 WriteDynamicListFieldComponent,
                 WriteDynamicRadioListFieldComponent,
+                WriteDynamicMultiSelectListFieldComponent,
+                ReadDynamicMultiSelectListFieldComponent,
                 WriteTextFieldComponent,
                 WriteDateContainerFieldComponent,
                 WriteTextAreaFieldComponent,
@@ -25739,6 +26018,13 @@
                 CaseFileViewOverlayMenuComponent,
                 CaseFileViewFolderDocumentActionsComponent,
                 CaseFileViewFolderSelectorComponent,
+                // component for dynamic list
+                WriteDynamicMultiSelectListFieldComponent,
+                WriteDynamicRadioListFieldComponent,
+                WriteDynamicListFieldComponent,
+                ReadDynamicMultiSelectListFieldComponent,
+                ReadDynamicListFieldComponent,
+                ReadDynamicRadioListFieldComponent,
                 LinkedCasesToTableComponent,
                 LinkedCasesFromTableComponent,
                 BeforeYouStartComponent,
@@ -30523,7 +30809,7 @@
             var _r34_1 = i0__namespace.ɵɵgetCurrentView();
             i0__namespace.ɵɵelementContainerStart(0);
             i0__namespace.ɵɵelementStart(1, "mat-tab-group", 23, 24);
-            i0__namespace.ɵɵlistener("selectedTabChange", function CaseFullAccessViewComponent_ng_container_12_Template_mat_tab_group_selectedTabChange_1_listener($event) { i0__namespace.ɵɵrestoreView(_r34_1); var ctx_r33 = i0__namespace.ɵɵnextContext(); return ctx_r33.tabChanged($event); });
+            i0__namespace.ɵɵlistener("selectedIndexChange", function CaseFullAccessViewComponent_ng_container_12_Template_mat_tab_group_selectedIndexChange_1_listener($event) { i0__namespace.ɵɵrestoreView(_r34_1); var ctx_r33 = i0__namespace.ɵɵnextContext(); return ctx_r33.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);
@@ -30639,10 +30925,9 @@
                 if (url) {
                     var tabUrl = url ? url.split('#') : null;
                     var tab_1 = tabUrl && tabUrl.length > 1 ? tabUrl[tabUrl.length - 1].replaceAll('%20', ' ') : '';
-                    var matTab = _this.tabGroup._tabs.find(function (x) { return x.textLabel.toLowerCase() === tab_1.toLowerCase(); });
-                    if (matTab && matTab.position) {
-                        _this.tabGroup.selectedIndex = matTab.position;
-                    }
+                    // Refactored under EXUI-110 to address infinite tab loop
+                    var tabIndex = _this.tabGroup._tabs.toArray().findIndex(function (t) { return t.textLabel.toLowerCase() === tab_1.toLowerCase(); });
+                    _this.selectedTabIndex = tabIndex || 0;
                 }
             });
         };
@@ -30768,23 +31053,11 @@
                 }
             }
         };
-        CaseFullAccessViewComponent.prototype.tabChanged = function (tabChangeEvent) {
-            // Update selected tab index
-            this.selectedTabIndex = tabChangeEvent.index;
-            var tab = tabChangeEvent.tab['_viewContainerRef'];
-            var id = tab.element.nativeElement.id;
-            // due to some edge case like hidden tab we can't calculate the last index of existing tabs,
-            // so have to hard code the hearings id here
-            if ((tabChangeEvent.index <= 1 && this.prependedTabs && this.prependedTabs.length) ||
-                (this.appendedTabs && this.appendedTabs.length && id === 'hearings')) {
-                this.router.navigate([id], { relativeTo: this.route });
-            }
-            else {
-                var label_1 = tabChangeEvent.tab.textLabel;
-                this.router.navigate(['cases', 'case-details', this.caseDetails.case_id]).then(function () {
-                    window.location.hash = label_1;
-                });
-            }
+        CaseFullAccessViewComponent.prototype.tabChanged = function (tabIndexChanged) {
+            // Refactored under EXUI-110 to address infinite tab loop
+            var matTab = this.tabGroup._tabs.find(function (tab) { return tab.isActive; });
+            var tabLabel = matTab.textLabel;
+            this.router.navigate(['cases', 'case-details', this.caseDetails.case_id], { fragment: tabLabel });
         };
         CaseFullAccessViewComponent.prototype.onLinkClicked = function (triggerOutputEventText) {
             // Get the *absolute* (not relative) index of the target tab and set as the active tab, using the selectedIndex input
@@ -30897,7 +31170,7 @@
                 var _t = void 0;
                 i0__namespace.ɵɵqueryRefresh(_t = i0__namespace.ɵɵloadQuery()) && (ctx.tabGroup = _t.first);
             }
-        }, inputs: { hasPrint: "hasPrint", hasEventSelector: "hasEventSelector", caseDetails: "caseDetails", prependedTabs: "prependedTabs", appendedTabs: "appendedTabs" }, features: [i0__namespace.ɵɵNgOnChangesFeature], decls: 13, vars: 12, consts: [["class", "error-summary", "role", "group", "aria-labelledby", "edit-case-event_error-summary-heading", "tabindex", "-1", 4, "ngIf"], [3, "triggerTextContinue", "triggerTextIgnore", "callbackErrorsSubject", "callbackErrorsContext"], [3, "caseId", "displayMode"], [1, "grid-row"], [1, "column-one-half"], [3, "caseDetails"], ["class", "case-viewer-controls", 4, "ngIf"], ["class", "column-one-half", 4, "ngIf"], ["class", "grid-row", 4, "ngIf"], [1, "column-full"], [4, "ngIf"], ["role", "group", "aria-labelledby", "edit-case-event_error-summary-heading", "tabindex", "-1", 1, "error-summary"], ["id", "edit-case-event_error-summary-heading", 1, "heading-h1", "error-summary-heading"], ["id", "edit-case-event_error-summary-body", 1, "govuk-error-summary__body"], ["href", "get-help", "target", "_blank"], ["id", "edit-case-event_error-summary-heading", 1, "heading-h2", "error-summary-heading"], ["class", "error-summary-list", 4, "ngIf"], [1, "error-summary-list"], [4, "ngFor", "ngForOf"], [1, "case-viewer-controls"], ["id", "case-viewer-control-print", "routerLink", "print", 1, "button", "button-secondary"], [3, "isDisabled", "triggers", "triggerText", "onTriggerChange", "onTriggerSubmit"], [3, "notificationBannerConfig", "linkClicked"], ["animationDuration", "0ms", 3, "disableRipple", "selectedIndex", "selectedTabChange"], ["tabGroup", ""], [3, "id", "label", 4, "ngFor", "ngForOf"], [3, "id", "label"], ["matTabContent", ""], ["aria-describedby", "case viewer table"], ["ccdLabelSubstitutor", "", 3, "caseField", "contextFields", "hidden"], [3, "ngSwitch"], [4, "ngSwitchCase"], ["class", "compound-field", 4, "ngSwitchCase"], ["id", "case-viewer-field-label", 4, "ngIf"], ["scope", "col", 3, "id"], [1, "text-16"], [3, "topLevelFormGroup", "caseField", "caseReference", "markdownUseHrefAsRouterLink"], ["id", "case-viewer-field-label"], [1, "case-viewer-label", "text-16"], [1, "compound-field"]], template: function CaseFullAccessViewComponent_Template(rf, ctx) {
+        }, inputs: { hasPrint: "hasPrint", hasEventSelector: "hasEventSelector", caseDetails: "caseDetails", prependedTabs: "prependedTabs", appendedTabs: "appendedTabs" }, features: [i0__namespace.ɵɵNgOnChangesFeature], decls: 13, vars: 12, consts: [["class", "error-summary", "role", "group", "aria-labelledby", "edit-case-event_error-summary-heading", "tabindex", "-1", 4, "ngIf"], [3, "triggerTextContinue", "triggerTextIgnore", "callbackErrorsSubject", "callbackErrorsContext"], [3, "caseId", "displayMode"], [1, "grid-row"], [1, "column-one-half"], [3, "caseDetails"], ["class", "case-viewer-controls", 4, "ngIf"], ["class", "column-one-half", 4, "ngIf"], ["class", "grid-row", 4, "ngIf"], [1, "column-full"], [4, "ngIf"], ["role", "group", "aria-labelledby", "edit-case-event_error-summary-heading", "tabindex", "-1", 1, "error-summary"], ["id", "edit-case-event_error-summary-heading", 1, "heading-h1", "error-summary-heading"], ["id", "edit-case-event_error-summary-body", 1, "govuk-error-summary__body"], ["href", "get-help", "target", "_blank"], ["id", "edit-case-event_error-summary-heading", 1, "heading-h2", "error-summary-heading"], ["class", "error-summary-list", 4, "ngIf"], [1, "error-summary-list"], [4, "ngFor", "ngForOf"], [1, "case-viewer-controls"], ["id", "case-viewer-control-print", "routerLink", "print", 1, "button", "button-secondary"], [3, "isDisabled", "triggers", "triggerText", "onTriggerChange", "onTriggerSubmit"], [3, "notificationBannerConfig", "linkClicked"], ["animationDuration", "0ms", 3, "disableRipple", "selectedIndex", "selectedIndexChange"], ["tabGroup", ""], [3, "id", "label", 4, "ngFor", "ngForOf"], [3, "id", "label"], ["matTabContent", ""], ["aria-describedby", "case viewer table"], ["ccdLabelSubstitutor", "", 3, "caseField", "contextFields", "hidden"], [3, "ngSwitch"], [4, "ngSwitchCase"], ["class", "compound-field", 4, "ngSwitchCase"], ["id", "case-viewer-field-label", 4, "ngIf"], ["scope", "col", 3, "id"], [1, "text-16"], [3, "topLevelFormGroup", "caseField", "caseReference", "markdownUseHrefAsRouterLink"], ["id", "case-viewer-field-label"], [1, "case-viewer-label", "text-16"], [1, "compound-field"]], template: function CaseFullAccessViewComponent_Template(rf, ctx) {
             if (rf & 1) {
                 i0__namespace.ɵɵtemplate(0, CaseFullAccessViewComponent_div_0_Template, 10, 0, "div", 0);
                 i0__namespace.ɵɵtemplate(1, CaseFullAccessViewComponent_div_1_Template, 6, 2, "div", 0);
@@ -35805,6 +36078,7 @@
     exports.ReadDateFieldComponent = ReadDateFieldComponent;
     exports.ReadDocumentFieldComponent = ReadDocumentFieldComponent;
     exports.ReadDynamicListFieldComponent = ReadDynamicListFieldComponent;
+    exports.ReadDynamicMultiSelectListFieldComponent = ReadDynamicMultiSelectListFieldComponent;
     exports.ReadDynamicRadioListFieldComponent = ReadDynamicRadioListFieldComponent;
     exports.ReadEmailFieldComponent = ReadEmailFieldComponent;
     exports.ReadFieldsFilterPipe = ReadFieldsFilterPipe;
@@ -35881,6 +36155,7 @@
     exports.WriteDateFieldComponent = WriteDateFieldComponent;
     exports.WriteDocumentFieldComponent = WriteDocumentFieldComponent;
     exports.WriteDynamicListFieldComponent = WriteDynamicListFieldComponent;
+    exports.WriteDynamicMultiSelectListFieldComponent = WriteDynamicMultiSelectListFieldComponent;
     exports.WriteDynamicRadioListFieldComponent = WriteDynamicRadioListFieldComponent;
     exports.WriteEmailFieldComponent = WriteEmailFieldComponent;
     exports.WriteFixedListFieldComponent = WriteFixedListFieldComponent;