@hmcts/ccd-case-ui-toolkit 6.13.0-test1 → 6.13.9-rc2

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

@@ -1,8 +1,8 @@
 (function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('@angular/common'), require('@angular/router'), require('@angular/forms'), require('rx-polling'), require('rxjs'), require('@angular/common/http'), require('rxjs/operators'), require('class-transformer'), require('underscore'), require('moment'), require('util'), require('@edium/fsm'), require('@angular/material/dialog'), require('@angular-material-components/datetime-picker'), require('@angular/cdk/overlay'), require('@angular/cdk/tree'), require('@angular/material/autocomplete'), require('@angular/material/core'), require('@angular/material/datepicker'), require('@angular/material/form-field'), require('@angular/material/input'), require('@hmcts/ccpay-web-component'), require('@hmcts/media-viewer'), require('@nicky-lenaers/ngx-scroll-to'), require('ngx-md'), require('@angular-material-components/moment-adapter'), require('@angular/cdk/portal'), require('ngx-pagination'), require('@angular/material/tabs')) :
-    typeof define === 'function' && define.amd ? define('@hmcts/ccd-case-ui-toolkit', ['exports', '@angular/core', '@angular/common', '@angular/router', '@angular/forms', 'rx-polling', 'rxjs', '@angular/common/http', 'rxjs/operators', 'class-transformer', 'underscore', 'moment', 'util', '@edium/fsm', '@angular/material/dialog', '@angular-material-components/datetime-picker', '@angular/cdk/overlay', '@angular/cdk/tree', '@angular/material/autocomplete', '@angular/material/core', '@angular/material/datepicker', '@angular/material/form-field', '@angular/material/input', '@hmcts/ccpay-web-component', '@hmcts/media-viewer', '@nicky-lenaers/ngx-scroll-to', 'ngx-md', '@angular-material-components/moment-adapter', '@angular/cdk/portal', 'ngx-pagination', '@angular/material/tabs'], factory) :
-    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.hmcts = global.hmcts || {}, global.hmcts["ccd-case-ui-toolkit"] = {}), global.ng.core, global.ng.common, global.ng.router, global.ng.forms, global["rx-polling"], global.rxjs, global.ng.common.http, global.rxjs.operators, global["class-transformer"], global.underscore, global.moment, global.util, global["@edium/fsm"], global.ng.material.dialog, global["@angular-material-components/datetime-picker"], global.ng.cdk.overlay, global.ng.cdk.tree, global.ng.material.autocomplete, global.ng.material.core, global.ng.material.datepicker, global.ng.material.formField, global.ng.material.input, global["@hmcts/ccpay-web-component"], global.i11, global["@nicky-lenaers/ngx-scroll-to"], global["ngx-md"], global["@angular-material-components/moment-adapter"], global.ng.cdk.portal, global["ngx-pagination"], global.ng.material.tabs));
-})(this, (function (exports, i0, i1, i1$1, i2, polling, rxjs, i1$2, operators, classTransformer, _, moment, util, fsm, i1$3, i4, i1$4, i7, i5, i6, i5$1, i6$1, i3$1, i3, i11, i2$1, i1$5, momentAdapter, i6$2, i1$6, i9) { 'use strict';
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('@angular/common'), require('@angular/router'), require('@angular/forms'), require('rx-polling'), require('rxjs'), require('@angular/common/http'), require('rxjs/operators'), require('class-transformer'), require('moment'), require('underscore'), require('pegjs'), require('util'), require('@edium/fsm'), require('@angular/material/dialog'), require('@angular-material-components/datetime-picker'), require('@angular/cdk/overlay'), require('@angular/cdk/tree'), require('@angular/material/autocomplete'), require('@angular/material/core'), require('@angular/material/datepicker'), require('@angular/material/form-field'), require('@angular/material/input'), require('@hmcts/ccpay-web-component'), require('@hmcts/media-viewer'), require('@nicky-lenaers/ngx-scroll-to'), require('ngx-md'), require('@angular-material-components/moment-adapter'), require('@angular/cdk/portal'), require('ngx-pagination'), require('@angular/material/tabs')) :
+    typeof define === 'function' && define.amd ? define('@hmcts/ccd-case-ui-toolkit', ['exports', '@angular/core', '@angular/common', '@angular/router', '@angular/forms', 'rx-polling', 'rxjs', '@angular/common/http', 'rxjs/operators', 'class-transformer', 'moment', 'underscore', 'pegjs', 'util', '@edium/fsm', '@angular/material/dialog', '@angular-material-components/datetime-picker', '@angular/cdk/overlay', '@angular/cdk/tree', '@angular/material/autocomplete', '@angular/material/core', '@angular/material/datepicker', '@angular/material/form-field', '@angular/material/input', '@hmcts/ccpay-web-component', '@hmcts/media-viewer', '@nicky-lenaers/ngx-scroll-to', 'ngx-md', '@angular-material-components/moment-adapter', '@angular/cdk/portal', 'ngx-pagination', '@angular/material/tabs'], factory) :
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.hmcts = global.hmcts || {}, global.hmcts["ccd-case-ui-toolkit"] = {}), global.ng.core, global.ng.common, global.ng.router, global.ng.forms, global["rx-polling"], global.rxjs, global.ng.common.http, global.rxjs.operators, global["class-transformer"], global.moment, global.underscore, global.pegjs, global.util, global["@edium/fsm"], global.ng.material.dialog, global["@angular-material-components/datetime-picker"], global.ng.cdk.overlay, global.ng.cdk.tree, global.ng.material.autocomplete, global.ng.material.core, global.ng.material.datepicker, global.ng.material.formField, global.ng.material.input, global["@hmcts/ccpay-web-component"], global.i11, global["@nicky-lenaers/ngx-scroll-to"], global["ngx-md"], global["@angular-material-components/moment-adapter"], global.ng.cdk.portal, global["ngx-pagination"], global.ng.material.tabs));
+})(this, (function (exports, i0, i1, i1$1, i2, polling, rxjs, i1$2, operators, classTransformer, moment, _, pegjs, util, fsm, i1$3, i4, i1$4, i7, i5, i6, i5$1, i6$1, i3$1, i3, i11, i2$1, i1$5, momentAdapter, i6$2, i1$6, i9) { 'use strict';
 
     function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -30,8 +30,8 @@
     var i2__namespace = /*#__PURE__*/_interopNamespace(i2);
     var polling__default = /*#__PURE__*/_interopDefaultLegacy(polling);
     var i1__namespace$2 = /*#__PURE__*/_interopNamespace(i1$2);
-    var ___namespace = /*#__PURE__*/_interopNamespace(_);
     var moment__namespace = /*#__PURE__*/_interopNamespace(moment);
+    var ___namespace = /*#__PURE__*/_interopNamespace(_);
     var i1__namespace$3 = /*#__PURE__*/_interopNamespace(i1$3);
     var i4__namespace = /*#__PURE__*/_interopNamespace(i4);
     var i1__namespace$4 = /*#__PURE__*/_interopNamespace(i1$4);
@@ -534,6 +534,64 @@
     function __param(paramIndex, decorator) {
         return function (target, key) { decorator(target, key, paramIndex); };
     }
+    function __esDecorate(ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+        function accept(f) { if (f !== void 0 && typeof f !== "function")
+            throw new TypeError("Function expected"); return f; }
+        var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+        var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+        var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+        var _, done = false;
+        for (var i = decorators.length - 1; i >= 0; i--) {
+            var context = {};
+            for (var p in contextIn)
+                context[p] = p === "access" ? {} : contextIn[p];
+            for (var p in contextIn.access)
+                context.access[p] = contextIn.access[p];
+            context.addInitializer = function (f) { if (done)
+                throw new TypeError("Cannot add initializers after decoration has completed"); extraInitializers.push(accept(f || null)); };
+            var result = (0, decorators[i])(kind === "accessor" ? { get: descriptor.get, set: descriptor.set } : descriptor[key], context);
+            if (kind === "accessor") {
+                if (result === void 0)
+                    continue;
+                if (result === null || typeof result !== "object")
+                    throw new TypeError("Object expected");
+                if (_ = accept(result.get))
+                    descriptor.get = _;
+                if (_ = accept(result.set))
+                    descriptor.set = _;
+                if (_ = accept(result.init))
+                    initializers.push(_);
+            }
+            else if (_ = accept(result)) {
+                if (kind === "field")
+                    initializers.push(_);
+                else
+                    descriptor[key] = _;
+            }
+        }
+        if (target)
+            Object.defineProperty(target, contextIn.name, descriptor);
+        done = true;
+    }
+    ;
+    function __runInitializers(thisArg, initializers, value) {
+        var useValue = arguments.length > 2;
+        for (var i = 0; i < initializers.length; i++) {
+            value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
+        }
+        return useValue ? value : void 0;
+    }
+    ;
+    function __propKey(x) {
+        return typeof x === "symbol" ? x : "".concat(x);
+    }
+    ;
+    function __setFunctionName(f, name, prefix) {
+        if (typeof name === "symbol")
+            name = name.description ? "[".concat(name.description, "]") : "";
+        return Object.defineProperty(f, "name", { configurable: true, value: prefix ? "".concat(prefix, " ", name) : name });
+    }
+    ;
     function __metadata(metadataKey, metadataValue) {
         if (typeof Reflect === "object" && typeof Reflect.metadata === "function")
             return Reflect.metadata(metadataKey, metadataValue);
@@ -733,7 +791,7 @@
     function __asyncDelegator(o) {
         var i, p;
         return i = {}, verb("next"), verb("throw", function (e) { throw e; }), verb("return"), i[Symbol.iterator] = function () { return this; }, i;
-        function verb(n, f) { i[n] = o[n] ? function (v) { return (p = !p) ? { value: __await(o[n](v)), done: n === "return" } : f ? f(v) : v; } : f; }
+        function verb(n, f) { i[n] = o[n] ? function (v) { return (p = !p) ? { value: __await(o[n](v)), done: false } : f ? f(v) : v; } : f; }
     }
     function __asyncValues(o) {
         if (!Symbol.asyncIterator)
@@ -4419,183 +4477,69 @@
             }], null, null);
     })();
 
-    var ShowCondition = /** @class */ (function () {
-        // Expects a show condition of the form: <fieldName>="string"
-        function ShowCondition(condition) {
-            this.condition = condition;
-            this.orConditions = null;
-            this.andConditions = null;
-            if (!!condition) {
-                if (condition.search(ShowCondition.OR_CONDITION_REGEXP) !== -1) {
-                    this.orConditions = condition.split(ShowCondition.OR_CONDITION_REGEXP);
-                }
-                else {
-                    this.andConditions = condition.split(ShowCondition.AND_CONDITION_REGEXP);
-                }
-            }
+    var conditionSource = "{\n    function flat(arr, depth = 1) {\n      var flatten = function (arr, depth = 1) {\n        if (depth) return arr;\n\n      // Otherwise, concatenate into the parent array\n      return arr.reduce(function (acc, val) {\n        return acc.concat(Array.isArray(val) ? flatten(val, depth - 1) : val);\n      }, []);\n\n      };\n\n    return flatten(arr, depth - 1);\n    }\n  }\n\n  Start\n    = Formula\n\n  Formula\n    = EnclosedFormula\n    / OpenFormula\n\n  EnclosedFormula\n    = bracket formula:OpenFormula bracket join:(JoinComparator)*\n      { return flat([ [formula], join[0] ], 1) }\n\n  OpenFormula\n    = eq:OpenEqualityCheck joins:(JoinComparator)*\n      { return flat([ eq, flat(joins) ]) }\n\n  JoinComparator\n    = comp:Comparator eq:OpenEqualityCheck\n      { return [comp, eq]; }\n      / CompoundJoinComparator\n\n  CompoundJoinComparator\n    = comp:Comparator bracket f:OpenFormula bracket\n      { return [comp, f ] }\n\n  OpenEqualityCheck\n    = fr:FieldRef _? op:operator _? val:Value\n     { return { fieldReference: fr, comparator: op, value: val } }\n\n  Comparator\n   = _? c:'AND' _?\n   { return c; }\n   / _? c:'OR' _?\n   { return c; }\n\n  Word\n   = l:Letter+\n   { return l.join(\"\"); }\n\n  Letter\n   = [a-zA-Z]\n\n  Value\n   = v:quotedValue / v:Word\n   { return v.join(\"\") }\n   / v:number\n   { return parseInt(v.join(\"\")) }\n\n  FieldRef\n   = FieldReference / MetadataFieldReference\n\n  MetadataFieldReference\n    = s1:openSquare fr:FieldReference s2:closeSquare\n    { return s1 + fr + s2 }\n\n  FieldReference\n    = characters:[A-Za-z0-9._-]+ { return characters.join(\"\"); }\n\n  openSquare\n   = \"[\"\n\n  closeSquare\n   = \"]\"\n\n  number\n   = [0-9]+\n\n  quotedValue\n   = '\"'val:[A-Za-z0-9.,* _&()/-]*'\"'\n   { return val.join(\"\"); }\n\n  bracket\n   = (_? \"(\"+ _? / _? \")\"+ _? )\n\n  operator\n   = \"=\" / \"!=\" / \"CONTAINS\"\n\n  ws \"Whitespace\"\n   = [ \t]\n\n  _ \"One or more whitespaces\"\n   = ws+\n\n  nl \"New line\"\n   = \"\\n\"";
+    var peg = pegjs.generate(conditionSource);
+
+    var ConditionParser = /** @class */ (function () {
+        function ConditionParser() {
         }
-        ShowCondition.addPathPrefixToCondition = function (showCondition, pathPrefix) {
-            if (!pathPrefix || pathPrefix === '') {
-                return showCondition;
-            }
-            if (showCondition.search(ShowCondition.OR_CONDITION_REGEXP) !== -1) {
-                var orConditions = showCondition.split(ShowCondition.OR_CONDITION_REGEXP);
-                orConditions = this.extractConditions(orConditions, pathPrefix);
-                return orConditions.join(' OR ');
-            }
-            else {
-                var andConditions = showCondition.split(ShowCondition.AND_CONDITION_REGEXP);
-                andConditions = this.extractConditions(andConditions, pathPrefix);
-                return andConditions.join(' AND ');
-            }
-        };
-        // Cache instances so that we can cache results more effectively
-        ShowCondition.getInstance = function (condition) {
-            var instance = this.instanceCache.get(condition);
-            if (!instance) {
-                instance = new ShowCondition(condition);
-                this.instanceCache.set(condition, instance);
+        /**
+         * Parse the raw formula and output structured condition data
+         * that can be used in evaluating show/hide logic
+         * @param condition raw formula e.g. TextField = "Hello"
+         */
+        ConditionParser.parse = function (condition) {
+            if (!condition) {
+                return null;
             }
-            return instance;
+            ;
+            condition = condition.replace(/CONTAINS/g, ' CONTAINS');
+            return peg.parse(condition.trim(), {});
         };
         /**
-         * Determine whether a ShowCondition model is affected by fields that have
-         * a display_context of HIDDEN or READONLY, which means they aren't able to
-         * be changed by the user's actions.
-         *
-         * @param showCondition The ShowCondition model to evaluate.
-         * @param caseFields Inspected to see appropriate display_contexts.
+         * Evaluate the current fields against the conditions
+         * @param fields the current page fields and their value
+         * @param conditions The PegJS formula output
          */
-        ShowCondition.hiddenCannotChange = function (showCondition, caseFields) {
-            var e_1, _a;
-            if (showCondition && caseFields) {
-                var conditions = showCondition.andConditions || showCondition.orConditions;
-                if (conditions && conditions.length > 0) {
-                    var allUnchangeable = true;
-                    var _loop_1 = function (condition) {
-                        var _a = __read(ShowCondition.getField(condition), 1), field = _a[0];
-                        var path = field.split('.');
-                        var head = path.shift();
-                        var caseField = caseFields.find(function (cf) { return cf.id === head; });
-                        while (path.length > 0) {
-                            head = path.shift();
-                            if (caseField) {
-                                // Jump out if this is HIDDEN or READONLY, regardless of whether or not it's
-                                // complex or a collection - nested fields will "inherit" the display_context.
-                                if (['HIDDEN', 'READONLY'].indexOf(caseField.display_context) > -1) {
-                                    break;
-                                }
-                                // Consider what type of field this is.
-                                var ft = caseField.field_type;
-                                switch (ft.type) {
-                                    case 'Collection':
-                                        if (ft.collection_field_type.type === 'Complex' && ft.collection_field_type.complex_fields) {
-                                            caseField = ft.collection_field_type.complex_fields.find(function (cf) { return cf.id === head; });
-                                        }
-                                        break;
-                                    case 'Complex':
-                                        if (ft.complex_fields) {
-                                            caseField = ft.complex_fields.find(function (cf) { return cf.id === head; });
-                                        }
-                                        break;
-                                }
-                            }
-                        }
-                        if (caseField) {
-                            allUnchangeable = allUnchangeable && ['HIDDEN', 'READONLY'].indexOf(caseField.display_context) > -1;
-                        }
-                    };
-                    try {
-                        for (var conditions_1 = __values(conditions), conditions_1_1 = conditions_1.next(); !conditions_1_1.done; conditions_1_1 = conditions_1.next()) {
-                            var condition = conditions_1_1.value;
-                            _loop_1(condition);
-                        }
-                    }
-                    catch (e_1_1) { e_1 = { error: e_1_1 }; }
-                    finally {
-                        try {
-                            if (conditions_1_1 && !conditions_1_1.done && (_a = conditions_1.return)) _a.call(conditions_1);
-                        }
-                        finally { if (e_1) throw e_1.error; }
+        ConditionParser.evaluate = function (fields, conditions, path) {
+            var _this = this;
+            if (!conditions || conditions.length === 0) {
+                return true;
+            }
+            ;
+            var validJoinComparators = ['AND', 'OR'];
+            var result = conditions.reduce(function (accumulator, condition, index) {
+                var isJoinComparator = function (comparator) { return (typeof comparator === 'string' && validJoinComparators.indexOf(comparator) !== -1); };
+                if (isJoinComparator(condition)) {
+                    return accumulator;
+                }
+                ;
+                var currentConditionResult = true;
+                if (Array.isArray(condition)) {
+                    currentConditionResult = _this.evaluate(fields, condition);
+                    if (isJoinComparator(conditions[index - 1])) {
+                        return _this.evaluateJoin(accumulator, conditions[index - 1], currentConditionResult);
                     }
-                    return allUnchangeable;
                 }
-            }
-            return false;
-        };
-        ShowCondition.extractConditions = function (conditionsArray, pathPrefix) {
-            var extracted = conditionsArray.map(function (condition) {
-                if (condition.startsWith(pathPrefix)) {
-                    return condition;
+                if (condition.comparator) {
+                    var formula = condition.fieldReference + condition.comparator + condition.value;
+                    currentConditionResult = _this.matchEqualityCondition(fields, formula, path);
                 }
-                return pathPrefix + "." + condition;
-            });
-            return extracted;
-        };
-        ShowCondition.getField = function (condition) {
-            var separator = ShowCondition.CONTAINS;
-            if (condition.indexOf(ShowCondition.CONTAINS) < 0) {
-                separator = ShowCondition.CONDITION_EQUALS;
-                if (condition.indexOf(ShowCondition.CONDITION_NOT_EQUALS) > -1) {
-                    separator = ShowCondition.CONDITION_NOT_EQUALS;
+                if (isJoinComparator(conditions[index - 1])) {
+                    return _this.evaluateJoin(accumulator, conditions[index - 1], currentConditionResult);
                 }
-            }
-            return [condition.split(separator)[0], separator];
-        };
-        ShowCondition.prototype.match = function (fields, path) {
-            if (!this.condition) {
-                return true;
-            }
-            return this.matchAndConditions(fields, this.updatePathName(path));
-        };
-        ShowCondition.prototype.matchByContextFields = function (contextFields) {
-            return this.match(FieldsUtils.toValuesMap(contextFields));
-        };
-        /**
-         * Determine whether this is affected by fields that have a display_context
-         * of HIDDEN or READONLY, which means they aren't able to be changed by the
-         * user's actions.
-         *
-         * @param caseFields Inspected to see appropriate display_contexts.
-         */
-        ShowCondition.prototype.hiddenCannotChange = function (caseFields) {
-            return ShowCondition.hiddenCannotChange(this, caseFields);
+                return currentConditionResult;
+            }, true);
+            return result;
         };
-        /**
-         * Path Name gets updated for complex sub fields
-         * @param path Path name.
-         */
-        ShowCondition.prototype.updatePathName = function (path) {
-            if (path && path.split(/[_]+/g).length > 0) {
-                var _a = __read(path.split(/[_]+/g)), pathName_1 = _a[0], pathTail = _a.slice(1);
-                var pathFinalIndex_1 = pathTail.pop();
-                var pathTailString = pathTail.toString();
-                var mappedPathTail = void 0;
-                mappedPathTail = pathTail.map(function (value) {
-                    return Number(pathFinalIndex_1) === Number(value) ? pathName_1 : value;
-                });
-                return pathTailString !== mappedPathTail.toString()
-                    ? pathName_1 + "_" + mappedPathTail.join('_') + "_" + pathFinalIndex_1
-                    : path;
-            }
-            else {
-                return path;
+        ConditionParser.evaluateJoin = function (leftResult, comparator, rightResult) {
+            switch (comparator) {
+                case 'OR': return leftResult || rightResult;
+                case 'AND': return leftResult && rightResult;
             }
         };
-        ShowCondition.prototype.matchAndConditions = function (fields, path) {
-            var _this = this;
-            if (!!this.orConditions) {
-                return this.orConditions.some(function (orCondition) { return _this.matchEqualityCondition(fields, orCondition, path); });
-            }
-            else if (!!this.andConditions) {
-                return this.andConditions.every(function (andCondition) { return _this.matchEqualityCondition(fields, andCondition, path); });
-            }
-            else {
-                return false;
-            }
-        };
-        ShowCondition.prototype.matchEqualityCondition = function (fields, condition, path) {
-            var _a = __read(ShowCondition.getField(condition), 2), field = _a[0], conditionSeparator = _a[1];
+        ConditionParser.matchEqualityCondition = function (fields, condition, path) {
+            var _a = __read(this.getField(condition), 2), field = _a[0], conditionSeparator = _a[1];
             var _b = __read(field.split('.')), head = _b[0], tail = _b.slice(1);
             var currentValue = this.findValueForComplexCondition(fields, head, tail, path);
             var expectedValue = this.unquoted(condition.split(conditionSeparator)[1]);
@@ -4606,7 +4550,29 @@
                 return this.checkValueEquals(expectedValue, currentValue, conditionSeparator);
             }
         };
-        ShowCondition.prototype.checkValueEquals = function (expectedValue, currentValue, conditionSeparaor) {
+        ConditionParser.getValue = function (fields, head) {
+            if (this.isDynamicList(fields[head])) {
+                return fields[head].value.code;
+            }
+            else {
+                return fields[head];
+            }
+        };
+        ConditionParser.isDynamicList = function (dynamiclist) {
+            return !___namespace.isEmpty(dynamiclist) &&
+                (___namespace.has(dynamiclist, 'value') && ___namespace.has(dynamiclist, 'list_items'));
+        };
+        ConditionParser.getField = function (condition) {
+            var separator = ShowCondition.CONTAINS;
+            if (condition.indexOf(ShowCondition.CONTAINS) < 0) {
+                separator = ShowCondition.CONDITION_EQUALS;
+                if (condition.indexOf(ShowCondition.CONDITION_NOT_EQUALS) > -1) {
+                    separator = ShowCondition.CONDITION_NOT_EQUALS;
+                }
+            }
+            return [condition.split(separator)[0], separator];
+        };
+        ConditionParser.checkValueEquals = function (expectedValue, currentValue, conditionSeparaor) {
             if (expectedValue.search('[,]') > -1) { // for  multi-select list
                 return this.checkMultiSelectListEquals(expectedValue, currentValue, conditionSeparaor);
             }
@@ -4626,7 +4592,7 @@
                 }
             }
         };
-        ShowCondition.prototype.checkValueNotEquals = function (expectedValue, currentValue) {
+        ConditionParser.checkValueNotEquals = function (expectedValue, currentValue) {
             var formatCurrentValue = currentValue ? currentValue.toString().trim() : '';
             if ('*' === expectedValue && formatCurrentValue !== '') {
                 return false;
@@ -4634,7 +4600,7 @@
             var formatExpectedValue = expectedValue ? expectedValue.toString().trim() : '';
             return formatCurrentValue != formatExpectedValue; // tslint:disable-line
         };
-        ShowCondition.prototype.checkMultiSelectListEquals = function (expectedValue, currentValue, conditionSeparator) {
+        ConditionParser.checkMultiSelectListEquals = function (expectedValue, currentValue, conditionSeparator) {
             var expectedValues = expectedValue.split(',').sort().toString();
             var values = currentValue ? currentValue.sort().toString() : '';
             if (conditionSeparator === ShowCondition.CONDITION_NOT_EQUALS) {
@@ -4644,7 +4610,7 @@
                 return expectedValues === values;
             }
         };
-        ShowCondition.prototype.checkValueContains = function (expectedValue, currentValue) {
+        ConditionParser.checkValueContains = function (expectedValue, currentValue) {
             if (expectedValue.search(',') > -1) {
                 var expectedValues = expectedValue.split(',').sort();
                 var values_1 = currentValue ? currentValue.sort().toString() : '';
@@ -4655,7 +4621,11 @@
                 return values.search(expectedValue) >= 0;
             }
         };
-        ShowCondition.prototype.findValueForComplexCondition = function (fields, head, tail, path) {
+        ConditionParser.unquoted = function (str) {
+            var res = str.replace(/^"|"$/g, '');
+            return res;
+        };
+        ConditionParser.findValueForComplexCondition = function (fields, head, tail, path) {
             if (!fields) {
                 return undefined;
             }
@@ -4671,7 +4641,7 @@
                 }
             }
         };
-        ShowCondition.prototype.findValueForComplexConditionForPathIfAny = function (fields, head, tail, path) {
+        ConditionParser.findValueForComplexConditionForPathIfAny = function (fields, head, tail, path) {
             if (path) {
                 var _a = __read(path.split(/[_]+/g)), _ = _a[0], pathTail = _a.slice(1);
                 return this.findValueForComplexCondition(fields[head], tail[0], tail.slice(1), pathTail.join('_'));
@@ -4680,9 +4650,9 @@
                 return this.findValueForComplexCondition(fields[head], tail[0], tail.slice(1), path);
             }
         };
-        ShowCondition.prototype.findValueForComplexConditionInArray = function (fields, head, tail, path) {
+        ConditionParser.findValueForComplexConditionInArray = function (fields, head, tail, path) {
             // use the path to resolve which array element we refer to
-            if (path && path.startsWith(head)) {
+            if (path.startsWith(head)) {
                 var _a = __read(path.split(/[_]+/g)), _ = _a[0], pathTail = _a.slice(1);
                 if (pathTail.length > 0) {
                     try {
@@ -4691,43 +4661,239 @@
                         return (fields[head][arrayIndex] !== undefined) ? this.findValueForComplexCondition(fields[head][arrayIndex]['value'], tail[0], tail.slice(1), dropNumberPath.join('_')) : null;
                     }
                     catch (e) {
-                        console.log('Error while parsing number', pathTail[0], e);
+                        console.error('Error while parsing number', pathTail[0], e);
                     }
                 }
             }
             else {
-                console.log('Path in formArray should start with ', head, ', full path: ', path);
+                console.error('Path in formArray should start with ', head, ', full path: ', path);
             }
         };
-        ShowCondition.prototype.getValue = function (fields, head) {
-            if (this.isDynamicList(fields[head])) {
-                return fields[head].value.code;
+        ConditionParser.removeStarChar = function (str) {
+            if (str && str.indexOf('*') > -1) {
+                return str.substring(0, str.indexOf('*'));
+            }
+            return str;
+        };
+        ConditionParser.okIfBothEmpty = function (right, value) {
+            return value === null && (right === '');
+        };
+        return ConditionParser;
+    }());
+
+    var ShowCondition = /** @class */ (function () {
+        // Expects a show condition of the form: <fieldName>="string"
+        function ShowCondition(condition) {
+            this.condition = condition;
+            this.conditions = [];
+            if (!!condition) {
+                this.conditions = ConditionParser.parse(condition);
+            }
+        }
+        ShowCondition.addPathPrefixToCondition = function (showCondition, pathPrefix) {
+            if (!pathPrefix || pathPrefix === '') {
+                return showCondition;
+            }
+            if (!showCondition) {
+                return '';
+            }
+            var formula = ConditionParser.parse(showCondition);
+            if (!formula) {
+                return showCondition;
+            }
+            this.processedList = [];
+            showCondition = showCondition.replace(/CONTAINS/g, ' CONTAINS');
+            var processedCondition = this.processAddPathPrefixToCondition(formula, pathPrefix, showCondition);
+            return processedCondition.replace(/ CONTAINS/g, 'CONTAINS');
+        };
+        ShowCondition.processAddPathPrefixToCondition = function (formula, pathPrefix, originalCondition) {
+            var _this = this;
+            var finalCondition = originalCondition;
+            if (Array.isArray(formula)) {
+                formula.forEach(function (condition) {
+                    if (typeof condition === 'string' && _this.validJoinComparators.indexOf(condition) !== -1) {
+                        // do nothing
+                    }
+                    else {
+                        if (Array.isArray(condition)) {
+                            finalCondition = _this.processAddPathPrefixToCondition(condition, pathPrefix, finalCondition);
+                        }
+                        else {
+                            finalCondition = _this.extractConditions(condition, pathPrefix, finalCondition);
+                        }
+                    }
+                });
             }
             else {
-                return fields[head];
+                finalCondition = this.extractConditions(formula, pathPrefix, finalCondition);
             }
+            return finalCondition;
         };
-        ShowCondition.prototype.isDynamicList = function (dynamiclist) {
-            return !___namespace.isEmpty(dynamiclist) &&
-                (___namespace.has(dynamiclist, 'value') && ___namespace.has(dynamiclist, 'list_items'));
+        ShowCondition.extractConditions = function (condition, pathPrefix, originalCondition) {
+            if (condition.fieldReference.startsWith(pathPrefix)) {
+                return originalCondition;
+            }
+            else {
+                if (originalCondition.indexOf(condition.fieldReference) > -1) {
+                    if (this.processedList && this.processedList.indexOf(condition.fieldReference) === -1) {
+                        this.processedList.push(condition.fieldReference);
+                        var regularExp = new RegExp('(\\b)' + condition.fieldReference + '(?=[^"]*(?:"[^"]*"[^"]*)*$)(\\b)', 'g');
+                        return originalCondition.replace(regularExp, pathPrefix + '.' + condition.fieldReference);
+                    }
+                    else {
+                        return originalCondition;
+                    }
+                }
+            }
         };
-        ShowCondition.prototype.unquoted = function (str) {
-            return str.replace(/(?:^")|(?:"$)/g, '');
+        // Cache instances so that we can cache results more effectively
+        ShowCondition.getInstance = function (condition) {
+            var instance = this.instanceCache.get(condition);
+            if (!instance) {
+                instance = new ShowCondition(condition);
+                this.instanceCache.set(condition, instance);
+            }
+            return instance;
         };
-        ShowCondition.prototype.removeStarChar = function (str) {
-            return str.substring(0, str.length - 1);
+        ShowCondition.getField = function (condition) {
+            var separator = ShowCondition.CONTAINS;
+            if (condition.indexOf(ShowCondition.CONTAINS) < 0) {
+                separator = ShowCondition.CONDITION_EQUALS;
+                if (condition.indexOf(ShowCondition.CONDITION_NOT_EQUALS) > -1) {
+                    separator = ShowCondition.CONDITION_NOT_EQUALS;
+                }
+            }
+            return [condition.split(separator)[0], separator];
         };
-        ShowCondition.prototype.okIfBothEmpty = function (right, value) {
-            return value === null && (right === '');
+        ShowCondition.getConditions = function (formula) {
+            var _this = this;
+            var conditionList = [];
+            if (!!formula) {
+                var newFormula = typeof formula === 'string' ? JSON.parse(formula) : formula;
+                if (Array.isArray(newFormula)) {
+                    newFormula.forEach(function (condition) {
+                        if (!(typeof condition === 'string' && _this.validJoinComparators.indexOf(condition) !== -1)) {
+                            if (Array.isArray(condition)) {
+                                conditionList.push(ShowCondition.getConditions(condition).toString());
+                            }
+                            else {
+                                conditionList.push(condition.fieldReference + condition.comparator + condition.value);
+                            }
+                        }
+                    });
+                }
+                else {
+                    conditionList.push(newFormula.fieldReference + newFormula.comparator + newFormula.value);
+                }
+            }
+            return conditionList.toString();
+        };
+        /**
+         * Determine whether a ShowCondition model is affected by fields that have
+         * a display_context of HIDDEN or READONLY, which means they aren't able to
+         * be changed by the user's actions.
+         *
+         * @param showCondition The ShowCondition model to evaluate.
+         * @param caseFields Inspected to see appropriate display_contexts.
+         */
+        ShowCondition.hiddenCannotChange = function (showCondition, caseFields) {
+            var e_1, _a;
+            if (showCondition && showCondition.conditions.length && caseFields) {
+                var conditions = this.getConditions(showCondition.conditions).split(',');
+                if (conditions && conditions.length > 0) {
+                    var allUnchangeable = true;
+                    var _loop_1 = function (condition) {
+                        var _a = __read(ShowCondition.getField(condition), 1), field = _a[0];
+                        var path = field.split('.');
+                        var head = path.shift();
+                        var caseField = caseFields.find(function (cf) { return cf.id === head; });
+                        while (path.length > 0) {
+                            head = path.shift();
+                            if (caseField) {
+                                // Jump out if this is HIDDEN or READONLY, regardless of whether or not it's
+                                // complex or a collection - nested fields will "inherit" the display_context.
+                                if (['HIDDEN', 'READONLY'].indexOf(caseField.display_context) > -1) {
+                                    break;
+                                }
+                                // Consider what type of field this is.
+                                var ft = caseField.field_type;
+                                switch (ft.type) {
+                                    case 'Collection':
+                                        if (ft.collection_field_type.type === 'Complex' && ft.collection_field_type.complex_fields) {
+                                            caseField = ft.collection_field_type.complex_fields.find(function (cf) { return cf.id === head; });
+                                        }
+                                        break;
+                                    case 'Complex':
+                                        if (ft.complex_fields) {
+                                            caseField = ft.complex_fields.find(function (cf) { return cf.id === head; });
+                                        }
+                                        break;
+                                }
+                            }
+                        }
+                        if (caseField) {
+                            allUnchangeable = allUnchangeable && ['HIDDEN', 'READONLY'].indexOf(caseField.display_context) > -1;
+                        }
+                    };
+                    try {
+                        for (var conditions_1 = __values(conditions), conditions_1_1 = conditions_1.next(); !conditions_1_1.done; conditions_1_1 = conditions_1.next()) {
+                            var condition = conditions_1_1.value;
+                            _loop_1(condition);
+                        }
+                    }
+                    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                    finally {
+                        try {
+                            if (conditions_1_1 && !conditions_1_1.done && (_a = conditions_1.return)) _a.call(conditions_1);
+                        }
+                        finally { if (e_1) throw e_1.error; }
+                    }
+                    return allUnchangeable;
+                }
+            }
+            return false;
+        };
+        ShowCondition.prototype.match = function (fields, path) {
+            return ConditionParser.evaluate(fields, this.conditions, this.updatePathName(path));
+        };
+        ShowCondition.prototype.updatePathName = function (path) {
+            if (path && path.split(/[_]+/g).length > 0) {
+                /* tslint:disable-next-line */
+                var _a = __read(path.split(/[_]+/g)), pathName_1 = _a[0], pathTail = _a.slice(1);
+                var pathFinalIndex_1 = pathTail.pop();
+                var pathTailString = pathTail.toString();
+                pathTail = pathTail.map(function (value) {
+                    return Number(pathFinalIndex_1) === Number(value) ? pathName_1 : value;
+                });
+                return pathTailString !== pathTail.toString()
+                    ? pathName_1 + "_" + pathTail.join('_') + "_" + pathFinalIndex_1
+                    : path;
+            }
+            else {
+                return path;
+            }
+        };
+        ShowCondition.prototype.matchByContextFields = function (contextFields) {
+            return this.match(FieldsUtils.toValuesMap(contextFields));
+        };
+        /**
+         * Determine whether this is affected by fields that have a display_context
+         * of HIDDEN or READONLY, which means they aren't able to be changed by the
+         * user's actions.
+         *
+         * @param caseFields Inspected to see appropriate display_contexts.
+         */
+        ShowCondition.prototype.hiddenCannotChange = function (caseFields) {
+            return ShowCondition.hiddenCannotChange(this, caseFields);
         };
         return ShowCondition;
     }());
-    ShowCondition.AND_CONDITION_REGEXP = new RegExp('\\sAND\\s(?![^"]*"(?:(?:[^"]*"){2})*[^"]*$)', 'g');
-    ShowCondition.OR_CONDITION_REGEXP = new RegExp('\\sOR\\s(?![^"]*"(?:(?:[^"]*"){2})*[^"]*$)', 'g');
     ShowCondition.CONDITION_NOT_EQUALS = '!=';
     ShowCondition.CONDITION_EQUALS = '=';
     ShowCondition.CONTAINS = 'CONTAINS';
     ShowCondition.instanceCache = new Map();
+    ShowCondition.validJoinComparators = ['AND', 'OR'];
+    ShowCondition.processedList = [];
 
     var Constants = /** @class */ (function () {
         function Constants() {
@@ -6906,13 +7072,14 @@
             return rxjs.of(null);
         };
         /**
-         * Retrieves the HMCTS service details for a jurisdiction or service, including service code. (For example, the "SSCS"
-         * service has a corresponding service code of "BBA3".)
+         * Retrieves the HMCTS service details for a jurisdiction or service, including service codes. More than one
+         * service code may be present. For example, the Divorce jurisdiction/service has corresponding service codes of
+         * "ABA1" and "ABA2".
          *
          * @param serviceNames The service name(s) to look up, comma-separated if more than one
          * @returns An `Observable` of an array of service details
          */
-        CaseFlagRefdataService.prototype.getHmctsServiceDetails = function (serviceNames) {
+        CaseFlagRefdataService.prototype.getHmctsServiceDetailsByServiceName = function (serviceNames) {
             var url = this.appConfig.getLocationRefApiUrl();
             if (url) {
                 url += '/orgServices';
@@ -6923,6 +7090,26 @@
             }
             return rxjs.of(null);
         };
+        /**
+         * Retrieves the HMCTS service details for a case type, including service code. For example, the
+         * "FinancialRemedyContested" case type is associated with the Divorce jurisdiction/service and service code "ABA2".
+         *
+         * Note that a case type might not be associated with any service codes of a jurisdiction or service.
+         *
+         * @param caseTypeId The case type ID to look up
+         * @returns An `Observable` of an array of service details
+         */
+        CaseFlagRefdataService.prototype.getHmctsServiceDetailsByCaseType = function (caseTypeId) {
+            var url = this.appConfig.getLocationRefApiUrl();
+            if (url) {
+                url += '/orgServices';
+                if (caseTypeId) {
+                    url += "?ccdCaseType=" + caseTypeId;
+                }
+                return this.http.get(url, { observe: 'body' });
+            }
+            return rxjs.of(null);
+        };
         return CaseFlagRefdataService;
     }());
     CaseFlagRefdataService.ɵfac = function CaseFlagRefdataService_Factory(t) { return new (t || CaseFlagRefdataService)(i0__namespace.ɵɵinject(HttpService), i0__namespace.ɵɵinject(AbstractAppConfig)); };
@@ -12283,7 +12470,7 @@
         if (rf & 2) {
             var ctx_r8 = i0__namespace.ɵɵnextContext(2);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("formGroup", ctx_r8.caseFlagParentFormGroup)("jurisdiction", ctx_r8.jurisdiction);
+            i0__namespace.ɵɵproperty("formGroup", ctx_r8.caseFlagParentFormGroup)("jurisdiction", ctx_r8.jurisdiction)("caseTypeId", ctx_r8.caseTypeId)("hmctsServiceId", ctx_r8.hmctsServiceId);
         }
     }
     function WriteCaseFlagFieldComponent_div_1_ng_container_6_Template(rf, ctx) {
@@ -12325,7 +12512,7 @@
             i0__namespace.ɵɵtext(3);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵtemplate(4, WriteCaseFlagFieldComponent_div_1_ng_container_4_Template, 2, 2, "ng-container", 11);
-            i0__namespace.ɵɵtemplate(5, WriteCaseFlagFieldComponent_div_1_ng_container_5_Template, 2, 2, "ng-container", 11);
+            i0__namespace.ɵɵtemplate(5, WriteCaseFlagFieldComponent_div_1_ng_container_5_Template, 2, 4, "ng-container", 11);
             i0__namespace.ɵɵtemplate(6, WriteCaseFlagFieldComponent_div_1_ng_container_6_Template, 2, 3, "ng-container", 11);
             i0__namespace.ɵɵtemplate(7, WriteCaseFlagFieldComponent_div_1_ng_container_7_Template, 2, 2, "ng-container", 11);
             i0__namespace.ɵɵelementEnd();
@@ -12438,29 +12625,40 @@
                 }
             }), true);
             this.createFlagCaption = exports.CaseFlagText.CAPTION;
-            // Get the jurisdiction from the CaseView object in the snapshot data (required for retrieving the available flag
+            // Get the case type ID from the CaseView object in the snapshot data (required for retrieving the available flag
             // types for a case)
-            if (this.route.snapshot.data.case && this.route.snapshot.data.case.case_type &&
-                this.route.snapshot.data.case.case_type.jurisdiction) {
-                this.jurisdiction = this.route.snapshot.data.case.case_type.jurisdiction.id;
+            if (this.route.snapshot.data.case && this.route.snapshot.data.case.case_type) {
+                this.caseTypeId = this.route.snapshot.data.case.case_type.id;
+                // Get the jurisdiction (required for retrieving the available flag types if unable to determine using case type ID)
+                if (this.route.snapshot.data.case.case_type.jurisdiction) {
+                    this.jurisdiction = this.route.snapshot.data.case.case_type.jurisdiction.id;
+                }
             }
             // Extract all flags-related data from the CaseEventTrigger object in the snapshot data
-            if (this.route.snapshot.data.eventTrigger && this.route.snapshot.data.eventTrigger.case_fields) {
-                this.flagsData = (this.route.snapshot.data.eventTrigger.case_fields)
-                    .reduce(function (flags, caseField) {
-                    return FieldsUtils.extractFlagsDataFromCaseField(flags, caseField, caseField.id, caseField);
-                }, []);
-                // Set boolean indicating the display_context_parameter is "update"
-                this.isDisplayContextParameterUpdate =
-                    this.setDisplayContextParameterUpdate((this.route.snapshot.data.eventTrigger.case_fields));
-                // Set starting field state
-                this.fieldState = this.isDisplayContextParameterUpdate ? exports.CaseFlagFieldState.FLAG_MANAGE_CASE_FLAGS : exports.CaseFlagFieldState.FLAG_LOCATION;
-                // Get case title, to be used by child components
-                this.caseEditDataService.caseTitle$.subscribe({
-                    next: function (title) {
-                        _this.caseTitle = title.length > 0 ? title : _this.caseNameMissing;
-                    }
-                });
+            if (this.route.snapshot.data.eventTrigger) {
+                // Get the HMCTSServiceId from supplementary data, if it exists (required for retrieving the available flag types in
+                // the first instance, only falling back on case type ID or jurisidiction if it's not present)
+                if (this.route.snapshot.data.eventTrigger.supplementary_data
+                    && this.route.snapshot.data.eventTrigger.supplementary_data.HMCTSServiceId) {
+                    this.hmctsServiceId = this.route.snapshot.data.eventTrigger.supplementary_data.HMCTSServiceId;
+                }
+                if (this.route.snapshot.data.eventTrigger.case_fields) {
+                    this.flagsData = (this.route.snapshot.data.eventTrigger.case_fields)
+                        .reduce(function (flags, caseField) {
+                        return FieldsUtils.extractFlagsDataFromCaseField(flags, caseField, caseField.id, caseField);
+                    }, []);
+                    // Set boolean indicating the display_context_parameter is "update"
+                    this.isDisplayContextParameterUpdate =
+                        this.setDisplayContextParameterUpdate((this.route.snapshot.data.eventTrigger.case_fields));
+                    // Set starting field state
+                    this.fieldState = this.isDisplayContextParameterUpdate ? exports.CaseFlagFieldState.FLAG_MANAGE_CASE_FLAGS : exports.CaseFlagFieldState.FLAG_LOCATION;
+                    // Get case title, to be used by child components
+                    this.caseEditDataService.caseTitle$.subscribe({
+                        next: function (title) {
+                            _this.caseTitle = title.length > 0 ? title : _this.caseNameMissing;
+                        }
+                    });
+                }
             }
         };
         WriteCaseFlagFieldComponent.prototype.setDisplayContextParameterUpdate = function (caseFields) {
@@ -12696,7 +12894,7 @@
         return WriteCaseFlagFieldComponent;
     }(AbstractFieldWriteComponent));
     WriteCaseFlagFieldComponent.ɵfac = function WriteCaseFlagFieldComponent_Factory(t) { return new (t || WriteCaseFlagFieldComponent)(i0__namespace.ɵɵdirectiveInject(i1__namespace$1.ActivatedRoute), i0__namespace.ɵɵdirectiveInject(CaseEditDataService)); };
-    WriteCaseFlagFieldComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: WriteCaseFlagFieldComponent, selectors: [["ccd-write-case-flag-field"]], features: [i0__namespace.ɵɵInheritDefinitionFeature], decls: 3, vars: 3, consts: [["class", "govuk-error-summary", "aria-labelledby", "error-summary-title", "role", "alert", "tabindex", "-1", "data-module", "govuk-error-summary", 4, "ngIf"], ["class", "form-group", 3, "formGroup", 4, "ngIf"], ["aria-labelledby", "error-summary-title", "role", "alert", "tabindex", "-1", "data-module", "govuk-error-summary", 1, "govuk-error-summary"], ["id", "error-summary-title", 1, "govuk-error-summary__title"], ["class", "govuk-error-summary__body", 4, "ngFor", "ngForOf"], [1, "govuk-error-summary__body"], [1, "govuk-list", "govuk-error-summary__list"], [1, "validation-error", 3, "click"], [1, "form-group", 3, "formGroup"], [1, "govuk-form-group", 3, "ngSwitch"], ["id", "create-flag-caption", 1, "govuk-caption-l", 3, "ngClass"], [4, "ngSwitchCase"], [3, "formGroup", "flagsData", "caseFlagStateEmitter"], [3, "formGroup", "jurisdiction", "caseFlagStateEmitter", "flagCommentsOptionalEmitter"], [3, "formGroup", "languages", "flagCode", "caseFlagStateEmitter"], [3, "formGroup", "optional", "caseFlagStateEmitter"], [3, "formGroup", "flagsData", "caseTitle", "caseFlagStateEmitter"], [3, "formGroup", "selectedFlag", "caseFlagStateEmitter"]], template: function WriteCaseFlagFieldComponent_Template(rf, ctx) {
+    WriteCaseFlagFieldComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: WriteCaseFlagFieldComponent, selectors: [["ccd-write-case-flag-field"]], features: [i0__namespace.ɵɵInheritDefinitionFeature], decls: 3, vars: 3, consts: [["class", "govuk-error-summary", "aria-labelledby", "error-summary-title", "role", "alert", "tabindex", "-1", "data-module", "govuk-error-summary", 4, "ngIf"], ["class", "form-group", 3, "formGroup", 4, "ngIf"], ["aria-labelledby", "error-summary-title", "role", "alert", "tabindex", "-1", "data-module", "govuk-error-summary", 1, "govuk-error-summary"], ["id", "error-summary-title", 1, "govuk-error-summary__title"], ["class", "govuk-error-summary__body", 4, "ngFor", "ngForOf"], [1, "govuk-error-summary__body"], [1, "govuk-list", "govuk-error-summary__list"], [1, "validation-error", 3, "click"], [1, "form-group", 3, "formGroup"], [1, "govuk-form-group", 3, "ngSwitch"], ["id", "create-flag-caption", 1, "govuk-caption-l", 3, "ngClass"], [4, "ngSwitchCase"], [3, "formGroup", "flagsData", "caseFlagStateEmitter"], [3, "formGroup", "jurisdiction", "caseTypeId", "hmctsServiceId", "caseFlagStateEmitter", "flagCommentsOptionalEmitter"], [3, "formGroup", "languages", "flagCode", "caseFlagStateEmitter"], [3, "formGroup", "optional", "caseFlagStateEmitter"], [3, "formGroup", "flagsData", "caseTitle", "caseFlagStateEmitter"], [3, "formGroup", "selectedFlag", "caseFlagStateEmitter"]], template: function WriteCaseFlagFieldComponent_Template(rf, ctx) {
             if (rf & 1) {
                 i0__namespace.ɵɵtemplate(0, WriteCaseFlagFieldComponent_div_0_Template, 4, 1, "div", 0);
                 i0__namespace.ɵɵtemplate(1, WriteCaseFlagFieldComponent_div_1_Template, 8, 10, "div", 1);
@@ -16857,6 +17055,9 @@
         PaymentField.prototype.getRefundsUrl = function () {
             return this.appConfig.getRefundsUrl();
         };
+        PaymentField.prototype.getNotificationUrl = function () {
+            return this.appConfig.getNotificationUrl();
+        };
         PaymentField.prototype.getUserRoles = function () {
             var userDetails = JSON.parse(this.sessionStorage.getItem('userDetails') || null);
             if (!userDetails || !userDetails.hasOwnProperty('roles')) {
@@ -16882,12 +17083,12 @@
         return CasePaymentHistoryViewerFieldComponent;
     }(PaymentField));
     CasePaymentHistoryViewerFieldComponent.ɵfac = function CasePaymentHistoryViewerFieldComponent_Factory(t) { return new (t || CasePaymentHistoryViewerFieldComponent)(i0__namespace.ɵɵdirectiveInject(AbstractAppConfig), i0__namespace.ɵɵdirectiveInject(SessionStorageService)); };
-    CasePaymentHistoryViewerFieldComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: CasePaymentHistoryViewerFieldComponent, selectors: [["ccd-case-payment-history-viewer-field"]], features: [i0__namespace.ɵɵInheritDefinitionFeature], decls: 1, vars: 15, consts: [[3, "API_ROOT", "CCD_CASE_NUMBER", "BULKSCAN_API_ROOT", "SELECTED_OPTION", "ISBSENABLE", "LOGGEDINUSEREMAIL", "LOGGEDINUSERROLES", "REFUNDS_API_ROOT", "VIEW", "TAKEPAYMENT", "SERVICEREQUEST", "PAYMENT_GROUP_REF", "EXC_REFERENCE", "DCN_NUMBER", "ISPAYMENTSTATUSENABLED"]], template: function CasePaymentHistoryViewerFieldComponent_Template(rf, ctx) {
+    CasePaymentHistoryViewerFieldComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: CasePaymentHistoryViewerFieldComponent, selectors: [["ccd-case-payment-history-viewer-field"]], features: [i0__namespace.ɵɵInheritDefinitionFeature], decls: 1, vars: 16, consts: [[3, "API_ROOT", "CCD_CASE_NUMBER", "BULKSCAN_API_ROOT", "SELECTED_OPTION", "ISBSENABLE", "LOGGEDINUSEREMAIL", "LOGGEDINUSERROLES", "REFUNDS_API_ROOT", "NOTIFICATION_API_ROOT", "VIEW", "TAKEPAYMENT", "SERVICEREQUEST", "PAYMENT_GROUP_REF", "EXC_REFERENCE", "DCN_NUMBER", "ISPAYMENTSTATUSENABLED"]], template: function CasePaymentHistoryViewerFieldComponent_Template(rf, ctx) {
             if (rf & 1) {
                 i0__namespace.ɵɵelement(0, "ccpay-payment-lib", 0);
             }
             if (rf & 2) {
-                i0__namespace.ɵɵproperty("API_ROOT", ctx.getBaseURL())("CCD_CASE_NUMBER", ctx.caseReference)("BULKSCAN_API_ROOT", ctx.getPayBulkScanBaseURL())("SELECTED_OPTION", "CCDorException")("ISBSENABLE", "true")("LOGGEDINUSEREMAIL", ctx.getUserEmail())("LOGGEDINUSERROLES", ctx.getUserRoles())("REFUNDS_API_ROOT", ctx.getRefundsUrl())("VIEW", "case-transactions")("TAKEPAYMENT", false)("SERVICEREQUEST", false)("PAYMENT_GROUP_REF", null)("EXC_REFERENCE", ctx.caseReference)("DCN_NUMBER", null)("ISPAYMENTSTATUSENABLED", "Enable");
+                i0__namespace.ɵɵproperty("API_ROOT", ctx.getBaseURL())("CCD_CASE_NUMBER", ctx.caseReference)("BULKSCAN_API_ROOT", ctx.getPayBulkScanBaseURL())("SELECTED_OPTION", "CCDorException")("ISBSENABLE", "true")("LOGGEDINUSEREMAIL", ctx.getUserEmail())("LOGGEDINUSERROLES", ctx.getUserRoles())("REFUNDS_API_ROOT", ctx.getRefundsUrl())("NOTIFICATION_API_ROOT", ctx.getNotificationUrl())("VIEW", "case-transactions")("TAKEPAYMENT", false)("SERVICEREQUEST", false)("PAYMENT_GROUP_REF", null)("EXC_REFERENCE", ctx.caseReference)("DCN_NUMBER", null)("ISPAYMENTSTATUSENABLED", "Enable");
             }
         }, directives: [i3__namespace.PaymentLibComponent], encapsulation: 2 });
     (function () {
@@ -17295,7 +17496,7 @@
         }
         if (rf & 2) {
             var ctx_r0 = i0__namespace.ɵɵnextContext();
-            i0__namespace.ɵɵproperty("API_ROOT", ctx_r0.getBaseURL())("BULKSCAN_API_ROOT", ctx_r0.getPayBulkScanBaseURL())("REFUNDS_API_ROOT", ctx_r0.getRefundsUrl())("CCD_CASE_NUMBER", ctx_r0.caseReference)("VIEW", "case-transactions")("TAKEPAYMENT", false)("SERVICEREQUEST", true)("PAYMENT_GROUP_REF", null)("EXC_REFERENCE", ctx_r0.caseReference)("DCN_NUMBER", null)("SELECTED_OPTION", "CCDorException")("LOGGEDINUSERROLES", ctx_r0.getUserRoles())("CARDPAYMENTRETURNURL", ctx_r0.getCardPaymentReturnUrl())("ISPAYMENTSTATUSENABLED", "Enable");
+            i0__namespace.ɵɵproperty("API_ROOT", ctx_r0.getBaseURL())("BULKSCAN_API_ROOT", ctx_r0.getPayBulkScanBaseURL())("REFUNDS_API_ROOT", ctx_r0.getRefundsUrl())("NOTIFICATION_API_ROOT", ctx_r0.getNotificationUrl())("CCD_CASE_NUMBER", ctx_r0.caseReference)("VIEW", "case-transactions")("TAKEPAYMENT", false)("SERVICEREQUEST", true)("PAYMENT_GROUP_REF", null)("EXC_REFERENCE", ctx_r0.caseReference)("DCN_NUMBER", null)("SELECTED_OPTION", "CCDorException")("LOGGEDINUSERROLES", ctx_r0.getUserRoles())("CARDPAYMENTRETURNURL", ctx_r0.getCardPaymentReturnUrl())("ISPAYMENTSTATUSENABLED", "Enable");
         }
     }
     var WaysToPayFieldComponent = /** @class */ (function (_super) {
@@ -17309,9 +17510,9 @@
         return WaysToPayFieldComponent;
     }(PaymentField));
     WaysToPayFieldComponent.ɵfac = function WaysToPayFieldComponent_Factory(t) { return new (t || WaysToPayFieldComponent)(i0__namespace.ɵɵdirectiveInject(AbstractAppConfig), i0__namespace.ɵɵdirectiveInject(SessionStorageService)); };
-    WaysToPayFieldComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: WaysToPayFieldComponent, selectors: [["ccd-ways-to-pay-field"]], features: [i0__namespace.ɵɵInheritDefinitionFeature], decls: 1, vars: 1, consts: [[3, "API_ROOT", "BULKSCAN_API_ROOT", "REFUNDS_API_ROOT", "CCD_CASE_NUMBER", "VIEW", "TAKEPAYMENT", "SERVICEREQUEST", "PAYMENT_GROUP_REF", "EXC_REFERENCE", "DCN_NUMBER", "SELECTED_OPTION", "LOGGEDINUSERROLES", "CARDPAYMENTRETURNURL", "ISPAYMENTSTATUSENABLED", 4, "ngIf"], [3, "API_ROOT", "BULKSCAN_API_ROOT", "REFUNDS_API_ROOT", "CCD_CASE_NUMBER", "VIEW", "TAKEPAYMENT", "SERVICEREQUEST", "PAYMENT_GROUP_REF", "EXC_REFERENCE", "DCN_NUMBER", "SELECTED_OPTION", "LOGGEDINUSERROLES", "CARDPAYMENTRETURNURL", "ISPAYMENTSTATUSENABLED"]], template: function WaysToPayFieldComponent_Template(rf, ctx) {
+    WaysToPayFieldComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: WaysToPayFieldComponent, selectors: [["ccd-ways-to-pay-field"]], features: [i0__namespace.ɵɵInheritDefinitionFeature], decls: 1, vars: 1, consts: [[3, "API_ROOT", "BULKSCAN_API_ROOT", "REFUNDS_API_ROOT", "NOTIFICATION_API_ROOT", "CCD_CASE_NUMBER", "VIEW", "TAKEPAYMENT", "SERVICEREQUEST", "PAYMENT_GROUP_REF", "EXC_REFERENCE", "DCN_NUMBER", "SELECTED_OPTION", "LOGGEDINUSERROLES", "CARDPAYMENTRETURNURL", "ISPAYMENTSTATUSENABLED", 4, "ngIf"], [3, "API_ROOT", "BULKSCAN_API_ROOT", "REFUNDS_API_ROOT", "NOTIFICATION_API_ROOT", "CCD_CASE_NUMBER", "VIEW", "TAKEPAYMENT", "SERVICEREQUEST", "PAYMENT_GROUP_REF", "EXC_REFERENCE", "DCN_NUMBER", "SELECTED_OPTION", "LOGGEDINUSERROLES", "CARDPAYMENTRETURNURL", "ISPAYMENTSTATUSENABLED"]], template: function WaysToPayFieldComponent_Template(rf, ctx) {
             if (rf & 1) {
-                i0__namespace.ɵɵtemplate(0, WaysToPayFieldComponent_ccpay_payment_lib_0_Template, 1, 14, "ccpay-payment-lib", 0);
+                i0__namespace.ɵɵtemplate(0, WaysToPayFieldComponent_ccpay_payment_lib_0_Template, 1, 15, "ccpay-payment-lib", 0);
             }
             if (rf & 2) {
                 i0__namespace.ɵɵproperty("ngIf", ctx.getUserRoles().length > 0);
@@ -18072,7 +18273,7 @@
                 i0__namespace.ɵɵadvance(2);
                 i0__namespace.ɵɵproperty("ngForOf", ctx.currentCategories);
             }
-        }, directives: [i1__namespace.NgForOf, i1__namespace.NgTemplateOutlet], styles: [":host{position:relative;display:block}.folders{margin-bottom:20px}.folder{display:none;border-top:1px solid #ccc;margin:0 0 -1px}.folder:last-child{border-bottom:1px solid #ccc}.folders>.folder,input:checked~.folder{display:block}.iconImg{position:relative;display:inline-block;height:28px}.folder>.folder{margin-left:20px}.folder label:before{top:3px}.folder label:after{top:13px}p{font-weight:700}button{margin-right:20px}.close{float:right;width:30px;height:30px;background:url(/assets/img/x.PNG) no-repeat 50%}.cancel,.close{cursor:pointer}.cdk-overlay-pane{overflow:auto}.cdk-overlay-pane::-webkit-scrollbar{width:7px}.cdk-overlay-pane::-webkit-scrollbar-thumb{border:4px solid transparent;background-clip:padding-box;border-radius:9999px;background-color:#aaa}.cdk-overlay-pane::-webkit-scrollbar-button{display:none}.cdk-overlay-pane::-webkit-scrollbar-track-piece{background:#eee}.cdk-overlay-pane::-webkit-scrollbar-thumb{background:#ccc}"], encapsulation: 2 });
+        }, directives: [i1__namespace.NgForOf, i1__namespace.NgTemplateOutlet], styles: [":host{position:relative;display:block}.folders{margin-bottom:20px}.folder{display:none;border-top:1px solid #ccc;margin:0 0 -1px}.folder,.folder:last-child{border-bottom:1px solid #ccc}.folders>.folder,input:checked~.folder{display:block}.iconImg{position:relative;display:inline-block;height:28px}.folder>.folder{margin-left:20px}.folder label:before{top:3px}.folder label:after{top:13px}p{font-weight:700}button{margin-right:20px}.close{float:right;width:30px;height:30px;background:url(/assets/img/x.PNG) no-repeat 50%}.cancel,.close{cursor:pointer}.cdk-overlay-pane{overflow:auto}.cdk-overlay-pane::-webkit-scrollbar{width:7px}.cdk-overlay-pane::-webkit-scrollbar-thumb{border:4px solid transparent;background-clip:padding-box;border-radius:9999px;background-color:#aaa}.cdk-overlay-pane::-webkit-scrollbar-button{display:none}.cdk-overlay-pane::-webkit-scrollbar-track-piece{background:#eee}.cdk-overlay-pane::-webkit-scrollbar-thumb{background:#ccc}"], encapsulation: 2 });
     (function () {
         (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(CaseFileViewFolderSelectorComponent, [{
                 type: i0.Component,
@@ -19084,23 +19285,30 @@
                 && this.formGroup['caseField'].id === this.caseLevelCaseFlagsFieldId
                 ? exports.RefdataCaseFlagType.CASE
                 : exports.RefdataCaseFlagType.PARTY;
-            // HMCTS service code for a given jurisdiction is required to retrieve the relevant list of flag types
-            this.flagRefdata$ = this.caseFlagRefdataService.getHmctsServiceDetails(this.jurisdiction)
-                .pipe(
-            // Use switchMap to return an inner Observable of the flag types data, having received the service details
-            // including service_code. This avoids having nested `subscribe`s, which is an anti-pattern!
-            operators.switchMap(function (serviceDetails) {
-                return _this.caseFlagRefdataService.getCaseFlagsRefdata(serviceDetails[0].service_code, flagType);
-            }))
-                .subscribe({
-                next: function (flagTypes) {
+            // If hmctsServiceId is present, use this to retrieve the relevant list of flag types
+            if (this.hmctsServiceId) {
+                this.flagRefdata$ = this.caseFlagRefdataService.getCaseFlagsRefdata(this.hmctsServiceId, flagType)
+                    .subscribe({
                     // First (and only) object in the returned array should be the top-level "Party" flag type
-                    _this.flagTypes = flagTypes[0].childFlags;
-                },
-                error: function (error) {
-                    _this.onRefdataError(error);
-                }
-            });
+                    next: function (flagTypes) { return _this.flagTypes = flagTypes[0].childFlags; },
+                    error: function (error) { return _this.onRefdataError(error); }
+                });
+            }
+            else {
+                // Else, HMCTS service code is required to retrieve the relevant list of flag types; attempt to obtain it by case type ID first
+                this.flagRefdata$ = this.caseFlagRefdataService.getHmctsServiceDetailsByCaseType(this.caseTypeId)
+                    .pipe(
+                // If an error occurs retrieving HMCTS service details by case type ID, try by service name instead
+                operators.catchError(function (_) { return _this.caseFlagRefdataService.getHmctsServiceDetailsByServiceName(_this.jurisdiction); }), 
+                // Use switchMap to return an inner Observable of the flag types data, having received the service details
+                // including service_code. This avoids having nested `subscribe`s, which is an anti-pattern!
+                operators.switchMap(function (serviceDetails) { return _this.caseFlagRefdataService.getCaseFlagsRefdata(serviceDetails[0].service_code, flagType); }))
+                    .subscribe({
+                    // First (and only) object in the returned array should be the top-level "Party" flag type
+                    next: function (flagTypes) { return _this.flagTypes = flagTypes[0].childFlags; },
+                    error: function (error) { return _this.onRefdataError(error); }
+                });
+            }
         };
         SelectFlagTypeComponent.prototype.ngOnDestroy = function () {
             if (this.flagRefdata$) {
@@ -19172,7 +19380,7 @@
         return SelectFlagTypeComponent;
     }());
     SelectFlagTypeComponent.ɵfac = function SelectFlagTypeComponent_Factory(t) { return new (t || SelectFlagTypeComponent)(i0__namespace.ɵɵdirectiveInject(CaseFlagRefdataService)); };
-    SelectFlagTypeComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: SelectFlagTypeComponent, selectors: [["ccd-select-flag-type"]], inputs: { formGroup: "formGroup", jurisdiction: "jurisdiction" }, outputs: { caseFlagStateEmitter: "caseFlagStateEmitter", flagCommentsOptionalEmitter: "flagCommentsOptionalEmitter" }, decls: 11, vars: 9, consts: [[1, "form-group", 3, "formGroup"], [1, "govuk-form-group", 3, "ngClass"], ["aria-describedby", "flag-type-heading", 1, "govuk-fieldset"], [1, "govuk-fieldset__legend", "govuk-fieldset__legend--l"], ["id", "flag-type-heading", 1, "govuk-fieldset__heading"], ["id", "flag-type-not-selected-error-message", "class", "govuk-error-message", 4, "ngIf"], ["data-module", "govuk-radios", "id", "conditional-radios-list", 1, "govuk-radios", "govuk-radios--conditional"], ["class", "govuk-radios__item", 4, "ngFor", "ngForOf"], ["class", "govuk-radios__conditional", "id", "conditional-flagType", 4, "ngIf"], ["class", "govuk-button-group", 4, "ngIf"], ["id", "flag-type-not-selected-error-message", 1, "govuk-error-message"], [1, "govuk-visually-hidden"], [1, "govuk-radios__item"], ["type", "radio", 1, "govuk-radios__input", 3, "id", "name", "value", "formControlName", "change"], [1, "govuk-label", "govuk-radios__label", 3, "for"], ["id", "conditional-flagType", 1, "govuk-radios__conditional"], ["for", "other-flag-type-description", 1, "govuk-label"], ["id", "flag-type-error-message", "class", "govuk-error-message", 4, "ngIf"], ["id", "other-flag-type-description", "type", "text", 1, "govuk-input", "govuk-!-width-one-half", 3, "ngClass", "name", "formControlName"], ["id", "flag-type-error-message", 1, "govuk-error-message"], [1, "govuk-button-group"], ["type", "button", 1, "button", "button-primary", 3, "click"]], template: function SelectFlagTypeComponent_Template(rf, ctx) {
+    SelectFlagTypeComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: SelectFlagTypeComponent, selectors: [["ccd-select-flag-type"]], inputs: { formGroup: "formGroup", jurisdiction: "jurisdiction", caseTypeId: "caseTypeId", hmctsServiceId: "hmctsServiceId" }, outputs: { caseFlagStateEmitter: "caseFlagStateEmitter", flagCommentsOptionalEmitter: "flagCommentsOptionalEmitter" }, decls: 11, vars: 9, consts: [[1, "form-group", 3, "formGroup"], [1, "govuk-form-group", 3, "ngClass"], ["aria-describedby", "flag-type-heading", 1, "govuk-fieldset"], [1, "govuk-fieldset__legend", "govuk-fieldset__legend--l"], ["id", "flag-type-heading", 1, "govuk-fieldset__heading"], ["id", "flag-type-not-selected-error-message", "class", "govuk-error-message", 4, "ngIf"], ["data-module", "govuk-radios", "id", "conditional-radios-list", 1, "govuk-radios", "govuk-radios--conditional"], ["class", "govuk-radios__item", 4, "ngFor", "ngForOf"], ["class", "govuk-radios__conditional", "id", "conditional-flagType", 4, "ngIf"], ["class", "govuk-button-group", 4, "ngIf"], ["id", "flag-type-not-selected-error-message", 1, "govuk-error-message"], [1, "govuk-visually-hidden"], [1, "govuk-radios__item"], ["type", "radio", 1, "govuk-radios__input", 3, "id", "name", "value", "formControlName", "change"], [1, "govuk-label", "govuk-radios__label", 3, "for"], ["id", "conditional-flagType", 1, "govuk-radios__conditional"], ["for", "other-flag-type-description", 1, "govuk-label"], ["id", "flag-type-error-message", "class", "govuk-error-message", 4, "ngIf"], ["id", "other-flag-type-description", "type", "text", 1, "govuk-input", "govuk-!-width-one-half", 3, "ngClass", "name", "formControlName"], ["id", "flag-type-error-message", 1, "govuk-error-message"], [1, "govuk-button-group"], ["type", "button", 1, "button", "button-primary", 3, "click"]], template: function SelectFlagTypeComponent_Template(rf, ctx) {
             if (rf & 1) {
                 i0__namespace.ɵɵelementStart(0, "div", 0);
                 i0__namespace.ɵɵelementStart(1, "div", 1);
@@ -19220,6 +19428,10 @@
                     type: i0.Input
                 }], jurisdiction: [{
                     type: i0.Input
+                }], caseTypeId: [{
+                    type: i0.Input
+                }], hmctsServiceId: [{
+                    type: i0.Input
                 }], caseFlagStateEmitter: [{
                     type: i0.Output
                 }], flagCommentsOptionalEmitter: [{
@@ -21494,7 +21706,10 @@
             }
         }, inputs: { dateControl: "dateControl" }, features: [i0__namespace.ɵɵProvidersFeature([
                 { provide: i4.NGX_MAT_DATE_FORMATS, useValue: CUSTOM_MOMENT_FORMATS },
-                { provide: i4.NgxMatDateAdapter, useClass: momentAdapter.NgxMatMomentAdapter },
+                { provide: i4.NgxMatDateAdapter,
+                    useClass: momentAdapter.NgxMatMomentAdapter,
+                    deps: [i6.MAT_DATE_LOCALE, momentAdapter.NGX_MAT_MOMENT_DATE_ADAPTER_OPTIONS]
+                },
                 { provide: momentAdapter.NGX_MAT_MOMENT_DATE_ADAPTER_OPTIONS, useValue: { useUtc: true } }
             ]), i0__namespace.ɵɵInheritDefinitionFeature], decls: 14, vars: 26, consts: [[1, "govuk-form-group", "bottom-30", 3, "id", "ngClass"], ["class", "form-label", 4, "ngIf"], ["class", "form-hint", 4, "ngIf"], ["class", "error-message", 4, "ngIf"], [1, "datepicker-container"], ["ng-model-options", "{timezone:'utc'}", 1, "govuk-input", 3, "min", "max", "formControl", "ngxMatDatetimePicker", "focusin", "focusout", "dateChange"], ["input", ""], ["matSuffix", "", "id", "pickerOpener", 3, "for"], [3, "color", "touchUi", "hideTime", "startView", "stepHour", "stepSecond", "stepMinute", "showSeconds", "showSpinners", "disableMinute", "enableMeridian", "yearSelected", "monthSelected", "opened"], ["picker", ""], [1, "form-label"], [1, "form-hint"], [1, "error-message"]], template: function DatetimePickerComponent_Template(rf, ctx) {
             if (rf & 1) {
@@ -21551,7 +21766,10 @@
                         encapsulation: i0.ViewEncapsulation.None,
                         providers: [
                             { provide: i4.NGX_MAT_DATE_FORMATS, useValue: CUSTOM_MOMENT_FORMATS },
-                            { provide: i4.NgxMatDateAdapter, useClass: momentAdapter.NgxMatMomentAdapter },
+                            { provide: i4.NgxMatDateAdapter,
+                                useClass: momentAdapter.NgxMatMomentAdapter,
+                                deps: [i6.MAT_DATE_LOCALE, momentAdapter.NGX_MAT_MOMENT_DATE_ADAPTER_OPTIONS]
+                            },
                             { provide: momentAdapter.NGX_MAT_MOMENT_DATE_ADAPTER_OPTIONS, useValue: { useUtc: true } }
                         ]
                     }]
@@ -27618,11 +27836,12 @@
                     _this.activitySubscription = _this.postViewActivity().subscribe();
                 });
             }
+            this.checkRouteAndSetCaseViewTab();
             // Check for active Case Flags
             this.activeCaseFlags = this.hasActiveCaseFlags();
         };
         CaseFullAccessViewComponent.prototype.ngOnChanges = function (changes) {
-            if (!changes.prependedTabs.firstChange) {
+            if (changes && changes.prependedTabs && !changes.prependedTabs.firstChange) {
                 this.init();
                 this.crf.detectChanges();
                 this.organiseTabPosition();
@@ -27647,6 +27866,22 @@
                 subscription.unsubscribe();
             }
         };
+        CaseFullAccessViewComponent.prototype.checkRouteAndSetCaseViewTab = function () {
+            var _this = this;
+            this.router.events
+                .pipe(operators.filter(function (event) { return event instanceof i1$1.NavigationEnd; }))
+                .subscribe(function (event) {
+                var url = event && event.url;
+                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;
+                    }
+                }
+            });
+        };
         CaseFullAccessViewComponent.prototype.postViewActivity = function () {
             return this.activityPollingService.postViewActivity(this.caseDetails.case_id);
         };
@@ -31404,12 +31639,12 @@
             i0__namespace.ɵɵproperty("checked", ctx_r6.allOnPageSelected())("disabled", !ctx_r6.canAnyBeShared());
         }
     }
-    function SearchResultComponent_table_0_th_10_div_6_Template(rf, ctx) {
+    function SearchResultComponent_table_0_th_10_div_4_Template(rf, ctx) {
         if (rf & 1) {
             var _r19_1 = i0__namespace.ɵɵgetCurrentView();
             i0__namespace.ɵɵelementStart(0, "div", 27);
             i0__namespace.ɵɵelementStart(1, "a", 28);
-            i0__namespace.ɵɵlistener("click", function SearchResultComponent_table_0_th_10_div_6_Template_a_click_1_listener() { i0__namespace.ɵɵrestoreView(_r19_1); var col_r15 = i0__namespace.ɵɵnextContext().$implicit; var ctx_r17 = i0__namespace.ɵɵnextContext(2); return ctx_r17.sort(col_r15); });
+            i0__namespace.ɵɵlistener("click", function SearchResultComponent_table_0_th_10_div_4_Template_a_click_1_listener() { i0__namespace.ɵɵrestoreView(_r19_1); var col_r15 = i0__namespace.ɵɵnextContext().$implicit; var ctx_r17 = i0__namespace.ɵɵnextContext(2); return ctx_r17.sort(col_r15); });
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
         }
@@ -31424,16 +31659,12 @@
         if (rf & 1) {
             var _r22_1 = i0__namespace.ɵɵgetCurrentView();
             i0__namespace.ɵɵelementStart(0, "th");
-            i0__namespace.ɵɵelementStart(1, "table", 24);
-            i0__namespace.ɵɵelementStart(2, "tr");
-            i0__namespace.ɵɵelementStart(3, "th");
-            i0__namespace.ɵɵelementStart(4, "div", 25);
-            i0__namespace.ɵɵlistener("click", function SearchResultComponent_table_0_th_10_Template_div_click_4_listener() { i0__namespace.ɵɵrestoreView(_r22_1); var col_r15 = ctx.$implicit; var ctx_r21 = i0__namespace.ɵɵnextContext(2); return ctx_r21.sort(col_r15); });
-            i0__namespace.ɵɵtext(5);
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵtemplate(6, SearchResultComponent_table_0_th_10_div_6_Template, 2, 1, "div", 26);
-            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementStart(1, "div", 24);
+            i0__namespace.ɵɵelementStart(2, "div", 25);
+            i0__namespace.ɵɵlistener("click", function SearchResultComponent_table_0_th_10_Template_div_click_2_listener() { i0__namespace.ɵɵrestoreView(_r22_1); var col_r15 = ctx.$implicit; var ctx_r21 = i0__namespace.ɵɵnextContext(2); return ctx_r21.sort(col_r15); });
+            i0__namespace.ɵɵtext(3);
             i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵtemplate(4, SearchResultComponent_table_0_th_10_div_4_Template, 2, 1, "div", 26);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
         }
@@ -31442,7 +31673,7 @@
             var ctx_r7 = i0__namespace.ɵɵnextContext(2);
             i0__namespace.ɵɵadvance(1);
             i0__namespace.ɵɵattribute("aria-label", "Sort by " + col_r15.label + " " + ctx_r7.isSortAscending(col_r15) ? "ascending" : "descending");
-            i0__namespace.ɵɵadvance(4);
+            i0__namespace.ɵɵadvance(2);
             i0__namespace.ɵɵtextInterpolate(col_r15.label);
             i0__namespace.ɵɵadvance(1);
             i0__namespace.ɵɵproperty("ngIf", ctx_r7.comparator(col_r15));
@@ -31778,7 +32009,7 @@
             i0__namespace.ɵɵelementStart(7, "thead");
             i0__namespace.ɵɵelementStart(8, "tr", 7);
             i0__namespace.ɵɵtemplate(9, SearchResultComponent_table_0_th_9_Template, 4, 2, "th", 8);
-            i0__namespace.ɵɵtemplate(10, SearchResultComponent_table_0_th_10_Template, 7, 3, "th", 9);
+            i0__namespace.ɵɵtemplate(10, SearchResultComponent_table_0_th_10_Template, 5, 3, "th", 9);
             i0__namespace.ɵɵtemplate(11, SearchResultComponent_table_0_th_11_Template, 1, 0, "th", 10);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();