@hmcts/ccd-case-ui-toolkit 7.3.3-3859 → 7.3.3-exui-3824-rc1

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

@@ -5099,10 +5099,15 @@ class FormValidatorsService {
         return validator;
     }
     static markDownPatternValidator() {
-        const pattern = /(\[[^\]]{0,500}\]\([^)]{0,500}\)|!\[[^\]]{0,500}\]\([^)]{0,500}\)|<img[^>]{0,500}>|<a[^>]{0,500}>.*?<\/a>)/;
+        // Matches: [text](url), ![alt](url), <img ...>, <a ...>...</a>
+        const inlineMarkdownPattern = /(?:!?\[[^\]]{0,500}\]\([^)]{0,500}\)|<(?:img\b[^>]{0,500}>|a\b[^>]{0,500}>[\s\S]*?<\/a>))/i;
+        // Matches: [text][id], ![alt][id], and the collapsed form [text][]
+        const referenceBoxPattern = /(!)?\[((?:[^[\]\\]|\\.){0,500})\]\s*\[([^\]]{0,100})\]/;
+        // Matches: autolinks such as <http://example.com>
+        const autolinkPattern = /<(?:[A-Za-z][A-Za-z0-9+.-]*:[^ <>\n]*|[A-Za-z0-9.!#$%&'*+/=?^_`{|}~-]+@[A-Za-z0-9-]+(?:\.[A-Za-z0-9-]+)+)>/;
         return (control) => {
             const value = control?.value?.toString().trim();
-            return (value && pattern.test(value)) ? { markDownPattern: {} } : null;
+            return (value && (inlineMarkdownPattern.test(value) || referenceBoxPattern.test(value) || this.matchesReferenceUrlDef(value) || autolinkPattern.test(value) || this.hasMultiBracket(value))) ? { markDownPattern: {} } : null;
         };
     }
     // TODO: Strip this out as it's only here for the moment because
@@ -5120,6 +5125,74 @@ class FormValidatorsService {
         }
         return control;
     }
+    // Check for multi-bracket markdown links and validate destination URL
+    static hasMultiBracket(value) {
+        // Sonar-friendly detector: opening-run + text + first closing ']'
+        const openingTextClosePattern = /\[{1,10}[^[\]\n]{1,60}\]/;
+        // Can add an additional RegEx for additional URL validation rules if needed here
+        let scanIndex = 0;
+        const totalLength = value.length;
+        while (scanIndex < totalLength) {
+            const seg = this.findOpeningTextClose(value, scanIndex, openingTextClosePattern);
+            if (!seg) {
+                return false; // no candidate -> no match
+            }
+            const runs = this.extendClosingRunAndRequireParen(value, seg.absStart, seg.afterFirstClose);
+            // if there is more than one opening '[' and there is at least a matching number of closing ']'
+            if (runs && runs.openingRunCount > 1 && runs.openingRunCount === runs.closingRunCount) {
+                // If there were additional validation rules, they would be applied here
+                return true;
+            }
+            // Advance to avoid stalling on overlaps
+            scanIndex = seg.absStart + 1;
+        }
+        return false;
+    }
+    // Find opening '[' run, text, and first closing ']'
+    static findOpeningTextClose(source, fromIndex, pattern) {
+        const slice = source.slice(fromIndex);
+        const match = pattern.exec(slice);
+        if (!match) {
+            return null;
+        }
+        const absStart = fromIndex + match.index;
+        const afterFirstClose = absStart + match[0].length; // index just after the first ']'
+        return { absStart, afterFirstClose };
+    }
+    // Count opening '[' run, extend the ']' run, and require '(' right after the full ']' run
+    static extendClosingRunAndRequireParen(source, absStart, afterFirstClose) {
+        const n = source.length;
+        // Count opening '[' run (e.g., '[[[')
+        let openingRunCount = 0;
+        for (let i = absStart; i < n && source[i] === '['; i++) {
+            openingRunCount++;
+        }
+        // Extend closing ']' run forward from the first one
+        let closingRunCount = 1;
+        let afterClosingRun = afterFirstClose;
+        while (afterClosingRun < n && source[afterClosingRun] === ']') {
+            closingRunCount++;
+            afterClosingRun++;
+        }
+        return { openingRunCount, closingRunCount, afterOpenParen: afterClosingRun + 1 };
+    }
+    static isValidReferenceUrlTitleTail(tail) {
+        const possibleTitle = tail.trim();
+        // Accept exactly one of: "title", 'title', (title) — bounded and single-line.
+        if (!possibleTitle || /^"[^"\r\n]{0,300}"$/.test(possibleTitle) || /^'[^'\r\n]{0,300}'$/.test(possibleTitle) || /^\([^)\r\n]{0,300}\)$/.test(possibleTitle)) {
+            return true;
+        }
+        return false;
+    }
+    static matchesReferenceUrlDef(line) {
+        // Single-line, pragmatic CommonMark-style reference definition e.g. [text]: http://example.com
+        const baseReferenceUrlPattern = /^[ \t]{0,3}\[([^\]]{1,100})\]:[ \t]*<?([^\s>]{1,2048})>?[ \t]*([^ \t\r\n].*)?$/m;
+        const mainRegEx = baseReferenceUrlPattern.exec(line);
+        if (!mainRegEx)
+            return false;
+        const tail = mainRegEx[3] ?? "";
+        return this.isValidReferenceUrlTitleTail(tail);
+    }
     static ɵfac = function FormValidatorsService_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || FormValidatorsService)(); };
     static ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: FormValidatorsService, factory: FormValidatorsService.ɵfac });
 }
@@ -6215,6 +6288,60 @@ class FormValueService {
             }
         }
     }
+    // exui-3582 When a form field becomes hidden based on user’s input in the event journey, 
+    // its stored value must be cleared and it must not be submitted or persisted.
+    removeHiddenField(data, caseFields, clearNonCase, formControls) {
+        if (clearNonCase && data && caseFields && caseFields.length > 0) {
+            for (const field of caseFields) {
+                if (!FormValueService.isLabel(field) && FormValueService.isReadOnly(field)) {
+                    // Retain anything that is readonly and not a label.
+                    continue;
+                }
+                // Check if formControls[field.id] exists before accessing its properties
+                const caseField = formControls[field.id] ? formControls[field.id]['caseField'] : undefined;
+                if (caseField === undefined || field.hidden === true) {
+                    continue;
+                }
+                const hasValue = data.hasOwnProperty(field.id) && data[field.id] != null &&
+                    (typeof data[field.id] !== 'object' || Object.keys(data[field.id]).length > 0);
+                if (caseField?.hidden === true &&
+                    field.display_context !== 'HIDDEN' &&
+                    field.display_context !== 'HIDDEN_TEMP' &&
+                    !field.retain_hidden_value &&
+                    field.id !== 'caseLinks' &&
+                    hasValue) {
+                    data[field.id] = null;
+                    continue; // If field is now hidden, skip checking its children
+                }
+                if (field.field_type) {
+                    switch (field.field_type.type) {
+                        case 'Complex':
+                            const complexData = data[field.id] ?? data['value'];
+                            if (complexData && formControls[field.id] && formControls[field.id]['controls']) {
+                                this.removeHiddenField(complexData, field.field_type.complex_fields, clearNonCase, formControls[field.id]['controls']);
+                            }
+                            break;
+                        case 'Collection':
+                            const collection = data[field.id];
+                            if (collection && Array.isArray(collection) && field.field_type.collection_field_type.type === 'Complex') {
+                                collection.forEach((item, index) => {
+                                    if (formControls[field.id] && formControls[field.id]['controls'] && formControls[field.id]['controls'][index]) {
+                                        const itemControls = formControls[field.id]?.['controls']?.[index]?.['controls']?.['value'];
+                                        const collectionData = item['value'] ?? item;
+                                        if (collectionData && itemControls?.['controls']) {
+                                            this.removeHiddenField(collectionData, field.field_type.collection_field_type.complex_fields, clearNonCase, itemControls['controls']);
+                                        }
+                                    }
+                                });
+                            }
+                            break;
+                        default:
+                            break;
+                    }
+                }
+            }
+        }
+    }
     /**
      * Remove any empty collection fields where a value of greater than zero is specified in the field's {@link FieldType}
      * `min` attribute.
@@ -7148,7 +7275,6 @@ class ReadCookieService {
 class DocumentManagementService {
     http;
     appConfig;
-    sessionStorageService;
     static PDF = 'pdf';
     static IMAGE = 'image';
     static WORD = 'word';
@@ -7163,22 +7289,29 @@ class DocumentManagementService {
     static wordList = ['DOC', 'DOCX', 'doc', 'docx'];
     static excelList = ['XLS', 'XLSX', 'xls', 'xlsx'];
     static powerpointList = ['PPT', 'PPTX', 'ppt', 'pptx'];
-    caseTypeId;
-    caseId;
-    constructor(http, appConfig, sessionStorageService) {
+    caseTypeId = '';
+    constructor(http, appConfig) {
         this.http = http;
         this.appConfig = appConfig;
-        this.sessionStorageService = sessionStorageService;
-        const caseInfo = this.parseCaseInfo(this.sessionStorageService.getItem('caseInfo'));
-        const currUrl = this.getCurrentPathname();
-        this.caseTypeId = this.resolveCaseTypeId(caseInfo, currUrl);
+        const currUrl = window.location.pathname;
+        if (currUrl.includes('/case-details/')) {
+            this.caseTypeId = currUrl.split('/')[4];
+        }
+        console.log(this.caseTypeId);
+        //if the user refreshes on the case creation page the above logic will not work, we can get the caseTypeId from the URL
+        if (!this.caseTypeId) {
+            if (currUrl.indexOf('/case-create/') > -1) {
+                const parts = currUrl.split('/');
+                this.caseTypeId = parts[parts.indexOf('case-create') + 2];
+            }
+        }
     }
     uploadFile(formData) {
         const url = this.getDocStoreUrl();
         // Do not set any headers, such as "Accept" or "Content-Type", with null values; this is not permitted with the
         // Angular HttpClient in @angular/common/http. Just create and pass a new HttpHeaders object. Angular will add the
         // correct headers and values automatically
-        this.appConfig.logMessage(`DMS:: Uploading document for case type: ${this.caseTypeId}, with url: ${url}, and case id: ${this.caseId}`);
+        this.appConfig.logMessage(`Uploading document for case type: ${this.caseTypeId}, with url: ${url}`);
         const headers = new HttpHeaders();
         return this.http
             .post(url, formData, { headers, observe: 'body' })
@@ -7243,40 +7376,6 @@ class DocumentManagementService {
     isPowerpoint(powerpointType) {
         return DocumentManagementService.powerpointList.find(e => e === powerpointType) !== undefined;
     }
-    parseCaseInfo(caseInfo) {
-        if (!caseInfo) {
-            return null;
-        }
-        try {
-            return JSON.parse(caseInfo);
-        }
-        catch (error) {
-            this.appConfig.logMessage('Failed to parse caseInfo from session storage');
-            return null;
-        }
-    }
-    getCurrentPathname() {
-        if (typeof window === 'undefined' || !window.location) {
-            return '';
-        }
-        return window.location.pathname || '';
-    }
-    resolveCaseTypeId(caseInfo, currUrl) {
-        const caseTypeIdFromSession = caseInfo?.caseType;
-        if (caseTypeIdFromSession) {
-            this.caseId = caseInfo?.caseId;
-            return caseTypeIdFromSession;
-        }
-        const parts = currUrl.split('/');
-        if (currUrl.includes('/case-details/') && parts.length > 4) {
-            return parts[4];
-        }
-        const caseCreateIndex = parts.indexOf('case-create');
-        if (currUrl.includes('/case-create/') && caseCreateIndex > -1 && parts.length > caseCreateIndex + 2) {
-            return parts[caseCreateIndex + 2];
-        }
-        return '';
-    }
     transformDocumentUrl(documentBinaryUrl) {
         const remoteHrsPattern = new RegExp(this.appConfig.getRemoteHrsUrl());
         documentBinaryUrl = documentBinaryUrl.replace(remoteHrsPattern, this.appConfig.getHrsUrl());
@@ -7300,12 +7399,12 @@ class DocumentManagementService {
         // if documentSecureModeEnabled is true, and case is in the exclusion list, return false
         return false;
     }
-    static ɵfac = function DocumentManagementService_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || DocumentManagementService)(i0.ɵɵinject(HttpService), i0.ɵɵinject(AbstractAppConfig), i0.ɵɵinject(SessionStorageService)); };
+    static ɵfac = function DocumentManagementService_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || DocumentManagementService)(i0.ɵɵinject(HttpService), i0.ɵɵinject(AbstractAppConfig)); };
     static ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: DocumentManagementService, factory: DocumentManagementService.ɵfac });
 }
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(DocumentManagementService, [{
         type: Injectable
-    }], () => [{ type: HttpService }, { type: AbstractAppConfig }, { type: SessionStorageService }], null); })();
+    }], () => [{ type: HttpService }, { type: AbstractAppConfig }], null); })();
 
 class ErrorNotifierService {
     errorSource = new BehaviorSubject(null);
@@ -8723,6 +8822,7 @@ var EventCompletionTaskStates;
 
 const EVENT_COMPLETION_STATE_MACHINE = 'EVENT COMPLETION STATE MACHINE';
 class EventCompletionStateMachineService {
+    abstractConfig;
     stateCheckTasksCanBeCompleted;
     stateCompleteEventAndTask;
     stateCancelEvent;
@@ -8733,6 +8833,9 @@ class EventCompletionStateMachineService {
     stateTaskAssignToUser;
     stateTaskUnassigned;
     stateFinal;
+    constructor(abstractConfig) {
+        this.abstractConfig = abstractConfig;
+    }
     initialiseStateMachine(context) {
         return new StateMachine(EVENT_COMPLETION_STATE_MACHINE, context);
     }
@@ -8757,9 +8860,10 @@ class EventCompletionStateMachineService {
         this.addTransitionsForStateTaskAssignedToAnotherUser();
         this.addTransitionsForStateTaskUnassigned();
     }
-    entryActionForStateCheckTasksCanBeCompleted(state, context) {
+    entryActionForStateCheckTasksCanBeCompleted = (state, context) => {
         const assignNeeded = context.sessionStorageService.getItem('assignNeeded');
         context.workAllocationService.getTask(context.task.id).subscribe(taskResponse => {
+            this.abstractConfig?.logMessage?.(`entryActionForStateCheckTasksCanBeCompleted: task_state ${taskResponse?.task?.task_state} for task id ${context?.task?.id}`);
             if (taskResponse?.task?.task_state) {
                 switch (taskResponse.task.task_state.toUpperCase()) {
                     case TaskState.Unassigned:
@@ -8798,27 +8902,30 @@ class EventCompletionStateMachineService {
             else if (!taskResponse?.task) {
                 context.alertService.setPreserveAlerts(true);
                 context.alertService.warning({ phrase: 'Task statecheck : no task available for completion', replacements: {} });
+                this.abstractConfig?.logMessage?.(`Task statecheck : no task available for completion`);
             }
             else {
                 context.alertService.setPreserveAlerts(true);
                 context.alertService.warning({ phrase: 'Task statecheck : no task state available for completion', replacements: {} });
+                this.abstractConfig?.logMessage?.(`Task statecheck : no task state available for completion`);
             }
         }, error => {
             context.alertService.error(error.message);
             return throwError(error);
         });
-    }
+    };
     entryActionForStateTaskCompletedOrCancelled(state, context) {
         // Trigger final state to complete processing of state machine
         state.trigger(EventCompletionStates.Final);
         // Load case event completion task cancelled component
         context.component.setTaskState(EventCompletionTaskStates.TaskCancelled);
     }
-    entryActionForStateCompleteEventAndTask(state, context) {
+    entryActionForStateCompleteEventAndTask = (state, context) => {
         // Trigger final state to complete processing of state machine
         state.trigger(EventCompletionStates.Final);
         const clientContextStr = context.sessionStorageService.getItem(CaseEditComponent.CLIENT_CONTEXT);
         const userTask = FieldsUtils.getUserTaskFromClientContext(clientContextStr);
+        this.abstractConfig?.logMessage?.(`entryActionForStateCompleteEventAndTask: userTask task_data ${JSON.stringify(userTask?.task_data?.id)}`);
         if (userTask?.task_data) {
             context.sessionStorageService.setItem('assignNeeded', 'false');
             // just set event can be completed
@@ -8830,7 +8937,7 @@ class EventCompletionStateMachineService {
             // Emit event cannot be completed event
             context.component.eventCanBeCompleted.emit(false);
         }
-    }
+    };
     entryActionForStateTaskAssignedToAnotherUser(state, context) {
         // Trigger final state to complete processing of state machine
         state.trigger(EventCompletionStates.Final);
@@ -8884,12 +8991,12 @@ class EventCompletionStateMachineService {
         const userTask = FieldsUtils.getUserTaskFromClientContext(clientContextStr);
         return !!userTask.task_data;
     }
-    static ɵfac = function EventCompletionStateMachineService_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || EventCompletionStateMachineService)(); };
+    static ɵfac = function EventCompletionStateMachineService_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || EventCompletionStateMachineService)(i0.ɵɵinject(AbstractAppConfig)); };
     static ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: EventCompletionStateMachineService, factory: EventCompletionStateMachineService.ɵfac });
 }
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(EventCompletionStateMachineService, [{
         type: Injectable
-    }], null, null); })();
+    }], () => [{ type: AbstractAppConfig }], null); })();
 
 class JudicialworkerService {
     http;
@@ -9220,6 +9327,27 @@ class ValidPageListCaseFieldsService {
         type: Injectable
     }], () => [{ type: FieldsUtils }], null); })();
 
+function CaseEditComponent_div_1_Template(rf, ctx) { if (rf & 1) {
+    const _r1 = i0.ɵɵgetCurrentView();
+    i0.ɵɵelementStart(0, "div", 1)(1, "div", 2)(2, "h2", 3);
+    i0.ɵɵtext(3, "Page refreshed");
+    i0.ɵɵelementEnd();
+    i0.ɵɵelementStart(4, "p");
+    i0.ɵɵtext(5);
+    i0.ɵɵelementEnd();
+    i0.ɵɵelementStart(6, "p");
+    i0.ɵɵtext(7);
+    i0.ɵɵelementEnd();
+    i0.ɵɵelementStart(8, "button", 4);
+    i0.ɵɵlistener("click", function CaseEditComponent_div_1_Template_button_click_8_listener() { i0.ɵɵrestoreView(_r1); const ctx_r1 = i0.ɵɵnextContext(); return i0.ɵɵresetView(ctx_r1.onRefreshModalOk()); });
+    i0.ɵɵtext(9, "Ok");
+    i0.ɵɵelementEnd()()();
+} if (rf & 2) {
+    i0.ɵɵadvance(5);
+    i0.ɵɵtextInterpolate("As the page has been refreshed mandatory data is now missing. You will be redirected to the first page of this event.");
+    i0.ɵɵadvance(2);
+    i0.ɵɵtextInterpolate("Please select Ok to continue.");
+} }
 class CaseEditComponent {
     fb;
     caseNotifier;
@@ -9266,6 +9394,7 @@ class CaseEditComponent {
     error;
     callbackErrorsSubject = new Subject();
     validPageList = [];
+    isRefreshModalVisible = false;
     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;
@@ -9312,12 +9441,25 @@ class CaseEditComponent {
     checkPageRefresh() {
         if (this.isPageRefreshed && this.initialUrl) {
             this.sessionStorageService.removeItem('eventUrl');
-            this.windowsService.alert(CaseEditComponent.ALERT_MESSAGE);
+            this.isRefreshModalVisible = true;
             this.router.navigate([this.initialUrl], { relativeTo: this.route });
             return true;
         }
+        // if the url contains /submit there is the potential that the user has gone straight to the submit page
+        // we should try and work out if they have been through the journey or not and prevent them submitting directly
+        if (this.router.url.includes('/submit') && !this.initialUrl) {
+            // we only want to check if the user has done this if there is a multi-page journey
+            if (this.eventTrigger.wizard_pages && this.eventTrigger.wizard_pages.length > 0) {
+                const firstPage = this.eventTrigger.wizard_pages.reduce((min, page) => page.order < min.order ? page : min, this.eventTrigger.wizard_pages[0]);
+                this.isRefreshModalVisible = true;
+                this.router.navigate([firstPage ? firstPage.id : 'submit'], { relativeTo: this.route });
+            }
+        }
         return false;
     }
+    onRefreshModalOk() {
+        this.isRefreshModalVisible = false;
+    }
     getPage(pageId) {
         return this.wizard.getPage(pageId, this.fieldsUtils.buildCanShowPredicate(this.eventTrigger, this.form));
     }
@@ -9410,7 +9552,7 @@ class CaseEditComponent {
         const userId = userInfo.id ? userInfo.id : userInfo.uid;
         const eventDetails = { eventId, caseId, userId, assignNeeded };
         if (this.taskExistsForThisEvent(taskInSessionStorage, taskEventCompletionInfo, eventDetails)) {
-            this.abstractConfig.logMessage(`task exist for this event for caseId and eventId as ${caseId} ${eventId}`);
+            this.abstractConfig.logMessage(`task ${taskInSessionStorage?.id} exist for this event for caseId and eventId as ${caseId} ${eventId}`);
             // Show event completion component to perform event completion checks
             this.eventCompletionParams = ({
                 caseId,
@@ -9430,6 +9572,7 @@ class CaseEditComponent {
             this.isEventCompletionChecksRequired = true;
         }
         else {
+            this.abstractConfig.logMessage(`task does not exist for caseId and eventId as ${caseId} ${eventId}`);
             // Task not in session storage, proceed to submit
             const caseEventData = this.generateCaseEventData({
                 eventTrigger,
@@ -9472,6 +9615,11 @@ class CaseEditComponent {
         if (!this.isCaseFlagSubmission) {
             this.formValueService.removeUnnecessaryFields(caseEventData.data, pageListCaseFields, true, true);
         }
+        // removeHiddenFields while are hidden in the UI
+        // Only remove hidden fields if editForm and its controls are available
+        if (form?.controls?.['data']?.['controls']) {
+            this.formValueService.removeHiddenField(caseEventData.data, pageListCaseFields, true, form.controls['data']['controls']);
+        }
         caseEventData.event_token = eventTrigger.event_token;
         caseEventData.ignore_warning = this.ignoreWarning;
         if (this.confirmation) {
@@ -9594,11 +9742,13 @@ class CaseEditComponent {
         this.sessionStorageService.setItem('taskCompletionError', 'false');
         submit(caseEventData).pipe(switchMap((response) => {
             eventResponse = response;
+            this.abstractConfig.logMessage(`Event ${this.eventCompletionParams?.eventId} of case Id ${this.eventCompletionParams?.caseId} and taskId ${this.eventCompletionParams?.task?.id}`);
             return this.postCompleteTaskIfRequired();
         }), finalize(() => {
             this.loadingService.unregister(loadingSpinnerToken);
             // on event completion ensure the previous event clientContext/taskEventCompletionInfo removed
             // Note - Not removeTaskFromClientContext because could interfere with other logic
+            this.abstractConfig.logMessage(`Clearing client context and task event completion info after event ${this.eventCompletionParams?.eventId} submission of case Id ${this.eventCompletionParams?.caseId} and task Id ${this.eventCompletionParams?.task?.id}`);
             this.sessionStorageService.removeItem(CaseEditComponent.CLIENT_CONTEXT);
             this.sessionStorageService.removeItem(CaseEditComponent.TASK_EVENT_COMPLETION_INFO);
             this.isSubmitting = false;
@@ -9606,6 +9756,7 @@ class CaseEditComponent {
             .subscribe(() => {
             this.finishEventCompletionLogic(eventResponse);
         }, error => {
+            this.abstractConfig.logMessage(`An error occurred while submission of event ${this.eventCompletionParams?.eventId} and case Id ${this.eventCompletionParams?.caseId} and taskId ${this.eventCompletionParams?.task?.id}`);
             if (!eventResponse) {
                 // event submission error
                 this.error = error;
@@ -9633,13 +9784,14 @@ class CaseEditComponent {
         const [task, taskToBeCompleted] = userTask ? [userTask.task_data, userTask.complete_task] : [null, false];
         const assignNeeded = this.sessionStorageService.getItem('assignNeeded') === 'true';
         if (task && assignNeeded && taskToBeCompleted) {
-            this.abstractConfig.logMessage(`postCompleteTaskIfRequired with assignNeeded: taskId ${task.id} and event name ${this.eventTrigger.name}`);
+            this.abstractConfig.logMessage(`postCompleteTaskIfRequired with assignNeeded: taskId ${task.id} and event name ${this.eventTrigger?.name}`);
             return this.workAllocationService.assignAndCompleteTask(task.id, this.eventTrigger.name);
         }
         else if (task && taskToBeCompleted) {
-            this.abstractConfig.logMessage(`postCompleteTaskIfRequired: taskId ${task.id} and event name ${this.eventTrigger.name}`);
+            this.abstractConfig.logMessage(`postCompleteTaskIfRequired: taskId ${task.id} and event name ${this.eventTrigger?.name}`);
             return this.workAllocationService.completeTask(task.id, this.eventTrigger.name);
         }
+        this.abstractConfig.logMessage(`postCompleteTaskIfRequired: no task to complete for event name ${this.eventTrigger?.name} and caseId ${this.caseDetails?.case_id}`);
         return of(true);
     }
     finishEventCompletionLogic(eventResponse) {
@@ -9738,13 +9890,17 @@ class CaseEditComponent {
         return task.case_id === eventDetails.caseId && (task.description?.includes(eventDetails.eventId));
     }
     static ɵfac = function CaseEditComponent_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || 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" }, standalone: false, features: [i0.ɵɵProvidersFeature([GreyBarService])], decls: 1, vars: 0, template: function CaseEditComponent_Template(rf, ctx) { if (rf & 1) {
+    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" }, standalone: false, features: [i0.ɵɵProvidersFeature([GreyBarService])], decls: 2, vars: 1, consts: [["class", "refresh-modal-backdrop", 4, "ngIf"], [1, "refresh-modal-backdrop"], [1, "refresh-modal"], [1, "heading-h2"], [1, "button", 3, "click"]], 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%}"] });
+            i0.ɵɵtemplate(1, CaseEditComponent_div_1_Template, 10, 2, "div", 0);
+        } if (rf & 2) {
+            i0.ɵɵadvance();
+            i0.ɵɵproperty("ngIf", ctx.isRefreshModalVisible);
+        } }, dependencies: [i5.NgIf, 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%}.refresh-modal-backdrop[_ngcontent-%COMP%]{position:fixed;inset:0;background:#0006;display:flex;align-items:center;justify-content:center;z-index:1000}.refresh-modal[_ngcontent-%COMP%]{background:#fff;padding:24px;max-width:520px;width:90%;box-shadow:0 8px 24px #0003;border-radius:4px;text-align:center}.refresh-modal[_ngcontent-%COMP%]   .button[_ngcontent-%COMP%]{margin-top:12px}"] });
 }
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(CaseEditComponent, [{
         type: Component,
-        args: [{ selector: 'ccd-case-edit', providers: [GreyBarService], standalone: false, 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"] }]
+        args: [{ selector: 'ccd-case-edit', providers: [GreyBarService], standalone: false, template: "<router-outlet></router-outlet>\n<!-- Simple centered modal shown on refresh -->\n<div *ngIf=\"isRefreshModalVisible\" class=\"refresh-modal-backdrop\">\n  <div class=\"refresh-modal\">\n    <h2 class=\"heading-h2\">Page refreshed</h2>\n    <p>{{ 'As the page has been refreshed mandatory data is now missing. You will be redirected to the first page of this event.' }}</p>\n    <p>{{ 'Please select Ok to continue.' }}</p>\n    <button class=\"button\" (click)=\"onRefreshModalOk()\">Ok</button>\n  </div>\n</div>", 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%}.refresh-modal-backdrop{position:fixed;inset:0;background:#0006;display:flex;align-items:center;justify-content:center;z-index:1000}.refresh-modal{background:#fff;padding:24px;max-width:520px;width:90%;box-shadow:0 8px 24px #0003;border-radius:4px;text-align:center}.refresh-modal .button{margin-top:12px}\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 }, { type: ReadCookieService }], { eventTrigger: [{
             type: Input
         }], submit: [{
@@ -10322,11 +10478,11 @@ class CaseEditConfirmComponent {
             i0.ɵɵproperty("ngIf", ctx.confirmation.getBody());
             i0.ɵɵadvance(2);
             i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(13, 10, ctx.triggerText));
-        } }, 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%}"] });
+        } }, 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%}.refresh-modal-backdrop[_ngcontent-%COMP%]{position:fixed;inset:0;background:#0006;display:flex;align-items:center;justify-content:center;z-index:1000}.refresh-modal[_ngcontent-%COMP%]{background:#fff;padding:24px;max-width:520px;width:90%;box-shadow:0 8px 24px #0003;border-radius:4px;text-align:center}.refresh-modal[_ngcontent-%COMP%]   .button[_ngcontent-%COMP%]{margin-top:12px}"] });
 }
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(CaseEditConfirmComponent, [{
         type: Component,
-        args: [{ standalone: false, template: "<!-- Current Page && Event trigger name -->\n<h1 class=\"heading-h1\">{{ eventTrigger.name | rpxTranslate}}</h1>\n\n<!--Case ID or Title -->\n<div *ngIf=\"getCaseTitle(); then titleBlock; else idBlock\"></div>\n<ng-template #titleBlock>\n  <ccd-markdown [content]=\"getCaseTitle() | ccdCaseTitle: caseFields : editForm.controls['data'] | rpxTranslate\"></ccd-markdown>\n</ng-template>\n<ng-template #idBlock>\n  <h2 *ngIf=\"getCaseId()\" class=\"heading-h2\">#{{ getCaseId() | ccdCaseReference }}</h2>\n</ng-template>\n\n<form [formGroup]=\"formGroup\" (submit)=\"submit()\">\n  <div id=\"confirmation-header\" *ngIf=\"confirmation.getHeader()\">\n    <ccd-markdown [content]=\"confirmation.getHeader() | rpxTranslate\"></ccd-markdown>\n  </div>\n  <div id=\"confirmation-body\" *ngIf=\"confirmation.getBody()\">\n    <ccd-markdown [content]=\"confirmation.getBody() | rpxTranslate\"></ccd-markdown>\n  </div>\n  <button type=\"submit\" class=\"button\" data-ng-click=\"submit()\">{{triggerText | rpxTranslate}}</button>\n</form>\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"] }]
+        args: [{ standalone: false, template: "<!-- Current Page && Event trigger name -->\n<h1 class=\"heading-h1\">{{ eventTrigger.name | rpxTranslate}}</h1>\n\n<!--Case ID or Title -->\n<div *ngIf=\"getCaseTitle(); then titleBlock; else idBlock\"></div>\n<ng-template #titleBlock>\n  <ccd-markdown [content]=\"getCaseTitle() | ccdCaseTitle: caseFields : editForm.controls['data'] | rpxTranslate\"></ccd-markdown>\n</ng-template>\n<ng-template #idBlock>\n  <h2 *ngIf=\"getCaseId()\" class=\"heading-h2\">#{{ getCaseId() | ccdCaseReference }}</h2>\n</ng-template>\n\n<form [formGroup]=\"formGroup\" (submit)=\"submit()\">\n  <div id=\"confirmation-header\" *ngIf=\"confirmation.getHeader()\">\n    <ccd-markdown [content]=\"confirmation.getHeader() | rpxTranslate\"></ccd-markdown>\n  </div>\n  <div id=\"confirmation-body\" *ngIf=\"confirmation.getBody()\">\n    <ccd-markdown [content]=\"confirmation.getBody() | rpxTranslate\"></ccd-markdown>\n  </div>\n  <button type=\"submit\" class=\"button\" data-ng-click=\"submit()\">{{triggerText | rpxTranslate}}</button>\n</form>\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%}.refresh-modal-backdrop{position:fixed;inset:0;background:#0006;display:flex;align-items:center;justify-content:center;z-index:1000}.refresh-modal{background:#fff;padding:24px;max-width:520px;width:90%;box-shadow:0 8px 24px #0003;border-radius:4px;text-align:center}.refresh-modal .button{margin-top:12px}\n"] }]
     }], () => [{ type: CaseEditComponent }, { type: i1$1.Router }], null); })();
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(CaseEditConfirmComponent, { className: "CaseEditConfirmComponent", filePath: "lib/shared/components/case-editor/case-edit-confirm/case-edit-confirm.component.ts", lineNumber: 16 }); })();
 
@@ -11608,6 +11764,11 @@ class CaseEditPageComponent {
         this.validPageListCaseFieldsService.deleteNonValidatedFields(this.caseEdit.validPageList, caseEventData.data, this.eventTrigger.case_fields, fromPreviousPage, this.editForm.controls['data'].value);
         // Tidy it up before we return it.
         this.formValueService.removeUnnecessaryFields(caseEventData.data, caseFields, clearEmpty, clearNonCase, fromPreviousPage, this.currentPage.case_fields);
+        // removeHiddenFields while are hidden in the UI
+        // Only remove hidden fields if editForm and its controls are available
+        if (this.editForm?.controls?.['data']?.['controls']) {
+            this.formValueService.removeHiddenField(caseEventData.data, caseFields, clearNonCase, this.editForm.controls['data']['controls']);
+        }
         return caseEventData;
     }
     syncCaseEditDataService() {
@@ -15254,7 +15415,6 @@ class WriteDocumentFieldComponent extends AbstractFieldWriteComponent {
     dialog;
     fileUploadStateService;
     jurisdictionService;
-    sessionStorageService;
     static DOCUMENT_URL = 'document_url';
     static DOCUMENT_BINARY_URL = 'document_binary_url';
     static DOCUMENT_FILENAME = 'document_filename';
@@ -15284,8 +15444,7 @@ class WriteDocumentFieldComponent extends AbstractFieldWriteComponent {
     caseId;
     // Should the file upload use CDAM
     fileSecureModeOn = false;
-    gotFromCaseInfo = false;
-    constructor(appConfig, caseNotifier, documentManagement, dialog, fileUploadStateService, jurisdictionService, sessionStorageService) {
+    constructor(appConfig, caseNotifier, documentManagement, dialog, fileUploadStateService, jurisdictionService) {
         super();
         this.appConfig = appConfig;
         this.caseNotifier = caseNotifier;
@@ -15293,20 +15452,12 @@ class WriteDocumentFieldComponent extends AbstractFieldWriteComponent {
         this.dialog = dialog;
         this.fileUploadStateService = fileUploadStateService;
         this.jurisdictionService = jurisdictionService;
-        this.sessionStorageService = sessionStorageService;
     }
     ngOnInit() {
         // Wait for both observables to emit at least once
-        const caseInfo = this.documentManagement.parseCaseInfo(this.sessionStorageService.getItem('caseInfo'));
         const currUrl = window.location.pathname;
-        if (caseInfo) {
-            this.gotFromCaseInfo = true;
-            this.caseTypeId = caseInfo.caseType;
-        }
-        else {
-            if (currUrl.includes('/case-details/')) {
-                this.caseTypeId = currUrl.split('/')[4];
-            }
+        if (currUrl.includes('/case-details/')) {
+            this.caseTypeId = currUrl.split('/')[4];
         }
         this.caseNotifierSubscription = combineLatest([
             this.caseNotifier.caseView.pipe(take(1)),
@@ -15567,10 +15718,10 @@ class WriteDocumentFieldComponent extends AbstractFieldWriteComponent {
     handleDocumentUploadResult(result) {
         // use the documentManagement service to check if the document upload should use CDAM
         if (this.documentManagement.isDocumentSecureModeEnabled()) {
-            this.appConfig.logMessage(`WDF:: CDAM is enabled for case with case ref:: ${this.caseId}, case type:: ${this.caseTypeId}, gotFromCaseInfo:: ${this.gotFromCaseInfo}`);
+            this.appConfig.logMessage(`CDAM is enabled for case with case ref:: ${this.caseId}`);
         }
         else {
-            this.appConfig.logMessage(`WDF:: CDAM is disabled for case with case ref:: ${this.caseId}, case type:: ${this.caseTypeId}, gotFromCaseInfo:: ${this.gotFromCaseInfo}`);
+            this.appConfig.logMessage(`CDAM is disabled for case with case ref:: ${this.caseId}`);
         }
         if (!this.uploadedDocument) {
             if (this.fileSecureModeOn) {
@@ -15604,7 +15755,7 @@ class WriteDocumentFieldComponent extends AbstractFieldWriteComponent {
         this.valid = false;
         this.fileUploadStateService.setUploadInProgress(false);
     }
-    static ɵfac = function WriteDocumentFieldComponent_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || WriteDocumentFieldComponent)(i0.ɵɵdirectiveInject(AbstractAppConfig), i0.ɵɵdirectiveInject(CaseNotifier), i0.ɵɵdirectiveInject(DocumentManagementService), i0.ɵɵdirectiveInject(i1$3.MatLegacyDialog), i0.ɵɵdirectiveInject(FileUploadStateService), i0.ɵɵdirectiveInject(JurisdictionService), i0.ɵɵdirectiveInject(SessionStorageService)); };
+    static ɵfac = function WriteDocumentFieldComponent_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || WriteDocumentFieldComponent)(i0.ɵɵdirectiveInject(AbstractAppConfig), i0.ɵɵdirectiveInject(CaseNotifier), i0.ɵɵdirectiveInject(DocumentManagementService), i0.ɵɵdirectiveInject(i1$3.MatLegacyDialog), i0.ɵɵdirectiveInject(FileUploadStateService), i0.ɵɵdirectiveInject(JurisdictionService)); };
     static ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: WriteDocumentFieldComponent, selectors: [["ccd-write-document-field"]], viewQuery: function WriteDocumentFieldComponent_Query(rf, ctx) { if (rf & 1) {
             i0.ɵɵviewQuery(_c0$S, 5);
         } if (rf & 2) {
@@ -15665,11 +15816,11 @@ class WriteDocumentFieldComponent extends AbstractFieldWriteComponent {
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(WriteDocumentFieldComponent, [{
         type: Component,
         args: [{ selector: 'ccd-write-document-field', standalone: false, template: "<div class=\"form-group\" [ngClass]=\"{'form-group-error bottom-30': !valid}\">\n  <label [for]=\"id()\">\n    <span class=\"form-label\" attr.aria-label=\"{{caseField | ccdFieldLabel}}\">{{(caseField | ccdFieldLabel)}}</span>\n  </label>\n  <span class=\"form-hint\" *ngIf=\"caseField.hint_text\">\n    <markdown [data]=\"caseField.hint_text | rpxTranslate\"></markdown>\n  </span>\n  <span class=\"error-message\"\n        role=\"alert\"\n        tabindex=\"0\"\n        [hidden]=\"!(fileUploadMessages && !valid)\">\n    {{ fileUploadMessages | rpxTranslate }}\n  </span>\n  <div>\n    <!--<span *ngIf=\"getUploadedFileName()\" class=\"text-16\">File name: {{getUploadedFileName()}}</span>-->\n    <ccd-read-document-field *ngIf=\"caseField\" [caseField]=\"caseField\"></ccd-read-document-field>\n  </div>\n\n  <div style='position:relative'>\n    <div [id]=\"createElementId('fileInputWrapper')\" (click)=\"fileSelectEvent()\" (keyup)=\"fileSelectEvent()\"></div>\n    <input class=\"form-control bottom-30\" [id]=\"id()\" type=\"file\" (keydown.Tab)=\"fileValidationsOnTab()\" (change)=\"fileChangeEvent($event, caseField.field_type.regular_expression)\"\n           accept=\"{{caseField.field_type.regular_expression}}\" #fileInput/>\n  </div>\n</div>\n<div class=\"form-group bottom-30\">\n  <button class=\"button button-secondary\" type=\"button\" aria-label=\"Cancel upload\" (click)=\"cancelUpload()\" [disabled]=\"!isUploadInProgress()\">{{'Cancel upload' | rpxTranslate}}</button>\n</div>\n" }]
-    }], () => [{ type: AbstractAppConfig }, { type: CaseNotifier }, { type: DocumentManagementService }, { type: i1$3.MatLegacyDialog }, { type: FileUploadStateService }, { type: JurisdictionService }, { type: SessionStorageService }], { fileInput: [{
+    }], () => [{ type: AbstractAppConfig }, { type: CaseNotifier }, { type: DocumentManagementService }, { type: i1$3.MatLegacyDialog }, { type: FileUploadStateService }, { type: JurisdictionService }], { fileInput: [{
             type: ViewChild,
             args: ['fileInput', { static: false }]
         }] }); })();
-(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(WriteDocumentFieldComponent, { className: "WriteDocumentFieldComponent", filePath: "lib/shared/components/palette/document/write-document-field.component.ts", lineNumber: 26 }); })();
+(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(WriteDocumentFieldComponent, { className: "WriteDocumentFieldComponent", filePath: "lib/shared/components/palette/document/write-document-field.component.ts", lineNumber: 25 }); })();
 
 class DynamicListPipe {
     static EMPTY = '';
@@ -30171,7 +30322,7 @@ class ReadFieldsFilterPipe {
         else if (field.show_condition) {
             let cond;
             if (fieldId && field.show_condition.indexOf(`${fieldId}.`) > -1 && !formGroupAvailable && !!Object.keys(formValue).length) {
-                const search = `${fieldId}.`;
+                const search = `/.*${fieldId}./`;
                 const searchRegExp = new RegExp(search, 'g');
                 const replaceWith = '';
                 cond = ShowCondition.getInstance(field.show_condition.replace(searchRegExp, replaceWith));
@@ -32227,11 +32378,11 @@ class CaseEditSubmitComponent {
             i0.ɵɵclassProp("disabled", ctx.caseEdit.isSubmitting);
             i0.ɵɵadvance();
             i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(24, 22, ctx.getCancelText()));
-        } }, 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%}"] });
+        } }, 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%}.refresh-modal-backdrop[_ngcontent-%COMP%]{position:fixed;inset:0;background:#0006;display:flex;align-items:center;justify-content:center;z-index:1000}.refresh-modal[_ngcontent-%COMP%]{background:#fff;padding:24px;max-width:520px;width:90%;box-shadow:0 8px 24px #0003;border-radius:4px;text-align:center}.refresh-modal[_ngcontent-%COMP%]   .button[_ngcontent-%COMP%]{margin-top:12px}"] });
 }
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(CaseEditSubmitComponent, [{
         type: Component,
-        args: [{ selector: 'ccd-case-edit-submit', standalone: false, template: "<div>\n  <!-- Event trigger name -->\n  <h1 class=\"govuk-heading-l\">{{eventTrigger.name | rpxTranslate}}</h1>\n\n  <!--Case ID or Title -->\n  <div *ngIf=\"getCaseTitle(); then titleBlock; else idBlock\"></div>\n  <ng-template #titleBlock>\n    <ccd-markdown [content]=\"getCaseTitle() | ccdCaseTitle: contextFields : editForm.controls['data'] | rpxTranslate\"></ccd-markdown>\n  </ng-template>\n  <ng-template #idBlock>\n    <h2 *ngIf=\"getCaseId()\" class=\"heading-h2\">#{{ getCaseId() | ccdCaseReference }}</h2>\n  </ng-template>\n\n  <ccd-case-edit-generic-errors [error]=\"caseEdit.error\"></ccd-case-edit-generic-errors>\n\n  <ccd-callback-errors [callbackErrorsSubject]=\"caseEdit.callbackErrorsSubject\"\n                      (callbackErrorsContext)=\"callbackErrorsNotify($event)\"></ccd-callback-errors>\n\n  <form class=\"check-your-answers\" [formGroup]=\"editForm\" (submit)=\"submit()\">\n    <div *ngIf=\"!caseEdit.isEventCompletionChecksRequired\">\n      <ng-container *ngIf=\"checkYourAnswerFieldsToDisplayExists()\">\n        <h2 class=\"heading-h2\">{{pageTitle | rpxTranslate }}</h2>\n        <span class=\"text-16\" *ngIf=\"!caseEdit.isCaseFlagSubmission\">{{'Check the information below carefully.' | rpxTranslate}}</span>\n\n        <table class=\"form-table\" aria-describedby=\"check your answers table\">\n          <tbody>\n          <ng-container *ngFor=\"let page of wizard.pages\">\n            <ng-container *ngIf=\"isShown(page)\">\n              <ng-container *ngFor=\"let field of page\n              | ccdPageFields: editForm\n              | ccdReadFieldsFilter: false :undefined :true :allFieldsValues\n              | ccdCYAPageLabelFilter\">\n                <ng-container *ngIf=\"canShowFieldInCYA(field)\">\n                  <tr ccdLabelSubstitutor [caseField]=\"field\" [hidden]=\"field.hidden\"\n                      [formGroup]=\"editForm.controls['data']\" [contextFields]=\"contextFields\">\n                    <th *ngIf=\"!isLabel(field) && !caseEdit.isCaseFlagSubmission\" class=\"valign-top case-field-label\">\n                      <span class=\"text-16\">{{field.label | rpxTranslate}}</span>\n                    </th>\n                    <td class=\"form-cell case-field-content text-16\" [attr.colspan]=\"isLabel(field) ? '2' : '1'\">\n                      <ccd-field-read\n                        [formGroup]=\"editForm.controls['data']\" [topLevelFormGroup]=\"editForm.controls['data']\"\n                        [caseField]=\"summaryCaseField(field)\" [context]=\"paletteContext\" [caseFields]=\"contextFields\"></ccd-field-read>\n                    </td>\n                    <ng-container *ngIf=\"!caseEdit.isCaseFlagSubmission\">\n                      <td class=\"valign-top check-your-answers__change case-field-change\">\n                        <a *ngIf=\"isChangeAllowed(field)\" (click)=\"navigateToPage(page.id); $event.preventDefault()\"\n                          href=\"#\">\n                          <span class=\"text-16\" attr.aria-label=\"{{'Change' | rpxTranslate}} {{ field.label | rpxTranslate }}\">\n                            {{'Change' | rpxTranslate}}\n                          </span>\n                        </a>\n                      </td>\n                    </ng-container>\n                  </tr>\n                </ng-container>\n              </ng-container>\n            </ng-container>\n          </ng-container>\n          </tbody>\n        </table>\n      </ng-container>\n      <ng-container *ngIf=\"readOnlySummaryFieldsToDisplayExists()\">\n\n        <table class=\"summary-fields\" aria-describedby=\"summary fields table\">\n          <tbody>\n            <ng-container *ngFor=\"let field of showSummaryFields\">\n                <ng-container [ngSwitch]=\"!(field | ccdIsCompound)\">\n                  <tr *ngSwitchCase=\"true\" ccdLabelSubstitutor [caseField]=\"field\" [formGroup]=\"editForm.controls['data']\" [contextFields]=\"contextFields\">\n                    <th id=\"summary-field-label\">{{field.label}}</th>\n                    <td class=\"form-cell\">\n                      <ccd-field-read [formGroup]=\"editForm.controls['data']\" [caseField]=\"summaryCaseField(field)\"></ccd-field-read>\n                    </td>\n                  </tr>\n                  <tr *ngSwitchCase=\"false\" class=\"compound-field\" ccdLabelSubstitutor [caseField]=\"field\" [formGroup]=\"editForm.controls['data']\" [contextFields]=\"contextFields\">\n                    <td colspan=\"2\">\n                      <ccd-field-read [formGroup]=\"editForm.controls['data']\" [caseField]=\"summaryCaseField(field)\" [caseFields]=\"contextFields\"></ccd-field-read>\n                    </td>\n                  </tr>\n                </ng-container>\n              </ng-container>\n          </tbody>\n        </table>\n      </ng-container>\n      <ng-container *ngIf=\"showEventNotes()\">\n        <fieldset id=\"fieldset-event\" formGroupName=\"event\">\n          <legend style=\"display: none;\"></legend>\n          <div class=\"form-group\" [ngClass]=\"{'form-group-error': !!summary && !summary.valid && (summary.dirty || summary.touched)}\">\n            <label for=\"field-trigger-summary\" class=\"form-label\">\n              Event summary (optional)\n              <span class=\"form-hint\">A few words describing the purpose of the event.</span>\n            </label>\n            <span class=\"error-message\" *ngIf=\"summary?.errors && (summary.dirty || summary.touched)\">\n              {{summary.errors | ccdFirstError: eventSummaryLabel | rpxTranslate}}\n            </span>\n            <input type=\"text\" id=\"field-trigger-summary\" class=\"form-control bottom-30 width-50\"\n              [ngClass]=\"{'govuk-input--error': summary?.errors && (summary.dirty || summary.touched)}\" formControlName=\"summary\" maxlength=\"1024\">\n          </div>\n          <div class=\"form-group\" [ngClass]=\"{'form-group-error': !!description && !description.valid && (description.dirty || description.touched)}\">\n            <label for=\"field-trigger-description\" class=\"form-label\">Event description (optional)</label>\n            <span class=\"error-message\" *ngIf=\"description?.errors && (description.dirty || description.touched)\">\n              {{description.errors | ccdFirstError: eventDescriptionLabel | rpxTranslate}}\n            </span>\n            <textarea id=\"field-trigger-description\" class=\"form-control bottom-30 width-50\" formControlName=\"description\"\n              [ngClass]=\"{'govuk-input--error': description?.errors && (description.dirty || description.touched)}\" maxlength=\"65536\"></textarea>\n          </div>\n        </fieldset>\n      </ng-container>\n    </div>\n    <ccd-case-event-completion *ngIf=\"caseEdit.isEventCompletionChecksRequired\"\n      [eventCompletionParams]=\"caseEdit.eventCompletionParams\"\n      (eventCanBeCompleted)=\"onEventCanBeCompleted($event)\">\n    </ccd-case-event-completion>\n    <div class=\"form-group form-group-related\">\n      <button class=\"button button-secondary\" type=\"button\" [disabled]=\"!hasPrevious() || caseEdit.isSubmitting\" (click)=\"previous()\">\n        {{'Previous' | rpxTranslate}}\n      </button>\n      <button type=\"submit\" [disabled]=\"isDisabled\" class=\"button\">\n        {{triggerText | rpxTranslate}}\n      </button>\n    </div>\n    <p class=\"cancel\">\n      <a (click)=\"cancel(); $event.preventDefault()\" href=\"#\" [class.disabled]=\"caseEdit.isSubmitting\">{{getCancelText() | rpxTranslate}}</a>\n    </p>\n  </form>\n</div>\n\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"] }]
+        args: [{ selector: 'ccd-case-edit-submit', standalone: false, template: "<div>\n  <!-- Event trigger name -->\n  <h1 class=\"govuk-heading-l\">{{eventTrigger.name | rpxTranslate}}</h1>\n\n  <!--Case ID or Title -->\n  <div *ngIf=\"getCaseTitle(); then titleBlock; else idBlock\"></div>\n  <ng-template #titleBlock>\n    <ccd-markdown [content]=\"getCaseTitle() | ccdCaseTitle: contextFields : editForm.controls['data'] | rpxTranslate\"></ccd-markdown>\n  </ng-template>\n  <ng-template #idBlock>\n    <h2 *ngIf=\"getCaseId()\" class=\"heading-h2\">#{{ getCaseId() | ccdCaseReference }}</h2>\n  </ng-template>\n\n  <ccd-case-edit-generic-errors [error]=\"caseEdit.error\"></ccd-case-edit-generic-errors>\n\n  <ccd-callback-errors [callbackErrorsSubject]=\"caseEdit.callbackErrorsSubject\"\n                      (callbackErrorsContext)=\"callbackErrorsNotify($event)\"></ccd-callback-errors>\n\n  <form class=\"check-your-answers\" [formGroup]=\"editForm\" (submit)=\"submit()\">\n    <div *ngIf=\"!caseEdit.isEventCompletionChecksRequired\">\n      <ng-container *ngIf=\"checkYourAnswerFieldsToDisplayExists()\">\n        <h2 class=\"heading-h2\">{{pageTitle | rpxTranslate }}</h2>\n        <span class=\"text-16\" *ngIf=\"!caseEdit.isCaseFlagSubmission\">{{'Check the information below carefully.' | rpxTranslate}}</span>\n\n        <table class=\"form-table\" aria-describedby=\"check your answers table\">\n          <tbody>\n          <ng-container *ngFor=\"let page of wizard.pages\">\n            <ng-container *ngIf=\"isShown(page)\">\n              <ng-container *ngFor=\"let field of page\n              | ccdPageFields: editForm\n              | ccdReadFieldsFilter: false :undefined :true :allFieldsValues\n              | ccdCYAPageLabelFilter\">\n                <ng-container *ngIf=\"canShowFieldInCYA(field)\">\n                  <tr ccdLabelSubstitutor [caseField]=\"field\" [hidden]=\"field.hidden\"\n                      [formGroup]=\"editForm.controls['data']\" [contextFields]=\"contextFields\">\n                    <th *ngIf=\"!isLabel(field) && !caseEdit.isCaseFlagSubmission\" class=\"valign-top case-field-label\">\n                      <span class=\"text-16\">{{field.label | rpxTranslate}}</span>\n                    </th>\n                    <td class=\"form-cell case-field-content text-16\" [attr.colspan]=\"isLabel(field) ? '2' : '1'\">\n                      <ccd-field-read\n                        [formGroup]=\"editForm.controls['data']\" [topLevelFormGroup]=\"editForm.controls['data']\"\n                        [caseField]=\"summaryCaseField(field)\" [context]=\"paletteContext\" [caseFields]=\"contextFields\"></ccd-field-read>\n                    </td>\n                    <ng-container *ngIf=\"!caseEdit.isCaseFlagSubmission\">\n                      <td class=\"valign-top check-your-answers__change case-field-change\">\n                        <a *ngIf=\"isChangeAllowed(field)\" (click)=\"navigateToPage(page.id); $event.preventDefault()\"\n                          href=\"#\">\n                          <span class=\"text-16\" attr.aria-label=\"{{'Change' | rpxTranslate}} {{ field.label | rpxTranslate }}\">\n                            {{'Change' | rpxTranslate}}\n                          </span>\n                        </a>\n                      </td>\n                    </ng-container>\n                  </tr>\n                </ng-container>\n              </ng-container>\n            </ng-container>\n          </ng-container>\n          </tbody>\n        </table>\n      </ng-container>\n      <ng-container *ngIf=\"readOnlySummaryFieldsToDisplayExists()\">\n\n        <table class=\"summary-fields\" aria-describedby=\"summary fields table\">\n          <tbody>\n            <ng-container *ngFor=\"let field of showSummaryFields\">\n                <ng-container [ngSwitch]=\"!(field | ccdIsCompound)\">\n                  <tr *ngSwitchCase=\"true\" ccdLabelSubstitutor [caseField]=\"field\" [formGroup]=\"editForm.controls['data']\" [contextFields]=\"contextFields\">\n                    <th id=\"summary-field-label\">{{field.label}}</th>\n                    <td class=\"form-cell\">\n                      <ccd-field-read [formGroup]=\"editForm.controls['data']\" [caseField]=\"summaryCaseField(field)\"></ccd-field-read>\n                    </td>\n                  </tr>\n                  <tr *ngSwitchCase=\"false\" class=\"compound-field\" ccdLabelSubstitutor [caseField]=\"field\" [formGroup]=\"editForm.controls['data']\" [contextFields]=\"contextFields\">\n                    <td colspan=\"2\">\n                      <ccd-field-read [formGroup]=\"editForm.controls['data']\" [caseField]=\"summaryCaseField(field)\" [caseFields]=\"contextFields\"></ccd-field-read>\n                    </td>\n                  </tr>\n                </ng-container>\n              </ng-container>\n          </tbody>\n        </table>\n      </ng-container>\n      <ng-container *ngIf=\"showEventNotes()\">\n        <fieldset id=\"fieldset-event\" formGroupName=\"event\">\n          <legend style=\"display: none;\"></legend>\n          <div class=\"form-group\" [ngClass]=\"{'form-group-error': !!summary && !summary.valid && (summary.dirty || summary.touched)}\">\n            <label for=\"field-trigger-summary\" class=\"form-label\">\n              Event summary (optional)\n              <span class=\"form-hint\">A few words describing the purpose of the event.</span>\n            </label>\n            <span class=\"error-message\" *ngIf=\"summary?.errors && (summary.dirty || summary.touched)\">\n              {{summary.errors | ccdFirstError: eventSummaryLabel | rpxTranslate}}\n            </span>\n            <input type=\"text\" id=\"field-trigger-summary\" class=\"form-control bottom-30 width-50\"\n              [ngClass]=\"{'govuk-input--error': summary?.errors && (summary.dirty || summary.touched)}\" formControlName=\"summary\" maxlength=\"1024\">\n          </div>\n          <div class=\"form-group\" [ngClass]=\"{'form-group-error': !!description && !description.valid && (description.dirty || description.touched)}\">\n            <label for=\"field-trigger-description\" class=\"form-label\">Event description (optional)</label>\n            <span class=\"error-message\" *ngIf=\"description?.errors && (description.dirty || description.touched)\">\n              {{description.errors | ccdFirstError: eventDescriptionLabel | rpxTranslate}}\n            </span>\n            <textarea id=\"field-trigger-description\" class=\"form-control bottom-30 width-50\" formControlName=\"description\"\n              [ngClass]=\"{'govuk-input--error': description?.errors && (description.dirty || description.touched)}\" maxlength=\"65536\"></textarea>\n          </div>\n        </fieldset>\n      </ng-container>\n    </div>\n    <ccd-case-event-completion *ngIf=\"caseEdit.isEventCompletionChecksRequired\"\n      [eventCompletionParams]=\"caseEdit.eventCompletionParams\"\n      (eventCanBeCompleted)=\"onEventCanBeCompleted($event)\">\n    </ccd-case-event-completion>\n    <div class=\"form-group form-group-related\">\n      <button class=\"button button-secondary\" type=\"button\" [disabled]=\"!hasPrevious() || caseEdit.isSubmitting\" (click)=\"previous()\">\n        {{'Previous' | rpxTranslate}}\n      </button>\n      <button type=\"submit\" [disabled]=\"isDisabled\" class=\"button\">\n        {{triggerText | rpxTranslate}}\n      </button>\n    </div>\n    <p class=\"cancel\">\n      <a (click)=\"cancel(); $event.preventDefault()\" href=\"#\" [class.disabled]=\"caseEdit.isSubmitting\">{{getCancelText() | rpxTranslate}}</a>\n    </p>\n  </form>\n</div>\n\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%}.refresh-modal-backdrop{position:fixed;inset:0;background:#0006;display:flex;align-items:center;justify-content:center;z-index:1000}.refresh-modal{background:#fff;padding:24px;max-width:520px;width:90%;box-shadow:0 8px 24px #0003;border-radius:4px;text-align:center}.refresh-modal .button{margin-top:12px}\n"] }]
     }], () => [{ type: CaseEditComponent }, { type: FieldsUtils }, { type: CaseFieldService }, { type: i1$1.ActivatedRoute }, { type: OrderService }, { type: ProfileNotifier }, { type: MultipageComponentStateService }, { type: FormValidatorsService }, { type: CaseFlagStateService }, { type: LinkedCasesService }], null); })();
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(CaseEditSubmitComponent, { className: "CaseEditSubmitComponent", filePath: "lib/shared/components/case-editor/case-edit-submit/case-edit-submit.component.ts", lineNumber: 31 }); })();
 
@@ -32413,11 +32564,11 @@ class CaseEditGenericErrorsComponent {
             i0.ɵɵproperty("ngIf", ctx.error && (!(ctx.error.callbackErrors || ctx.error.callbackWarnings || ctx.error.details) && !ctx.error.message));
             i0.ɵɵadvance();
             i0.ɵɵproperty("ngIf", ctx.error && (ctx.error.details || ctx.error.message));
-        } }, dependencies: [i5.NgForOf, i5.NgIf], 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%}"] });
+        } }, dependencies: [i5.NgForOf, i5.NgIf], 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%}.refresh-modal-backdrop[_ngcontent-%COMP%]{position:fixed;inset:0;background:#0006;display:flex;align-items:center;justify-content:center;z-index:1000}.refresh-modal[_ngcontent-%COMP%]{background:#fff;padding:24px;max-width:520px;width:90%;box-shadow:0 8px 24px #0003;border-radius:4px;text-align:center}.refresh-modal[_ngcontent-%COMP%]   .button[_ngcontent-%COMP%]{margin-top:12px}"] });
 }
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(CaseEditGenericErrorsComponent, [{
         type: Component,
-        args: [{ selector: 'ccd-case-edit-generic-errors', providers: [], standalone: false, 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) && !error.message)\" class=\"error-summary\" 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\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.</p>\n      <p><a href=\"get-help\" target=\"_blank\">Contact us</a> if you're still having problems.</p>\n    </div>\n  </div>\n  <!-- Event error heading and error message to be displayed if there are specific error details -->\n  <div *ngIf=\"error && (error.details || error.message)\" class=\"error-summary\" role=\"group\" aria-labelledby=\"edit-case-event_error-summary-heading\" tabindex=\"-1\">\n    <h3 class=\"heading-h3 error-summary-heading\" id=\"edit-case-event_error-summary-heading\">\n      The event could not be created\n    </h3>\n    <p>{{error.message}}</p>\n    <ul *ngIf=\"error.details?.field_errors\" class=\"error-summary-list\">\n      <li *ngFor=\"let fieldError of error.details.field_errors\" class=\"ccd-error-summary-li\">{{fieldError.message}}</li>\n    </ul>\n  </div>\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"] }]
+        args: [{ selector: 'ccd-case-edit-generic-errors', providers: [], standalone: false, 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) && !error.message)\" class=\"error-summary\" 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\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.</p>\n      <p><a href=\"get-help\" target=\"_blank\">Contact us</a> if you're still having problems.</p>\n    </div>\n  </div>\n  <!-- Event error heading and error message to be displayed if there are specific error details -->\n  <div *ngIf=\"error && (error.details || error.message)\" class=\"error-summary\" role=\"group\" aria-labelledby=\"edit-case-event_error-summary-heading\" tabindex=\"-1\">\n    <h3 class=\"heading-h3 error-summary-heading\" id=\"edit-case-event_error-summary-heading\">\n      The event could not be created\n    </h3>\n    <p>{{error.message}}</p>\n    <ul *ngIf=\"error.details?.field_errors\" class=\"error-summary-list\">\n      <li *ngFor=\"let fieldError of error.details.field_errors\" class=\"ccd-error-summary-li\">{{fieldError.message}}</li>\n    </ul>\n  </div>\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%}.refresh-modal-backdrop{position:fixed;inset:0;background:#0006;display:flex;align-items:center;justify-content:center;z-index:1000}.refresh-modal{background:#fff;padding:24px;max-width:520px;width:90%;box-shadow:0 8px 24px #0003;border-radius:4px;text-align:center}.refresh-modal .button{margin-top:12px}\n"] }]
     }], null, { error: [{
             type: Input
         }] }); })();
@@ -34586,18 +34737,9 @@ class CaseResolver {
             this.navigateToCaseList();
         }
         else {
-            const resultPromise = this.isRootCaseViewRoute(route) ? this.getAndCacheCaseView(cid)
+            return this.isRootCaseViewRoute(route) ? this.getAndCacheCaseView(cid)
                 : this.caseNotifier.cachedCaseView ? Promise.resolve(this.caseNotifier.cachedCaseView)
                     : this.getAndCacheCaseView(cid);
-            return resultPromise.then((caseView) => {
-                const newCaseInfo = {
-                    caseId: caseView.case_id,
-                    jurisdiction: caseView.case_type.jurisdiction.id,
-                    caseType: caseView.case_type.id
-                };
-                this.sessionStorage.setItem('caseInfo', JSON.stringify(newCaseInfo));
-                return caseView;
-            });
         }
     }
     navigateToCaseList() {
@@ -34780,8 +34922,10 @@ class EventTriggerResolver {
             this.alertService.setPreserveAlerts(true);
             this.alertService.error(error.message);
             this.errorNotifier.announceError(error);
-            caseTypeId = route.parent.paramMap.get('caseType');
-            this.router.navigate([`/cases/case-details/${jurisdiction}/${caseType}/${cid}/tasks`]);
+            if (!this.router.url?.includes('/cases/case-details/')) {
+                caseTypeId = route.parent.paramMap.get('caseType');
+                this.router.navigate([`/cases/case-details/${jurisdiction}/${caseType}/${cid}/tasks`]);
+            }
             return throwError(error);
         })).toPromise();
     }
@@ -35712,6 +35856,7 @@ class CaseFullAccessViewComponent {
             });
         }
         this.checkRouteAndSetCaseViewTab();
+        this.setCaseInfo();
         // Check for active Case Flags
         this.activeCaseFlags = this.hasActiveCaseFlags();
         this.linkedCasesService.resetLinkedCaseData();
@@ -35724,6 +35869,18 @@ class CaseFullAccessViewComponent {
             this.organiseTabPosition();
         }
     }
+    setCaseInfo() {
+        const caseInfo = JSON.parse(this.sessionStorageService.getItem('caseInfo') || '{}');
+        console.log('Case Info from session storage: ', caseInfo);
+        if (caseInfo?.caseId !== this.caseDetails.case_id) {
+            const newCaseInfo = {
+                caseId: this.caseDetails.case_id,
+                jurisdiction: this.caseDetails.case_type.jurisdiction.id,
+                caseType: this.caseDetails.case_type.id
+            };
+            this.sessionStorageService.setItem('caseInfo', JSON.stringify(newCaseInfo));
+        }
+    }
     isPrintEnabled() {
         return this.caseDetails.case_type.printEnabled;
     }
@@ -36982,6 +37139,7 @@ class EventStartGuard {
         }
     }
     checkForTasks(payload, caseId, eventId, taskId, userId) {
+        this.abstractConfig.logMessage(`checkForTasks: for caseId ${caseId} and eventId ${eventId} and taskId ${taskId} and userId ${userId}`);
         if (taskId && payload?.tasks?.length > 0) {
             const task = payload.tasks.find((t) => t.id == taskId);
             if (task) {
@@ -37030,6 +37188,7 @@ class EventStartGuard {
         };
         this.sessionStorageService.setItem(CaseEditComponent.TASK_EVENT_COMPLETION_INFO, JSON.stringify(taskEventCompletionInfo));
         this.sessionStorageService.setItem(CaseEditComponent.CLIENT_CONTEXT, JSON.stringify(storeClientContext));
+        this.abstractConfig.logMessage(`EventStartGuard:setClientContextStorage: set task ${task?.id} in client context for caseId ${caseId} and eventId ${eventId}`);
     }
     static ɵfac = function EventStartGuard_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || EventStartGuard)(i0.ɵɵinject(WorkAllocationService), i0.ɵɵinject(i1$1.Router), i0.ɵɵinject(SessionStorageService), i0.ɵɵinject(AbstractAppConfig), i0.ɵɵinject(ReadCookieService), i0.ɵɵinject(CaseNotifier)); };
     static ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: EventStartGuard, factory: EventStartGuard.ɵfac });
@@ -37056,6 +37215,7 @@ var EventStartStates;
 
 const EVENT_STATE_MACHINE = 'EVENT STATE MACHINE';
 class EventStartStateMachineService {
+    abstractConfig;
     stateCheckForMatchingTasks;
     stateNoTask;
     stateOneTask;
@@ -37065,6 +37225,9 @@ class EventStartStateMachineService {
     stateMultipleTasksAssignedToUser;
     stateTaskUnassigned;
     stateFinal;
+    constructor(abstractConfig) {
+        this.abstractConfig = abstractConfig;
+    }
     initialiseStateMachine(context) {
         return new StateMachine(EVENT_STATE_MACHINE, context);
     }
@@ -37169,7 +37332,7 @@ class EventStartStateMachineService {
         // Navigate
         context.router.navigate([`${navigationURL}`], { queryParams: theQueryParams, relativeTo: context.route });
     }
-    entryActionForStateOneTaskAssignedToUser(state, context) {
+    entryActionForStateOneTaskAssignedToUser = (state, context) => {
         // Trigger final state to complete processing of state machine
         state.trigger(EventStartStates.FINAL);
         // Get task assigned to user
@@ -37178,6 +37341,7 @@ class EventStartStateMachineService {
             task = context.tasks[0];
         }
         const taskStr = JSON.stringify(task);
+        this.abstractConfig?.logMessage?.(`entryActionForStateOneTaskAssignedToUser: task_state ${task?.task_state} for task id ${task?.id}`);
         console.log('entryActionForStateOneTaskAssignedToUser: setting client context task_data to ' + taskStr);
         // Store task to session
         const currentLanguage = context.cookieService.getCookie('exui-preferred-language');
@@ -37210,7 +37374,7 @@ class EventStartStateMachineService {
         context.sessionStorageService.setItem(CaseEditComponent.CLIENT_CONTEXT, JSON.stringify(clientContext));
         // Allow user to perform the event
         context.router.navigate([`/cases/case-details/${task.jurisdiction}/${task.case_type_id}/${context.caseId}/trigger/${context.eventId}`], { relativeTo: context.route });
-    }
+    };
     entryActionForStateMultipleTasksAssignedToUser(state, context) {
         // Trigger final state to complete processing of state machine
         state.trigger(EventStartStates.FINAL);
@@ -37249,12 +37413,12 @@ class EventStartStateMachineService {
     addTransitionsForStateMultipleTasksAssignedToUser() {
         this.stateMultipleTasksAssignedToUser.addTransition(EventStartStates.FINAL, this.stateFinal);
     }
-    static ɵfac = function EventStartStateMachineService_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || EventStartStateMachineService)(); };
+    static ɵfac = function EventStartStateMachineService_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || EventStartStateMachineService)(i0.ɵɵinject(AbstractAppConfig)); };
     static ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: EventStartStateMachineService, factory: EventStartStateMachineService.ɵfac });
 }
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(EventStartStateMachineService, [{
         type: Injectable
-    }], null, null); })();
+    }], () => [{ type: AbstractAppConfig }], null); })();
 
 class EventStartComponent {
     service;
@@ -37262,14 +37426,16 @@ class EventStartComponent {
     route;
     sessionStorageService;
     cookieService;
+    abstractConfig;
     stateMachine;
     context;
-    constructor(service, router, route, sessionStorageService, cookieService) {
+    constructor(service, router, route, sessionStorageService, cookieService, abstractConfig) {
         this.service = service;
         this.router = router;
         this.route = route;
         this.sessionStorageService = sessionStorageService;
         this.cookieService = cookieService;
+        this.abstractConfig = abstractConfig;
     }
     ngOnInit() {
         // Get task and case id payload from route data
@@ -37289,7 +37455,7 @@ class EventStartComponent {
             cookieService: this.cookieService
         };
         // Initialise state machine
-        this.service = new EventStartStateMachineService();
+        this.service = new EventStartStateMachineService(this.abstractConfig);
         this.stateMachine = this.service.initialiseStateMachine(this.context);
         // Create states
         this.service.createStates(this.stateMachine);
@@ -37298,14 +37464,14 @@ class EventStartComponent {
         // Start state machine
         this.service.startStateMachine(this.stateMachine);
     }
-    static ɵfac = function EventStartComponent_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || EventStartComponent)(i0.ɵɵdirectiveInject(EventStartStateMachineService), i0.ɵɵdirectiveInject(i1$1.Router), i0.ɵɵdirectiveInject(i1$1.ActivatedRoute), i0.ɵɵdirectiveInject(SessionStorageService), i0.ɵɵdirectiveInject(ReadCookieService)); };
+    static ɵfac = function EventStartComponent_Factory(__ngFactoryType__) { return new (__ngFactoryType__ || EventStartComponent)(i0.ɵɵdirectiveInject(EventStartStateMachineService), i0.ɵɵdirectiveInject(i1$1.Router), i0.ɵɵdirectiveInject(i1$1.ActivatedRoute), i0.ɵɵdirectiveInject(SessionStorageService), i0.ɵɵdirectiveInject(ReadCookieService), i0.ɵɵdirectiveInject(AbstractAppConfig)); };
     static ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: EventStartComponent, selectors: [["ccd-event-start"]], standalone: false, decls: 0, vars: 0, template: function EventStartComponent_Template(rf, ctx) { }, encapsulation: 2 });
 }
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(EventStartComponent, [{
         type: Component,
         args: [{ selector: 'ccd-event-start', standalone: false, template: "" }]
-    }], () => [{ type: EventStartStateMachineService }, { type: i1$1.Router }, { type: i1$1.ActivatedRoute }, { type: SessionStorageService }, { type: ReadCookieService }], null); })();
-(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(EventStartComponent, { className: "EventStartComponent", filePath: "lib/shared/components/event-start/event-start.component.ts", lineNumber: 15 }); })();
+    }], () => [{ type: EventStartStateMachineService }, { type: i1$1.Router }, { type: i1$1.ActivatedRoute }, { type: SessionStorageService }, { type: ReadCookieService }, { type: AbstractAppConfig }], null); })();
+(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(EventStartComponent, { className: "EventStartComponent", filePath: "lib/shared/components/event-start/event-start.component.ts", lineNumber: 16 }); })();
 
 class EventTasksResolverService {
     service;