@hmcts/ccd-case-ui-toolkit 7.1.40-qm-additional-text → 7.1.41-exui-2792-task-completion

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

@@ -8,10 +8,10 @@ import * as i1$1 from '@angular/router';
 import { RouterModule, NavigationStart, NavigationEnd } from '@angular/router';
 import * as i4 from '@angular/forms';
 import { NG_VALUE_ACCESSOR, NG_VALIDATORS, FormArray, FormGroup, FormControl, Validators, ReactiveFormsModule, FormsModule } from '@angular/forms';
-import { throwError, Subject, EMPTY, Observable, BehaviorSubject, of, timer, fromEvent, forkJoin, Subscription, combineLatest } from 'rxjs';
+import { BehaviorSubject, throwError, Subject, EMPTY, Observable, of, timer, fromEvent, forkJoin, Subscription, combineLatest } from 'rxjs';
 import * as i1$2 from '@angular/common/http';
 import { HttpErrorResponse, HttpHeaders, HttpParams } from '@angular/common/http';
-import { catchError, map, publish, refCount, switchMap, debounceTime, delay, distinctUntilChanged, finalize, timeout, mergeMap, retryWhen, tap, delayWhen, publishReplay, take, first, takeUntil, filter } from 'rxjs/operators';
+import { distinctUntilChanged, catchError, map, publish, refCount, switchMap, debounceTime, delay, finalize, timeout, mergeMap, retryWhen, tap, delayWhen, publishReplay, take, first, takeUntil, filter } from 'rxjs/operators';
 import { polling } from 'rx-polling-hmcts';
 import { Type, Expose, plainToClassFromExist, plainToClass } from 'class-transformer';
 import moment from 'moment';
@@ -1400,10 +1400,70 @@ class AuthService {
                 args: [DOCUMENT]
             }] }], null); })();
 
+class LoadingService {
+    registered = new Map();
+    loading = new BehaviorSubject(false);
+    sharedSpinners = [];
+    get isLoading() {
+        return this.loading.pipe(distinctUntilChanged());
+    }
+    register() {
+        const token = this.generateToken();
+        this.registered.set(token, token);
+        this.loading.next(true);
+        return token;
+    }
+    unregister(token) {
+        this.registered.delete(token);
+        this.loading.next(this.registered.size > 0);
+    }
+    addSharedSpinner(spinnerId) {
+        this.sharedSpinners.push(spinnerId);
+    }
+    hasSharedSpinner() {
+        return this.sharedSpinners.length > 0;
+    }
+    unregisterSharedSpinner() {
+        this.registered.delete(this.sharedSpinners[0]);
+        this.sharedSpinners.shift();
+        this.loading.next(this.registered.size > 0);
+    }
+    generateToken() {
+        const timestamp = window.performance.now();
+        return `toolkit-loading-${timestamp}`; // format: [source-library]-[unique incrementing number]
+    }
+    static ɵfac = function LoadingService_Factory(t) { return new (t || LoadingService)(); };
+    static ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: LoadingService, factory: LoadingService.ɵfac });
+}
+(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(LoadingService, [{
+        type: Injectable
+    }], null, null); })();
+
+class LoadingModule {
+    static ɵfac = function LoadingModule_Factory(t) { return new (t || LoadingModule)(); };
+    static ɵmod = /*@__PURE__*/ i0.ɵɵdefineNgModule({ type: LoadingModule });
+    static ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ providers: [
+            LoadingService
+        ] });
+}
+(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(LoadingModule, [{
+        type: NgModule,
+        args: [{
+                imports: [],
+                declarations: [],
+                exports: [],
+                providers: [
+                    LoadingService
+                ]
+            }]
+    }], null, null); })();
+
 class HttpErrorService {
     authService;
-    constructor(authService) {
+    loadingService;
+    constructor(authService, loadingService) {
         this.authService = authService;
+        this.loadingService = loadingService;
     }
     static CONTENT_TYPE = 'Content-Type';
     static JSON = 'json';
@@ -1447,18 +1507,21 @@ class HttpErrorService {
     handle(error, redirectIfNotAuthorised = true) {
         console.error('Handling error in http error service.');
         console.error(error);
+        if (this.loadingService.hasSharedSpinner()) {
+            this.loadingService.unregisterSharedSpinner();
+        }
         const httpError = HttpErrorService.convertToHttpError(error);
         if (redirectIfNotAuthorised && httpError.status === 401) {
             this.authService.signIn();
         }
         return throwError(httpError);
     }
-    static ɵfac = function HttpErrorService_Factory(t) { return new (t || HttpErrorService)(i0.ɵɵinject(AuthService)); };
+    static ɵfac = function HttpErrorService_Factory(t) { return new (t || HttpErrorService)(i0.ɵɵinject(AuthService), i0.ɵɵinject(LoadingService)); };
     static ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: HttpErrorService, factory: HttpErrorService.ɵfac });
 }
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(HttpErrorService, [{
         type: Injectable
-    }], () => [{ type: AuthService }], null); })();
+    }], () => [{ type: AuthService }, { type: LoadingService }], null); })();
 
 class HttpService {
     httpclient;
@@ -7319,33 +7382,6 @@ class RequestOptionsBuilder {
         type: Injectable
     }], null, null); })();
 
-class LoadingService {
-    registered = new Map();
-    loading = new BehaviorSubject(false);
-    get isLoading() {
-        return this.loading.pipe(distinctUntilChanged());
-    }
-    register() {
-        const token = this.generateToken();
-        this.registered.set(token, token);
-        this.loading.next(true);
-        return token;
-    }
-    unregister(token) {
-        this.registered.delete(token);
-        this.loading.next(this.registered.size > 0);
-    }
-    generateToken() {
-        const timestamp = window.performance.now();
-        return `toolkit-loading-${timestamp}`; // format: [source-library]-[unique incrementing number]
-    }
-    static ɵfac = function LoadingService_Factory(t) { return new (t || LoadingService)(); };
-    static ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: LoadingService, factory: LoadingService.ɵfac });
-}
-(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(LoadingService, [{
-        type: Injectable
-    }], null, null); })();
-
 class SearchService {
     appConfig;
     httpService;
@@ -7798,25 +7834,6 @@ class BrowserService {
         type: Injectable
     }], null, null); })();
 
-class LoadingModule {
-    static ɵfac = function LoadingModule_Factory(t) { return new (t || LoadingModule)(); };
-    static ɵmod = /*@__PURE__*/ i0.ɵɵdefineNgModule({ type: LoadingModule });
-    static ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ providers: [
-            LoadingService
-        ] });
-}
-(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(LoadingModule, [{
-        type: NgModule,
-        args: [{
-                imports: [],
-                declarations: [],
-                exports: [],
-                providers: [
-                    LoadingService
-                ]
-            }]
-    }], null, null); })();
-
 class CaseAccessUtils {
     // User role mapping
     static JUDGE_ROLE = 'judge';
@@ -8036,455 +8053,6 @@ class WizardPageFieldToCaseFieldMapper {
             }]
     }], null, null); })();
 
-function convertNonASCIICharacter(character) {
-    if (character === '£') {
-        // pound sign will be frequently used and works for btoa despite being non-ASCII
-        // note: this could be done for other characters provided they work for btoa()
-        return character;
-    }
-    // Note: Will convert to HTML entity
-    return CaseEditUtils.PREFIX + character.charCodeAt(0) + CaseEditUtils.SUFFIX;
-}
-class CaseEditUtils {
-    static PREFIX = '&#';
-    static SUFFIX = ';';
-    convertNonASCIICharacters(rawString) {
-        return rawString ? rawString.replace(/[^\x20-\x7E]/g, function (c) {
-            return convertNonASCIICharacter(c);
-        }) : '';
-    }
-    convertHTMLEntities(editedString) {
-        const revertedCharacterList = editedString.split(CaseEditUtils.PREFIX);
-        let rawString = revertedCharacterList[0];
-        for (let index = 1; index < revertedCharacterList.length; index++) {
-            const currentSection = revertedCharacterList[index];
-            if (!currentSection.includes(CaseEditUtils.SUFFIX)) {
-                return rawString.concat(currentSection);
-            }
-            else {
-                const suffixSplitList = currentSection.split(CaseEditUtils.SUFFIX);
-                const characterCode = Number(suffixSplitList[0]);
-                rawString = rawString.concat(String.fromCharCode(characterCode), suffixSplitList[1]);
-            }
-        }
-        return rawString;
-    }
-}
-
-class CasesService {
-    http;
-    appConfig;
-    orderService;
-    errorService;
-    wizardPageFieldToCaseFieldMapper;
-    loadingService;
-    sessionStorageService;
-    retryUtil;
-    // Internal (UI) API
-    static V2_MEDIATYPE_CASE_VIEW = 'application/vnd.uk.gov.hmcts.ccd-data-store-api.ui-case-view.v2+json';
-    static V2_MEDIATYPE_START_CASE_TRIGGER = 'application/vnd.uk.gov.hmcts.ccd-data-store-api.ui-start-case-trigger.v2+json;charset=UTF-8';
-    static V2_MEDIATYPE_START_EVENT_TRIGGER = 'application/vnd.uk.gov.hmcts.ccd-data-store-api.ui-start-event-trigger.v2+json;charset=UTF-8';
-    static V2_MEDIATYPE_START_DRAFT_TRIGGER = 'application/vnd.uk.gov.hmcts.ccd-data-store-api.ui-start-draft-trigger.v2+json;charset=UTF-8';
-    // External (Data Store) API
-    static V2_MEDIATYPE_CASE_DOCUMENTS = 'application/vnd.uk.gov.hmcts.ccd-data-store-api.case-documents.v2+json;charset=UTF-8';
-    static V2_MEDIATYPE_CASE_DATA_VALIDATE = 'application/vnd.uk.gov.hmcts.ccd-data-store-api.case-data-validate.v2+json;charset=UTF-8';
-    static V2_MEDIATYPE_CREATE_EVENT = 'application/vnd.uk.gov.hmcts.ccd-data-store-api.create-event.v2+json;charset=UTF-8';
-    static V2_MEDIATYPE_CREATE_CASE = 'application/vnd.uk.gov.hmcts.ccd-data-store-api.create-case.v2+json;charset=UTF-8';
-    static PUI_CASE_MANAGER = 'pui-case-manager';
-    get = this.getCaseView;
-    static updateChallengedAccessRequestAttributes(httpClient, caseId, attributesToUpdate) {
-        return httpClient.post(`/api/challenged-access-request/update-attributes`, {
-            caseId,
-            attributesToUpdate
-        });
-    }
-    static updateSpecificAccessRequestAttributes(httpClient, caseId, attributesToUpdate) {
-        return httpClient.post(`/api/specific-access-request/update-attributes`, {
-            caseId,
-            attributesToUpdate
-        });
-    }
-    constructor(http, appConfig, orderService, errorService, wizardPageFieldToCaseFieldMapper, loadingService, sessionStorageService, retryUtil) {
-        this.http = http;
-        this.appConfig = appConfig;
-        this.orderService = orderService;
-        this.errorService = errorService;
-        this.wizardPageFieldToCaseFieldMapper = wizardPageFieldToCaseFieldMapper;
-        this.loadingService = loadingService;
-        this.sessionStorageService = sessionStorageService;
-        this.retryUtil = retryUtil;
-    }
-    getCaseView(jurisdictionId, caseTypeId, caseId) {
-        const url = `${this.appConfig.getApiUrl()}/caseworkers/:uid/jurisdictions/${jurisdictionId}/case-types/${caseTypeId}/cases/${caseId}`;
-        const loadingToken = this.loadingService.register();
-        return this.http
-            .get(url)
-            .pipe(catchError(error => {
-            this.errorService.setError(error);
-            return throwError(error);
-        }), finalize(() => this.loadingService.unregister(loadingToken)));
-    }
-    getCaseViewV2(caseId) {
-        const url = `${this.appConfig.getCaseDataUrl()}/internal/cases/${caseId}`;
-        const headers = new HttpHeaders()
-            .set('experimental', 'true')
-            .set('Accept', CasesService.V2_MEDIATYPE_CASE_VIEW)
-            .set('Content-Type', 'application/json');
-        const loadingToken = this.loadingService.register();
-        let http$ = this.http.get(url, { headers, observe: 'body' });
-        const artificialDelay = this.appConfig.getTimeoutsCaseRetrievalArtificialDelay();
-        const timeoutPeriods = this.appConfig.getTimeoutsForCaseRetrieval();
-        console.log(`Timeout periods: ${timeoutPeriods} seconds.`);
-        if (timeoutPeriods && timeoutPeriods.length > 0 && timeoutPeriods[0] > 0) {
-            http$ = this.retryUtil.pipeTimeoutMechanismOn(http$, artificialDelay, timeoutPeriods);
-        }
-        else {
-            console.warn('Skipping to pipe a retry mechanism!');
-        }
-        http$ = this.pipeErrorProcessor(http$);
-        http$ = http$.pipe(finalize(() => this.finalizeGetCaseViewWith(caseId, loadingToken)));
-        return http$;
-    }
-    pipeErrorProcessor(in$) {
-        const out$ = in$.pipe(catchError(error => {
-            console.error(`Error while getting case view with getCaseViewV2! Error type: '${typeof error}, Error name: '${error?.name}'`);
-            console.error(error);
-            this.errorService.setError(error);
-            return throwError(error);
-        }));
-        return out$;
-    }
-    finalizeGetCaseViewWith(caseId, loadingToken) {
-        this.loadingService.unregister(loadingToken);
-    }
-    syncWait(seconds) {
-        const end = Date.now() + seconds * 1000;
-        while (Date.now() < end)
-            continue;
-    }
-    getEventTrigger(caseTypeId, eventTriggerId, caseId, ignoreWarning) {
-        ignoreWarning = undefined !== ignoreWarning ? ignoreWarning : 'false';
-        const url = this.buildEventTriggerUrl(caseTypeId, eventTriggerId, caseId, ignoreWarning);
-        let headers = new HttpHeaders();
-        headers = headers.set('experimental', 'true');
-        headers = headers.set('Content-Type', 'application/json');
-        headers = this.addClientContextHeader(headers);
-        if (Draft.isDraft(caseId)) {
-            headers = headers.set('Accept', CasesService.V2_MEDIATYPE_START_DRAFT_TRIGGER);
-        }
-        else if (caseId !== undefined && caseId !== null) {
-            headers = headers.set('Accept', CasesService.V2_MEDIATYPE_START_EVENT_TRIGGER);
-        }
-        else {
-            headers = headers.set('Accept', CasesService.V2_MEDIATYPE_START_CASE_TRIGGER);
-        }
-        return this.http
-            .get(url, { headers, observe: 'response' })
-            .pipe(map((response) => {
-            this.updateClientContextStorage(response.headers);
-            return FieldsUtils.handleNestedDynamicLists(response.body);
-        }), catchError(error => {
-            this.errorService.setError(error);
-            return throwError(error);
-        }), map((p) => plainToClass(CaseEventTrigger, p)), tap(eventTrigger => this.initialiseEventTrigger(eventTrigger)));
-    }
-    createEvent(caseDetails, eventData) {
-        const caseId = caseDetails.case_id;
-        const url = `${this.appConfig.getCaseDataUrl()}/cases/${caseId}/events`;
-        let headers = new HttpHeaders()
-            .set('experimental', 'true')
-            .set('Accept', CasesService.V2_MEDIATYPE_CREATE_EVENT)
-            .set('Content-Type', 'application/json');
-        headers = this.addClientContextHeader(headers);
-        return this.http
-            .post(url, eventData, { headers, observe: 'response' })
-            .pipe(map((response) => {
-            this.updateClientContextStorage(response.headers);
-            return response.body;
-        }), catchError(error => {
-            this.errorService.setError(error);
-            return throwError(error);
-        }));
-    }
-    validateCase(ctid, eventData, pageId) {
-        const pageIdString = pageId ? `?pageId=${pageId}` : '';
-        const url = `${this.appConfig.getCaseDataUrl()}/case-types/${ctid}/validate${pageIdString}`;
-        let headers = new HttpHeaders()
-            .set('experimental', 'true')
-            .set('Accept', CasesService.V2_MEDIATYPE_CASE_DATA_VALIDATE)
-            .set('Content-Type', 'application/json');
-        headers = this.addClientContextHeader(headers);
-        return this.http
-            .post(url, eventData, { headers, observe: 'response' })
-            .pipe(map((response) => {
-            this.updateClientContextStorage(response.headers);
-            return response.body;
-        }), catchError(error => {
-            this.errorService.setError(error);
-            return throwError(error);
-        }));
-    }
-    createCase(ctid, eventData) {
-        let ignoreWarning = 'false';
-        if (eventData.ignore_warning) {
-            ignoreWarning = 'true';
-        }
-        const url = `${this.appConfig.getCaseDataUrl()}/case-types/${ctid}/cases?ignore-warning=${ignoreWarning}`;
-        let headers = new HttpHeaders()
-            .set('experimental', 'true')
-            .set('Accept', CasesService.V2_MEDIATYPE_CREATE_CASE)
-            .set('Content-Type', 'application/json');
-        headers = this.addClientContextHeader(headers);
-        return this.http
-            .post(url, eventData, { headers, observe: 'response' })
-            .pipe(map((response) => {
-            this.updateClientContextStorage(response.headers);
-            return response.body;
-        }), catchError(error => {
-            this.errorService.setError(error);
-            return throwError(error);
-        }));
-    }
-    getPrintDocuments(caseId) {
-        const url = `${this.appConfig.getCaseDataUrl()}/cases/${caseId}/documents`;
-        let headers = new HttpHeaders()
-            .set('experimental', 'true')
-            .set('Accept', CasesService.V2_MEDIATYPE_CASE_DOCUMENTS)
-            .set('Content-Type', 'application/json');
-        headers = this.addClientContextHeader(headers);
-        return this.http
-            .get(url, { headers, observe: 'response' })
-            .pipe(map((response) => {
-            this.updateClientContextStorage(response.headers);
-            return response.body.documentResources;
-        }), catchError(error => {
-            this.errorService.setError(error);
-            return throwError(error);
-        }));
-    }
-    buildEventTriggerUrl(caseTypeId, eventTriggerId, caseId, ignoreWarning) {
-        let url = `${this.appConfig.getCaseDataUrl()}/internal`;
-        if (Draft.isDraft(caseId)) {
-            url += `/drafts/${caseId}`
-                + `/event-trigger`
-                + `?ignore-warning=${ignoreWarning}`;
-        }
-        else if (caseTypeId === undefined || caseTypeId === null) {
-            url += `/cases/${caseId}`
-                + `/event-triggers/${eventTriggerId}`
-                + `?ignore-warning=${ignoreWarning}`;
-        }
-        else {
-            url += `/case-types/${caseTypeId}`
-                + `/event-triggers/${eventTriggerId}`
-                + `?ignore-warning=${ignoreWarning}`;
-        }
-        return url;
-    }
-    initialiseEventTrigger(eventTrigger) {
-        if (!eventTrigger.wizard_pages) {
-            eventTrigger.wizard_pages = [];
-        }
-        eventTrigger.wizard_pages.forEach((wizardPage) => {
-            wizardPage.parsedShowCondition = ShowCondition.getInstance(wizardPage.show_condition);
-            wizardPage.case_fields = this.orderService.sort(this.wizardPageFieldToCaseFieldMapper.mapAll(wizardPage.wizard_page_fields, eventTrigger.case_fields));
-        });
-    }
-    getCourtOrHearingCentreName(locationId) {
-        return this.http.post(`/api/locations/getLocationsById`, { locations: [{ locationId }] });
-    }
-    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);
-        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);
-        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);
-        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);
-        payload.roleRequest = {
-            ...payload.roleRequest,
-            process: 'specific-access',
-            replaceExisting: true,
-            assignerId: payload.requestedRoles[0].actorId,
-            reference: `${caseId}/${roleName}/${payload.requestedRoles[0].actorId}`
-        };
-        payload.requestedRoles[0] = {
-            ...payload.requestedRoles[0],
-            roleName: 'specific-access-requested',
-            roleCategory,
-            classification: 'PRIVATE',
-            endTime: new Date(new Date().setDate(new Date().getDate() + 30)),
-            beginTime: null,
-            grantType: 'BASIC',
-            readOnly: true
-        };
-        payload.requestedRoles[0].attributes = {
-            ...payload.requestedRoles[0].attributes,
-            requestedRole: roleName,
-            specificAccessReason: sar.specificReason
-        };
-        payload.requestedRoles[0].notes[0] = {
-            ...payload.requestedRoles[0].notes[0],
-            userId: payload.requestedRoles[0].actorId
-        };
-        return this.http.post(`/api/specific-access-request`, payload);
-    }
-    getLinkedCases(caseId) {
-        const url = `${this.appConfig.getCaseDataStoreApiUrl()}/${caseId}`;
-        return this.http
-            .get(url)
-            .pipe(catchError(error => throwError(error)));
-    }
-    addClientContextHeader(headers) {
-        const clientContextDetails = this.sessionStorageService.getItem('clientContext');
-        if (clientContextDetails) {
-            const caseEditUtils = new CaseEditUtils();
-            // below changes non-ASCII characters 
-            const editedClientContext = caseEditUtils.convertNonASCIICharacters(clientContextDetails);
-            const clientContext = window.btoa(editedClientContext);
-            if (clientContext) {
-                headers = headers.set('Client-Context', clientContext);
-            }
-        }
-        return headers;
-    }
-    updateClientContextStorage(headers) {
-        if (headers && headers.get('Client-Context')) {
-            const caseEditUtils = new CaseEditUtils();
-            const clientContextString = window.atob(headers.get('Client-Context'));
-            // below reverts non-ASCII characters 
-            const editedClientContextString = caseEditUtils.convertHTMLEntities(clientContextString);
-            this.sessionStorageService.setItem('clientContext', editedClientContextString);
-        }
-    }
-    static ɵfac = function CasesService_Factory(t) { return new (t || CasesService)(i0.ɵɵinject(HttpService), i0.ɵɵinject(AbstractAppConfig), i0.ɵɵinject(OrderService), i0.ɵɵinject(HttpErrorService), i0.ɵɵinject(WizardPageFieldToCaseFieldMapper), i0.ɵɵinject(LoadingService), i0.ɵɵinject(SessionStorageService), i0.ɵɵinject(RetryUtil)); };
-    static ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: CasesService, factory: CasesService.ɵfac });
-}
-(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(CasesService, [{
-        type: Injectable
-    }], () => [{ type: HttpService }, { type: AbstractAppConfig }, { type: OrderService }, { type: HttpErrorService }, { type: WizardPageFieldToCaseFieldMapper }, { type: LoadingService }, { type: SessionStorageService }, { type: RetryUtil }], null); })();
-
-class EventTriggerService {
-    eventTriggerSource = new Subject();
-    announceEventTrigger(eventTrigger) {
-        this.eventTriggerSource.next(eventTrigger);
-    }
-    static ɵfac = function EventTriggerService_Factory(t) { return new (t || EventTriggerService)(); };
-    static ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: EventTriggerService, factory: EventTriggerService.ɵfac, providedIn: 'root' });
-}
-(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(EventTriggerService, [{
-        type: Injectable,
-        args: [{
-                providedIn: 'root',
-            }]
-    }], null, null); })();
-
-function CaseCreateComponent_div_0_Template(rf, ctx) { if (rf & 1) {
-    const _r1 = i0.ɵɵgetCurrentView();
-    i0.ɵɵelementStart(0, "div")(1, "ccd-case-edit", 1);
-    i0.ɵɵlistener("cancelled", function CaseCreateComponent_div_0_Template_ccd_case_edit_cancelled_1_listener($event) { i0.ɵɵrestoreView(_r1); const ctx_r1 = i0.ɵɵnextContext(); return i0.ɵɵresetView(ctx_r1.emitCancelled($event)); })("submitted", function CaseCreateComponent_div_0_Template_ccd_case_edit_submitted_1_listener($event) { i0.ɵɵrestoreView(_r1); const ctx_r1 = i0.ɵɵnextContext(); return i0.ɵɵresetView(ctx_r1.emitSubmitted($event)); });
-    i0.ɵɵelementEnd()();
-} if (rf & 2) {
-    const ctx_r1 = i0.ɵɵnextContext();
-    i0.ɵɵadvance();
-    i0.ɵɵproperty("submit", ctx_r1.submit())("validate", ctx_r1.validate())("saveDraft", ctx_r1.saveDraft())("eventTrigger", ctx_r1.eventTrigger);
-} }
-class CaseCreateComponent {
-    casesService;
-    alertService;
-    draftService;
-    eventTriggerService;
-    jurisdiction;
-    caseType;
-    event;
-    cancelled = new EventEmitter();
-    submitted = new EventEmitter();
-    eventTrigger;
-    constructor(casesService, alertService, draftService, eventTriggerService) {
-        this.casesService = casesService;
-        this.alertService = alertService;
-        this.draftService = draftService;
-        this.eventTriggerService = eventTriggerService;
-    }
-    ngOnInit() {
-        this.casesService.getEventTrigger(this.caseType, this.event).toPromise()
-            .then(eventTrigger => {
-            this.eventTrigger = eventTrigger;
-            this.eventTriggerService.announceEventTrigger(eventTrigger);
-        })
-            .catch((error) => {
-            this.alertService.error({ phrase: error.message });
-            return throwError(error);
-        });
-    }
-    submit() {
-        return (sanitizedEditForm) => {
-            sanitizedEditForm.draft_id = this.eventTrigger.case_id;
-            return this.casesService.createCase(this.caseType, sanitizedEditForm);
-        };
-    }
-    validate() {
-        return (sanitizedEditForm, pageId) => this.casesService
-            .validateCase(this.caseType, sanitizedEditForm, pageId);
-    }
-    saveDraft() {
-        if (this.eventTrigger.can_save_draft) {
-            return (caseEventData) => this.draftService.createOrUpdateDraft(this.caseType, this.eventTrigger.case_id, caseEventData);
-        }
-    }
-    emitCancelled(event) {
-        this.cancelled.emit(event);
-    }
-    emitSubmitted(event) {
-        this.submitted.emit(event);
-    }
-    isDataLoaded() {
-        return this.eventTrigger ? true : false;
-    }
-    static ɵfac = function CaseCreateComponent_Factory(t) { return new (t || CaseCreateComponent)(i0.ɵɵdirectiveInject(CasesService), i0.ɵɵdirectiveInject(AlertService), i0.ɵɵdirectiveInject(DraftService), i0.ɵɵdirectiveInject(EventTriggerService)); };
-    static ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: CaseCreateComponent, selectors: [["ccd-case-create"]], inputs: { jurisdiction: "jurisdiction", caseType: "caseType", event: "event" }, outputs: { cancelled: "cancelled", submitted: "submitted" }, decls: 1, vars: 1, consts: [[4, "ngIf"], [3, "cancelled", "submitted", "submit", "validate", "saveDraft", "eventTrigger"]], template: function CaseCreateComponent_Template(rf, ctx) { if (rf & 1) {
-            i0.ɵɵtemplate(0, CaseCreateComponent_div_0_Template, 2, 4, "div", 0);
-        } if (rf & 2) {
-            i0.ɵɵproperty("ngIf", ctx.isDataLoaded());
-        } }, encapsulation: 2 });
-}
-(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(CaseCreateComponent, [{
-        type: Component,
-        args: [{ selector: 'ccd-case-create', template: "<div *ngIf=\"isDataLoaded()\">\n    <ccd-case-edit [submit]=\"submit()\"\n                   [validate]=\"validate()\"\n                   [saveDraft]=\"saveDraft()\"\n                   [eventTrigger]=\"eventTrigger\"\n                   (cancelled)=\"emitCancelled($event)\"\n                   (submitted)=\"emitSubmitted($event)\"></ccd-case-edit>\n</div>" }]
-    }], () => [{ type: CasesService }, { type: AlertService }, { type: DraftService }, { type: EventTriggerService }], { jurisdiction: [{
-            type: Input
-        }], caseType: [{
-            type: Input
-        }], event: [{
-            type: Input
-        }], cancelled: [{
-            type: Output
-        }], submitted: [{
-            type: Output
-        }] }); })();
-(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(CaseCreateComponent, { className: "CaseCreateComponent", filePath: "lib/shared/components/case-editor/case-create/case-create.component.ts", lineNumber: 17 }); })();
-
 class Confirmation {
     caseId;
     status;
@@ -8622,6 +8190,21 @@ class ConvertHrefToRouterService {
         type: Injectable
     }], () => [{ type: i1$1.Router }], null); })();
 
+class EventTriggerService {
+    eventTriggerSource = new Subject();
+    announceEventTrigger(eventTrigger) {
+        this.eventTriggerSource.next(eventTrigger);
+    }
+    static ɵfac = function EventTriggerService_Factory(t) { return new (t || EventTriggerService)(); };
+    static ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: EventTriggerService, factory: EventTriggerService.ɵfac, providedIn: 'root' });
+}
+(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(EventTriggerService, [{
+        type: Injectable,
+        args: [{
+                providedIn: 'root',
+            }]
+    }], null, null); })();
+
 class WizardFactoryService {
     create(eventTrigger) {
         return new Wizard(eventTrigger.wizard_pages);
@@ -8904,7 +8487,7 @@ class EventCompletionStateMachineService {
     entryActionForStateCompleteEventAndTask(state, context) {
         // Trigger final state to complete processing of state machine
         state.trigger(EventCompletionStates.Final);
-        const clientContextStr = context.sessionStorageService.getItem('clientContext');
+        const clientContextStr = context.sessionStorageService.getItem(CaseEditComponent.CLIENT_CONTEXT);
         const userTask = FieldsUtils.getUserTaskFromClientContext(clientContextStr);
         if (userTask?.task_data) {
             context.sessionStorageService.setItem('assignNeeded', 'false');
@@ -8927,7 +8510,7 @@ class EventCompletionStateMachineService {
     entryActionForStateTaskUnassigned(state, context) {
         // Trigger final state to complete processing of state machine
         state.trigger(EventCompletionStates.Final);
-        const clientContextStr = context.sessionStorageService.getItem('clientContext');
+        const clientContextStr = context.sessionStorageService.getItem(CaseEditComponent.CLIENT_CONTEXT);
         const userTask = FieldsUtils.getUserTaskFromClientContext(clientContextStr);
         if (userTask?.task_data) {
             context.sessionStorageService.setItem('assignNeeded', 'true');
@@ -8967,7 +8550,7 @@ class EventCompletionStateMachineService {
         this.stateTaskUnassigned.addTransition(EventCompletionStates.Final, this.stateFinal);
     }
     taskPresentInSessionStorage(context) {
-        const clientContextStr = context.sessionStorageService.getItem('clientContext');
+        const clientContextStr = context.sessionStorageService.getItem(CaseEditComponent.CLIENT_CONTEXT);
         const userTask = FieldsUtils.getUserTaskFromClientContext(clientContextStr);
         return !!userTask.task_data;
     }
@@ -9334,8 +8917,11 @@ class CaseEditComponent {
     workAllocationService;
     alertService;
     abstractConfig;
+    cookieService;
     static ORIGIN_QUERY_PARAM = 'origin';
     static ALERT_MESSAGE = 'Page is being refreshed so you will be redirected to the first page of this event.';
+    static CLIENT_CONTEXT = 'clientContext';
+    static TASK_EVENT_COMPLETION_INFO = 'taskEventCompletionInfo';
     eventTrigger;
     submit;
     validate;
@@ -9359,7 +8945,7 @@ class CaseEditComponent {
     error;
     callbackErrorsSubject = new Subject();
     validPageList = [];
-    constructor(fb, caseNotifier, router, route, fieldsUtils, fieldsPurger, registrarService, wizardFactory, sessionStorageService, windowsService, formValueService, formErrorService, loadingService, validPageListCaseFieldsService, workAllocationService, alertService, abstractConfig) {
+    constructor(fb, caseNotifier, router, route, fieldsUtils, fieldsPurger, registrarService, wizardFactory, sessionStorageService, windowsService, formValueService, formErrorService, loadingService, validPageListCaseFieldsService, workAllocationService, alertService, abstractConfig, cookieService) {
         this.fb = fb;
         this.caseNotifier = caseNotifier;
         this.router = router;
@@ -9377,6 +8963,7 @@ class CaseEditComponent {
         this.workAllocationService = workAllocationService;
         this.alertService = alertService;
         this.abstractConfig = abstractConfig;
+        this.cookieService = cookieService;
     }
     ngOnInit() {
         this.wizard = this.wizardFactory.create(this.eventTrigger);
@@ -9483,12 +9070,12 @@ class CaseEditComponent {
         this.isSubmitting = true;
         // We have to run the event completion checks if task in session storage
         // and if the task is in session storage, then is it associated to the case
-        const clientContextStr = this.sessionStorageService.getItem('clientContext');
+        const clientContextStr = this.sessionStorageService.getItem(CaseEditComponent.CLIENT_CONTEXT);
         const userTask = FieldsUtils.getUserTaskFromClientContext(clientContextStr);
         const taskInSessionStorage = userTask ? userTask.task_data : null;
         let taskEventCompletionInfo;
         let userInfo;
-        const taskEventCompletionStr = this.sessionStorageService.getItem('taskEventCompletionInfo');
+        const taskEventCompletionStr = this.sessionStorageService.getItem(CaseEditComponent.TASK_EVENT_COMPLETION_INFO);
         const userInfoStr = this.sessionStorageService.getItem('userDetails');
         const assignNeeded = this.sessionStorageService.getItem('assignNeeded');
         if (taskEventCompletionStr) {
@@ -9518,7 +9105,7 @@ class CaseEditComponent {
                 taskId: taskInSessionStorage.id,
                 createdTimestamp: Date.now()
             };
-            this.sessionStorageService.setItem('taskEventCompletionInfo', JSON.stringify(taskEventCompletionInfo));
+            this.sessionStorageService.setItem(CaseEditComponent.TASK_EVENT_COMPLETION_INFO, JSON.stringify(taskEventCompletionInfo));
             this.isEventCompletionChecksRequired = true;
         }
         else {
@@ -9690,8 +9277,9 @@ class CaseEditComponent {
         }), finalize(() => {
             this.loadingService.unregister(loadingSpinnerToken);
             // on event completion ensure the previous event clientContext/taskEventCompletionInfo removed
-            this.sessionStorageService.removeItem('clientContext');
-            this.sessionStorageService.removeItem('taskEventCompletionInfo');
+            // Note - Not removeTaskFromClientContext because could interfere with other logic
+            this.sessionStorageService.removeItem(CaseEditComponent.CLIENT_CONTEXT);
+            this.sessionStorageService.removeItem(CaseEditComponent.TASK_EVENT_COMPLETION_INFO);
             this.isSubmitting = false;
         }))
             .subscribe(() => {
@@ -9719,7 +9307,7 @@ class CaseEditComponent {
         });
     }
     postCompleteTaskIfRequired() {
-        const clientContextStr = this.sessionStorageService.getItem('clientContext');
+        const clientContextStr = this.sessionStorageService.getItem(CaseEditComponent.CLIENT_CONTEXT);
         const userTask = FieldsUtils.getUserTaskFromClientContext(clientContextStr);
         const [task, taskToBeCompleted] = userTask ? [userTask.task_data, userTask.complete_task] : [null, false];
         const assignNeeded = this.sessionStorageService.getItem('assignNeeded') === 'true';
@@ -9759,7 +9347,15 @@ class CaseEditComponent {
         }
         if (!taskEventCompletionInfo) {
             // if no task event present then there is no task to complete from previous event present
-            return true;
+            // EXUI-2668 - Add additional logic to confirm the task is relevant to the event
+            if (this.taskIsForEvent(taskInSessionStorage, eventDetails)) {
+                return true;
+            }
+            else {
+                // client context still needed for language
+                removeTaskFromClientContext(this.sessionStorageService);
+                return false;
+            }
         }
         else {
             if (taskEventCompletionInfo.taskId !== taskInSessionStorage.id) {
@@ -9769,8 +9365,8 @@ class CaseEditComponent {
                 this.eventDetailsDoNotMatch(taskEventCompletionInfo, eventDetails))
                 || this.eventMoreThanDayAgo(taskEventCompletionInfo.createdTimestamp)) {
                 // if the session storage not related to event, ignore it and remove
-                this.sessionStorageService.removeItem('clientContext');
-                this.sessionStorageService.removeItem('taskEventCompletionInfo');
+                removeTaskFromClientContext(this.sessionStorageService);
+                this.sessionStorageService.removeItem(CaseEditComponent.TASK_EVENT_COMPLETION_INFO);
                 return false;
             }
             if (eventDetails.assignNeeded === 'false' && eventDetails.userId !== taskInSessionStorage.assignee) {
@@ -9812,7 +9408,15 @@ class CaseEditComponent {
         }
         return false;
     }
-    static ɵfac = function CaseEditComponent_Factory(t) { return new (t || CaseEditComponent)(i0.ɵɵdirectiveInject(i4.FormBuilder), i0.ɵɵdirectiveInject(CaseNotifier), i0.ɵɵdirectiveInject(i1$1.Router), i0.ɵɵdirectiveInject(i1$1.ActivatedRoute), i0.ɵɵdirectiveInject(FieldsUtils), i0.ɵɵdirectiveInject(FieldsPurger), i0.ɵɵdirectiveInject(ConditionalShowRegistrarService), i0.ɵɵdirectiveInject(WizardFactoryService), i0.ɵɵdirectiveInject(SessionStorageService), i0.ɵɵdirectiveInject(WindowService), i0.ɵɵdirectiveInject(FormValueService), i0.ɵɵdirectiveInject(FormErrorService), i0.ɵɵdirectiveInject(LoadingService), i0.ɵɵdirectiveInject(ValidPageListCaseFieldsService), i0.ɵɵdirectiveInject(WorkAllocationService), i0.ɵɵdirectiveInject(AlertService), i0.ɵɵdirectiveInject(AbstractAppConfig)); };
+    taskIsForEvent(task, eventDetails) {
+        // EXUI-2668 - Ensure description for task includes event ID
+        // Note - This is a failsafe for an edge case that may never occur again
+        // Description may not include eventId in some cases which may mean task not completed (however this will be easy to check)
+        // In instances of the above taskEventCompletionInfo will be created to block this check from occurring
+        this.abstractConfig.logMessage(`checking taskIsForEvent: task ID ${task.id}, task description ${task.description}, event name ${eventDetails.eventId}`);
+        return task.case_id === eventDetails.caseId && (task.description?.includes(eventDetails.eventId));
+    }
+    static ɵfac = function CaseEditComponent_Factory(t) { return new (t || CaseEditComponent)(i0.ɵɵdirectiveInject(i4.FormBuilder), i0.ɵɵdirectiveInject(CaseNotifier), i0.ɵɵdirectiveInject(i1$1.Router), i0.ɵɵdirectiveInject(i1$1.ActivatedRoute), i0.ɵɵdirectiveInject(FieldsUtils), i0.ɵɵdirectiveInject(FieldsPurger), i0.ɵɵdirectiveInject(ConditionalShowRegistrarService), i0.ɵɵdirectiveInject(WizardFactoryService), i0.ɵɵdirectiveInject(SessionStorageService), i0.ɵɵdirectiveInject(WindowService), i0.ɵɵdirectiveInject(FormValueService), i0.ɵɵdirectiveInject(FormErrorService), i0.ɵɵdirectiveInject(LoadingService), i0.ɵɵdirectiveInject(ValidPageListCaseFieldsService), i0.ɵɵdirectiveInject(WorkAllocationService), i0.ɵɵdirectiveInject(AlertService), i0.ɵɵdirectiveInject(AbstractAppConfig), i0.ɵɵdirectiveInject(ReadCookieService)); };
     static ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: CaseEditComponent, selectors: [["ccd-case-edit"]], inputs: { eventTrigger: "eventTrigger", submit: "submit", validate: "validate", saveDraft: "saveDraft", caseDetails: "caseDetails" }, outputs: { cancelled: "cancelled", submitted: "submitted" }, features: [i0.ɵɵProvidersFeature([GreyBarService])], decls: 1, vars: 0, template: function CaseEditComponent_Template(rf, ctx) { if (rf & 1) {
             i0.ɵɵelement(0, "router-outlet");
         } }, dependencies: [i1$1.RouterOutlet], styles: ["#fieldset-case-data[_ngcontent-%COMP%]{margin-bottom:30px}#fieldset-case-data[_ngcontent-%COMP%]   th[_ngcontent-%COMP%]{width:1%;white-space:nowrap;vertical-align:top}.compound-field[_ngcontent-%COMP%]   td[_ngcontent-%COMP%]{padding:0}#confirmation-header[_ngcontent-%COMP%]{width:630px;background-color:#17958b;border:solid 1px #979797;color:#fff;text-align:center}#confirmation-body[_ngcontent-%COMP%]{width:630px;background-color:#fff}.valign-top[_ngcontent-%COMP%]{vertical-align:top}.summary-fields[_ngcontent-%COMP%]{margin-bottom:30px}.summary-fields[_ngcontent-%COMP%]   tbody[_ngcontent-%COMP%]   tr[_ngcontent-%COMP%]   th[_ngcontent-%COMP%], .summary-fields[_ngcontent-%COMP%]   tbody[_ngcontent-%COMP%]   tr[_ngcontent-%COMP%]   td[_ngcontent-%COMP%]{border-bottom:0px}a.disabled[_ngcontent-%COMP%]{pointer-events:none;cursor:default}.case-field-label[_ngcontent-%COMP%]{width:45%}.case-field-content[_ngcontent-%COMP%]{width:50%}.no-bottom-border[_ngcontent-%COMP%]{border-bottom:none}.case-field-change[_ngcontent-%COMP%]{width:5%}"] });
@@ -9820,7 +9424,7 @@ class CaseEditComponent {
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(CaseEditComponent, [{
         type: Component,
         args: [{ selector: 'ccd-case-edit', providers: [GreyBarService], template: "<router-outlet></router-outlet>\n", styles: ["#fieldset-case-data{margin-bottom:30px}#fieldset-case-data th{width:1%;white-space:nowrap;vertical-align:top}.compound-field td{padding:0}#confirmation-header{width:630px;background-color:#17958b;border:solid 1px #979797;color:#fff;text-align:center}#confirmation-body{width:630px;background-color:#fff}.valign-top{vertical-align:top}.summary-fields{margin-bottom:30px}.summary-fields tbody tr th,.summary-fields tbody tr td{border-bottom:0px}a.disabled{pointer-events:none;cursor:default}.case-field-label{width:45%}.case-field-content{width:50%}.no-bottom-border{border-bottom:none}.case-field-change{width:5%}\n"] }]
-    }], () => [{ type: i4.FormBuilder }, { type: CaseNotifier }, { type: i1$1.Router }, { type: i1$1.ActivatedRoute }, { type: FieldsUtils }, { type: FieldsPurger }, { type: ConditionalShowRegistrarService }, { type: WizardFactoryService }, { type: SessionStorageService }, { type: WindowService }, { type: FormValueService }, { type: FormErrorService }, { type: LoadingService }, { type: ValidPageListCaseFieldsService }, { type: WorkAllocationService }, { type: AlertService }, { type: AbstractAppConfig }], { eventTrigger: [{
+    }], () => [{ type: i4.FormBuilder }, { type: CaseNotifier }, { type: i1$1.Router }, { type: i1$1.ActivatedRoute }, { type: FieldsUtils }, { type: FieldsPurger }, { type: ConditionalShowRegistrarService }, { type: WizardFactoryService }, { type: SessionStorageService }, { type: WindowService }, { type: FormValueService }, { type: FormErrorService }, { type: LoadingService }, { type: ValidPageListCaseFieldsService }, { type: WorkAllocationService }, { type: AlertService }, { type: AbstractAppConfig }, { type: ReadCookieService }], { eventTrigger: [{
             type: Input
         }], submit: [{
             type: Input
@@ -9835,7 +9439,452 @@ class CaseEditComponent {
         }], submitted: [{
             type: Output
         }] }); })();
-(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(CaseEditComponent, { className: "CaseEditComponent", filePath: "lib/shared/components/case-editor/case-edit/case-edit.component.ts", lineNumber: 35 }); })();
+(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(CaseEditComponent, { className: "CaseEditComponent", filePath: "lib/shared/components/case-editor/case-edit/case-edit.component.ts", lineNumber: 37 }); })();
+
+function convertNonASCIICharacter(character) {
+    if (character === '£') {
+        // pound sign will be frequently used and works for btoa despite being non-ASCII
+        // note: this could be done for other characters provided they work for btoa()
+        return character;
+    }
+    // Note: Will convert to HTML entity
+    return CaseEditUtils.PREFIX + character.charCodeAt(0) + CaseEditUtils.SUFFIX;
+}
+class CaseEditUtils {
+    static PREFIX = '&#';
+    static SUFFIX = ';';
+    convertNonASCIICharacters(rawString) {
+        return rawString ? rawString.replace(/[^\x20-\x7E]/g, function (c) {
+            return convertNonASCIICharacter(c);
+        }) : '';
+    }
+    convertHTMLEntities(editedString) {
+        const revertedCharacterList = editedString.split(CaseEditUtils.PREFIX);
+        let rawString = revertedCharacterList[0];
+        for (let index = 1; index < revertedCharacterList.length; index++) {
+            const currentSection = revertedCharacterList[index];
+            if (!currentSection.includes(CaseEditUtils.SUFFIX)) {
+                return rawString.concat(currentSection);
+            }
+            else {
+                const suffixSplitList = currentSection.split(CaseEditUtils.SUFFIX);
+                const characterCode = Number(suffixSplitList[0]);
+                rawString = rawString.concat(String.fromCharCode(characterCode), suffixSplitList[1]);
+            }
+        }
+        return rawString;
+    }
+}
+function removeTaskFromClientContext(sessionStorageService) {
+    if (!sessionStorageService) {
+        return;
+    }
+    const clientContextString = sessionStorageService.getItem(CaseEditComponent.CLIENT_CONTEXT);
+    const clientContext = clientContextString ? JSON.parse(clientContextString) : null;
+    if (clientContext?.client_context?.user_task) {
+        delete clientContext.client_context.user_task;
+        sessionStorageService.setItem(CaseEditComponent.CLIENT_CONTEXT, JSON.stringify(clientContext));
+    }
+}
+
+class CasesService {
+    http;
+    appConfig;
+    orderService;
+    errorService;
+    wizardPageFieldToCaseFieldMapper;
+    loadingService;
+    sessionStorageService;
+    retryUtil;
+    // Internal (UI) API
+    static V2_MEDIATYPE_CASE_VIEW = 'application/vnd.uk.gov.hmcts.ccd-data-store-api.ui-case-view.v2+json';
+    static V2_MEDIATYPE_START_CASE_TRIGGER = 'application/vnd.uk.gov.hmcts.ccd-data-store-api.ui-start-case-trigger.v2+json;charset=UTF-8';
+    static V2_MEDIATYPE_START_EVENT_TRIGGER = 'application/vnd.uk.gov.hmcts.ccd-data-store-api.ui-start-event-trigger.v2+json;charset=UTF-8';
+    static V2_MEDIATYPE_START_DRAFT_TRIGGER = 'application/vnd.uk.gov.hmcts.ccd-data-store-api.ui-start-draft-trigger.v2+json;charset=UTF-8';
+    // External (Data Store) API
+    static V2_MEDIATYPE_CASE_DOCUMENTS = 'application/vnd.uk.gov.hmcts.ccd-data-store-api.case-documents.v2+json;charset=UTF-8';
+    static V2_MEDIATYPE_CASE_DATA_VALIDATE = 'application/vnd.uk.gov.hmcts.ccd-data-store-api.case-data-validate.v2+json;charset=UTF-8';
+    static V2_MEDIATYPE_CREATE_EVENT = 'application/vnd.uk.gov.hmcts.ccd-data-store-api.create-event.v2+json;charset=UTF-8';
+    static V2_MEDIATYPE_CREATE_CASE = 'application/vnd.uk.gov.hmcts.ccd-data-store-api.create-case.v2+json;charset=UTF-8';
+    static PUI_CASE_MANAGER = 'pui-case-manager';
+    get = this.getCaseView;
+    static updateChallengedAccessRequestAttributes(httpClient, caseId, attributesToUpdate) {
+        return httpClient.post(`/api/challenged-access-request/update-attributes`, {
+            caseId,
+            attributesToUpdate
+        });
+    }
+    static updateSpecificAccessRequestAttributes(httpClient, caseId, attributesToUpdate) {
+        return httpClient.post(`/api/specific-access-request/update-attributes`, {
+            caseId,
+            attributesToUpdate
+        });
+    }
+    constructor(http, appConfig, orderService, errorService, wizardPageFieldToCaseFieldMapper, loadingService, sessionStorageService, retryUtil) {
+        this.http = http;
+        this.appConfig = appConfig;
+        this.orderService = orderService;
+        this.errorService = errorService;
+        this.wizardPageFieldToCaseFieldMapper = wizardPageFieldToCaseFieldMapper;
+        this.loadingService = loadingService;
+        this.sessionStorageService = sessionStorageService;
+        this.retryUtil = retryUtil;
+    }
+    getCaseView(jurisdictionId, caseTypeId, caseId) {
+        const url = `${this.appConfig.getApiUrl()}/caseworkers/:uid/jurisdictions/${jurisdictionId}/case-types/${caseTypeId}/cases/${caseId}`;
+        const loadingToken = this.loadingService.register();
+        return this.http
+            .get(url)
+            .pipe(catchError(error => {
+            this.errorService.setError(error);
+            return throwError(error);
+        }), finalize(() => this.loadingService.unregister(loadingToken)));
+    }
+    getCaseViewV2(caseId) {
+        const url = `${this.appConfig.getCaseDataUrl()}/internal/cases/${caseId}`;
+        const headers = new HttpHeaders()
+            .set('experimental', 'true')
+            .set('Accept', CasesService.V2_MEDIATYPE_CASE_VIEW)
+            .set('Content-Type', 'application/json');
+        const loadingToken = this.loadingService.register();
+        let http$ = this.http.get(url, { headers, observe: 'body' });
+        const artificialDelay = this.appConfig.getTimeoutsCaseRetrievalArtificialDelay();
+        const timeoutPeriods = this.appConfig.getTimeoutsForCaseRetrieval();
+        console.log(`Timeout periods: ${timeoutPeriods} seconds.`);
+        if (timeoutPeriods && timeoutPeriods.length > 0 && timeoutPeriods[0] > 0) {
+            http$ = this.retryUtil.pipeTimeoutMechanismOn(http$, artificialDelay, timeoutPeriods);
+        }
+        else {
+            console.warn('Skipping to pipe a retry mechanism!');
+        }
+        http$ = this.pipeErrorProcessor(http$);
+        http$ = http$.pipe(finalize(() => this.finalizeGetCaseViewWith(caseId, loadingToken)));
+        return http$;
+    }
+    pipeErrorProcessor(in$) {
+        const out$ = in$.pipe(catchError(error => {
+            console.error(`Error while getting case view with getCaseViewV2! Error type: '${typeof error}, Error name: '${error?.name}'`);
+            console.error(error);
+            this.errorService.setError(error);
+            return throwError(error);
+        }));
+        return out$;
+    }
+    finalizeGetCaseViewWith(caseId, loadingToken) {
+        this.loadingService.unregister(loadingToken);
+    }
+    syncWait(seconds) {
+        const end = Date.now() + seconds * 1000;
+        while (Date.now() < end)
+            continue;
+    }
+    getEventTrigger(caseTypeId, eventTriggerId, caseId, ignoreWarning) {
+        ignoreWarning = undefined !== ignoreWarning ? ignoreWarning : 'false';
+        const url = this.buildEventTriggerUrl(caseTypeId, eventTriggerId, caseId, ignoreWarning);
+        let headers = new HttpHeaders();
+        headers = headers.set('experimental', 'true');
+        headers = headers.set('Content-Type', 'application/json');
+        headers = this.addClientContextHeader(headers);
+        if (Draft.isDraft(caseId)) {
+            headers = headers.set('Accept', CasesService.V2_MEDIATYPE_START_DRAFT_TRIGGER);
+        }
+        else if (caseId !== undefined && caseId !== null) {
+            headers = headers.set('Accept', CasesService.V2_MEDIATYPE_START_EVENT_TRIGGER);
+        }
+        else {
+            headers = headers.set('Accept', CasesService.V2_MEDIATYPE_START_CASE_TRIGGER);
+        }
+        return this.http
+            .get(url, { headers, observe: 'response' })
+            .pipe(map((response) => {
+            this.updateClientContextStorage(response.headers);
+            return FieldsUtils.handleNestedDynamicLists(response.body);
+        }), catchError(error => {
+            this.errorService.setError(error);
+            return throwError(error);
+        }), map((p) => plainToClass(CaseEventTrigger, p)), tap(eventTrigger => this.initialiseEventTrigger(eventTrigger)));
+    }
+    createEvent(caseDetails, eventData) {
+        const caseId = caseDetails.case_id;
+        const url = `${this.appConfig.getCaseDataUrl()}/cases/${caseId}/events`;
+        let headers = new HttpHeaders()
+            .set('experimental', 'true')
+            .set('Accept', CasesService.V2_MEDIATYPE_CREATE_EVENT)
+            .set('Content-Type', 'application/json');
+        headers = this.addClientContextHeader(headers);
+        return this.http
+            .post(url, eventData, { headers, observe: 'response' })
+            .pipe(map((response) => {
+            this.updateClientContextStorage(response.headers);
+            return response.body;
+        }), catchError(error => {
+            this.errorService.setError(error);
+            return throwError(error);
+        }));
+    }
+    validateCase(ctid, eventData, pageId) {
+        const pageIdString = pageId ? `?pageId=${pageId}` : '';
+        const url = `${this.appConfig.getCaseDataUrl()}/case-types/${ctid}/validate${pageIdString}`;
+        let headers = new HttpHeaders()
+            .set('experimental', 'true')
+            .set('Accept', CasesService.V2_MEDIATYPE_CASE_DATA_VALIDATE)
+            .set('Content-Type', 'application/json');
+        headers = this.addClientContextHeader(headers);
+        return this.http
+            .post(url, eventData, { headers, observe: 'response' })
+            .pipe(map((response) => {
+            this.updateClientContextStorage(response.headers);
+            return response.body;
+        }), catchError(error => {
+            this.errorService.setError(error);
+            return throwError(error);
+        }));
+    }
+    createCase(ctid, eventData) {
+        let ignoreWarning = 'false';
+        if (eventData.ignore_warning) {
+            ignoreWarning = 'true';
+        }
+        const url = `${this.appConfig.getCaseDataUrl()}/case-types/${ctid}/cases?ignore-warning=${ignoreWarning}`;
+        let headers = new HttpHeaders()
+            .set('experimental', 'true')
+            .set('Accept', CasesService.V2_MEDIATYPE_CREATE_CASE)
+            .set('Content-Type', 'application/json');
+        headers = this.addClientContextHeader(headers);
+        return this.http
+            .post(url, eventData, { headers, observe: 'response' })
+            .pipe(map((response) => {
+            this.updateClientContextStorage(response.headers);
+            return response.body;
+        }), catchError(error => {
+            this.errorService.setError(error);
+            return throwError(error);
+        }));
+    }
+    getPrintDocuments(caseId) {
+        const url = `${this.appConfig.getCaseDataUrl()}/cases/${caseId}/documents`;
+        let headers = new HttpHeaders()
+            .set('experimental', 'true')
+            .set('Accept', CasesService.V2_MEDIATYPE_CASE_DOCUMENTS)
+            .set('Content-Type', 'application/json');
+        headers = this.addClientContextHeader(headers);
+        return this.http
+            .get(url, { headers, observe: 'response' })
+            .pipe(map((response) => {
+            this.updateClientContextStorage(response.headers);
+            return response.body.documentResources;
+        }), catchError(error => {
+            this.errorService.setError(error);
+            return throwError(error);
+        }));
+    }
+    buildEventTriggerUrl(caseTypeId, eventTriggerId, caseId, ignoreWarning) {
+        let url = `${this.appConfig.getCaseDataUrl()}/internal`;
+        if (Draft.isDraft(caseId)) {
+            url += `/drafts/${caseId}`
+                + `/event-trigger`
+                + `?ignore-warning=${ignoreWarning}`;
+        }
+        else if (caseTypeId === undefined || caseTypeId === null) {
+            url += `/cases/${caseId}`
+                + `/event-triggers/${eventTriggerId}`
+                + `?ignore-warning=${ignoreWarning}`;
+        }
+        else {
+            url += `/case-types/${caseTypeId}`
+                + `/event-triggers/${eventTriggerId}`
+                + `?ignore-warning=${ignoreWarning}`;
+        }
+        return url;
+    }
+    initialiseEventTrigger(eventTrigger) {
+        if (!eventTrigger.wizard_pages) {
+            eventTrigger.wizard_pages = [];
+        }
+        eventTrigger.wizard_pages.forEach((wizardPage) => {
+            wizardPage.parsedShowCondition = ShowCondition.getInstance(wizardPage.show_condition);
+            wizardPage.case_fields = this.orderService.sort(this.wizardPageFieldToCaseFieldMapper.mapAll(wizardPage.wizard_page_fields, eventTrigger.case_fields));
+        });
+    }
+    getCourtOrHearingCentreName(locationId) {
+        return this.http.post(`/api/locations/getLocationsById`, { locations: [{ locationId }] });
+    }
+    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);
+        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);
+        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);
+        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);
+        payload.roleRequest = {
+            ...payload.roleRequest,
+            process: 'specific-access',
+            replaceExisting: true,
+            assignerId: payload.requestedRoles[0].actorId,
+            reference: `${caseId}/${roleName}/${payload.requestedRoles[0].actorId}`
+        };
+        payload.requestedRoles[0] = {
+            ...payload.requestedRoles[0],
+            roleName: 'specific-access-requested',
+            roleCategory,
+            classification: 'PRIVATE',
+            endTime: new Date(new Date().setDate(new Date().getDate() + 30)),
+            beginTime: null,
+            grantType: 'BASIC',
+            readOnly: true
+        };
+        payload.requestedRoles[0].attributes = {
+            ...payload.requestedRoles[0].attributes,
+            requestedRole: roleName,
+            specificAccessReason: sar.specificReason
+        };
+        payload.requestedRoles[0].notes[0] = {
+            ...payload.requestedRoles[0].notes[0],
+            userId: payload.requestedRoles[0].actorId
+        };
+        return this.http.post(`/api/specific-access-request`, payload);
+    }
+    getLinkedCases(caseId) {
+        const url = `${this.appConfig.getCaseDataStoreApiUrl()}/${caseId}`;
+        return this.http
+            .get(url)
+            .pipe(catchError(error => throwError(error)));
+    }
+    addClientContextHeader(headers) {
+        const clientContextDetails = this.sessionStorageService.getItem(CaseEditComponent.CLIENT_CONTEXT);
+        if (clientContextDetails) {
+            const caseEditUtils = new CaseEditUtils();
+            // below changes non-ASCII characters 
+            const editedClientContext = caseEditUtils.convertNonASCIICharacters(clientContextDetails);
+            const clientContext = window.btoa(editedClientContext);
+            if (clientContext) {
+                headers = headers.set('Client-Context', clientContext);
+            }
+        }
+        return headers;
+    }
+    updateClientContextStorage(headers) {
+        if (headers && headers.get('Client-Context')) {
+            const caseEditUtils = new CaseEditUtils();
+            const clientContextString = window.atob(headers.get('Client-Context'));
+            // below reverts non-ASCII characters 
+            const editedClientContextString = caseEditUtils.convertHTMLEntities(clientContextString);
+            this.sessionStorageService.setItem(CaseEditComponent.CLIENT_CONTEXT, editedClientContextString);
+        }
+    }
+    static ɵfac = function CasesService_Factory(t) { return new (t || CasesService)(i0.ɵɵinject(HttpService), i0.ɵɵinject(AbstractAppConfig), i0.ɵɵinject(OrderService), i0.ɵɵinject(HttpErrorService), i0.ɵɵinject(WizardPageFieldToCaseFieldMapper), i0.ɵɵinject(LoadingService), i0.ɵɵinject(SessionStorageService), i0.ɵɵinject(RetryUtil)); };
+    static ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: CasesService, factory: CasesService.ɵfac });
+}
+(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(CasesService, [{
+        type: Injectable
+    }], () => [{ type: HttpService }, { type: AbstractAppConfig }, { type: OrderService }, { type: HttpErrorService }, { type: WizardPageFieldToCaseFieldMapper }, { type: LoadingService }, { type: SessionStorageService }, { type: RetryUtil }], null); })();
+
+function CaseCreateComponent_div_0_Template(rf, ctx) { if (rf & 1) {
+    const _r1 = i0.ɵɵgetCurrentView();
+    i0.ɵɵelementStart(0, "div")(1, "ccd-case-edit", 1);
+    i0.ɵɵlistener("cancelled", function CaseCreateComponent_div_0_Template_ccd_case_edit_cancelled_1_listener($event) { i0.ɵɵrestoreView(_r1); const ctx_r1 = i0.ɵɵnextContext(); return i0.ɵɵresetView(ctx_r1.emitCancelled($event)); })("submitted", function CaseCreateComponent_div_0_Template_ccd_case_edit_submitted_1_listener($event) { i0.ɵɵrestoreView(_r1); const ctx_r1 = i0.ɵɵnextContext(); return i0.ɵɵresetView(ctx_r1.emitSubmitted($event)); });
+    i0.ɵɵelementEnd()();
+} if (rf & 2) {
+    const ctx_r1 = i0.ɵɵnextContext();
+    i0.ɵɵadvance();
+    i0.ɵɵproperty("submit", ctx_r1.submit())("validate", ctx_r1.validate())("saveDraft", ctx_r1.saveDraft())("eventTrigger", ctx_r1.eventTrigger);
+} }
+class CaseCreateComponent {
+    casesService;
+    alertService;
+    draftService;
+    eventTriggerService;
+    jurisdiction;
+    caseType;
+    event;
+    cancelled = new EventEmitter();
+    submitted = new EventEmitter();
+    eventTrigger;
+    constructor(casesService, alertService, draftService, eventTriggerService) {
+        this.casesService = casesService;
+        this.alertService = alertService;
+        this.draftService = draftService;
+        this.eventTriggerService = eventTriggerService;
+    }
+    ngOnInit() {
+        this.casesService.getEventTrigger(this.caseType, this.event).toPromise()
+            .then(eventTrigger => {
+            this.eventTrigger = eventTrigger;
+            this.eventTriggerService.announceEventTrigger(eventTrigger);
+        })
+            .catch((error) => {
+            this.alertService.error({ phrase: error.message });
+            return throwError(error);
+        });
+    }
+    submit() {
+        return (sanitizedEditForm) => {
+            sanitizedEditForm.draft_id = this.eventTrigger.case_id;
+            return this.casesService.createCase(this.caseType, sanitizedEditForm);
+        };
+    }
+    validate() {
+        return (sanitizedEditForm, pageId) => this.casesService
+            .validateCase(this.caseType, sanitizedEditForm, pageId);
+    }
+    saveDraft() {
+        if (this.eventTrigger.can_save_draft) {
+            return (caseEventData) => this.draftService.createOrUpdateDraft(this.caseType, this.eventTrigger.case_id, caseEventData);
+        }
+    }
+    emitCancelled(event) {
+        this.cancelled.emit(event);
+    }
+    emitSubmitted(event) {
+        this.submitted.emit(event);
+    }
+    isDataLoaded() {
+        return this.eventTrigger ? true : false;
+    }
+    static ɵfac = function CaseCreateComponent_Factory(t) { return new (t || CaseCreateComponent)(i0.ɵɵdirectiveInject(CasesService), i0.ɵɵdirectiveInject(AlertService), i0.ɵɵdirectiveInject(DraftService), i0.ɵɵdirectiveInject(EventTriggerService)); };
+    static ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: CaseCreateComponent, selectors: [["ccd-case-create"]], inputs: { jurisdiction: "jurisdiction", caseType: "caseType", event: "event" }, outputs: { cancelled: "cancelled", submitted: "submitted" }, decls: 1, vars: 1, consts: [[4, "ngIf"], [3, "cancelled", "submitted", "submit", "validate", "saveDraft", "eventTrigger"]], template: function CaseCreateComponent_Template(rf, ctx) { if (rf & 1) {
+            i0.ɵɵtemplate(0, CaseCreateComponent_div_0_Template, 2, 4, "div", 0);
+        } if (rf & 2) {
+            i0.ɵɵproperty("ngIf", ctx.isDataLoaded());
+        } }, encapsulation: 2 });
+}
+(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(CaseCreateComponent, [{
+        type: Component,
+        args: [{ selector: 'ccd-case-create', template: "<div *ngIf=\"isDataLoaded()\">\n    <ccd-case-edit [submit]=\"submit()\"\n                   [validate]=\"validate()\"\n                   [saveDraft]=\"saveDraft()\"\n                   [eventTrigger]=\"eventTrigger\"\n                   (cancelled)=\"emitCancelled($event)\"\n                   (submitted)=\"emitSubmitted($event)\"></ccd-case-edit>\n</div>" }]
+    }], () => [{ type: CasesService }, { type: AlertService }, { type: DraftService }, { type: EventTriggerService }], { jurisdiction: [{
+            type: Input
+        }], caseType: [{
+            type: Input
+        }], event: [{
+            type: Input
+        }], cancelled: [{
+            type: Output
+        }], submitted: [{
+            type: Output
+        }] }); })();
+(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(CaseCreateComponent, { className: "CaseCreateComponent", filePath: "lib/shared/components/case-editor/case-create/case-create.component.ts", lineNumber: 17 }); })();
 
 function CaseEditConfirmComponent_div_3_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelement(0, "div");
@@ -11260,7 +11309,7 @@ class CaseEventCompletionTaskCancelledComponent {
     }
     onContinue() {
         // Removes task to complete so event completes without task
-        this.context.sessionStorageService.removeItem('clientContext');
+        this.context.sessionStorageService.removeItem(CaseEditComponent.CLIENT_CONTEXT);
         // may be able to remove this call below since it is now unneccesary
         this.notifyEventCompletionCancelled.emit(true);
     }
@@ -11446,7 +11495,7 @@ class CaseEventCompletionTaskReassignedComponent {
     }
     onContinue() {
         // Get task details
-        const clientContextStr = this.sessionStorageService.getItem('clientContext');
+        const clientContextStr = this.sessionStorageService.getItem(CaseEditComponent.CLIENT_CONTEXT);
         const userTask = FieldsUtils.getUserTaskFromClientContext(clientContextStr);
         const task = userTask ? userTask.task_data : null;
         // not complete_task not utilised here as related to event completion
@@ -11476,7 +11525,7 @@ class CaseEventCompletionTaskReassignedComponent {
         }], notifyEventCompletionReassigned: [{
             type: Output
         }] }); })();
-(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(CaseEventCompletionTaskReassignedComponent, { className: "CaseEventCompletionTaskReassignedComponent", filePath: "lib/shared/components/case-editor/case-event-completion/components/case-event-completion-task-reassigned/case-event-completion-task-reassigned.component.ts", lineNumber: 15 }); })();
+(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(CaseEventCompletionTaskReassignedComponent, { className: "CaseEventCompletionTaskReassignedComponent", filePath: "lib/shared/components/case-editor/case-event-completion/components/case-event-completion-task-reassigned/case-event-completion-task-reassigned.component.ts", lineNumber: 16 }); })();
 
 class AddressOption {
     description;
@@ -20290,7 +20339,7 @@ class QueryCheckYourAnswersComponent {
     fieldId;
     attachments;
     errorMessages = [];
-    filteredTask = [];
+    filteredTasks = [];
     constructor(route, router, casesService, caseNotifier, workAllocationService, sessionStorageService, qualifyingQuestionService) {
         this.route = route;
         this.router = router;
@@ -20320,11 +20369,11 @@ class QueryCheckYourAnswersComponent {
                 .subscribe({
                 next: (response) => {
                     // Filter task by query id
-                    if (response.tasks?.length > 1) {
-                        this.filteredTask = response.tasks?.find((task) => task.case_id === this.tid);
+                    if (this.tid && response.tasks?.length > 1) {
+                        this.filteredTasks = response.tasks?.filter((task) => task.id === this.tid);
                     }
                     else {
-                        this.filteredTask = response.tasks;
+                        this.filteredTasks = response.tasks;
                     }
                 },
                 error: (error) => {
@@ -20356,13 +20405,18 @@ class QueryCheckYourAnswersComponent {
         const data = this.generateCaseQueriesCollectionData();
         const createEvent$ = this.createEvent(data);
         if (this.queryCreateContext === QueryCreateContext.RESPOND) {
-            const completeTask$ = this.workAllocationService.completeTask(this.filteredTask[0].id, this.caseViewTrigger.name);
-            this.createEventSubscription = forkJoin([createEvent$, completeTask$]).subscribe({
-                next: ([createEventResponse, tasksResponse]) => {
-                    this.finaliseSubmission();
-                },
-                error: (error) => this.handleError(error)
-            });
+            if (this.filteredTasks?.length > 0) {
+                const completeTask$ = this.workAllocationService.completeTask(this.filteredTasks[0].id, this.caseViewTrigger.name);
+                this.createEventSubscription = forkJoin([createEvent$, completeTask$]).subscribe({
+                    next: ([createEventResponse, tasksResponse]) => {
+                        this.finaliseSubmission();
+                    },
+                    error: (error) => this.handleError(error)
+                });
+            }
+            else {
+                console.error('Error: No task to complete found');
+            }
         }
         else {
             this.createEventSubscription = createEvent$.subscribe({
@@ -20599,7 +20653,7 @@ class QueryCheckYourAnswersComponent {
         }], querySubmitted: [{
             type: Output
         }] }); })();
-(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(QueryCheckYourAnswersComponent, { className: "QueryCheckYourAnswersComponent", filePath: "lib/shared/components/palette/query-management/components/query-check-your-answers/query-check-your-answers.component.ts", lineNumber: 26 }); })();
+(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(QueryCheckYourAnswersComponent, { className: "QueryCheckYourAnswersComponent", filePath: "lib/shared/components/palette/query-management/components/query-check-your-answers/query-check-your-answers.component.ts", lineNumber: 27 }); })();
 
 function QueryDetailsComponent_ng_container_0_cut_alert_1_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementStart(0, "cut-alert", 11);
@@ -21195,8 +21249,8 @@ class QueryWriteAddDocumentsComponent {
         // This field is mocked to allow the document component to be used in isolation
         this.mockDocumentCaseField = Object.assign(new CaseField(), {
             id: QueryWriteAddDocumentsComponent.DOCUMENTS_FORM_CONTROL_NAME,
-            label: this.label ? this.label : 'Attach a document',
-            hint_text: this.hintText ? this.hintText : 'Only attach documents related to your query. For all other documents use your case management document upload function.',
+            label: this.label ? this.label : 'Add document',
+            hint_text: this.hintText ? this.hintText : 'Attach a document to this message',
             display_context: 'OPTIONAL',
             display_context_parameter: '#COLLECTION(allowInsert,allowUpdate)',
             field_type: Object.assign(new FieldType(), {
@@ -23563,7 +23617,7 @@ class CaseFileViewFolderComponent {
             i0.ɵɵelementStart(0, "div", 0)(1, "div", 1);
             i0.ɵɵelement(2, "input", 2);
             i0.ɵɵelementEnd()();
-            i0.ɵɵelementStart(3, "div", 3)(4, "div", 4);
+            i0.ɵɵelementStart(3, "div", 3)(4, "span", 4);
             i0.ɵɵtext(5);
             i0.ɵɵelementEnd();
             i0.ɵɵelementStart(6, "div")(7, "ccd-case-file-view-folder-sort", 5);
@@ -23581,7 +23635,7 @@ class CaseFileViewFolderComponent {
 }
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(CaseFileViewFolderComponent, [{
         type: Component,
-        args: [{ selector: 'ccd-case-file-view-folder', template: "<div class=\"document-filter-container\">\n  <div class=\"form-group document-filter\" [formGroup]=\"documentFilterFormGroup\">\n    <input class=\"form-control document-search\"\n      type=\"search\"\n      id=\"document-search\"\n      name=\"documentSearchFormControl\"\n      formControlName=\"documentSearchFormControl\"\n      placeholder=\"Search by document name\"\n      aria-label=\"Search by document name\">\n  </div>\n</div>\n\n<div class=\"document-folders-header\">\n  <div class=\"document-folders-header__title\">Documents ({{ documentCount }})</div>\n  <div>\n    <ccd-case-file-view-folder-sort\n      (sortAscending)=\"sortDataSourceAscending($event)\"\n      (sortDescending)=\"sortDataSourceDescending($event)\"\n    ></ccd-case-file-view-folder-sort>\n  </div>\n</div>\n\n<div class=\"document-tree-container\" *ngIf=\"documentTreeData\">\n  <div *ngIf=\"!nestedDataSource || nestedDataSource.length === 0\">\n    No results found\n  </div>\n  <div>\n    <cdk-tree [dataSource]=\"nestedDataSource\" [treeControl]=\"nestedTreeControl\">\n      <!-- document -->\n      <cdk-nested-tree-node class=\"document-tree-container__node document-tree-container__node--document\" *cdkTreeNodeDef=\"let node\">\n        <button class=\"node\" (click)=\"selectedNodeItem = node; clickedDocument.emit(node)\"\n                [class.node--selected]=\"selectedNodeItem?.name === node.name\">\n          <div class=\"node__icon\" disabled>\n            <img src=\"/assets/img/case-file-view/case-file-view-document.svg\" class=\"node__iconImg\" alt=\"Document icon\">\n          </div>\n          <span class=\"node__name node-name-document\">\n            {{node.name}}\n            <br>\n            <span class=\"node__document-upload-timestamp\">{{node.upload_timestamp | ccdDate : 'local' :'dd MMM YYYY HH:mm'}}</span>\n          </span>\n          <div class=\"node__document-options\">\n            <ccd-case-file-view-folder-document-actions\n              (changeFolderAction)=\"triggerDocumentAction('changeFolder', node)\"\n              (openInANewTabAction)=\"triggerDocumentAction('openInANewTab', node)\"\n              (downloadAction)=\"triggerDocumentAction('download', node)\"\n              (printAction)=\"triggerDocumentAction('print', node)\"\n              [allowMoving]=\"allowMoving\"\n            >\n            </ccd-case-file-view-folder-document-actions>\n          </div>\n        </button>\n      </cdk-nested-tree-node>\n      <!-- folder-->\n      <cdk-nested-tree-node class=\"document-tree-container__node document-tree-container__folder\" *cdkTreeNodeDef=\"let node; when: nestedChildren\">\n        <button class=\"node\" cdkTreeNodeToggle>\n          <div class=\"node__icon\" [attr.aria-label]=\"'toggle ' + node.name\" >\n            <img class=\"node__iconImg\"\n                 [src]=\"nestedTreeControl.isExpanded(node) ? '/assets/images/folder-open.png' : '/assets/images/folder.png'\" alt=\"Folder icon\">\n            <span class=\"node__count\">{{node.childDocumentCount}}</span>\n          </div>\n          <span class=\"node__name node__name--folder\">{{node.name}}</span>\n        </button>\n\n        <div [class.document-tree-invisible]=\"!nestedTreeControl.isExpanded(node)\">\n          <ng-container cdkTreeNodeOutlet></ng-container>\n        </div>\n      </cdk-nested-tree-node>\n    </cdk-tree>\n  </div>\n</div>\n", styles: [":host{display:flex;height:100%;flex-direction:column}:host .document-tree-container{flex:1 0}.document-filter-container{border-bottom:2px solid #C9C9C9}.document-filter-container .document-filter{padding:10px}.document-filter-container .document-filter .document-search{background:url(/assets/images/icon-search-black.svg) no-repeat right #fff;background-position-x:calc(100% - 4px);padding-right:30px;width:100%}.document-filter-container .documents-title{height:30%;margin-left:8px;font-weight:700}.document-tree-container{padding:4px;overflow-x:hidden;overflow-y:scroll}.document-tree-container__node{display:block}.document-tree-container__node .document-tree-container__node{padding-left:40px}.document-tree-container .document-tree-invisible{display:none}.document-tree-container::-webkit-scrollbar{width:7px}.document-tree-container::-webkit-scrollbar-thumb{border:4px solid rgba(0,0,0,0);background-clip:padding-box;border-radius:9999px;background-color:#aaa}.document-tree-container::-webkit-scrollbar-button{display:none}.document-tree-container::-webkit-scrollbar-track-piece{background:#eee}.document-tree-container::-webkit-scrollbar-thumb{background:#ccc}.document-folders-header{display:flex;align-items:center;justify-content:space-between;border-bottom:2px solid #C9C9C9;padding:10px}.document-folders-header__title{font-weight:700}.node{display:flex;align-items:center;width:100%;padding:10px;background:none;border:0;cursor:pointer;white-space:nowrap}.node--selected{background:#fff2cc}.node__icon{position:relative;display:inline-block}.node__count{color:#fff;position:absolute;top:50%;left:50%;transform:translate(-50%,-50%);font-size:.875rem;padding-top:4px}.node__iconImg{display:block;height:30px;width:30px}.node__name{margin-left:6px;font-size:1rem;overflow:hidden;text-overflow:ellipsis}.node__document-options{margin-left:auto;margin-right:0}.node__document-upload-timestamp{font-size:.8rem;float:left;padding-left:10px}\n"] }]
+        args: [{ selector: 'ccd-case-file-view-folder', template: "<div class=\"document-filter-container\">\n  <div class=\"form-group document-filter\" [formGroup]=\"documentFilterFormGroup\">\n    <input class=\"form-control document-search\"\n      type=\"search\"\n      id=\"document-search\"\n      name=\"documentSearchFormControl\"\n      formControlName=\"documentSearchFormControl\"\n      placeholder=\"Search by document name\"\n      aria-label=\"Search by document name\">\n  </div>\n</div>\n\n<div class=\"document-folders-header\">\n  <span class=\"document-folders-header__title\">Documents ({{ documentCount }})</span>\n  <div>\n    <ccd-case-file-view-folder-sort\n      (sortAscending)=\"sortDataSourceAscending($event)\"\n      (sortDescending)=\"sortDataSourceDescending($event)\"\n    ></ccd-case-file-view-folder-sort>\n  </div>\n</div>\n\n<div class=\"document-tree-container\" *ngIf=\"documentTreeData\">\n  <div *ngIf=\"!nestedDataSource || nestedDataSource.length === 0\">\n    No results found\n  </div>\n  <div>\n    <cdk-tree [dataSource]=\"nestedDataSource\" [treeControl]=\"nestedTreeControl\">\n      <!-- document -->\n      <cdk-nested-tree-node class=\"document-tree-container__node document-tree-container__node--document\" *cdkTreeNodeDef=\"let node\">\n        <button class=\"node\" (click)=\"selectedNodeItem = node; clickedDocument.emit(node)\"\n                [class.node--selected]=\"selectedNodeItem?.name === node.name\">\n          <div class=\"node__icon\" disabled>\n            <img src=\"/assets/img/case-file-view/case-file-view-document.svg\" class=\"node__iconImg\" alt=\"Document icon\">\n          </div>\n          <span class=\"node__name node-name-document\">\n            {{node.name}}\n            <br>\n            <span class=\"node__document-upload-timestamp\">{{node.upload_timestamp | ccdDate : 'local' :'dd MMM YYYY HH:mm'}}</span>\n          </span>\n          <div class=\"node__document-options\">\n            <ccd-case-file-view-folder-document-actions\n              (changeFolderAction)=\"triggerDocumentAction('changeFolder', node)\"\n              (openInANewTabAction)=\"triggerDocumentAction('openInANewTab', node)\"\n              (downloadAction)=\"triggerDocumentAction('download', node)\"\n              (printAction)=\"triggerDocumentAction('print', node)\"\n              [allowMoving]=\"allowMoving\"\n            >\n            </ccd-case-file-view-folder-document-actions>\n          </div>\n        </button>\n      </cdk-nested-tree-node>\n      <!-- folder-->\n      <cdk-nested-tree-node class=\"document-tree-container__node document-tree-container__folder\" *cdkTreeNodeDef=\"let node; when: nestedChildren\">\n        <button class=\"node\" cdkTreeNodeToggle>\n          <div class=\"node__icon\" [attr.aria-label]=\"'toggle ' + node.name\" >\n            <img class=\"node__iconImg\"\n                 [src]=\"nestedTreeControl.isExpanded(node) ? '/assets/images/folder-open.png' : '/assets/images/folder.png'\" alt=\"Folder icon\">\n            <span class=\"node__count\">{{node.childDocumentCount}}</span>\n          </div>\n          <span class=\"node__name node__name--folder\">{{node.name}}</span>\n        </button>\n\n        <div [class.document-tree-invisible]=\"!nestedTreeControl.isExpanded(node)\">\n          <ng-container cdkTreeNodeOutlet></ng-container>\n        </div>\n      </cdk-nested-tree-node>\n    </cdk-tree>\n  </div>\n</div>\n", styles: [":host{display:flex;height:100%;flex-direction:column}:host .document-tree-container{flex:1 0}.document-filter-container{border-bottom:2px solid #C9C9C9}.document-filter-container .document-filter{padding:10px}.document-filter-container .document-filter .document-search{background:url(/assets/images/icon-search-black.svg) no-repeat right #fff;background-position-x:calc(100% - 4px);padding-right:30px;width:100%}.document-filter-container .documents-title{height:30%;margin-left:8px;font-weight:700}.document-tree-container{padding:4px;overflow-x:hidden;overflow-y:scroll}.document-tree-container__node{display:block}.document-tree-container__node .document-tree-container__node{padding-left:40px}.document-tree-container .document-tree-invisible{display:none}.document-tree-container::-webkit-scrollbar{width:7px}.document-tree-container::-webkit-scrollbar-thumb{border:4px solid rgba(0,0,0,0);background-clip:padding-box;border-radius:9999px;background-color:#aaa}.document-tree-container::-webkit-scrollbar-button{display:none}.document-tree-container::-webkit-scrollbar-track-piece{background:#eee}.document-tree-container::-webkit-scrollbar-thumb{background:#ccc}.document-folders-header{display:flex;align-items:center;justify-content:space-between;border-bottom:2px solid #C9C9C9;padding:10px}.document-folders-header__title{font-weight:700}.node{display:flex;align-items:center;width:100%;padding:10px;background:none;border:0;cursor:pointer;white-space:nowrap}.node--selected{background:#fff2cc}.node__icon{position:relative;display:inline-block}.node__count{color:#fff;position:absolute;top:50%;left:50%;transform:translate(-50%,-50%);font-size:.875rem;padding-top:4px}.node__iconImg{display:block;height:30px;width:30px}.node__name{margin-left:6px;font-size:1rem;overflow:hidden;text-overflow:ellipsis}.node__document-options{margin-left:auto;margin-right:0}.node__document-upload-timestamp{font-size:.8rem;float:left;padding-left:10px}\n"] }]
     }], () => [{ type: WindowService }, { type: i1$1.Router }, { type: DocumentManagementService }, { type: i1$3.MatLegacyDialog }, { type: AbstractAppConfig }], { categoriesAndDocuments: [{
             type: Input
         }], allowMoving: [{
@@ -27771,7 +27825,7 @@ class EventLogTableComponent {
 }
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(EventLogTableComponent, [{
         type: Component,
-        args: [{ selector: 'ccd-event-log-table', template: "<table class=\"EventLogTable\">\n  <caption><h2 class=\"heading-h2\">{{'History' | rpxTranslate}}</h2></caption>\n  <thead>\n  <tr>\n    <th><span class=\"text-16\">{{'Event' | rpxTranslate}}</span></th>\n    <th><span class=\"text-16\">{{'Date' | rpxTranslate}}</span></th>\n    <th><span class=\"text-16\">{{'Author' | rpxTranslate}}</span></th>\n  </tr>\n  </thead>\n  <tbody>\n  <tr *ngFor=\"let event of events\" (click)=\"select(event)\" (keyup)=\"select(event)\" [ngClass]=\"{'EventLogTable-Selected': selected === event}\" tabindex=\"0\" attr.aria-label=\"{{getAriaLabelforRow(event)}}\">\n    <td>\n      <ng-container [ngSwitch]=\"isPartOfCaseTimeline\">\n        <div id=\"case-timeline\" *ngSwitchCase=\"true\">\n          <a (click)=\"caseHistoryClicked(event.id)\"\n            *ngIf=\"event.state_id !== 'Draft'\" class=\"text-16 event-link\" attr.aria-label=\"{{getAriaLabelforLink(event)}}\">{{event.event_name | rpxTranslate}}</a>\n          </div>\n        <div *ngSwitchCase=\"false\">\n          <a [routerLink]=\"['./', 'event', event.id, 'history']\"\n              [target]=\"'_blank'\"\n              *ngIf=\"event.state_id !== 'Draft'\" class=\"text-16 event-link\" attr.aria-label=\"{{getAriaLabelforLink(event)}}\">{{event.event_name | rpxTranslate}}</a>\n        </div>\n      </ng-container>\n      <span *ngIf=\"event.state_id === 'Draft'\">{{event.event_name}}</span>\n      <div class=\"tooltip\" *ngIf=\"significantItemExist(event)\">\n        <a href=\"{{getSignificantItemUrl(event)}}\" target=\"_blank\" rel=\"noopener\" attr.aria-label=\"{{getAriaLabelforLink(event)}}\">\n          <img class=\"doc-img\" alt=\"document image\" src=\"data:image/png;base64,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\"/>\n        </a>\n        <span class=\"tooltiptext doc-tooltip\">{{getSignificantItemDesc(event)}}</span>\n      </div>\n    </td>\n    <td tabindex=\"0\" attr.aria-label=\"{{getAriaLabelforColumn(event)}}\" (keydown.enter)=\"select(event)\"><div class=\"tooltip text-16\">{{event.timestamp | ccdDate : 'local'}}\n      <span class=\"tooltiptext\">{{'Local:' | rpxTranslate}} {{event.timestamp | ccdDate : 'local'}}</span>\n    </div></td>\n    <td tabindex=\"0\"><span class=\"text-16\">{{event.user_first_name | titlecase}} {{event.user_last_name | uppercase}}</span></td>\n  </tr>\n  </tbody>\n</table>\n", styles: ["#case-timeline a{cursor:pointer;text-decoration:underline;color:#005ea5}#case-timeline a:hover{color:#2b8cc4}#case-timeline a:visited{color:#4c2c92}.EventLogTable tbody>tr td:first-child{padding-left:10px}.EventLogTable tbody>tr.EventLogTable-Selected{border-left:8px solid #005ea5;background-color:#f8f8f8}.EventLogTable tbody>tr.EventLogTable-Selected td:first-child{padding-left:6px}.EventLogTable tbody>tr:not(.EventLogTable-Selected):hover{border-left:8px solid #2b8cc4;background-color:#f8f8f8;cursor:pointer;cursor:hand}.EventLogTable tbody>tr:not(.EventLogTable-Selected):hover td:first-child{padding-left:6px}.EventLogTable tbody>tr .event-link{float:left;padding-right:8px}.EventLogTable tbody>tr .doc-img{width:16px;float:left}.EventLogTable tbody>tr .doc-tooltip{left:35%;bottom:7px}.EventLogTable tbody>tr .doc-tooltip:after{border-color:transparent}\n"] }]
+        args: [{ selector: 'ccd-event-log-table', template: "<table class=\"EventLogTable\">\n  <caption><h2 class=\"heading-h2\">{{'History' | rpxTranslate}}</h2></caption>\n  <thead>\n  <tr>\n    <th><span class=\"text-16\">{{'Event' | rpxTranslate}}</span></th>\n    <th><span class=\"text-16\">{{'Date' | rpxTranslate}}</span></th>\n    <th><span class=\"text-16\">{{'Author' | rpxTranslate}}</span></th>\n  </tr>\n  </thead>\n  <tbody>\n  <tr *ngFor=\"let event of events\" (click)=\"select(event)\" (keyup)=\"select(event)\" [ngClass]=\"{'EventLogTable-Selected': selected === event}\" tabindex=\"0\" attr.aria-label=\"{{getAriaLabelforRow(event)}}\">\n    <td>\n      <ng-container [ngSwitch]=\"isPartOfCaseTimeline\">\n        <div id=\"case-timeline\" *ngSwitchCase=\"true\">\n          <a (click)=\"caseHistoryClicked(event.id)\"\n            *ngIf=\"event.state_id !== 'Draft'\" class=\"text-16 event-link\" attr.aria-label=\"{{getAriaLabelforLink(event)}}\">{{event.event_name | rpxTranslate}}</a>\n          </div>\n        <div *ngSwitchCase=\"false\">\n          <a [routerLink]=\"['./', 'event', event.id, 'history']\"\n              [target]=\"'_blank'\"\n              *ngIf=\"event.state_id !== 'Draft'\" class=\"text-16 event-link\" attr.aria-label=\"{{getAriaLabelforLink(event)}}\">{{event.event_name | rpxTranslate}}</a>\n        </div>\n      </ng-container>\n      <span *ngIf=\"event.state_id === 'Draft'\">{{event.event_name}}</span>\n      <div class=\"tooltip\" *ngIf=\"significantItemExist(event)\">\n        <a href=\"{{getSignificantItemUrl(event)}}\" target=\"_blank\" rel=\"noopener\" attr.aria-label=\"{{getAriaLabelforLink(event)}}\">\n          <img class=\"doc-img\" alt=\"document image\" src=\"data:image/png;base64,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\"/>\n        </a>\n        <span class=\"tooltiptext doc-tooltip\">{{getSignificantItemDesc(event)}}</span>\n      </div>\n    </td>\n    <td tabindex=\"0\" attr.aria-label=\"{{getAriaLabelforColumn(event)}}\" (keydown.enter)=\"select(event)\"><div class=\"tooltip text-16\">{{event.timestamp | ccdDate : 'local'}}\n      <span class=\"tooltiptext\">{{'Local:' | rpxTranslate}} {{event.timestamp | ccdDate : 'local'}}</span>\n    </div></td>\n    <td tabindex=\"0\"><span class=\"text-16\">{{event.user_first_name | titlecase}} {{event.user_last_name | uppercase}}</span></td>\n  </tr>\n  </tbody>\n</table>", styles: ["#case-timeline a{cursor:pointer;text-decoration:underline;color:#005ea5}#case-timeline a:hover{color:#2b8cc4}#case-timeline a:visited{color:#4c2c92}.EventLogTable tbody>tr td:first-child{padding-left:10px}.EventLogTable tbody>tr.EventLogTable-Selected{border-left:8px solid #005ea5;background-color:#f8f8f8}.EventLogTable tbody>tr.EventLogTable-Selected td:first-child{padding-left:6px}.EventLogTable tbody>tr:not(.EventLogTable-Selected):hover{border-left:8px solid #2b8cc4;background-color:#f8f8f8;cursor:pointer;cursor:hand}.EventLogTable tbody>tr:not(.EventLogTable-Selected):hover td:first-child{padding-left:6px}.EventLogTable tbody>tr .event-link{float:left;padding-right:8px}.EventLogTable tbody>tr .doc-img{width:16px;float:left}.EventLogTable tbody>tr .doc-tooltip{left:35%;bottom:7px}.EventLogTable tbody>tr .doc-tooltip:after{border-color:transparent}\n"] }]
     }], null, { events: [{
             type: Input
         }], selected: [{
@@ -32417,13 +32471,14 @@ class EventTriggerResolver {
     router;
     appConfig;
     errorNotifier;
+    loadingService;
     static PARAM_CASE_ID = 'cid';
     static PARAM_EVENT_ID = 'eid';
     static IGNORE_WARNING = 'ignoreWarning';
     static IGNORE_WARNING_VALUES = ['true', 'false'];
     cachedEventTrigger;
     cachedProfile;
-    constructor(casesService, alertService, profileService, profileNotifier, router, appConfig, errorNotifier) {
+    constructor(casesService, alertService, profileService, profileNotifier, router, appConfig, errorNotifier, loadingService) {
         this.casesService = casesService;
         this.alertService = alertService;
         this.profileService = profileService;
@@ -32431,6 +32486,7 @@ class EventTriggerResolver {
         this.router = router;
         this.appConfig = appConfig;
         this.errorNotifier = errorNotifier;
+        this.loadingService = loadingService;
     }
     resolve(route) {
         return this.isRootTriggerEventRoute(route) ? this.getAndCacheEventTrigger(route)
@@ -32461,7 +32517,7 @@ class EventTriggerResolver {
         }
         return this.casesService
             .getEventTrigger(caseTypeId, eventTriggerId, cid, ignoreWarning)
-            .pipe(map(eventTrigger => this.cachedEventTrigger = eventTrigger), catchError(error => {
+            .pipe(map((eventTrigger) => this.cachedEventTrigger = eventTrigger), catchError((error) => {
             error.details = { eventId: eventTriggerId, ...error.details };
             this.alertService.setPreserveAlerts(true);
             this.alertService.error(error.message);
@@ -32470,12 +32526,12 @@ class EventTriggerResolver {
             return throwError(error);
         })).toPromise();
     }
-    static ɵfac = function EventTriggerResolver_Factory(t) { return new (t || EventTriggerResolver)(i0.ɵɵinject(CasesService), i0.ɵɵinject(AlertService), i0.ɵɵinject(ProfileService), i0.ɵɵinject(ProfileNotifier), i0.ɵɵinject(i1$1.Router), i0.ɵɵinject(AbstractAppConfig), i0.ɵɵinject(ErrorNotifierService)); };
+    static ɵfac = function EventTriggerResolver_Factory(t) { return new (t || EventTriggerResolver)(i0.ɵɵinject(CasesService), i0.ɵɵinject(AlertService), i0.ɵɵinject(ProfileService), i0.ɵɵinject(ProfileNotifier), i0.ɵɵinject(i1$1.Router), i0.ɵɵinject(AbstractAppConfig), i0.ɵɵinject(ErrorNotifierService), i0.ɵɵinject(LoadingService)); };
     static ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: EventTriggerResolver, factory: EventTriggerResolver.ɵfac });
 }
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(EventTriggerResolver, [{
         type: Injectable
-    }], () => [{ type: CasesService }, { type: AlertService }, { type: ProfileService }, { type: ProfileNotifier }, { type: i1$1.Router }, { type: AbstractAppConfig }, { type: ErrorNotifierService }], null); })();
+    }], () => [{ type: CasesService }, { type: AlertService }, { type: ProfileService }, { type: ProfileNotifier }, { type: i1$1.Router }, { type: AbstractAppConfig }, { type: ErrorNotifierService }, { type: LoadingService }], null); })();
 
 function CaseEventTriggerComponent_div_0_Template(rf, ctx) { if (rf & 1) {
     const _r1 = i0.ɵɵgetCurrentView();
@@ -32501,6 +32557,7 @@ class CaseEventTriggerComponent {
     caseReferencePipe;
     activityPollingService;
     sessionStorageService;
+    loadingService;
     static EVENT_COMPLETION_MESSAGE = `Case #%CASEREFERENCE% has been updated with event: %NAME%`;
     static CALLBACK_FAILED_MESSAGE = ' but the callback service cannot be completed';
     BANNER = DisplayMode.BANNER;
@@ -32509,7 +32566,7 @@ class CaseEventTriggerComponent {
     activitySubscription;
     caseSubscription;
     parentUrl;
-    constructor(ngZone, casesService, caseNotifier, router, alertService, route, caseReferencePipe, activityPollingService, sessionStorageService) {
+    constructor(ngZone, casesService, caseNotifier, router, alertService, route, caseReferencePipe, activityPollingService, sessionStorageService, loadingService) {
         this.ngZone = ngZone;
         this.casesService = casesService;
         this.caseNotifier = caseNotifier;
@@ -32519,8 +32576,12 @@ class CaseEventTriggerComponent {
         this.caseReferencePipe = caseReferencePipe;
         this.activityPollingService = activityPollingService;
         this.sessionStorageService = sessionStorageService;
+        this.loadingService = loadingService;
     }
     ngOnInit() {
+        if (this.loadingService.hasSharedSpinner()) {
+            this.loadingService.unregisterSharedSpinner();
+        }
         if (this.route.snapshot.data.case) {
             this.caseDetails = this.route.snapshot.data.case;
         }
@@ -32607,7 +32668,7 @@ class CaseEventTriggerComponent {
     isDataLoaded() {
         return !!(this.eventTrigger && this.caseDetails);
     }
-    static ɵfac = function CaseEventTriggerComponent_Factory(t) { return new (t || CaseEventTriggerComponent)(i0.ɵɵdirectiveInject(i0.NgZone), i0.ɵɵdirectiveInject(CasesService), i0.ɵɵdirectiveInject(CaseNotifier), i0.ɵɵdirectiveInject(i1$1.Router), i0.ɵɵdirectiveInject(AlertService), i0.ɵɵdirectiveInject(i1$1.ActivatedRoute), i0.ɵɵdirectiveInject(CaseReferencePipe), i0.ɵɵdirectiveInject(ActivityPollingService), i0.ɵɵdirectiveInject(SessionStorageService)); };
+    static ɵfac = function CaseEventTriggerComponent_Factory(t) { return new (t || CaseEventTriggerComponent)(i0.ɵɵdirectiveInject(i0.NgZone), i0.ɵɵdirectiveInject(CasesService), i0.ɵɵdirectiveInject(CaseNotifier), i0.ɵɵdirectiveInject(i1$1.Router), i0.ɵɵdirectiveInject(AlertService), i0.ɵɵdirectiveInject(i1$1.ActivatedRoute), i0.ɵɵdirectiveInject(CaseReferencePipe), i0.ɵɵdirectiveInject(ActivityPollingService), i0.ɵɵdirectiveInject(SessionStorageService), i0.ɵɵdirectiveInject(LoadingService)); };
     static ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: CaseEventTriggerComponent, selectors: [["ccd-case-event-trigger"]], decls: 1, vars: 1, consts: [["class", "screen-990", 4, "ngIf"], [1, "screen-990"], [3, "caseId", "displayMode"], [3, "cancelled", "submitted", "caseDetails", "submit", "validate", "eventTrigger"]], template: function CaseEventTriggerComponent_Template(rf, ctx) { if (rf & 1) {
             i0.ɵɵtemplate(0, CaseEventTriggerComponent_div_0_Template, 3, 6, "div", 0);
         } if (rf & 2) {
@@ -32617,7 +32678,7 @@ class CaseEventTriggerComponent {
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(CaseEventTriggerComponent, [{
         type: Component,
         args: [{ selector: 'ccd-case-event-trigger', template: "<div *ngIf=\"isDataLoaded()\" class=\"screen-990\">\n  <ccd-activity [caseId]=\"caseDetails.case_id\" [displayMode]=\"BANNER\"></ccd-activity>\n  <ccd-case-edit [caseDetails]=\"caseDetails\"\n                 [submit]=\"submit()\"\n                 [validate]=\"validate()\"\n                 [eventTrigger]=\"eventTrigger\"\n                 (cancelled)=\"cancel()\"\n                 (submitted)=\"submitted($event)\"></ccd-case-edit>\n</div>\n" }]
-    }], () => [{ type: i0.NgZone }, { type: CasesService }, { type: CaseNotifier }, { type: i1$1.Router }, { type: AlertService }, { type: i1$1.ActivatedRoute }, { type: CaseReferencePipe }, { type: ActivityPollingService }, { type: SessionStorageService }], null); })();
+    }], () => [{ type: i0.NgZone }, { type: CasesService }, { type: CaseNotifier }, { type: i1$1.Router }, { type: AlertService }, { type: i1$1.ActivatedRoute }, { type: CaseReferencePipe }, { type: ActivityPollingService }, { type: SessionStorageService }, { type: LoadingService }], null); })();
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(CaseEventTriggerComponent, { className: "CaseEventTriggerComponent", filePath: "lib/shared/components/case-viewer/case-event-trigger/case-event-trigger.component.ts", lineNumber: 14 }); })();
 
 function CaseViewComponent_div_0_Template(rf, ctx) { if (rf & 1) {
@@ -33281,6 +33342,7 @@ class CaseFullAccessViewComponent {
     crf;
     sessionStorageService;
     rpxTranslationPipe;
+    loadingService;
     static ORIGIN_QUERY_PARAM = 'origin';
     static TRIGGER_TEXT_START = 'Go';
     static TRIGGER_TEXT_CONTINUE = 'Ignore Warning and Go';
@@ -33315,9 +33377,10 @@ class CaseFullAccessViewComponent {
     caseFlagsReadExternalMode = '#ARGUMENT(READ,EXTERNAL)';
     subs = [];
     eventId;
+    isEventButtonClicked = false;
     callbackErrorsSubject;
     tabGroup;
-    constructor(ngZone, route, router, navigationNotifierService, orderService, activityPollingService, dialog, alertService, draftService, errorNotifierService, convertHrefToRouterService, location, crf, sessionStorageService, rpxTranslationPipe) {
+    constructor(ngZone, route, router, navigationNotifierService, orderService, activityPollingService, dialog, alertService, draftService, errorNotifierService, convertHrefToRouterService, location, crf, sessionStorageService, rpxTranslationPipe, loadingService) {
         this.ngZone = ngZone;
         this.route = route;
         this.router = router;
@@ -33333,6 +33396,7 @@ class CaseFullAccessViewComponent {
         this.crf = crf;
         this.sessionStorageService = sessionStorageService;
         this.rpxTranslationPipe = rpxTranslationPipe;
+        this.loadingService = loadingService;
     }
     ngOnInit() {
         this.callbackErrorsSubject = this.errorNotifierService.errorSource.pipe(filter((x) => {
@@ -33412,8 +33476,15 @@ class CaseFullAccessViewComponent {
         this.resetErrors();
         this.ignoreWarning = false;
         this.triggerText = CaseFullAccessViewComponent.TRIGGER_TEXT_START;
+        this.isEventButtonClicked = false;
     }
     async applyTrigger(trigger) {
+        if (this.isEventButtonClicked) {
+            return;
+        }
+        this.isEventButtonClicked = true;
+        const spinner = this.loadingService.register();
+        this.loadingService.addSharedSpinner(spinner);
         this.errorNotifierService.announceError(null);
         const theQueryParams = {};
         if (this.ignoreWarning) {
@@ -33664,7 +33735,7 @@ class CaseFullAccessViewComponent {
         this.errorNotifierService.announceError(null);
         this.alertService.clear();
     }
-    static ɵfac = function CaseFullAccessViewComponent_Factory(t) { return new (t || CaseFullAccessViewComponent)(i0.ɵɵdirectiveInject(i0.NgZone), i0.ɵɵdirectiveInject(i1$1.ActivatedRoute), i0.ɵɵdirectiveInject(i1$1.Router), i0.ɵɵdirectiveInject(NavigationNotifierService), i0.ɵɵdirectiveInject(OrderService), i0.ɵɵdirectiveInject(ActivityPollingService), i0.ɵɵdirectiveInject(i1$3.MatLegacyDialog), i0.ɵɵdirectiveInject(AlertService), i0.ɵɵdirectiveInject(DraftService), i0.ɵɵdirectiveInject(ErrorNotifierService), i0.ɵɵdirectiveInject(ConvertHrefToRouterService), i0.ɵɵdirectiveInject(i5.Location), i0.ɵɵdirectiveInject(i0.ChangeDetectorRef), i0.ɵɵdirectiveInject(SessionStorageService), i0.ɵɵdirectiveInject(i1.RpxTranslatePipe)); };
+    static ɵfac = function CaseFullAccessViewComponent_Factory(t) { return new (t || CaseFullAccessViewComponent)(i0.ɵɵdirectiveInject(i0.NgZone), i0.ɵɵdirectiveInject(i1$1.ActivatedRoute), i0.ɵɵdirectiveInject(i1$1.Router), i0.ɵɵdirectiveInject(NavigationNotifierService), i0.ɵɵdirectiveInject(OrderService), i0.ɵɵdirectiveInject(ActivityPollingService), i0.ɵɵdirectiveInject(i1$3.MatLegacyDialog), i0.ɵɵdirectiveInject(AlertService), i0.ɵɵdirectiveInject(DraftService), i0.ɵɵdirectiveInject(ErrorNotifierService), i0.ɵɵdirectiveInject(ConvertHrefToRouterService), i0.ɵɵdirectiveInject(i5.Location), i0.ɵɵdirectiveInject(i0.ChangeDetectorRef), i0.ɵɵdirectiveInject(SessionStorageService), i0.ɵɵdirectiveInject(i1.RpxTranslatePipe), i0.ɵɵdirectiveInject(LoadingService)); };
     static ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: CaseFullAccessViewComponent, selectors: [["ccd-case-full-access-view"]], viewQuery: function CaseFullAccessViewComponent_Query(rf, ctx) { if (rf & 1) {
             i0.ɵɵviewQuery(_c0$b, 5);
         } if (rf & 2) {
@@ -33709,7 +33780,7 @@ class CaseFullAccessViewComponent {
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(CaseFullAccessViewComponent, [{
         type: Component,
         args: [{ selector: 'ccd-case-full-access-view', template: "<!-- Generic error heading and error message to be displayed only if there are no specific callback errors or warnings, or no error details -->\n<div *ngIf=\"error && !(error.callbackErrors || error.callbackWarnings || error.details)\" class=\"error-summary\"\n     role=\"group\" aria-labelledby=\"edit-case-event_error-summary-heading\" tabindex=\"-1\">\n  <h1 class=\"heading-h1 error-summary-heading\" id=\"edit-case-event_error-summary-heading\">\n    {{'Something went wrong' | rpxTranslate}}\n  </h1>\n  <div class=\"govuk-error-summary__body\" id=\"edit-case-event_error-summary-body\">\n    <p>{{\"We're working to fix the problem. Try again shortly.\" | rpxTranslate}}</p>\n    <p>\n      <a href=\"get-help\" target=\"_blank\">\n        {{\"Contact us\" | rpxTranslate}}</a> {{\"if you're still having problems.\" | rpxTranslate}}\n    </p>\n  </div>\n</div>\n<!-- Callback error heading and error message to be displayed if there are specific error details -->\n<div *ngIf=\"error && error.details\" class=\"error-summary\" role=\"group\"\n     aria-labelledby=\"edit-case-event_error-summary-heading\" tabindex=\"-1\">\n  <h2 class=\"heading-h2 error-summary-heading\" id=\"edit-case-event_error-summary-heading\">\n    {{'The callback data failed validation' | rpxTranslate}}\n  </h2>\n  <p>{{error.message | rpxTranslate}}</p>\n  <ul *ngIf=\"error.details?.field_errors\" class=\"error-summary-list\">\n    <li *ngFor=\"let fieldError of error.details.field_errors\">\n      {{fieldError.message | rpxTranslate}}\n    </li>\n  </ul>\n</div>\n<ccd-callback-errors\n  [triggerTextContinue]=\"triggerTextStart\"\n  [triggerTextIgnore]=\"triggerTextIgnoreWarnings\"\n  [callbackErrorsSubject]=\"callbackErrorsSubject\"\n  (callbackErrorsContext)=\"callbackErrorsNotify($event)\">\n</ccd-callback-errors>\n<ccd-activity [caseId]=\"caseDetails.case_id\" [displayMode]=\"BANNER\"></ccd-activity>\n<div class=\"grid-row\">\n  <div class=\"column-one-half\">\n    <ccd-case-header [caseDetails]=\"caseDetails\"></ccd-case-header>\n    <div class=\"case-viewer-controls\" *ngIf=\"hasPrint && !isDraft() && isPrintEnabled()\">\n      <a id=\"case-viewer-control-print\" routerLink=\"print\" class=\"button button-secondary\">{{'Print' | rpxTranslate}}</a>\n    </div>\n  </div>\n  <div *ngIf=\"hasEventSelector\" class=\"column-one-half\">\n    <ccd-event-trigger [isDisabled]=\"isTriggerButtonDisabled()\" [triggers]=\"caseDetails.triggers\"\n                       [triggerText]=\"triggerText\"\n                       [eventId]=\"eventId\"\n                       (onTriggerChange)=\"clearErrorsAndWarnings()\"\n                       (onTriggerSubmit)=\"applyTrigger($event)\"></ccd-event-trigger>\n  </div>\n</div>\n<div class=\"grid-row\" *ngIf=\"activeCaseFlags && !caseFlagsExternalUser\">\n  <div class=\"column-full\">\n    <ccd-notification-banner [notificationBannerConfig]=\"notificationBannerConfig\" (linkClicked)=\"onLinkClicked($event)\">\n    </ccd-notification-banner>\n  </div>\n</div>\n<div class=\"grid-row\">\n  <div class=\"column-full\">\n    <ng-container *ngIf=\"hasTabsPresent()\">\n      <mat-tab-group #tabGroup animationDuration=\"0ms\" (selectedIndexChange)=\"tabChanged($event)\" [disableRipple]=\"true\"\n        [selectedIndex]=\"selectedTabIndex\">\n        <mat-tab *ngFor=\"let tab of prependedTabs\" [id]=\"tab.id\" [label]=\"tab.label | rpxTranslate\">\n        </mat-tab>\n        <mat-tab *ngFor=\"let tab of sortedTabs; let curIdx=index\" [id]=\"tab.id\" [label]=\"tab.label | rpxTranslate\">\n          <ng-template matTabContent>\n            <table [class]=\"tab.id\" [attr.aria-label]=\"'case viewer table' | rpxTranslate\">\n              <tbody>\n              <ng-container *ngFor=\"let field of tab | ccdTabFields | ccdReadFieldsFilter:false :undefined :true : formGroup?.controls['data']\">\n                <div ccdLabelSubstitutor [caseField]=\"field\" [contextFields]=\"caseFields\" [hidden]=\"field.hidden\">\n                  <ng-container [ngSwitch]=\"!(field | ccdIsCompound)\">\n                    <tr *ngSwitchCase=\"true\">\n                      <th id=\"case-viewer-field-label\" *ngIf=\"!isFieldToHaveNoLabel(field)\">\n                        <div class=\"case-viewer-label text-16\">\n                          {{field.label | rpxTranslate}}</div>\n                      </th>\n                      <td [id]=\"'case-viewer-field-read--' + field.id\" scope=\"col\">\n                        <span class=\"text-16\">\n                          <ccd-field-read [topLevelFormGroup]=\"formGroup?.controls['data']\"\n                                          [caseField]=\"field\" [caseReference]=\"caseDetails.case_id\"\n                                          [markdownUseHrefAsRouterLink]=\"markdownUseHrefAsRouterLink\">\n                          </ccd-field-read>\n                        </span>\n                      </td>\n                    </tr>\n                    <tr *ngSwitchCase=\"false\" class=\"compound-field\">\n                      <th [id]=\"'case-viewer-field-read--' + field.id\" scope=\"col\">\n                        <span class=\"text-16\">\n                          <ccd-field-read [topLevelFormGroup]=\"formGroup.controls['data']\"\n                                          [caseField]=\"field\" [caseReference]=\"caseDetails.case_id\"\n                                          [markdownUseHrefAsRouterLink]=\"markdownUseHrefAsRouterLink\">\n                          </ccd-field-read>\n                        </span>\n                      </th>\n                    </tr>\n                  </ng-container>\n                </div>\n              </ng-container>\n              </tbody>\n            </table>\n          </ng-template>\n        </mat-tab>\n        <mat-tab *ngFor=\"let tab of appendedTabs\" [id]=\"tab.id\" [label]=\"tab.label | rpxTranslate\">\n        </mat-tab>\n      </mat-tab-group>\n      <router-outlet *ngIf=\"(prependedTabs && prependedTabs.length) || (appendedTabs && appendedTabs.length)\"></router-outlet>\n    </ng-container>\n  </div>\n</div>\n", styles: ["th{width:1%;white-space:nowrap;vertical-align:top}.compound-field th{padding:0}.case-viewer-controls{margin-top:47px;margin-bottom:20px}ccd-case-header{float:left;margin-right:10px}ccd-event-trigger{float:right}.case-viewer-label{min-width:300px;white-space:normal}.markdown h3{margin-bottom:0}.hide-table-capion{position:absolute;visibility:hidden}\n"] }]
-    }], () => [{ type: i0.NgZone }, { type: i1$1.ActivatedRoute }, { type: i1$1.Router }, { type: NavigationNotifierService }, { type: OrderService }, { type: ActivityPollingService }, { type: i1$3.MatLegacyDialog }, { type: AlertService }, { type: DraftService }, { type: ErrorNotifierService }, { type: ConvertHrefToRouterService }, { type: i5.Location }, { type: i0.ChangeDetectorRef }, { type: SessionStorageService }, { type: i1.RpxTranslatePipe }], { hasPrint: [{
+    }], () => [{ type: i0.NgZone }, { type: i1$1.ActivatedRoute }, { type: i1$1.Router }, { type: NavigationNotifierService }, { type: OrderService }, { type: ActivityPollingService }, { type: i1$3.MatLegacyDialog }, { type: AlertService }, { type: DraftService }, { type: ErrorNotifierService }, { type: ConvertHrefToRouterService }, { type: i5.Location }, { type: i0.ChangeDetectorRef }, { type: SessionStorageService }, { type: i1.RpxTranslatePipe }, { type: LoadingService }], { hasPrint: [{
             type: Input
         }], hasEventSelector: [{
             type: Input
@@ -33723,7 +33794,7 @@ class CaseFullAccessViewComponent {
             type: ViewChild,
             args: ['tabGroup', { static: false }]
         }] }); })();
-(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(CaseFullAccessViewComponent, { className: "CaseFullAccessViewComponent", filePath: "lib/shared/components/case-viewer/case-full-access-view/case-full-access-view.component.ts", lineNumber: 43 }); })();
+(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(CaseFullAccessViewComponent, { className: "CaseFullAccessViewComponent", filePath: "lib/shared/components/case-viewer/case-full-access-view/case-full-access-view.component.ts", lineNumber: 44 }); })();
 
 class PrintUrlPipe {
     appConfig;
@@ -33991,7 +34062,7 @@ class CaseViewerComponent {
         return tabs;
     }
     static ɵfac = function CaseViewerComponent_Factory(t) { return new (t || CaseViewerComponent)(i0.ɵɵdirectiveInject(i1$1.ActivatedRoute), i0.ɵɵdirectiveInject(CaseNotifier), i0.ɵɵdirectiveInject(AbstractAppConfig), i0.ɵɵdirectiveInject(OrderService)); };
-    static ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: CaseViewerComponent, selectors: [["ccd-case-viewer"]], inputs: { hasPrint: "hasPrint", hasEventSelector: "hasEventSelector", prependedTabs: "prependedTabs", appendedTabs: "appendedTabs" }, decls: 1, vars: 1, consts: [[4, "ngIf"], [3, "accessType", "caseDetails", 4, "ngIf"], [3, "caseDetails", "hasPrint", "hasEventSelector", "prependedTabs", "appendedTabs", 4, "ngIf"], [3, "accessType", "caseDetails"], [3, "caseDetails", "hasPrint", "hasEventSelector", "prependedTabs", "appendedTabs"]], template: function CaseViewerComponent_Template(rf, ctx) { if (rf & 1) {
+    static ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: CaseViewerComponent, selectors: [["ccd-case-viewer"]], inputs: { hasPrint: "hasPrint", hasEventSelector: "hasEventSelector", prependedTabs: "prependedTabs", appendedTabs: "appendedTabs" }, decls: 1, vars: 1, consts: [[4, "ngIf"], ["id", "content", 3, "accessType", "caseDetails", 4, "ngIf"], ["id", "content", 3, "caseDetails", "hasPrint", "hasEventSelector", "prependedTabs", "appendedTabs", 4, "ngIf"], ["id", "content", 3, "accessType", "caseDetails"], ["id", "content", 3, "caseDetails", "hasPrint", "hasEventSelector", "prependedTabs", "appendedTabs"]], template: function CaseViewerComponent_Template(rf, ctx) { if (rf & 1) {
             i0.ɵɵtemplate(0, CaseViewerComponent_div_0_Template, 3, 2, "div", 0);
         } if (rf & 2) {
             i0.ɵɵproperty("ngIf", ctx.isDataLoaded());
@@ -33999,7 +34070,7 @@ class CaseViewerComponent {
 }
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(CaseViewerComponent, [{
         type: Component,
-        args: [{ selector: 'ccd-case-viewer', template: "<div *ngIf=\"isDataLoaded()\">\n  <ccd-case-basic-access-view *ngIf=\"!hasStandardAccess()\"\n                              [accessType]=\"userAccessType\"\n                              [caseDetails]=\"caseDetails\">\n  </ccd-case-basic-access-view>\n  <ccd-case-full-access-view *ngIf=\"hasStandardAccess()\"\n                             [caseDetails]=\"caseDetails\"\n                             [hasPrint]=\"hasPrint\"\n                             [hasEventSelector]=\"hasEventSelector\"\n                             [prependedTabs]=\"prependedTabs\"\n                             [appendedTabs]=\"appendedTabs\">\n  </ccd-case-full-access-view>\n</div>\n" }]
+        args: [{ selector: 'ccd-case-viewer', template: "<div *ngIf=\"isDataLoaded()\">\n  <ccd-case-basic-access-view *ngIf=\"!hasStandardAccess()\"\n                              [accessType]=\"userAccessType\"\n                              [caseDetails]=\"caseDetails\"\n                              id=\"content\">\n  </ccd-case-basic-access-view>\n  <ccd-case-full-access-view *ngIf=\"hasStandardAccess()\"\n                             [caseDetails]=\"caseDetails\"\n                             [hasPrint]=\"hasPrint\"\n                             [hasEventSelector]=\"hasEventSelector\"\n                             [prependedTabs]=\"prependedTabs\"\n                             [appendedTabs]=\"appendedTabs\"\n                             id=\"content\">\n  </ccd-case-full-access-view>\n</div>\n" }]
     }], () => [{ type: i1$1.ActivatedRoute }, { type: CaseNotifier }, { type: AbstractAppConfig }, { type: OrderService }], { hasPrint: [{
             type: Input
         }], hasEventSelector: [{
@@ -34473,7 +34544,6 @@ class EventStartGuard {
     sessionStorageService;
     abstractConfig;
     cookieService;
-    static CLIENT_CONTEXT = 'clientContext';
     constructor(workAllocationService, router, sessionStorageService, abstractConfig, cookieService) {
         this.workAllocationService = workAllocationService;
         this.router = router;
@@ -34494,7 +34564,7 @@ class EventStartGuard {
         const caseInfoStr = this.sessionStorageService.getItem('caseInfo');
         const languageCookie = this.cookieService.getCookie('exui-preferred-language');
         const currentLanguage = !!languageCookie && languageCookie !== '' ? languageCookie : 'en';
-        const preClientContext = this.sessionStorageService.getItem(EventStartGuard.CLIENT_CONTEXT);
+        const preClientContext = this.sessionStorageService.getItem(CaseEditComponent.CLIENT_CONTEXT);
         if (!preClientContext) {
             // creates client context for language if not already existing
             const storeClientContext = {
@@ -34504,7 +34574,7 @@ class EventStartGuard {
                     }
                 }
             };
-            this.sessionStorageService.setItem(EventStartGuard.CLIENT_CONTEXT, JSON.stringify(storeClientContext));
+            this.sessionStorageService.setItem(CaseEditComponent.CLIENT_CONTEXT, JSON.stringify(storeClientContext));
         }
         else {
             const clientContextObj = JSON.parse(preClientContext);
@@ -34518,7 +34588,7 @@ class EventStartGuard {
                         }
                     }
                 };
-                this.sessionStorageService.setItem(EventStartGuard.CLIENT_CONTEXT, JSON.stringify(clientContextAddLanguage));
+                this.sessionStorageService.setItem(CaseEditComponent.CLIENT_CONTEXT, JSON.stringify(clientContextAddLanguage));
             }
         }
         if (caseInfoStr) {
@@ -34536,7 +34606,7 @@ class EventStartGuard {
         }
         return of(false);
     }
-    checkTaskInEventNotRequired(payload, caseId, taskId) {
+    checkTaskInEventNotRequired(payload, caseId, taskId, eventId, userId) {
         if (!payload || !payload.tasks) {
             return true;
         }
@@ -34566,55 +34636,18 @@ class EventStartGuard {
             else {
                 task = tasksAssignedToUser[0];
             }
-            const currentLanguage = this.cookieService.getCookie('exui-preferred-language');
-            // if one task assigned to user, allow user to complete event
-            const storeClientContext = {
-                client_context: {
-                    user_task: {
-                        task_data: task,
-                        complete_task: true
-                    },
-                    user_language: {
-                        language: currentLanguage
-                    }
-                }
-            };
-            this.sessionStorageService.setItem(EventStartGuard.CLIENT_CONTEXT, JSON.stringify(storeClientContext));
+            this.setClientContextStorage(task, caseId, eventId, userId);
             return true;
         }
     }
-    removeTaskFromSessionStorage() {
-        this.sessionStorageService.removeItem(EventStartGuard.CLIENT_CONTEXT);
-    }
     checkForTasks(payload, caseId, eventId, taskId, userId) {
         if (taskId && payload?.tasks?.length > 0) {
             const task = payload.tasks.find((t) => t.id == taskId);
             if (task) {
-                // Store task to session
-                const taskEventCompletionInfo = {
-                    caseId: caseId,
-                    eventId: eventId,
-                    userId: userId,
-                    taskId: task.id,
-                    createdTimestamp: Date.now()
-                };
-                const currentLanguage = this.cookieService.getCookie('exui-preferred-language');
-                const storeClientContext = {
-                    client_context: {
-                        user_task: {
-                            task_data: task,
-                            complete_task: true
-                        },
-                        user_language: {
-                            language: currentLanguage
-                        }
-                    }
-                };
-                this.sessionStorageService.setItem('taskEventCompletionInfo', JSON.stringify(taskEventCompletionInfo));
-                this.sessionStorageService.setItem(EventStartGuard.CLIENT_CONTEXT, JSON.stringify(storeClientContext));
+                this.setClientContextStorage(task, caseId, eventId, userId);
             }
             else {
-                this.removeTaskFromSessionStorage();
+                removeTaskFromClientContext(this.sessionStorageService);
             }
         }
         if (payload.task_required_for_event) {
@@ -34629,9 +34662,34 @@ class EventStartGuard {
             return of(false);
         }
         else {
-            return of(this.checkTaskInEventNotRequired(payload, caseId, taskId));
+            return of(this.checkTaskInEventNotRequired(payload, caseId, taskId, eventId, userId));
         }
     }
+    // EXUI-2743 - Make taskEventCompletionInfo always available in session storage with client context
+    setClientContextStorage(task, caseId, eventId, userId) {
+        // Store task to session
+        const taskEventCompletionInfo = {
+            caseId: caseId,
+            eventId: eventId,
+            userId: userId,
+            taskId: task.id,
+            createdTimestamp: Date.now()
+        };
+        const currentLanguage = this.cookieService.getCookie('exui-preferred-language');
+        const storeClientContext = {
+            client_context: {
+                user_task: {
+                    task_data: task,
+                    complete_task: true
+                },
+                user_language: {
+                    language: currentLanguage
+                }
+            }
+        };
+        this.sessionStorageService.setItem(CaseEditComponent.TASK_EVENT_COMPLETION_INFO, JSON.stringify(taskEventCompletionInfo));
+        this.sessionStorageService.setItem(CaseEditComponent.CLIENT_CONTEXT, JSON.stringify(storeClientContext));
+    }
     static ɵfac = function EventStartGuard_Factory(t) { return new (t || EventStartGuard)(i0.ɵɵinject(WorkAllocationService), i0.ɵɵinject(i1$1.Router), i0.ɵɵinject(SessionStorageService), i0.ɵɵinject(AbstractAppConfig), i0.ɵɵinject(ReadCookieService)); };
     static ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: EventStartGuard, factory: EventStartGuard.ɵfac });
 }
@@ -34793,7 +34851,6 @@ class EventStartStateMachineService {
                 }
             }
         };
-        context.sessionStorageService.setItem('clientContext', JSON.stringify(clientContext));
         let userInfo;
         const userInfoStr = context.sessionStorageService.getItem('userDetails');
         if (userInfoStr) {
@@ -34807,7 +34864,9 @@ class EventStartStateMachineService {
             taskId: task.id,
             createdTimestamp: Date.now()
         };
-        context.sessionStorageService.setItem('taskEventCompletionInfo', JSON.stringify(taskEventCompletionInfo));
+        context.sessionStorageService.setItem(CaseEditComponent.TASK_EVENT_COMPLETION_INFO, JSON.stringify(taskEventCompletionInfo));
+        // EXUI-2668 - Only add client context when taskEventCompletionInfo is set - stops auto completing incorrect tasks
+        context.sessionStorageService.setItem(CaseEditComponent.CLIENT_CONTEXT, JSON.stringify(clientContext));
         // Allow user to perform the event
         context.router.navigate([`/cases/case-details/${context.caseId}/trigger/${context.eventId}`], { relativeTo: context.route });
     }