@hmcts/ccd-case-ui-toolkit 7.3.77 → 7.3.78

package/fesm2022/hmcts-ccd-case-ui-toolkit.mjs

@@ -17,7 +17,6 @@ import moment from 'moment';
 import { __decorate, __metadata } from 'tslib';
 import * as _ from 'underscore';
 import 'reflect-metadata';
-import { generate } from 'pegjs';
 import { StateMachine } from '@edium/fsm';
 import * as i1$3 from '@angular/material/legacy-dialog';
 import { MAT_LEGACY_DIALOG_DATA, MatLegacyDialogModule } from '@angular/material/legacy-dialog';
@@ -1854,13 +1853,13 @@ function getUserDetails(sessionStorageService) {
 }
 function isInternalUser(sessionStorageService) {
     const userDetails = getUserDetails(sessionStorageService);
-    return userDetails && userDetails?.roles
+    return !!userDetails?.roles
         && !(userDetails.roles.includes(PUI_CASE_MANAGER)
             || userDetails.roles.some((role) => role.toLowerCase().includes(JUDGE)));
 }
 function isJudiciaryUser(sessionStorageService) {
     const userDetails = getUserDetails(sessionStorageService);
-    return userDetails && userDetails?.roles
+    return !!userDetails?.roles
         && (userDetails.roles.some((role) => role.toLowerCase().includes(JUDGE)));
 }
 
@@ -4796,107 +4795,955 @@ class FieldsUtils {
         type: Injectable
     }], null, null); })();
 
-const conditionSource = `{
+// @ts-nocheck
+// This file is generated by npm run generate:condition-parser. Do not edit by hand.
+// @generated by Peggy 5.1.0.
+//
+// https://peggyjs.org/
+class peg$SyntaxError extends SyntaxError {
+    constructor(message, expected, found, location) {
+        super(message);
+        this.expected = expected;
+        this.found = found;
+        this.location = location;
+        this.name = "SyntaxError";
+    }
+    format(sources) {
+        let str = "Error: " + this.message;
+        if (this.location) {
+            let src = null;
+            const st = sources.find(s => s.source === this.location.source);
+            if (st) {
+                src = st.text.split(/\r\n|\n|\r/g);
+            }
+            const s = this.location.start;
+            const offset_s = (this.location.source && (typeof this.location.source.offset === "function"))
+                ? this.location.source.offset(s)
+                : s;
+            const loc = this.location.source + ":" + offset_s.line + ":" + offset_s.column;
+            if (src) {
+                const e = this.location.end;
+                const filler = "".padEnd(offset_s.line.toString().length, " ");
+                const line = src[s.line - 1];
+                const last = s.line === e.line ? e.column : line.length + 1;
+                const hatLen = (last - s.column) || 1;
+                str += "\n --> " + loc + "\n"
+                    + filler + " |\n"
+                    + offset_s.line + " | " + line + "\n"
+                    + filler + " | " + "".padEnd(s.column - 1, " ")
+                    + "".padEnd(hatLen, "^");
+            }
+            else {
+                str += "\n at " + loc;
+            }
+        }
+        return str;
+    }
+    static buildMessage(expected, found) {
+        function hex(ch) {
+            return ch.codePointAt(0).toString(16).toUpperCase();
+        }
+        const nonPrintable = Object.prototype.hasOwnProperty.call(RegExp.prototype, "unicode")
+            ? new RegExp("[\\p{C}\\p{Mn}\\p{Mc}]", "gu")
+            : null;
+        function unicodeEscape(s) {
+            if (nonPrintable) {
+                return s.replace(nonPrintable, ch => "\\u{" + hex(ch) + "}");
+            }
+            return s;
+        }
+        function literalEscape(s) {
+            return unicodeEscape(s
+                .replace(/\\/g, "\\\\")
+                .replace(/"/g, "\\\"")
+                .replace(/\0/g, "\\0")
+                .replace(/\t/g, "\\t")
+                .replace(/\n/g, "\\n")
+                .replace(/\r/g, "\\r")
+                .replace(/[\x00-\x0F]/g, ch => "\\x0" + hex(ch))
+                .replace(/[\x10-\x1F\x7F-\x9F]/g, ch => "\\x" + hex(ch)));
+        }
+        function classEscape(s) {
+            return unicodeEscape(s
+                .replace(/\\/g, "\\\\")
+                .replace(/\]/g, "\\]")
+                .replace(/\^/g, "\\^")
+                .replace(/-/g, "\\-")
+                .replace(/\0/g, "\\0")
+                .replace(/\t/g, "\\t")
+                .replace(/\n/g, "\\n")
+                .replace(/\r/g, "\\r")
+                .replace(/[\x00-\x0F]/g, ch => "\\x0" + hex(ch))
+                .replace(/[\x10-\x1F\x7F-\x9F]/g, ch => "\\x" + hex(ch)));
+        }
+        const DESCRIBE_EXPECTATION_FNS = {
+            literal(expectation) {
+                return "\"" + literalEscape(expectation.text) + "\"";
+            },
+            class(expectation) {
+                const escapedParts = expectation.parts.map(part => (Array.isArray(part)
+                    ? classEscape(part[0]) + "-" + classEscape(part[1])
+                    : classEscape(part)));
+                return "[" + (expectation.inverted ? "^" : "") + escapedParts.join("") + "]" + (expectation.unicode ? "u" : "");
+            },
+            any() {
+                return "any character";
+            },
+            end() {
+                return "end of input";
+            },
+            other(expectation) {
+                return expectation.description;
+            },
+        };
+        function describeExpectation(expectation) {
+            return DESCRIBE_EXPECTATION_FNS[expectation.type](expectation);
+        }
+        function describeExpected(expected) {
+            const descriptions = expected.map(describeExpectation);
+            descriptions.sort();
+            if (descriptions.length > 0) {
+                let j = 1;
+                for (let i = 1; i < descriptions.length; i++) {
+                    if (descriptions[i - 1] !== descriptions[i]) {
+                        descriptions[j] = descriptions[i];
+                        j++;
+                    }
+                }
+                descriptions.length = j;
+            }
+            switch (descriptions.length) {
+                case 1:
+                    return descriptions[0];
+                case 2:
+                    return descriptions[0] + " or " + descriptions[1];
+                default:
+                    return descriptions.slice(0, -1).join(", ")
+                        + ", or "
+                        + descriptions[descriptions.length - 1];
+            }
+        }
+        function describeFound(found) {
+            return found ? "\"" + literalEscape(found) + "\"" : "end of input";
+        }
+        return "Expected " + describeExpected(expected) + " but " + describeFound(found) + " found.";
+    }
+}
+function peg$parse(input, options) {
+    options = options !== undefined ? options : {};
+    const peg$FAILED = {};
+    const peg$source = options.grammarSource;
+    const peg$startRuleFunctions = {
+        Start: peg$parseStart,
+    };
+    let peg$startRuleFunction = peg$parseStart;
+    const peg$c0 = "AND";
+    const peg$c1 = "OR";
+    const peg$c2 = "[";
+    const peg$c3 = "]";
+    const peg$c4 = "\"";
+    const peg$c5 = "(";
+    const peg$c6 = ")";
+    const peg$c7 = "=";
+    const peg$c8 = "!=";
+    const peg$c9 = "CONTAINS";
+    const peg$r0 = /^[a-zA-Z]/;
+    const peg$r1 = /^[A-Za-z0-9._\-]/;
+    const peg$r2 = /^[0-9]/;
+    const peg$r3 = /^[A-Za-z0-9.,* _&()\/\-]/;
+    const peg$r4 = /^[ \t]/;
+    const peg$e0 = peg$literalExpectation("AND", false);
+    const peg$e1 = peg$literalExpectation("OR", false);
+    const peg$e2 = peg$classExpectation([["a", "z"], ["A", "Z"]], false, false, false);
+    const peg$e3 = peg$classExpectation([["A", "Z"], ["a", "z"], ["0", "9"], ".", "_", "-"], false, false, false);
+    const peg$e4 = peg$literalExpectation("[", false);
+    const peg$e5 = peg$literalExpectation("]", false);
+    const peg$e6 = peg$classExpectation([["0", "9"]], false, false, false);
+    const peg$e7 = peg$literalExpectation("\"", false);
+    const peg$e8 = peg$classExpectation([["A", "Z"], ["a", "z"], ["0", "9"], ".", ",", "*", " ", "_", "&", "(", ")", "/", "-"], false, false, false);
+    const peg$e9 = peg$literalExpectation("(", false);
+    const peg$e10 = peg$literalExpectation(")", false);
+    const peg$e11 = peg$literalExpectation("=", false);
+    const peg$e12 = peg$literalExpectation("!=", false);
+    const peg$e13 = peg$literalExpectation("CONTAINS", false);
+    const peg$e14 = peg$otherExpectation("Whitespace");
+    const peg$e15 = peg$classExpectation([" ", "\t"], false, false, false);
+    const peg$e16 = peg$otherExpectation("One or more whitespaces");
+    function peg$f0(term, joins) { return [term].concat(flat(joins)); }
+    function peg$f1(formula) { return formula.length === 1 ? formula[0] : formula; }
+    function peg$f2(comp, term) { return [comp, term]; }
+    function peg$f3(fr, op, val) { return { fieldReference: fr, comparator: op, value: val }; }
+    function peg$f4(c) { return c; }
+    function peg$f5(c) { return c; }
+    function peg$f6(l) { return l.join(""); }
+    function peg$f7(v) { return v.join(""); }
+    function peg$f8(v) { return parseInt(v.join("")); }
+    function peg$f9(s1, fr, s2) { return s1 + fr + s2; }
+    function peg$f10(characters) { return characters.join(""); }
+    function peg$f11(val) { return val.join(""); }
+    let peg$currPos = options.peg$currPos | 0;
+    let peg$savedPos = peg$currPos;
+    const peg$posDetailsCache = [{ line: 1, column: 1 }];
+    let peg$maxFailPos = peg$currPos;
+    let peg$maxFailExpected = options.peg$maxFailExpected || [];
+    let peg$silentFails = options.peg$silentFails | 0;
+    let peg$result;
+    if (options.startRule) {
+        if (!(options.startRule in peg$startRuleFunctions)) {
+            throw new Error("Can't start parsing from rule \"" + options.startRule + "\".");
+        }
+        peg$startRuleFunction = peg$startRuleFunctions[options.startRule];
+    }
+    function text() {
+        return input.substring(peg$savedPos, peg$currPos);
+    }
+    function offset() {
+        return peg$savedPos;
+    }
+    function range() {
+        return {
+            source: peg$source,
+            start: peg$savedPos,
+            end: peg$currPos,
+        };
+    }
+    function location() {
+        return peg$computeLocation(peg$savedPos, peg$currPos);
+    }
+    function expected(description, location) {
+        location = location !== undefined
+            ? location
+            : peg$computeLocation(peg$savedPos, peg$currPos);
+        throw peg$buildStructuredError([peg$otherExpectation(description)], input.substring(peg$savedPos, peg$currPos), location);
+    }
+    function error(message, location) {
+        location = location !== undefined
+            ? location
+            : peg$computeLocation(peg$savedPos, peg$currPos);
+        throw peg$buildSimpleError(message, location);
+    }
+    function peg$getUnicode(pos = peg$currPos) {
+        const cp = input.codePointAt(pos);
+        if (cp === undefined) {
+            return "";
+        }
+        return String.fromCodePoint(cp);
+    }
+    function peg$literalExpectation(text, ignoreCase) {
+        return { type: "literal", text, ignoreCase };
+    }
+    function peg$classExpectation(parts, inverted, ignoreCase, unicode) {
+        return { type: "class", parts, inverted, ignoreCase, unicode };
+    }
+    function peg$anyExpectation() {
+        return { type: "any" };
+    }
+    function peg$endExpectation() {
+        return { type: "end" };
+    }
+    function peg$otherExpectation(description) {
+        return { type: "other", description };
+    }
+    function peg$computePosDetails(pos) {
+        let details = peg$posDetailsCache[pos];
+        let p;
+        if (details) {
+            return details;
+        }
+        else {
+            if (pos >= peg$posDetailsCache.length) {
+                p = peg$posDetailsCache.length - 1;
+            }
+            else {
+                p = pos;
+                while (!peg$posDetailsCache[--p]) { }
+            }
+            details = peg$posDetailsCache[p];
+            details = {
+                line: details.line,
+                column: details.column,
+            };
+            while (p < pos) {
+                if (input.charCodeAt(p) === 10) {
+                    details.line++;
+                    details.column = 1;
+                }
+                else {
+                    details.column++;
+                }
+                p++;
+            }
+            peg$posDetailsCache[pos] = details;
+            return details;
+        }
+    }
+    function peg$computeLocation(startPos, endPos, offset) {
+        const startPosDetails = peg$computePosDetails(startPos);
+        const endPosDetails = peg$computePosDetails(endPos);
+        const res = {
+            source: peg$source,
+            start: {
+                offset: startPos,
+                line: startPosDetails.line,
+                column: startPosDetails.column,
+            },
+            end: {
+                offset: endPos,
+                line: endPosDetails.line,
+                column: endPosDetails.column,
+            },
+        };
+        if (offset && peg$source && (typeof peg$source.offset === "function")) {
+            res.start = peg$source.offset(res.start);
+            res.end = peg$source.offset(res.end);
+        }
+        return res;
+    }
+    function peg$fail(expected) {
+        if (peg$currPos < peg$maxFailPos) {
+            return;
+        }
+        if (peg$currPos > peg$maxFailPos) {
+            peg$maxFailPos = peg$currPos;
+            peg$maxFailExpected = [];
+        }
+        peg$maxFailExpected.push(expected);
+    }
+    function peg$buildSimpleError(message, location) {
+        return new peg$SyntaxError(message, null, null, location);
+    }
+    function peg$buildStructuredError(expected, found, location) {
+        return new peg$SyntaxError(peg$SyntaxError.buildMessage(expected, found), expected, found, location);
+    }
+    function peg$parseStart() {
+        let s0;
+        s0 = peg$parseFormula();
+        return s0;
+    }
+    function peg$parseFormula() {
+        let s0, s1, s2, s3;
+        s0 = peg$currPos;
+        s1 = peg$parseFormulaTerm();
+        if (s1 !== peg$FAILED) {
+            s2 = [];
+            s3 = peg$parseJoinComparator();
+            while (s3 !== peg$FAILED) {
+                s2.push(s3);
+                s3 = peg$parseJoinComparator();
+            }
+            peg$savedPos = s0;
+            s0 = peg$f0(s1, s2);
+        }
+        else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+        }
+        return s0;
+    }
+    function peg$parseFormulaTerm() {
+        let s0;
+        s0 = peg$parseEnclosedFormula();
+        if (s0 === peg$FAILED) {
+            s0 = peg$parseOpenEqualityCheck();
+        }
+        return s0;
+    }
+    function peg$parseEnclosedFormula() {
+        let s0, s1, s2, s3;
+        s0 = peg$currPos;
+        s1 = peg$parseopenBracket();
+        if (s1 !== peg$FAILED) {
+            s2 = peg$parseFormula();
+            if (s2 !== peg$FAILED) {
+                s3 = peg$parsecloseBracket();
+                if (s3 !== peg$FAILED) {
+                    peg$savedPos = s0;
+                    s0 = peg$f1(s2);
+                }
+                else {
+                    peg$currPos = s0;
+                    s0 = peg$FAILED;
+                }
+            }
+            else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+            }
+        }
+        else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+        }
+        return s0;
+    }
+    function peg$parseJoinComparator() {
+        let s0, s1, s2;
+        s0 = peg$currPos;
+        s1 = peg$parseComparator();
+        if (s1 !== peg$FAILED) {
+            s2 = peg$parseFormulaTerm();
+            if (s2 !== peg$FAILED) {
+                peg$savedPos = s0;
+                s0 = peg$f2(s1, s2);
+            }
+            else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+            }
+        }
+        else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+        }
+        return s0;
+    }
+    function peg$parseOpenEqualityCheck() {
+        let s0, s1, s2, s3, s4, s5;
+        s0 = peg$currPos;
+        s1 = peg$parseFieldRef();
+        if (s1 !== peg$FAILED) {
+            s2 = peg$parse_();
+            if (s2 === peg$FAILED) {
+                s2 = null;
+            }
+            s3 = peg$parseoperator();
+            if (s3 !== peg$FAILED) {
+                s4 = peg$parse_();
+                if (s4 === peg$FAILED) {
+                    s4 = null;
+                }
+                s5 = peg$parseValue();
+                if (s5 !== peg$FAILED) {
+                    peg$savedPos = s0;
+                    s0 = peg$f3(s1, s3, s5);
+                }
+                else {
+                    peg$currPos = s0;
+                    s0 = peg$FAILED;
+                }
+            }
+            else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+            }
+        }
+        else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+        }
+        return s0;
+    }
+    function peg$parseComparator() {
+        let s0, s1, s2, s3;
+        s0 = peg$currPos;
+        s1 = peg$parse_();
+        if (s1 === peg$FAILED) {
+            s1 = null;
+        }
+        if (input.substr(peg$currPos, 3) === peg$c0) {
+            s2 = peg$c0;
+            peg$currPos += 3;
+        }
+        else {
+            s2 = peg$FAILED;
+            if (peg$silentFails === 0) {
+                peg$fail(peg$e0);
+            }
+        }
+        if (s2 !== peg$FAILED) {
+            s3 = peg$parse_();
+            if (s3 === peg$FAILED) {
+                s3 = null;
+            }
+            peg$savedPos = s0;
+            s0 = peg$f4(s2);
+        }
+        else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+        }
+        if (s0 === peg$FAILED) {
+            s0 = peg$currPos;
+            s1 = peg$parse_();
+            if (s1 === peg$FAILED) {
+                s1 = null;
+            }
+            if (input.substr(peg$currPos, 2) === peg$c1) {
+                s2 = peg$c1;
+                peg$currPos += 2;
+            }
+            else {
+                s2 = peg$FAILED;
+                if (peg$silentFails === 0) {
+                    peg$fail(peg$e1);
+                }
+            }
+            if (s2 !== peg$FAILED) {
+                s3 = peg$parse_();
+                if (s3 === peg$FAILED) {
+                    s3 = null;
+                }
+                peg$savedPos = s0;
+                s0 = peg$f5(s2);
+            }
+            else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+            }
+        }
+        return s0;
+    }
+    function peg$parseWord() {
+        let s0, s1, s2;
+        s0 = peg$currPos;
+        s1 = [];
+        s2 = peg$parseLetter();
+        if (s2 !== peg$FAILED) {
+            while (s2 !== peg$FAILED) {
+                s1.push(s2);
+                s2 = peg$parseLetter();
+            }
+        }
+        else {
+            s1 = peg$FAILED;
+        }
+        if (s1 !== peg$FAILED) {
+            peg$savedPos = s0;
+            s1 = peg$f6(s1);
+        }
+        s0 = s1;
+        return s0;
+    }
+    function peg$parseLetter() {
+        let s0;
+        s0 = input.charAt(peg$currPos);
+        if (peg$r0.test(s0)) {
+            peg$currPos++;
+        }
+        else {
+            s0 = peg$FAILED;
+            if (peg$silentFails === 0) {
+                peg$fail(peg$e2);
+            }
+        }
+        return s0;
+    }
+    function peg$parseValue() {
+        let s0, s1;
+        s0 = peg$parsequotedValue();
+        if (s0 === peg$FAILED) {
+            s0 = peg$currPos;
+            s1 = peg$parseWord();
+            if (s1 !== peg$FAILED) {
+                peg$savedPos = s0;
+                s1 = peg$f7(s1);
+            }
+            s0 = s1;
+            if (s0 === peg$FAILED) {
+                s0 = peg$currPos;
+                s1 = peg$parsenumber();
+                if (s1 !== peg$FAILED) {
+                    peg$savedPos = s0;
+                    s1 = peg$f8(s1);
+                }
+                s0 = s1;
+            }
+        }
+        return s0;
+    }
+    function peg$parseFieldRef() {
+        let s0;
+        s0 = peg$parseFieldReference();
+        if (s0 === peg$FAILED) {
+            s0 = peg$parseMetadataFieldReference();
+        }
+        return s0;
+    }
+    function peg$parseMetadataFieldReference() {
+        let s0, s1, s2, s3;
+        s0 = peg$currPos;
+        s1 = peg$parseopenSquare();
+        if (s1 !== peg$FAILED) {
+            s2 = peg$parseFieldReference();
+            if (s2 !== peg$FAILED) {
+                s3 = peg$parsecloseSquare();
+                if (s3 !== peg$FAILED) {
+                    peg$savedPos = s0;
+                    s0 = peg$f9(s1, s2, s3);
+                }
+                else {
+                    peg$currPos = s0;
+                    s0 = peg$FAILED;
+                }
+            }
+            else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+            }
+        }
+        else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+        }
+        return s0;
+    }
+    function peg$parseFieldReference() {
+        let s0, s1, s2;
+        s0 = peg$currPos;
+        s1 = [];
+        s2 = input.charAt(peg$currPos);
+        if (peg$r1.test(s2)) {
+            peg$currPos++;
+        }
+        else {
+            s2 = peg$FAILED;
+            if (peg$silentFails === 0) {
+                peg$fail(peg$e3);
+            }
+        }
+        if (s2 !== peg$FAILED) {
+            while (s2 !== peg$FAILED) {
+                s1.push(s2);
+                s2 = input.charAt(peg$currPos);
+                if (peg$r1.test(s2)) {
+                    peg$currPos++;
+                }
+                else {
+                    s2 = peg$FAILED;
+                    if (peg$silentFails === 0) {
+                        peg$fail(peg$e3);
+                    }
+                }
+            }
+        }
+        else {
+            s1 = peg$FAILED;
+        }
+        if (s1 !== peg$FAILED) {
+            peg$savedPos = s0;
+            s1 = peg$f10(s1);
+        }
+        s0 = s1;
+        return s0;
+    }
+    function peg$parseopenSquare() {
+        let s0;
+        if (input.charCodeAt(peg$currPos) === 91) {
+            s0 = peg$c2;
+            peg$currPos++;
+        }
+        else {
+            s0 = peg$FAILED;
+            if (peg$silentFails === 0) {
+                peg$fail(peg$e4);
+            }
+        }
+        return s0;
+    }
+    function peg$parsecloseSquare() {
+        let s0;
+        if (input.charCodeAt(peg$currPos) === 93) {
+            s0 = peg$c3;
+            peg$currPos++;
+        }
+        else {
+            s0 = peg$FAILED;
+            if (peg$silentFails === 0) {
+                peg$fail(peg$e5);
+            }
+        }
+        return s0;
+    }
+    function peg$parsenumber() {
+        let s0, s1;
+        s0 = [];
+        s1 = input.charAt(peg$currPos);
+        if (peg$r2.test(s1)) {
+            peg$currPos++;
+        }
+        else {
+            s1 = peg$FAILED;
+            if (peg$silentFails === 0) {
+                peg$fail(peg$e6);
+            }
+        }
+        if (s1 !== peg$FAILED) {
+            while (s1 !== peg$FAILED) {
+                s0.push(s1);
+                s1 = input.charAt(peg$currPos);
+                if (peg$r2.test(s1)) {
+                    peg$currPos++;
+                }
+                else {
+                    s1 = peg$FAILED;
+                    if (peg$silentFails === 0) {
+                        peg$fail(peg$e6);
+                    }
+                }
+            }
+        }
+        else {
+            s0 = peg$FAILED;
+        }
+        return s0;
+    }
+    function peg$parsequotedValue() {
+        let s0, s1, s2, s3;
+        s0 = peg$currPos;
+        if (input.charCodeAt(peg$currPos) === 34) {
+            s1 = peg$c4;
+            peg$currPos++;
+        }
+        else {
+            s1 = peg$FAILED;
+            if (peg$silentFails === 0) {
+                peg$fail(peg$e7);
+            }
+        }
+        if (s1 !== peg$FAILED) {
+            s2 = [];
+            s3 = input.charAt(peg$currPos);
+            if (peg$r3.test(s3)) {
+                peg$currPos++;
+            }
+            else {
+                s3 = peg$FAILED;
+                if (peg$silentFails === 0) {
+                    peg$fail(peg$e8);
+                }
+            }
+            while (s3 !== peg$FAILED) {
+                s2.push(s3);
+                s3 = input.charAt(peg$currPos);
+                if (peg$r3.test(s3)) {
+                    peg$currPos++;
+                }
+                else {
+                    s3 = peg$FAILED;
+                    if (peg$silentFails === 0) {
+                        peg$fail(peg$e8);
+                    }
+                }
+            }
+            if (input.charCodeAt(peg$currPos) === 34) {
+                s3 = peg$c4;
+                peg$currPos++;
+            }
+            else {
+                s3 = peg$FAILED;
+                if (peg$silentFails === 0) {
+                    peg$fail(peg$e7);
+                }
+            }
+            if (s3 !== peg$FAILED) {
+                peg$savedPos = s0;
+                s0 = peg$f11(s2);
+            }
+            else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+            }
+        }
+        else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+        }
+        return s0;
+    }
+    function peg$parseopenBracket() {
+        let s0, s1, s2, s3;
+        s0 = peg$currPos;
+        s1 = peg$parse_();
+        if (s1 === peg$FAILED) {
+            s1 = null;
+        }
+        if (input.charCodeAt(peg$currPos) === 40) {
+            s2 = peg$c5;
+            peg$currPos++;
+        }
+        else {
+            s2 = peg$FAILED;
+            if (peg$silentFails === 0) {
+                peg$fail(peg$e9);
+            }
+        }
+        if (s2 !== peg$FAILED) {
+            s3 = peg$parse_();
+            if (s3 === peg$FAILED) {
+                s3 = null;
+            }
+            s1 = [s1, s2, s3];
+            s0 = s1;
+        }
+        else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+        }
+        return s0;
+    }
+    function peg$parsecloseBracket() {
+        let s0, s1, s2, s3;
+        s0 = peg$currPos;
+        s1 = peg$parse_();
+        if (s1 === peg$FAILED) {
+            s1 = null;
+        }
+        if (input.charCodeAt(peg$currPos) === 41) {
+            s2 = peg$c6;
+            peg$currPos++;
+        }
+        else {
+            s2 = peg$FAILED;
+            if (peg$silentFails === 0) {
+                peg$fail(peg$e10);
+            }
+        }
+        if (s2 !== peg$FAILED) {
+            s3 = peg$parse_();
+            if (s3 === peg$FAILED) {
+                s3 = null;
+            }
+            s1 = [s1, s2, s3];
+            s0 = s1;
+        }
+        else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+        }
+        return s0;
+    }
+    function peg$parseoperator() {
+        let s0;
+        if (input.charCodeAt(peg$currPos) === 61) {
+            s0 = peg$c7;
+            peg$currPos++;
+        }
+        else {
+            s0 = peg$FAILED;
+            if (peg$silentFails === 0) {
+                peg$fail(peg$e11);
+            }
+        }
+        if (s0 === peg$FAILED) {
+            if (input.substr(peg$currPos, 2) === peg$c8) {
+                s0 = peg$c8;
+                peg$currPos += 2;
+            }
+            else {
+                s0 = peg$FAILED;
+                if (peg$silentFails === 0) {
+                    peg$fail(peg$e12);
+                }
+            }
+            if (s0 === peg$FAILED) {
+                if (input.substr(peg$currPos, 8) === peg$c9) {
+                    s0 = peg$c9;
+                    peg$currPos += 8;
+                }
+                else {
+                    s0 = peg$FAILED;
+                    if (peg$silentFails === 0) {
+                        peg$fail(peg$e13);
+                    }
+                }
+            }
+        }
+        return s0;
+    }
+    function peg$parsews() {
+        let s0, s1;
+        peg$silentFails++;
+        s0 = input.charAt(peg$currPos);
+        if (peg$r4.test(s0)) {
+            peg$currPos++;
+        }
+        else {
+            s0 = peg$FAILED;
+            if (peg$silentFails === 0) {
+                peg$fail(peg$e15);
+            }
+        }
+        peg$silentFails--;
+        if (s0 === peg$FAILED) {
+            s1 = peg$FAILED;
+            if (peg$silentFails === 0) {
+                peg$fail(peg$e14);
+            }
+        }
+        return s0;
+    }
+    function peg$parse_() {
+        let s0, s1;
+        peg$silentFails++;
+        s0 = [];
+        s1 = peg$parsews();
+        if (s1 !== peg$FAILED) {
+            while (s1 !== peg$FAILED) {
+                s0.push(s1);
+                s1 = peg$parsews();
+            }
+        }
+        else {
+            s0 = peg$FAILED;
+        }
+        peg$silentFails--;
+        if (s0 === peg$FAILED) {
+            s1 = peg$FAILED;
+            if (peg$silentFails === 0) {
+                peg$fail(peg$e16);
+            }
+        }
+        return s0;
+    }
     function flat(arr, depth = 1) {
-      var flatten = function (arr, depth = 1) {
-        if (depth) return arr;
-
-      // Otherwise, concatenate into the parent array
-      return arr.reduce(function (acc, val) {
-        return acc.concat(Array.isArray(val) ? flatten(val, depth - 1) : val);
-      }, []);
-
-      };
-
-    return flatten(arr, depth - 1);
+        var flatten = function (arr, depth = 1) {
+            if (depth)
+                return arr;
+            // Otherwise, concatenate into the parent array
+            return arr.reduce(function (acc, val) {
+                return acc.concat(Array.isArray(val) ? flatten(val, depth - 1) : val);
+            }, []);
+        };
+        return flatten(arr, depth - 1);
+    }
+    peg$result = peg$startRuleFunction();
+    const peg$success = (peg$result !== peg$FAILED && peg$currPos === input.length);
+    function peg$throw() {
+        if (peg$result !== peg$FAILED && peg$currPos < input.length) {
+            peg$fail(peg$endExpectation());
+        }
+        throw peg$buildStructuredError(peg$maxFailExpected, peg$maxFailPos < input.length ? peg$getUnicode(peg$maxFailPos) : null, peg$maxFailPos < input.length
+            ? peg$computeLocation(peg$maxFailPos, peg$maxFailPos + 1)
+            : peg$computeLocation(peg$maxFailPos, peg$maxFailPos));
+    }
+    if (options.peg$library) {
+        return /** @type {any} */ ({
+            peg$result,
+            peg$currPos,
+            peg$FAILED,
+            peg$maxFailExpected,
+            peg$maxFailPos,
+            peg$success,
+            peg$throw: peg$success ? undefined : peg$throw,
+        });
     }
-  }
-
-  Start
-    = Formula
-
-  Formula
-    = EnclosedFormula
-    / OpenFormula
-
-  EnclosedFormula
-    = bracket formula:OpenFormula bracket join:(JoinComparator)*
-      { return flat([ [formula], join[0] ], 1) }
-
-  OpenFormula
-    = eq:OpenEqualityCheck joins:(JoinComparator)*
-      { return flat([ eq, flat(joins) ]) }
-
-  JoinComparator
-    = comp:Comparator eq:OpenEqualityCheck
-      { return [comp, eq]; }
-      / CompoundJoinComparator
-
-  CompoundJoinComparator
-    = comp:Comparator bracket f:OpenFormula bracket
-      { return [comp, f ] }
-
-  OpenEqualityCheck
-    = fr:FieldRef _? op:operator _? val:Value
-     { return { fieldReference: fr, comparator: op, value: val } }
-
-  Comparator
-   = _? c:'AND' _?
-   { return c; }
-   / _? c:'OR' _?
-   { return c; }
-
-  Word
-   = l:Letter+
-   { return l.join(""); }
-
-  Letter
-   = [a-zA-Z]
-
-  Value
-   = v:quotedValue / v:Word
-   { return v.join("") }
-   / v:number
-   { return parseInt(v.join("")) }
-
-  FieldRef
-   = FieldReference / MetadataFieldReference
-
-  MetadataFieldReference
-    = s1:openSquare fr:FieldReference s2:closeSquare
-    { return s1 + fr + s2 }
-
-  FieldReference
-    = characters:[A-Za-z0-9._-]+ { return characters.join(""); }
-
-  openSquare
-   = "["
-
-  closeSquare
-   = "]"
-
-  number
-   = [0-9]+
-
-  quotedValue
-   = '"'val:[A-Za-z0-9.,* _&()/-]*'"'
-   { return val.join(""); }
-
-  bracket
-   = (_? "("+ _? / _? ")"+ _? )
-
-  operator
-   = "=" / "!=" / "CONTAINS"
-
-  ws "Whitespace"
-   = [ \t]
-
-  _ "One or more whitespaces"
-   = ws+
+    if (peg$success) {
+        return peg$result;
+    }
+    else {
+        peg$throw();
+    }
+}
+const peg$allowedStartRules = [
+    "Start"
+];
 
-  nl "New line"
-   = "\\n"`;
-var peg = generate(conditionSource);
+var parser = /*#__PURE__*/Object.freeze({
+    __proto__: null,
+    StartRules: peg$allowedStartRules,
+    SyntaxError: peg$SyntaxError,
+    parse: peg$parse
+});
 
 class ConditionParser {
     static logger = new StructuredLoggerService();
@@ -4910,7 +5757,7 @@ class ConditionParser {
             return null;
         }
         condition = condition.replace(/CONTAINS/g, ' CONTAINS');
-        return peg.parse(condition.trim(), {});
+        return parser.parse(condition.trim(), {});
     }
     /**
      * Evaluate the current fields against the conditions
@@ -7059,6 +7906,7 @@ class LabelSubstitutorModule {
     static ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ providers: [
             FieldsUtils,
             CurrencyPipe,
+            PlaceholderService
         ] });
 }
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(LabelSubstitutorModule, [{
@@ -7073,6 +7921,7 @@ class LabelSubstitutorModule {
                 providers: [
                     FieldsUtils,
                     CurrencyPipe,
+                    PlaceholderService
                 ]
             }]
     }], null, null); })();
@@ -8121,6 +8970,9 @@ class RequestOptionsBuilder {
      * @param value The value to be assessed.
      */
     static includeParam(value) {
+        if (Array.isArray(value)) {
+            return value.some(item => RequestOptionsBuilder.includeParam(item));
+        }
         /* istanbul ignore else */
         if (value) {
             /* istanbul ignore else */
@@ -8131,6 +8983,36 @@ class RequestOptionsBuilder {
         }
         return false;
     }
+    static sanitiseValue(value) {
+        const trimmedValue = value.trim ? value.trim() : value;
+        return trimmedValue.replace ? trimmedValue.replace(/’/i, `'`) : trimmedValue;
+    }
+    static getValueByPath(value, path) {
+        return path.split('.').reduce((currentValue, pathPart) => {
+            if (currentValue === undefined || currentValue === null) {
+                return undefined;
+            }
+            return currentValue[pathPart];
+        }, value);
+    }
+    static getCollectionValues(value, criterion) {
+        if (!Array.isArray(value) ||
+            !criterion.includes('.value.') ||
+            value.some(item => item === null || typeof item !== 'object' || !Object.hasOwn(item, 'value'))) {
+            return value;
+        }
+        const valuePath = criterion.substring(criterion.indexOf('.value.') + 1);
+        return value.map(item => RequestOptionsBuilder.getValueByPath(item, valuePath));
+    }
+    static appendParam(params, key, value) {
+        if (Array.isArray(value)) {
+            const values = value
+                .filter(item => RequestOptionsBuilder.includeParam(item))
+                .map(item => RequestOptionsBuilder.sanitiseValue(item));
+            return params.set(key, `[${values.join(', ')}]`);
+        }
+        return params.set(key, RequestOptionsBuilder.sanitiseValue(value));
+    }
     buildOptions(metaCriteria, caseCriteria, view) {
         // TODO: This should probably be the now built-in URLSearchParams but it
         // requires a bigger refactor and there are bigger fish to fry right now.
@@ -8155,8 +9037,7 @@ class RequestOptionsBuilder {
                 /* istanbul ignore else */
                 if (RequestOptionsBuilder.includeParam(caseCriteria[criterion])) {
                     const key = RequestOptionsBuilder.FIELD_PREFIX + criterion;
-                    const value = caseCriteria[criterion].trim ? caseCriteria[criterion].trim() : caseCriteria[criterion];
-                    params = params.set(key, value.replace(/’/i, `'`));
+                    params = RequestOptionsBuilder.appendParam(params, key, RequestOptionsBuilder.getCollectionValues(caseCriteria[criterion], criterion));
                 }
             }
         }
@@ -8669,31 +9550,32 @@ class CaseAccessUtils {
     static CTSC_ROLE = 'ctsc';
     static CTSC_ROLE_CATEGORY = 'CTSC';
     static CTSC_ROLE_NAME = 'ctsc';
-    getMappedRoleCategory(roles = [], roleCategories = []) {
+    // fallback purely if roleCategories is not available in 
+    getMappedRoleCategories(roles = []) {
         const roleKeywords = roles.join().split('-').join().split(',');
-        if (this.roleOrCategoryExists(CaseAccessUtils.JUDGE_ROLE, CaseAccessUtils.JUDGE_ROLE_CATEGORY, roleKeywords, roleCategories)) {
-            return CaseAccessUtils.JUDGE_ROLE_CATEGORY;
+        const roleCategoryList = [];
+        if (this.roleHasKeyword(CaseAccessUtils.JUDGE_ROLE, roleKeywords)) {
+            roleCategoryList.push(CaseAccessUtils.JUDGE_ROLE_CATEGORY);
         }
-        else if (this.roleOrCategoryExists(CaseAccessUtils.PROFESSIONAL_ROLE, CaseAccessUtils.PROFESSIONAL_ROLE_CATEGORY, roleKeywords, roleCategories)) {
-            return CaseAccessUtils.PROFESSIONAL_ROLE_CATEGORY;
+        if (this.roleHasKeyword(CaseAccessUtils.PROFESSIONAL_ROLE, roleKeywords)) {
+            roleCategoryList.push(CaseAccessUtils.PROFESSIONAL_ROLE_CATEGORY);
         }
-        else if (this.roleOrCategoryExists(CaseAccessUtils.CITIZEN_ROLE, CaseAccessUtils.CITIZEN_ROLE_CATEGORY, roleKeywords, roleCategories)) {
-            return CaseAccessUtils.CITIZEN_ROLE_CATEGORY;
+        if (this.roleHasKeyword(CaseAccessUtils.CITIZEN_ROLE, roleKeywords)) {
+            roleCategoryList.push(CaseAccessUtils.CITIZEN_ROLE_CATEGORY);
         }
-        else if (this.roleOrCategoryExists(CaseAccessUtils.ADMIN_ROLE, CaseAccessUtils.ADMIN_ROLE_CATEGORY, roleKeywords, roleCategories)) {
-            return CaseAccessUtils.ADMIN_ROLE_CATEGORY;
+        if (this.roleHasKeyword(CaseAccessUtils.ADMIN_ROLE, roleKeywords)) {
+            roleCategoryList.push(CaseAccessUtils.ADMIN_ROLE_CATEGORY);
         }
-        else if (this.roleOrCategoryExists(CaseAccessUtils.CTSC_ROLE, CaseAccessUtils.CTSC_ROLE_CATEGORY, roleKeywords, roleCategories)) {
-            return CaseAccessUtils.CTSC_ROLE_CATEGORY;
+        if (this.roleHasKeyword(CaseAccessUtils.CTSC_ROLE, roleKeywords)) {
+            roleCategoryList.push(CaseAccessUtils.CTSC_ROLE_CATEGORY);
         }
-        else {
-            return CaseAccessUtils.LEGAL_OPERATIONS_ROLE_CATEGORY;
+        if (this.roleHasKeyword(CaseAccessUtils.LEGAL_OPERATIONS_ROLE, roleKeywords)) {
+            roleCategoryList.push(CaseAccessUtils.LEGAL_OPERATIONS_ROLE_CATEGORY);
         }
+        return roleCategoryList;
     }
-    roleOrCategoryExists(roleKeyword, roleCategory, roleKeywords, roleCategories) {
-        const categoryExists = roleCategories.indexOf(roleCategory) > -1;
-        const keywordExists = roleKeywords.indexOf(roleKeyword) > -1;
-        return categoryExists ? categoryExists : keywordExists;
+    roleHasKeyword(keyword, roleWords) {
+        return roleWords.includes(keyword);
     }
     getAMRoleName(accessType, aMRole) {
         let roleName = '';
@@ -9123,10 +10005,10 @@ class CaseworkerService {
         this.appConfig = appConfig;
         this.errorService = errorService;
     }
-    getCaseworkers(serviceId) {
-        const url = `${this.appConfig.getWorkAllocationApiUrl()}/caseworker/getUsersByServiceName`;
+    getUserByIdamId(idamId) {
+        const url = `${this.appConfig.getWorkAllocationApiUrl()}/caseworker/getUserByIdamId`;
         return this.http
-            .post(url, { services: [serviceId] })
+            .post(url, idamId)
             .pipe(catchError(error => {
             this.errorService.setError(error);
             return throwError(error);
@@ -9977,8 +10859,10 @@ class CaseEditComponent {
         return form.value.event.id;
     }
     generateCaseEventData({ eventTrigger, form }) {
+        const formData = this.replaceHiddenFormValuesWithOriginalCaseData(form.get('data'), eventTrigger.case_fields);
+        this.formValueService.sanitiseDynamicLists(eventTrigger.case_fields, { data: formData });
         const caseEventData = {
-            data: this.replaceEmptyComplexFieldValues(this.formValueService.sanitise(this.replaceHiddenFormValuesWithOriginalCaseData(form.get('data'), eventTrigger.case_fields), this.isCaseFlagSubmission)),
+            data: this.replaceEmptyComplexFieldValues(this.formValueService.sanitise(formData, this.isCaseFlagSubmission)),
             event: form.value.event
         };
         this.formValueService.clearNonCaseFields(caseEventData.data, eventTrigger.case_fields);
@@ -10578,30 +11462,35 @@ class CasesService {
     }
     createChallengedAccessRequest(caseId, request) {
         // Assignment API endpoint
-        const userInfoStr = this.sessionStorageService.getItem('userDetails');
         const camUtils = new CaseAccessUtils();
-        let userInfo;
-        if (userInfoStr) {
-            userInfo = JSON.parse(userInfoStr);
-        }
-        const roleCategory = userInfo.roleCategory || camUtils.getMappedRoleCategory(userInfo.roles, userInfo.roleCategories);
-        const roleName = camUtils.getAMRoleName('challenged', roleCategory);
+        let userInfo = getUserDetails(this.sessionStorageService);
+        if (!userInfo) {
+            return throwError(() => new Error('User info not found in session storage'));
+        }
+        // EXUI-4758 - getMappedRoleCategories no longer returns a single string, checks all roles to get the most likely roleCategory
+        // Unsure whether we should be using mapped role categories any more - should trust the roleCategories from userInfo if they exist
+        const roleCategories = userInfo.roleCategories || camUtils.getMappedRoleCategories(userInfo.roles);
+        // If user has no role categories, default to LEGAL_OPERATIONS
+        const roleName = camUtils.getAMRoleName('challenged', roleCategories?.length > 0 ? roleCategories[0] : "LEGAL_OPERATIONS");
         const beginTime = new Date();
         const endTime = new Date(new Date().setUTCHours(23, 59, 59, 999));
         const id = userInfo.id ? userInfo.id : userInfo.uid;
         const isNew = true;
-        const payload = camUtils.getAMPayload(id, id, roleName, roleCategory, 'CHALLENGED', caseId, request, beginTime, endTime, isNew);
+        const payload = camUtils.getAMPayload(id, id, roleName, 
+        // EXUI-4758 - Return first roleCategory as the roleCategory
+        roleCategories[0], 'CHALLENGED', caseId, request, beginTime, endTime, isNew);
         return this.http.post(`/api/challenged-access-request`, payload);
     }
     createSpecificAccessRequest(caseId, sar) {
-        // Assignment API endpoint
-        const userInfoStr = this.sessionStorageService.getItem('userDetails');
         const camUtils = new CaseAccessUtils();
-        let userInfo;
-        if (userInfoStr) {
-            userInfo = JSON.parse(userInfoStr);
-        }
-        const roleCategory = userInfo.roleCategory || camUtils.getMappedRoleCategory(userInfo.roles, userInfo.roleCategories);
+        let userInfo = getUserDetails(this.sessionStorageService);
+        if (!userInfo) {
+            return throwError(() => new Error('User info not found in session storage'));
+        }
+        // EXUI-4758 - See above comment
+        const roleCategories = userInfo.roleCategories || camUtils.getMappedRoleCategories(userInfo.roles);
+        // EXUI-4758 - Return first roleCategory as the roleCategory for now, unless not present, in which case default to LEGAL_OPERATIONS
+        const roleCategory = roleCategories?.length > 0 ? roleCategories[0] : "LEGAL_OPERATIONS";
         const roleName = camUtils.getAMRoleName('specific', roleCategory);
         const id = userInfo.id ? userInfo.id : userInfo.uid;
         const payload = camUtils.getAMPayload(null, id, roleName, roleCategory, 'SPECIFIC', caseId, sar, null, null, true);
@@ -11558,6 +12447,8 @@ class CaseEditPageComponent {
     saveDraftSub;
     caseFormValidationErrorsSub;
     logger = new StructuredLoggerService();
+    fieldsUtils = new FieldsUtils();
+    placeholderService = new PlaceholderService();
     caseEditFormComponents;
     static scrollToTop() {
         window.scrollTo(0, 0);
@@ -11722,7 +12613,7 @@ class CaseEditPageComponent {
                 ? group.get(`${casefield.id}_judicialUserControl`)
                 : group.get(casefield.id);
             if (fieldElement) {
-                const label = casefield.label || 'Field';
+                const label = this.getInterpolatedFieldLabel(casefield);
                 let id = casefield.id;
                 if (fieldElement['component'] && (fieldElement['component'].parent || sourceFromComplexField)) {
                     if (fieldElement['component'].idPrefix.indexOf(`_${id}_`) === -1) {
@@ -11787,7 +12678,7 @@ class CaseEditPageComponent {
                         });
                     }
                     else {
-                        this.validationErrors.push({ id, message: `Select or fill the required ${casefield.label} field` });
+                        this.validationErrors.push({ id, message: `Select or fill the required ${label} field` });
                         fieldElement.markAsDirty();
                     }
                 }
@@ -12195,7 +13086,20 @@ class CaseEditPageComponent {
         });
     }
     getRpxTranslatePipeArgs(fieldLabel) {
-        return fieldLabel ? ({ FIELDLABEL: fieldLabel }) : null;
+        return fieldLabel ? ({ FIELDLABEL: this.resolveLabelPlaceholders(fieldLabel) }) : null;
+    }
+    getInterpolatedFieldLabel(caseField) {
+        const label = caseField.label || 'Field';
+        return this.resolveLabelPlaceholders(label);
+    }
+    resolveLabelPlaceholders(label) {
+        const dataControl = this.editForm?.controls?.['data'];
+        const formFields = dataControl && typeof dataControl.getRawValue === 'function'
+            ? dataControl.getRawValue()
+            : {};
+        const contextFields = this.caseFields?.length ? this.caseFields : this.eventTrigger?.case_fields || [];
+        const fields = this.fieldsUtils.mergeLabelCaseFieldsAndFormFields(contextFields, formFields);
+        return this.placeholderService.resolvePlaceholders(fields, label);
     }
     onEventCanBeCompleted(eventCanBeCompleted) {
         this.caseEdit.onEventCanBeCompleted({
@@ -12255,7 +13159,7 @@ class CaseEditPageComponent {
             type: ViewChildren,
             args: [CaseEditFormComponent]
         }] }); })();
-(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(CaseEditPageComponent, { className: "CaseEditPageComponent", filePath: "lib/shared/components/case-editor/case-edit-page/case-edit-page.component.ts", lineNumber: 37 }); })();
+(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(CaseEditPageComponent, { className: "CaseEditPageComponent", filePath: "lib/shared/components/case-editor/case-edit-page/case-edit-page.component.ts", lineNumber: 38 }); })();
 
 class CallbackErrorsContext {
     triggerText;
@@ -12701,12 +13605,9 @@ class CaseEventCompletionTaskReassignedComponent {
         this.jurisdiction = task.jurisdiction;
         this.caseType = task.case_type_id;
         // Current user is a caseworker?
-        this.caseworkerSubscription = this.caseworkerService.getCaseworkers(task.jurisdiction).subscribe(result => {
-            if (result && result[0].service === task.jurisdiction && result[0].caseworkers) {
-                const caseworker = result[0].caseworkers.find(x => x.idamId === task.assignee);
-                if (caseworker) {
-                    this.assignedUserName = `${caseworker.firstName} ${caseworker.lastName}`;
-                }
+        this.caseworkerSubscription = this.caseworkerService.getUserByIdamId(task.assignee).subscribe(caseworker => {
+            if (caseworker) {
+                this.assignedUserName = `${caseworker.firstName} ${caseworker.lastName}`;
             }
             if (!this.assignedUserName) {
                 // Current user is a judicial user?
@@ -25350,7 +26251,7 @@ class FieldReadComponent extends AbstractFieldReadComponent {
             type: ViewChild,
             args: ['fieldContainer', { static: false, read: ViewContainerRef }]
         }] }); })();
-(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(FieldReadComponent, { className: "FieldReadComponent", filePath: "lib/shared/components/palette/base-field/field-read.component.ts", lineNumber: 16 }); })();
+(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(FieldReadComponent, { className: "FieldReadComponent", filePath: "lib/shared/components/palette/base-field/field-read.component.ts", lineNumber: 15 }); })();
 
 const _c0$y = ["fieldContainer"];
 const FIX_CASEFIELD_FOR = ['FixedList', 'DynamicList', 'DynamicMultiSelectList'];
@@ -29712,22 +30613,24 @@ class UpdateFlagTitleDisplayPipe extends AsyncPipe {
 
 const _c0$l = (a0, a1, a2) => [a0, false, undefined, true, a1, a2];
 function ReadComplexFieldRawComponent_ng_container_1_Template(rf, ctx) { if (rf & 1) {
-    i0.ɵɵelementContainerStart(0);
-    i0.ɵɵelementStart(1, "dt", 2)(2, "span", 3);
-    i0.ɵɵtext(3);
-    i0.ɵɵpipe(4, "rpxTranslate");
+    i0.ɵɵelementContainerStart(0)(1, 2);
+    i0.ɵɵelementStart(2, "dt", 3)(3, "span", 4);
+    i0.ɵɵtext(4);
+    i0.ɵɵpipe(5, "rpxTranslate");
     i0.ɵɵelementEnd()();
-    i0.ɵɵelementStart(5, "dd", 2);
-    i0.ɵɵelement(6, "ccd-field-read", 4);
+    i0.ɵɵelementStart(6, "dd", 3);
+    i0.ɵɵelement(7, "ccd-field-read", 5);
     i0.ɵɵelementEnd();
-    i0.ɵɵelementContainerEnd();
+    i0.ɵɵelementContainerEnd()();
 } if (rf & 2) {
     const field_r1 = ctx.$implicit;
     const ctx_r1 = i0.ɵɵnextContext();
     i0.ɵɵadvance();
+    i0.ɵɵproperty("caseField", field_r1)("formGroup", ctx_r1.topLevelFormGroup)("contextFields", ctx_r1.caseFields);
+    i0.ɵɵadvance();
     i0.ɵɵproperty("hidden", field_r1.hidden || field_r1.field_type.type === "Label");
     i0.ɵɵadvance(2);
-    i0.ɵɵtextInterpolate(ctx_r1.isTranslatable(field_r1) ? i0.ɵɵpipeBind1(4, 8, field_r1.label) : field_r1.label);
+    i0.ɵɵtextInterpolate(ctx_r1.isTranslatable(field_r1) ? i0.ɵɵpipeBind1(5, 11, field_r1.label) : field_r1.label);
     i0.ɵɵadvance(2);
     i0.ɵɵproperty("hidden", field_r1.hidden);
     i0.ɵɵadvance();
@@ -29740,9 +30643,9 @@ function ReadComplexFieldRawComponent_ng_container_1_Template(rf, ctx) { if (rf
 class ReadComplexFieldRawComponent extends AbstractFieldReadComponent {
     caseFields = [];
     static ɵfac = /*@__PURE__*/ (() => { let ɵReadComplexFieldRawComponent_BaseFactory; return function ReadComplexFieldRawComponent_Factory(__ngFactoryType__) { return (ɵReadComplexFieldRawComponent_BaseFactory || (ɵReadComplexFieldRawComponent_BaseFactory = i0.ɵɵgetInheritedFactory(ReadComplexFieldRawComponent)))(__ngFactoryType__ || ReadComplexFieldRawComponent); }; })();
-    static ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: ReadComplexFieldRawComponent, selectors: [["ccd-read-complex-field-raw"]], inputs: { caseFields: "caseFields" }, standalone: false, features: [i0.ɵɵInheritDefinitionFeature], decls: 3, vars: 12, consts: [[1, "complex-raw"], [4, "ngFor", "ngForOf"], [3, "hidden"], [1, "text-16"], [3, "caseField", "context", "caseFields", "topLevelFormGroup", "idPrefix"]], template: function ReadComplexFieldRawComponent_Template(rf, ctx) { if (rf & 1) {
+    static ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: ReadComplexFieldRawComponent, selectors: [["ccd-read-complex-field-raw"]], inputs: { caseFields: "caseFields" }, standalone: false, features: [i0.ɵɵInheritDefinitionFeature], decls: 3, vars: 12, consts: [[1, "complex-raw"], [4, "ngFor", "ngForOf"], ["ccdLabelSubstitutor", "", 3, "caseField", "formGroup", "contextFields"], [3, "hidden"], [1, "text-16"], [3, "caseField", "context", "caseFields", "topLevelFormGroup", "idPrefix"]], template: function ReadComplexFieldRawComponent_Template(rf, ctx) { if (rf & 1) {
             i0.ɵɵelementStart(0, "dl", 0);
-            i0.ɵɵtemplate(1, ReadComplexFieldRawComponent_ng_container_1_Template, 7, 10, "ng-container", 1);
+            i0.ɵɵtemplate(1, ReadComplexFieldRawComponent_ng_container_1_Template, 8, 13, "ng-container", 1);
             i0.ɵɵpipe(2, "ccdReadFieldsFilter");
             i0.ɵɵelementEnd();
         } if (rf & 2) {
@@ -29752,17 +30655,17 @@ class ReadComplexFieldRawComponent extends AbstractFieldReadComponent {
 }
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(ReadComplexFieldRawComponent, [{
         type: Component,
-        args: [{ selector: 'ccd-read-complex-field-raw', standalone: false, template: "<dl class=\"complex-raw\">\n  <ng-container *ngFor=\"let field of caseField | ccdReadFieldsFilter:false :undefined :true :topLevelFormGroup :id()\">\n    <dt [hidden]=\"field.hidden || field.field_type.type === 'Label'\"><span class=\"text-16\">{{isTranslatable(field) ? (field.label | rpxTranslate) : field.label}}</span></dt>\n    <dd [hidden]=\"field.hidden\">\n      <ccd-field-read [caseField]=\"field\" [context]=\"context\" [caseFields]=\"caseFields\" [topLevelFormGroup]=\"topLevelFormGroup\" [idPrefix]=\"idPrefix\"></ccd-field-read>\n    </dd>\n  </ng-container>\n</dl>\n", styles: ["dl.complex-raw{list-style-type:none;margin:5px 0 10px}dl.complex-raw dl.complex-raw{padding-left:2ch}dl.complex-raw dt{font-weight:700}\n"] }]
+        args: [{ selector: 'ccd-read-complex-field-raw', standalone: false, template: "<dl class=\"complex-raw\">\n  <ng-container *ngFor=\"let field of caseField | ccdReadFieldsFilter:false :undefined :true :topLevelFormGroup :id()\">\n     <ng-container ccdLabelSubstitutor [caseField]=\"field\" [formGroup]=\"topLevelFormGroup\" [contextFields]=\"caseFields\">\n      <dt [hidden]=\"field.hidden || field.field_type.type === 'Label'\"><span class=\"text-16\">{{isTranslatable(field) ? (field.label | rpxTranslate) : field.label}}</span></dt>\n      <dd [hidden]=\"field.hidden\">\n        <ccd-field-read [caseField]=\"field\" [context]=\"context\" [caseFields]=\"caseFields\" [topLevelFormGroup]=\"topLevelFormGroup\" [idPrefix]=\"idPrefix\"></ccd-field-read>\n      </dd>\n    </ng-container>\n  </ng-container>\n</dl>\n", styles: ["dl.complex-raw{list-style-type:none;margin:5px 0 10px}dl.complex-raw dl.complex-raw{padding-left:2ch}dl.complex-raw dt{font-weight:700}\n"] }]
     }], null, { caseFields: [{
             type: Input
         }] }); })();
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(ReadComplexFieldRawComponent, { className: "ReadComplexFieldRawComponent", filePath: "lib/shared/components/palette/complex/read-complex-field-raw.component.ts", lineNumber: 17 }); })();
 
 const _c0$k = (a0, a1, a2, a3) => [a0, false, undefined, true, a1, a2, a3];
-function ReadComplexFieldTableComponent_ng_container_9_ng_container_1_Template(rf, ctx) { if (rf & 1) {
+function ReadComplexFieldTableComponent_ng_container_9_ng_container_2_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementContainerStart(0);
-    i0.ɵɵelementStart(1, "tr", 7)(2, "td", 8)(3, "span", 3);
-    i0.ɵɵelement(4, "ccd-field-read", 9);
+    i0.ɵɵelementStart(1, "tr", 8)(2, "td", 9)(3, "span", 3);
+    i0.ɵɵelement(4, "ccd-field-read", 10);
     i0.ɵɵelementEnd()()();
     i0.ɵɵelementContainerEnd();
 } if (rf & 2) {
@@ -29773,13 +30676,13 @@ function ReadComplexFieldTableComponent_ng_container_9_ng_container_1_Template(r
     i0.ɵɵadvance(3);
     i0.ɵɵproperty("topLevelFormGroup", ctx_r1.topLevelFormGroup)("caseFields", ctx_r1.caseFields)("caseField", field_r1)("context", ctx_r1.context);
 } }
-function ReadComplexFieldTableComponent_ng_container_9_ng_template_3_Template(rf, ctx) { if (rf & 1) {
-    i0.ɵɵelementStart(0, "tr", 10)(1, "th", 11)(2, "span", 3);
+function ReadComplexFieldTableComponent_ng_container_9_ng_template_4_Template(rf, ctx) { if (rf & 1) {
+    i0.ɵɵelementStart(0, "tr", 11)(1, "th", 12)(2, "span", 3);
     i0.ɵɵtext(3);
     i0.ɵɵpipe(4, "rpxTranslate");
     i0.ɵɵelementEnd()();
     i0.ɵɵelementStart(5, "td")(6, "span", 3);
-    i0.ɵɵelement(7, "ccd-field-read", 9);
+    i0.ɵɵelement(7, "ccd-field-read", 10);
     i0.ɵɵelementEnd()()();
 } if (rf & 2) {
     const field_r1 = i0.ɵɵnextContext().$implicit;
@@ -29791,16 +30694,19 @@ function ReadComplexFieldTableComponent_ng_container_9_ng_template_3_Template(rf
     i0.ɵɵproperty("topLevelFormGroup", ctx_r1.topLevelFormGroup)("caseFields", ctx_r1.caseFields)("caseField", field_r1)("context", ctx_r1.context);
 } }
 function ReadComplexFieldTableComponent_ng_container_9_Template(rf, ctx) { if (rf & 1) {
-    i0.ɵɵelementContainerStart(0);
-    i0.ɵɵtemplate(1, ReadComplexFieldTableComponent_ng_container_9_ng_container_1_Template, 5, 5, "ng-container", 6);
-    i0.ɵɵpipe(2, "ccdIsCompound");
-    i0.ɵɵtemplate(3, ReadComplexFieldTableComponent_ng_container_9_ng_template_3_Template, 8, 8, "ng-template", null, 0, i0.ɵɵtemplateRefExtractor);
-    i0.ɵɵelementContainerEnd();
+    i0.ɵɵelementContainerStart(0)(1, 6);
+    i0.ɵɵtemplate(2, ReadComplexFieldTableComponent_ng_container_9_ng_container_2_Template, 5, 5, "ng-container", 7);
+    i0.ɵɵpipe(3, "ccdIsCompound");
+    i0.ɵɵtemplate(4, ReadComplexFieldTableComponent_ng_container_9_ng_template_4_Template, 8, 8, "ng-template", null, 0, i0.ɵɵtemplateRefExtractor);
+    i0.ɵɵelementContainerEnd()();
 } if (rf & 2) {
     const field_r1 = ctx.$implicit;
-    const SimpleRow_r3 = i0.ɵɵreference(4);
+    const SimpleRow_r3 = i0.ɵɵreference(5);
+    const ctx_r1 = i0.ɵɵnextContext();
     i0.ɵɵadvance();
-    i0.ɵɵproperty("ngIf", i0.ɵɵpipeBind1(2, 2, field_r1))("ngIfElse", SimpleRow_r3);
+    i0.ɵɵproperty("caseField", field_r1)("formGroup", ctx_r1.topLevelFormGroup)("contextFields", ctx_r1.caseFields);
+    i0.ɵɵadvance();
+    i0.ɵɵproperty("ngIf", i0.ɵɵpipeBind1(3, 5, field_r1))("ngIfElse", SimpleRow_r3);
 } }
 class ReadComplexFieldTableComponent extends AbstractFieldReadComponent {
     // parent_ can be replaced with any ***_ - underscore is only important character
@@ -29821,7 +30727,7 @@ class ReadComplexFieldTableComponent extends AbstractFieldReadComponent {
         this.path = ReadComplexFieldTableComponent.DUMMY_STRING_PRE + this.idPrefix + ReadComplexFieldTableComponent.DUMMY_STRING_POST;
     }
     static ɵfac = /*@__PURE__*/ (() => { let ɵReadComplexFieldTableComponent_BaseFactory; return function ReadComplexFieldTableComponent_Factory(__ngFactoryType__) { return (ɵReadComplexFieldTableComponent_BaseFactory || (ɵReadComplexFieldTableComponent_BaseFactory = i0.ɵɵgetInheritedFactory(ReadComplexFieldTableComponent)))(__ngFactoryType__ || ReadComplexFieldTableComponent); }; })();
-    static ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: ReadComplexFieldTableComponent, selectors: [["ccd-read-complex-field-table"]], inputs: { caseFields: "caseFields" }, standalone: false, features: [i0.ɵɵInheritDefinitionFeature], decls: 11, vars: 17, consts: [["SimpleRow", ""], [1, "complex-panel"], [1, "complex-panel-title"], [1, "text-16"], ["aria-describedby", "complex field table", 1, "complex-panel-table"], [4, "ngFor", "ngForOf"], [4, "ngIf", "ngIfElse"], [1, "complex-panel-compound-field", 3, "hidden"], ["colspan", "2"], [3, "topLevelFormGroup", "caseFields", "caseField", "context"], [1, "complex-panel-simple-field", 3, "hidden"], ["id", "complex-panel-simple-field-label"]], template: function ReadComplexFieldTableComponent_Template(rf, ctx) { if (rf & 1) {
+    static ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: ReadComplexFieldTableComponent, selectors: [["ccd-read-complex-field-table"]], inputs: { caseFields: "caseFields" }, standalone: false, features: [i0.ɵɵInheritDefinitionFeature], decls: 11, vars: 17, consts: [["SimpleRow", ""], [1, "complex-panel"], [1, "complex-panel-title"], [1, "text-16"], ["aria-describedby", "complex field table", 1, "complex-panel-table"], [4, "ngFor", "ngForOf"], ["ccdLabelSubstitutor", "", 3, "caseField", "formGroup", "contextFields"], [4, "ngIf", "ngIfElse"], [1, "complex-panel-compound-field", 3, "hidden"], ["colspan", "2"], [3, "topLevelFormGroup", "caseFields", "caseField", "context"], [1, "complex-panel-simple-field", 3, "hidden"], ["id", "complex-panel-simple-field-label"]], template: function ReadComplexFieldTableComponent_Template(rf, ctx) { if (rf & 1) {
             i0.ɵɵelementStart(0, "div", 1)(1, "dl", 2)(2, "dt")(3, "span", 3);
             i0.ɵɵtext(4);
             i0.ɵɵpipe(5, "rpxTranslate");
@@ -29829,7 +30735,7 @@ class ReadComplexFieldTableComponent extends AbstractFieldReadComponent {
             i0.ɵɵelement(6, "dd");
             i0.ɵɵelementEnd();
             i0.ɵɵelementStart(7, "table", 4)(8, "tbody");
-            i0.ɵɵtemplate(9, ReadComplexFieldTableComponent_ng_container_9_Template, 5, 4, "ng-container", 5);
+            i0.ɵɵtemplate(9, ReadComplexFieldTableComponent_ng_container_9_Template, 6, 7, "ng-container", 5);
             i0.ɵɵpipe(10, "ccdReadFieldsFilter");
             i0.ɵɵelementEnd()()();
         } if (rf & 2) {
@@ -29841,7 +30747,7 @@ class ReadComplexFieldTableComponent extends AbstractFieldReadComponent {
 }
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(ReadComplexFieldTableComponent, [{
         type: Component,
-        args: [{ selector: 'ccd-read-complex-field-table', standalone: false, template: "<div class=\"complex-panel\">\n  <dl class=\"complex-panel-title\"><dt><span class=\"text-16\">{{caseField.label | rpxTranslate}}</span></dt><dd></dd></dl>\n  <table class=\"complex-panel-table\" aria-describedby=\"complex field table\">\n    <tbody>\n      <ng-container *ngFor=\"let field of caseField | ccdReadFieldsFilter:false :undefined :true :topLevelFormGroup :path :idPrefix\">\n        <ng-container *ngIf=\"(field | ccdIsCompound); else SimpleRow\">\n          <tr class=\"complex-panel-compound-field\" [hidden]=\"field.hidden\">\n            <td colspan=\"2\">\n              <span class=\"text-16\">\n                <ccd-field-read [topLevelFormGroup]=\"topLevelFormGroup\" [caseFields]=\"caseFields\"\n                  [caseField]=\"field\" [context]=\"context\"></ccd-field-read>\n              </span>\n            </td>\n          </tr>\n        </ng-container>\n        <ng-template #SimpleRow>\n          <tr class=\"complex-panel-simple-field\" [hidden]=\"field.hidden\">\n            <th id=\"complex-panel-simple-field-label\"><span class=\"text-16\">{{field.label | rpxTranslate}}</span></th>\n            <td>\n                <span class=\"text-16\">\n                  <ccd-field-read [topLevelFormGroup]=\"topLevelFormGroup\" [caseFields]=\"caseFields\"\n                    [caseField]=\"field\" [context]=\"context\"></ccd-field-read>\n                </span>\n            </td>\n          </tr>\n        </ng-template>\n      </ng-container>\n    </tbody>\n  </table>\n</div>\n", styles: [".complex-panel{margin:13px 0;border:1px solid #bfc1c3}.complex-panel .complex-panel-title{background-color:#dee0e2;padding:5px 5px 2px;border-bottom:1px solid #bfc1c3;display:block;color:#0b0c0c;font-family:nta,Arial,sans-serif;font-weight:700;text-transform:none;font-size:16px;line-height:1.25}@media(min-width:641px){.complex-panel .complex-panel-title{font-size:19px;line-height:1.3157894737}}.complex-panel .complex-panel-table>tbody>tr>th{vertical-align:top}.complex-panel .complex-panel-table>tbody>tr:last-child>th,.complex-panel .complex-panel-table>tbody>tr:last-child>td{border-bottom:none}.complex-panel .complex-panel-simple-field th{padding-left:5px;width:295px}.complex-panel .complex-panel-compound-field td{padding:5px}\n"] }]
+        args: [{ selector: 'ccd-read-complex-field-table', standalone: false, template: "<div class=\"complex-panel\">\n  <dl class=\"complex-panel-title\"><dt><span class=\"text-16\">{{caseField.label | rpxTranslate}}</span></dt><dd></dd></dl>\n  <table class=\"complex-panel-table\" aria-describedby=\"complex field table\">\n    <tbody>\n      <ng-container *ngFor=\"let field of caseField | ccdReadFieldsFilter:false :undefined :true :topLevelFormGroup :path :idPrefix\">\n        <ng-container ccdLabelSubstitutor [caseField]=\"field\" [formGroup]=\"topLevelFormGroup\" [contextFields]=\"caseFields\">\n          <ng-container *ngIf=\"(field | ccdIsCompound); else SimpleRow\">\n            <tr class=\"complex-panel-compound-field\" [hidden]=\"field.hidden\">\n              <td colspan=\"2\">\n                <span class=\"text-16\">\n                  <ccd-field-read [topLevelFormGroup]=\"topLevelFormGroup\" [caseFields]=\"caseFields\"\n                    [caseField]=\"field\" [context]=\"context\"></ccd-field-read>\n                </span>\n              </td>\n            </tr>\n          </ng-container>\n          <ng-template #SimpleRow>\n            <tr class=\"complex-panel-simple-field\" [hidden]=\"field.hidden\">\n              <th id=\"complex-panel-simple-field-label\"><span class=\"text-16\">{{field.label | rpxTranslate}}</span></th>\n              <td>\n                  <span class=\"text-16\">\n                    <ccd-field-read [topLevelFormGroup]=\"topLevelFormGroup\" [caseFields]=\"caseFields\"\n                    [caseField]=\"field\" [context]=\"context\"></ccd-field-read>\n                  </span>\n              </td>\n            </tr>\n          </ng-template>\n        </ng-container>\n      </ng-container>\n    </tbody>\n  </table>\n</div>\n", styles: [".complex-panel{margin:13px 0;border:1px solid #bfc1c3}.complex-panel .complex-panel-title{background-color:#dee0e2;padding:5px 5px 2px;border-bottom:1px solid #bfc1c3;display:block;color:#0b0c0c;font-family:nta,Arial,sans-serif;font-weight:700;text-transform:none;font-size:16px;line-height:1.25}@media(min-width:641px){.complex-panel .complex-panel-title{font-size:19px;line-height:1.3157894737}}.complex-panel .complex-panel-table>tbody>tr>th{vertical-align:top}.complex-panel .complex-panel-table>tbody>tr:last-child>th,.complex-panel .complex-panel-table>tbody>tr:last-child>td{border-bottom:none}.complex-panel .complex-panel-simple-field th{padding-left:5px;width:295px}.complex-panel .complex-panel-compound-field td{padding:5px}\n"] }]
     }], null, { caseFields: [{
             type: Input
         }] }); })();
@@ -32621,8 +33527,8 @@ i0.ɵɵsetComponentScope(ReadOrderSummaryRowComponent, function () { return [Rea
 i0.ɵɵsetComponentScope(ReadComplexFieldComponent, function () { return [i4.NgSwitch, i4.NgSwitchCase, i4.NgSwitchDefault, ReadComplexFieldRawComponent,
     ReadComplexFieldTableComponent,
     ReadComplexFieldCollectionTableComponent]; }, []);
-i0.ɵɵsetComponentScope(ReadComplexFieldRawComponent, function () { return [i4.NgForOf, FieldReadComponent]; }, function () { return [ReadFieldsFilterPipe, i1.RpxTranslatePipe]; });
-i0.ɵɵsetComponentScope(ReadComplexFieldTableComponent, function () { return [i4.NgForOf, i4.NgIf, FieldReadComponent]; }, function () { return [IsCompoundPipe, ReadFieldsFilterPipe, i1.RpxTranslatePipe]; });
+i0.ɵɵsetComponentScope(ReadComplexFieldRawComponent, function () { return [i4.NgForOf, i3.NgControlStatusGroup, i3.FormGroupDirective, LabelSubstitutorDirective, FieldReadComponent]; }, function () { return [ReadFieldsFilterPipe, i1.RpxTranslatePipe]; });
+i0.ɵɵsetComponentScope(ReadComplexFieldTableComponent, function () { return [i4.NgForOf, i4.NgIf, i3.NgControlStatusGroup, i3.FormGroupDirective, LabelSubstitutorDirective, FieldReadComponent]; }, function () { return [IsCompoundPipe, ReadFieldsFilterPipe, i1.RpxTranslatePipe]; });
 i0.ɵɵsetComponentScope(ReadComplexFieldCollectionTableComponent, function () { return [i4.NgForOf, i4.NgIf, FieldReadComponent,
     ReadCaseLinkFieldComponent]; }, function () { return [i4.KeyValuePipe, IsCompoundPipe, CcdCollectionTableCaseFieldsFilterPipe, ReadFieldsFilterPipe, i1.RpxTranslatePipe]; });
 i0.ɵɵsetComponentScope(ReadCaseFlagFieldComponent, function () { return [i4.NgForOf, i4.NgIf, i4.NgSwitch, i4.NgSwitchCase, i4.NgSwitchDefault, 
@@ -34730,6 +35636,7 @@ class WorkbasketFiltersComponent {
         }
     }
     onJurisdictionIdChange() {
+        this.clearStoredWorkbasketFilterValues();
         if (this.selected.jurisdiction) {
             this.jurisdictionService.announceSelectedJurisdiction(this.selected.jurisdiction);
             this.selectedJurisdictionCaseTypes = this.selected.jurisdiction.caseTypes.length > 0
@@ -34744,7 +35651,7 @@ class WorkbasketFiltersComponent {
             this.selected.caseState = null;
             this.clearWorkbasketInputs();
             if (!this.isApplyButtonDisabled()) {
-                this.onCaseTypeIdChange();
+                this.onCaseTypeIdChange(false);
             }
         }
         else {
@@ -34752,7 +35659,10 @@ class WorkbasketFiltersComponent {
             this.resetCaseState();
         }
     }
-    onCaseTypeIdChange() {
+    onCaseTypeIdChange(clearStoredValues = true) {
+        if (clearStoredValues) {
+            this.clearStoredWorkbasketFilterValues();
+        }
         if (this.selected.caseType) {
             this.selectedCaseTypeStates = this.sortStates(this.selected.caseType.states);
             this.selected.caseState = null;
@@ -34846,7 +35756,7 @@ class WorkbasketFiltersComponent {
                 this.selectedJurisdictionCaseTypes = this.selected.jurisdiction.caseTypes;
                 this.selected.caseType = this.selectCaseType(this.selected, this.selectedJurisdictionCaseTypes, routeSnapshot);
                 if (this.selected.caseType) {
-                    this.onCaseTypeIdChange();
+                    this.onCaseTypeIdChange(false);
                     this.selected.caseState = this.selectCaseState(this.selected.caseType, routeSnapshot);
                 }
                 this.workbasketDefaults = true;
@@ -34893,6 +35803,9 @@ class WorkbasketFiltersComponent {
         this.workbasketInputsReady = false;
         this.workbasketInputs = [];
     }
+    clearStoredWorkbasketFilterValues() {
+        this.windowService.removeLocalStorage(FORM_GROUP_VAL_LOC_STORAGE);
+    }
     resetCaseState() {
         this.defaults.state_id = null;
         this.selected.caseState = null;
@@ -37834,12 +38747,9 @@ class TaskAssignedComponent {
         // Current user is a caseworker?
         this.jurisdiction = this.task.jurisdiction;
         this.caseType = this.task.case_type_id;
-        this.caseworkerSubscription = this.caseworkerService.getCaseworkers(this.task.jurisdiction).subscribe(result => {
-            if (result && result[0].service === this.task.jurisdiction && result[0].caseworkers) {
-                const caseworker = result[0].caseworkers.find(x => x.idamId === this.task.assignee);
-                if (caseworker) {
-                    this.assignedUserName = `${caseworker.firstName} ${caseworker.lastName}`;
-                }
+        this.caseworkerSubscription = this.caseworkerService.getUserByIdamId(this.task.assignee).subscribe(caseworker => {
+            if (caseworker) {
+                this.assignedUserName = `${caseworker.firstName} ${caseworker.lastName}`;
             }
             if (!this.assignedUserName) {
                 // Current user is a judicial user?