@hmcts/ccd-case-ui-toolkit 7.0.65-ungrey-back-button-3 → 7.0.66-ungrey-back-button

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

@@ -1,5 +1,5 @@
 import * as i0 from '@angular/core';
-import { Component, Input, EventEmitter, Output, NgModule, ViewEncapsulation, forwardRef, Pipe, ViewChildren, ContentChildren, Injectable, Inject, ChangeDetectorRef, Directive, InjectionToken, Injector, ViewChild, HostListener, ViewContainerRef, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import { Component, Input, EventEmitter, Output, NgModule, ViewEncapsulation, forwardRef, Pipe, ViewChildren, ContentChildren, Injectable, Inject, ChangeDetectorRef, Directive, InjectionToken, ViewChild, HostListener, Injector, ViewContainerRef, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import * as i5 from '@angular/common';
 import { CommonModule, DOCUMENT, AsyncPipe, CurrencyPipe, formatDate } from '@angular/common';
 import * as i1 from 'rpx-xui-translation';
@@ -24,7 +24,6 @@ import { StateMachine } from '@edium/fsm';
 import * as i1$3 from '@angular/material/legacy-dialog';
 import { MAT_LEGACY_DIALOG_DATA, MatLegacyDialogModule } from '@angular/material/legacy-dialog';
 import { MatDialogConfig } from '@angular/material/dialog';
-import { ComponentPortal, PortalModule } from '@angular/cdk/portal';
 import * as i2 from '@nicky-lenaers/ngx-scroll-to';
 import { ScrollToModule } from '@nicky-lenaers/ngx-scroll-to';
 import * as marked from 'marked';
@@ -53,6 +52,7 @@ import * as i15 from '@angular/material/legacy-input';
 import { MatLegacyInputModule } from '@angular/material/legacy-input';
 import * as i14 from '@hmcts/media-viewer';
 import { MediaViewerModule } from '@hmcts/media-viewer';
+import { PortalModule } from '@angular/cdk/portal';
 import * as i2$3 from 'ngx-pagination';
 import { NgxPaginationModule, PaginatePipe } from 'ngx-pagination';
 import * as i10 from '@angular/material/legacy-tabs';
@@ -8823,11 +8823,11 @@ var TaskState;
     TaskState["PendingReConfiguration"] = "PENDING_RECONFIGURATION";
 })(TaskState || (TaskState = {}));
 
-var EventCompletionPortalTypes;
-(function (EventCompletionPortalTypes) {
-    EventCompletionPortalTypes[EventCompletionPortalTypes["TaskCancelled"] = 0] = "TaskCancelled";
-    EventCompletionPortalTypes[EventCompletionPortalTypes["TaskReassigned"] = 1] = "TaskReassigned";
-})(EventCompletionPortalTypes || (EventCompletionPortalTypes = {}));
+var EventCompletionTaskStates;
+(function (EventCompletionTaskStates) {
+    EventCompletionTaskStates[EventCompletionTaskStates["TaskCancelled"] = 0] = "TaskCancelled";
+    EventCompletionTaskStates[EventCompletionTaskStates["TaskReassigned"] = 1] = "TaskReassigned";
+})(EventCompletionTaskStates || (EventCompletionTaskStates = {}));
 
 const EVENT_COMPLETION_STATE_MACHINE = 'EVENT COMPLETION STATE MACHINE';
 class EventCompletionStateMachineService {
@@ -8866,6 +8866,7 @@ class EventCompletionStateMachineService {
         this.addTransitionsForStateTaskUnassigned();
     }
     entryActionForStateCheckTasksCanBeCompleted(state, context) {
+        const assignNeeded = context.sessionStorageService.getItem('assignNeeded');
         context.workAllocationService.getTask(context.task.id).subscribe(taskResponse => {
             if (taskResponse && taskResponse.task && taskResponse.task.task_state) {
                 switch (taskResponse.task.task_state.toUpperCase()) {
@@ -8885,6 +8886,11 @@ class EventCompletionStateMachineService {
                             // Task still assigned to current user, complete event and task
                             state.trigger(EventCompletionStates.CompleteEventAndTask);
                         }
+                        else if (assignNeeded === 'true - override') {
+                            // this will treat task as unassigned instead of reassigned to complete after user confirmation
+                            // assignNeeded will also be immediately overwritten to true
+                            state.trigger(EventCompletionStates.TaskUnassigned);
+                        }
                         else {
                             // Task has been reassigned to another user, display error message
                             context.reassignedTask = taskResponse.task;
@@ -8906,7 +8912,7 @@ class EventCompletionStateMachineService {
         // Trigger final state to complete processing of state machine
         state.trigger(EventCompletionStates.Final);
         // Load case event completion task cancelled component
-        context.component.showPortal(EventCompletionPortalTypes.TaskCancelled);
+        context.component.setTaskState(EventCompletionTaskStates.TaskCancelled);
     }
     entryActionForStateCompleteEventAndTask(state, context) {
         // Trigger final state to complete processing of state machine
@@ -8927,7 +8933,7 @@ class EventCompletionStateMachineService {
         // Trigger final state to complete processing of state machine
         state.trigger(EventCompletionStates.Final);
         // Load case event completion task reassigned component
-        context.component.showPortal(EventCompletionPortalTypes.TaskReassigned);
+        context.component.setTaskState(EventCompletionTaskStates.TaskReassigned);
     }
     entryActionForStateTaskUnassigned(state, context) {
         // Trigger final state to complete processing of state machine
@@ -9492,15 +9498,22 @@ class CaseEditComponent {
         const clientContextStr = this.sessionStorageService.getItem('clientContext');
         const userTask = FieldsUtils.getUserTaskFromClientContext(clientContextStr);
         const taskInSessionStorage = userTask ? userTask.task_data : null;
-        let taskEventInSessionStorage;
-        const taskStr = this.sessionStorageService.getItem('taskToComplete');
-        const taskEventStr = this.sessionStorageService.getItem('taskEvent');
-        if (taskEventStr) {
-            taskEventInSessionStorage = JSON.parse(taskEventStr);
+        let taskEventCompletionInfo;
+        let userInfo;
+        const taskEventCompletionStr = this.sessionStorageService.getItem('taskEventCompletionInfo');
+        const userInfoStr = this.sessionStorageService.getItem('userDetails');
+        const assignNeeded = this.sessionStorageService.getItem('assignNeeded');
+        if (taskEventCompletionStr) {
+            taskEventCompletionInfo = JSON.parse(taskEventCompletionStr);
+        }
+        if (userInfoStr) {
+            userInfo = JSON.parse(userInfoStr);
         }
         const eventId = this.getEventId(form);
         const caseId = this.getCaseId(caseDetails);
-        if (this.taskExistsForThisEventAndCase(taskInSessionStorage, taskEventInSessionStorage, eventId, caseId)) {
+        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}`);
             // Show event completion component to perform event completion checks
             this.eventCompletionParams = ({
@@ -9508,9 +9521,16 @@ class CaseEditComponent {
                 eventId,
                 task: taskInSessionStorage
             });
-            // add taskEvent to link current event with task id
-            const taskEvent = { eventId, taskId: taskInSessionStorage.id };
-            this.sessionStorageService.setItem('taskEvent', JSON.stringify(taskEvent));
+            // add taskEventCompletionInfo again to ensure link current event with task id
+            // note: previous usage was created here so this is to ensure correct functionality continues
+            const taskEventCompletionInfo = {
+                caseId,
+                eventId,
+                userId,
+                taskId: taskInSessionStorage.id,
+                createdTimestamp: Date.now()
+            };
+            this.sessionStorageService.setItem('taskEventCompletionInfo', JSON.stringify(taskEventCompletionInfo));
             this.isEventCompletionChecksRequired = true;
         }
         else {
@@ -9675,9 +9695,9 @@ class CaseEditComponent {
             return this.postCompleteTaskIfRequired();
         }), finalize(() => {
             this.loadingService.unregister(loadingSpinnerToken);
-            // on event completion ensure the previous event taskToComplete/taskEvent removed
-            this.sessionStorageService.removeItem('taskToComplete');
-            this.sessionStorageService.removeItem('taskEvent');
+            // on event completion ensure the previous event clientContext/taskEventCompletionInfo removed
+            this.sessionStorageService.removeItem('clientContext');
+            this.sessionStorageService.removeItem('taskEventCompletionInfo');
             this.isSubmitting = false;
         }))
             .subscribe(() => {
@@ -9738,22 +9758,32 @@ class CaseEditComponent {
             return null;
         }
     }
-    // checks whether current taskToComplete relevant for the event
-    taskExistsForThisEventAndCase(taskInSessionStorage, taskEvent, eventId, caseId) {
-        if (!taskInSessionStorage || taskInSessionStorage.case_id !== caseId) {
+    // checks whether current clientContext relevant for the event
+    taskExistsForThisEvent(taskInSessionStorage, taskEventCompletionInfo, eventDetails) {
+        if (!taskInSessionStorage || taskInSessionStorage.case_id !== eventDetails.caseId) {
             return false;
         }
-        if (!taskEvent) {
+        if (!taskEventCompletionInfo) {
             // if no task event present then there is no task to complete from previous event present
             return true;
         }
         else {
-            if (taskEvent.taskId === taskInSessionStorage.id && taskEvent.eventId !== eventId) {
+            if (taskEventCompletionInfo.taskId !== taskInSessionStorage.id) {
+                return true;
+            }
+            else if ((taskEventCompletionInfo.taskId === taskInSessionStorage.id &&
+                this.eventDetailsDoNotMatch(taskEventCompletionInfo, eventDetails))
+                || this.eventMoreThanDayAgo(taskEventCompletionInfo.createdTimestamp)) {
                 // if the session storage not related to event, ignore it and remove
-                this.sessionStorageService.removeItem('taskToComplete');
-                this.sessionStorageService.removeItem('taskEvent');
+                this.sessionStorageService.removeItem('clientContext');
+                this.sessionStorageService.removeItem('taskEventCompletionInfo');
                 return false;
             }
+            if (eventDetails.assignNeeded === 'false' && eventDetails.userId !== taskInSessionStorage.assignee) {
+                // if the user does not match task assignee, assign is now needed
+                // data cannot be deleted and ignored as it matches understanding
+                this.sessionStorageService.setItem('assignNeeded', 'true');
+            }
             return true;
         }
     }
@@ -9774,6 +9804,20 @@ class CaseEditComponent {
     hasCallbackFailed(response) {
         return response['callback_response_status'] !== 'CALLBACK_COMPLETED';
     }
+    eventMoreThanDayAgo(timestamp) {
+        if ((new Date().getTime() - timestamp) > (24 * 60 * 60 * 1000)) {
+            return true;
+        }
+        return false;
+    }
+    eventDetailsDoNotMatch(taskEventCompletionInfo, eventDetails) {
+        if (taskEventCompletionInfo.eventId !== eventDetails.eventId
+            || taskEventCompletionInfo.caseId !== eventDetails.caseId
+            || taskEventCompletionInfo.userId !== eventDetails.userId) {
+            return true;
+        }
+        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)); };
     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");
@@ -9797,7 +9841,7 @@ 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: 34 }); })();
+(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(CaseEditComponent, { className: "CaseEditComponent", filePath: "lib/shared/components/case-editor/case-edit/case-edit.component.ts", lineNumber: 35 }); })();
 
 function CaseEditConfirmComponent_div_3_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelement(0, "div");
@@ -10211,6 +10255,7 @@ class LinkedCasesService {
     storedCaseNumber = '';
     cameFromFinalStep = false;
     hasNavigatedInJourney = false;
+    cachedFieldValues;
     constructor(jurisdictionService, searchService) {
         this.jurisdictionService = jurisdictionService;
         this.searchService = searchService;
@@ -10605,7 +10650,8 @@ class CaseEditPageComponent {
         this.cancel();
     }
     isAtStart() {
-        return this.multipageComponentStateService.getJourneyCollection()[0]?.fieldState === this.multipageComponentStateService.getJourneyCollection()[0]?.journeyStartPageNumber;
+        const pageNumberToUse = this.multipageComponentStateService.getJourneyCollection()[0]?.linkedCasesPage !== undefined ? this.multipageComponentStateService.getJourneyCollection()[0]?.linkedCasesPage : this.multipageComponentStateService.getJourneyCollection()[0]?.fieldState;
+        return pageNumberToUse === this.multipageComponentStateService.getJourneyCollection()[0]?.journeyStartPageNumber;
     }
     isAtEnd() {
         return this.multipageComponentStateService.getJourneyCollection()[0]?.fieldState === this.multipageComponentStateService.getJourneyCollection()[0]?.journeyEndPageNumber;
@@ -11339,20 +11385,118 @@ class CallbackErrorsComponent {
         }] }); })();
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(CallbackErrorsComponent, { className: "CallbackErrorsComponent", filePath: "lib/shared/components/error/callback-errors.component.ts", lineNumber: 10 }); })();
 
+function CaseEventCompletionComponent_app_case_event_completion_task_cancelled_0_Template(rf, ctx) { if (rf & 1) {
+    const _r1 = i0.ɵɵgetCurrentView();
+    i0.ɵɵelementStart(0, "app-case-event-completion-task-cancelled", 2);
+    i0.ɵɵlistener("notifyEventCompletionCancelled", function CaseEventCompletionComponent_app_case_event_completion_task_cancelled_0_Template_app_case_event_completion_task_cancelled_notifyEventCompletionCancelled_0_listener($event) { i0.ɵɵrestoreView(_r1); const ctx_r1 = i0.ɵɵnextContext(); return i0.ɵɵresetView(ctx_r1.setEventCanBeCompleted($event)); });
+    i0.ɵɵelementEnd();
+} if (rf & 2) {
+    const ctx_r1 = i0.ɵɵnextContext();
+    i0.ɵɵproperty("context", ctx_r1.context);
+} }
+function CaseEventCompletionComponent_app_case_event_completion_task_reassigned_1_Template(rf, ctx) { if (rf & 1) {
+    const _r3 = i0.ɵɵgetCurrentView();
+    i0.ɵɵelementStart(0, "app-case-event-completion-task-reassigned", 3);
+    i0.ɵɵlistener("notifyEventCompletionReassigned", function CaseEventCompletionComponent_app_case_event_completion_task_reassigned_1_Template_app_case_event_completion_task_reassigned_notifyEventCompletionReassigned_0_listener($event) { i0.ɵɵrestoreView(_r3); const ctx_r1 = i0.ɵɵnextContext(); return i0.ɵɵresetView(ctx_r1.setEventCanBeCompleted($event)); });
+    i0.ɵɵelementEnd();
+} if (rf & 2) {
+    const ctx_r1 = i0.ɵɵnextContext();
+    i0.ɵɵproperty("context", ctx_r1.context);
+} }
+const COMPONENT_PORTAL_INJECTION_TOKEN = new InjectionToken('');
+class CaseEventCompletionComponent {
+    service;
+    router;
+    route;
+    sessionStorageService;
+    workAllocationService;
+    alertService;
+    eventCompletionParams;
+    eventCanBeCompleted = new EventEmitter();
+    eventCompletionTaskStates = EventCompletionTaskStates;
+    stateMachine;
+    context;
+    taskState;
+    constructor(service, router, route, sessionStorageService, workAllocationService, alertService) {
+        this.service = service;
+        this.router = router;
+        this.route = route;
+        this.sessionStorageService = sessionStorageService;
+        this.workAllocationService = workAllocationService;
+        this.alertService = alertService;
+    }
+    ngOnChanges(changes) {
+        if (changes.eventCompletionParams?.currentValue) {
+            // Setup the context
+            this.context = {
+                task: this.eventCompletionParams.task,
+                caseId: this.eventCompletionParams.caseId,
+                eventId: this.eventCompletionParams.eventId,
+                reassignedTask: null,
+                router: this.router,
+                route: this.route,
+                sessionStorageService: this.sessionStorageService,
+                workAllocationService: this.workAllocationService,
+                alertService: this.alertService,
+                canBeCompleted: false,
+                component: this
+            };
+            // Initialise state machine
+            this.stateMachine = this.service.initialiseStateMachine(this.context);
+            // Create states
+            this.service.createStates(this.stateMachine);
+            // Add transitions for the states
+            this.service.addTransitions();
+            // Start state machine
+            this.service.startStateMachine(this.stateMachine);
+        }
+    }
+    setTaskState(taskState) {
+        this.taskState = taskState;
+    }
+    setEventCanBeCompleted(completable) {
+        // note: event not completed from here as will then skip task completion
+        if (!completable) {
+            // if event cannot be completed ensure that this is communicated
+            // otherwise this will be handled via onchanges
+            this.eventCanBeCompleted.emit(completable);
+        }
+    }
+    static ɵfac = function CaseEventCompletionComponent_Factory(t) { return new (t || CaseEventCompletionComponent)(i0.ɵɵdirectiveInject(EventCompletionStateMachineService), i0.ɵɵdirectiveInject(i1$1.Router), i0.ɵɵdirectiveInject(i1$1.ActivatedRoute), i0.ɵɵdirectiveInject(SessionStorageService), i0.ɵɵdirectiveInject(WorkAllocationService), i0.ɵɵdirectiveInject(AlertService)); };
+    static ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: CaseEventCompletionComponent, selectors: [["ccd-case-event-completion"]], inputs: { eventCompletionParams: "eventCompletionParams" }, outputs: { eventCanBeCompleted: "eventCanBeCompleted" }, features: [i0.ɵɵNgOnChangesFeature], decls: 2, vars: 2, consts: [[3, "context", "notifyEventCompletionCancelled", 4, "ngIf"], [3, "context", "notifyEventCompletionReassigned", 4, "ngIf"], [3, "notifyEventCompletionCancelled", "context"], [3, "notifyEventCompletionReassigned", "context"]], template: function CaseEventCompletionComponent_Template(rf, ctx) { if (rf & 1) {
+            i0.ɵɵtemplate(0, CaseEventCompletionComponent_app_case_event_completion_task_cancelled_0_Template, 1, 1, "app-case-event-completion-task-cancelled", 0)(1, CaseEventCompletionComponent_app_case_event_completion_task_reassigned_1_Template, 1, 1, "app-case-event-completion-task-reassigned", 1);
+        } if (rf & 2) {
+            i0.ɵɵproperty("ngIf", ctx.taskState === ctx.eventCompletionTaskStates.TaskCancelled);
+            i0.ɵɵadvance();
+            i0.ɵɵproperty("ngIf", ctx.taskState === ctx.eventCompletionTaskStates.TaskReassigned);
+        } }, encapsulation: 2 });
+}
+(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(CaseEventCompletionComponent, [{
+        type: Component,
+        args: [{ selector: 'ccd-case-event-completion', template: "<app-case-event-completion-task-cancelled\n    *ngIf=\"taskState === eventCompletionTaskStates.TaskCancelled\"\n    [context]=\"context\"\n    (notifyEventCompletionCancelled)=\"setEventCanBeCompleted($event)\">\n</app-case-event-completion-task-cancelled>\n<app-case-event-completion-task-reassigned\n    *ngIf=\"taskState === eventCompletionTaskStates.TaskReassigned\"\n    [context]=\"context\"\n    (notifyEventCompletionReassigned)=\"setEventCanBeCompleted($event)\">\n</app-case-event-completion-task-reassigned>" }]
+    }], () => [{ type: EventCompletionStateMachineService }, { type: i1$1.Router }, { type: i1$1.ActivatedRoute }, { type: SessionStorageService }, { type: WorkAllocationService }, { type: AlertService }], { eventCompletionParams: [{
+            type: Input
+        }], eventCanBeCompleted: [{
+            type: Output
+        }] }); })();
+(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(CaseEventCompletionComponent, { className: "CaseEventCompletionComponent", filePath: "lib/shared/components/case-editor/case-event-completion/case-event-completion.component.ts", lineNumber: 20 }); })();
+
 const _c0$Z = a0 => ["/", "cases", "case-details", a0, "tasks"];
 class CaseEventCompletionTaskCancelledComponent {
-    parentComponent;
+    context;
+    notifyEventCompletionCancelled = new EventEmitter();
     caseId;
-    constructor(parentComponent) {
-        this.parentComponent = parentComponent;
-        this.caseId = this.parentComponent.context.caseId;
+    ngOnInit() {
+        this.caseId = this.context.caseId;
     }
     onContinue() {
-        // Emit event can be completed event
-        this.parentComponent.eventCanBeCompleted.emit(true);
+        // Removes task to complete so event completes without task
+        this.context.sessionStorageService.removeItem('clientContext');
+        // may be able to remove this call below since it is now unneccesary
+        this.notifyEventCompletionCancelled.emit(true);
     }
-    static ɵfac = function CaseEventCompletionTaskCancelledComponent_Factory(t) { return new (t || CaseEventCompletionTaskCancelledComponent)(i0.ɵɵdirectiveInject(COMPONENT_PORTAL_INJECTION_TOKEN)); };
-    static ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: CaseEventCompletionTaskCancelledComponent, selectors: [["app-case-event-completion-task-cancelled"]], decls: 31, vars: 27, consts: [[1, "govuk-!-margin-9"], ["aria-labelledby", "error-summary-title", "role", "alert", "tabindex", "-1", "data-module", "error-summary", 1, "govuk-error-summary"], ["id", "error-summary-title", 1, "govuk-error-summary__title"], [1, "govuk-error-summary__body"], [1, "govuk-list", "govuk-error-summary__list"], ["href", "#"], [1, "govuk-form-group", "govuk-form-group--error"], [1, "govuk-heading-m"], [1, "form-group", "form-group-related"], ["data-module", "govuk-button", 1, "govuk-button", "govuk-!-margin-right-2", 3, "click"], ["data-module", "govuk-button", 1, "govuk-button", "govuk-button--secondary", 3, "routerLink"]], template: function CaseEventCompletionTaskCancelledComponent_Template(rf, ctx) { if (rf & 1) {
+    static ɵfac = function CaseEventCompletionTaskCancelledComponent_Factory(t) { return new (t || CaseEventCompletionTaskCancelledComponent)(); };
+    static ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: CaseEventCompletionTaskCancelledComponent, selectors: [["app-case-event-completion-task-cancelled"]], inputs: { context: "context" }, outputs: { notifyEventCompletionCancelled: "notifyEventCompletionCancelled" }, decls: 31, vars: 27, consts: [[1, "govuk-!-margin-9"], ["aria-labelledby", "error-summary-title", "role", "alert", "tabindex", "-1", "data-module", "error-summary", 1, "govuk-error-summary"], ["id", "error-summary-title", 1, "govuk-error-summary__title"], [1, "govuk-error-summary__body"], [1, "govuk-list", "govuk-error-summary__list"], ["href", "#"], [1, "govuk-form-group", "govuk-form-group--error"], [1, "govuk-heading-m"], [1, "form-group", "form-group-related"], ["data-module", "govuk-button", 1, "govuk-button", "govuk-!-margin-right-2", 3, "click"], ["data-module", "govuk-button", 1, "govuk-button", "govuk-button--secondary", 3, "routerLink"]], template: function CaseEventCompletionTaskCancelledComponent_Template(rf, ctx) { if (rf & 1) {
             i0.ɵɵelementStart(0, "div", 0)(1, "div", 1)(2, "h2", 2);
             i0.ɵɵtext(3);
             i0.ɵɵpipe(4, "rpxTranslate");
@@ -11410,11 +11554,12 @@ class CaseEventCompletionTaskCancelledComponent {
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(CaseEventCompletionTaskCancelledComponent, [{
         type: Component,
         args: [{ selector: 'app-case-event-completion-task-cancelled', template: "<div class=\"govuk-!-margin-9\">\n  <div class=\"govuk-error-summary\" aria-labelledby=\"error-summary-title\" role=\"alert\" tabindex=\"-1\" data-module=\"error-summary\">\n    <h2 class=\"govuk-error-summary__title\" id=\"error-summary-title\">\n      {{'There is a problem' | rpxTranslate}}\n    </h2>\n    <div class=\"govuk-error-summary__body\">\n      <ul class=\"govuk-list govuk-error-summary__list\">\n        <li>\n          <a href=\"#\">{{'Task cancelled/marked as done' | rpxTranslate}}</a>\n        </li>\n      </ul>\n    </div>\n  </div>\n\n  <div class=\"govuk-form-group govuk-form-group--error\">\n    <h2 class=\"govuk-heading-m\">{{'Task cancelled/marked as done' | rpxTranslate}}</h2>\n    <p>{{'This task has been cancelled or marked as done.' | rpxTranslate}}</p>\n    <p>{{'Click Continue to complete the event and save your progress.' | rpxTranslate}}</p>\n\n    <p>{{'Alternatively, click Cancel to return to the tasks tab without saving your progress.' | rpxTranslate}}</p>\n\n    <div class=\"form-group form-group-related\">\n      <button class=\"govuk-button govuk-!-margin-right-2\" data-module=\"govuk-button\" (click)=\"onContinue()\">\n        {{'Continue' | rpxTranslate}}\n      </button>\n      <a [routerLink]=\"['/', 'cases', 'case-details', caseId, 'tasks']\"\n              class=\"govuk-button govuk-button--secondary\" data-module=\"govuk-button\">\n        {{'Cancel' | rpxTranslate}}\n      </a>\n    </div>\n  </div>\n</div>\n" }]
-    }], () => [{ type: CaseEventCompletionComponent, decorators: [{
-                type: Inject,
-                args: [COMPONENT_PORTAL_INJECTION_TOKEN]
-            }] }], null); })();
-(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(CaseEventCompletionTaskCancelledComponent, { className: "CaseEventCompletionTaskCancelledComponent", filePath: "lib/shared/components/case-editor/case-event-completion/components/case-event-completion-task-cancelled/case-event-completion-task-cancelled.component.ts", lineNumber: 8 }); })();
+    }], null, { context: [{
+            type: Input
+        }], notifyEventCompletionCancelled: [{
+            type: Output
+        }] }); })();
+(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(CaseEventCompletionTaskCancelledComponent, { className: "CaseEventCompletionTaskCancelledComponent", filePath: "lib/shared/components/case-editor/case-event-completion/components/case-event-completion-task-cancelled/case-event-completion-task-cancelled.component.ts", lineNumber: 9 }); })();
 
 const _c0$Y = a0 => ["/", "cases", "case-details", a0, "tasks"];
 function CaseEventCompletionTaskReassignedComponent_div_0_Template(rf, ctx) { if (rf & 1) {
@@ -11474,32 +11619,26 @@ function CaseEventCompletionTaskReassignedComponent_div_0_Template(rf, ctx) { if
     i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(30, 24, "Cancel"), " ");
 } }
 class CaseEventCompletionTaskReassignedComponent {
-    parentComponent;
-    route;
-    workAllocationService;
     sessionStorageService;
     judicialworkerService;
     caseworkerService;
-    alertService;
+    context;
+    notifyEventCompletionReassigned = new EventEmitter();
     caseId;
     assignedUserId;
     assignedUserName;
     subscription;
     caseworkerSubscription;
     judicialworkerSubscription;
-    constructor(parentComponent, route, workAllocationService, sessionStorageService, judicialworkerService, caseworkerService, alertService) {
-        this.parentComponent = parentComponent;
-        this.route = route;
-        this.workAllocationService = workAllocationService;
+    constructor(sessionStorageService, judicialworkerService, caseworkerService) {
         this.sessionStorageService = sessionStorageService;
         this.judicialworkerService = judicialworkerService;
         this.caseworkerService = caseworkerService;
-        this.alertService = alertService;
     }
     ngOnInit() {
         // Get case id and task from the parent component
-        this.caseId = this.parentComponent.context.caseId;
-        const task = this.parentComponent.context.reassignedTask;
+        this.caseId = this.context.caseId;
+        const task = this.context.reassignedTask;
         // Current user is a caseworker?
         this.caseworkerSubscription = this.caseworkerService.getCaseworkers(task.jurisdiction).subscribe(result => {
             if (result && result[0].service === task.jurisdiction && result[0].caseworkers) {
@@ -11544,17 +11683,17 @@ class CaseEventCompletionTaskReassignedComponent {
         // not complete_task not utilised here as related to event completion
         // service wanting task associated with event to not be completed not directly relevant
         if (task) {
-            this.sessionStorageService.setItem('assignNeeded', 'true');
-            // set event can be completed to true
-            this.parentComponent.eventCanBeCompleted.emit(true);
+            // Set session to override reassignment settings so code flow does not return to this component
+            this.sessionStorageService.setItem('assignNeeded', 'true - override');
+            this.notifyEventCompletionReassigned.emit(true);
         }
         else {
             // Emit event cannot be completed event
-            this.parentComponent.eventCanBeCompleted.emit(false);
+            this.notifyEventCompletionReassigned.emit(false);
         }
     }
-    static ɵfac = function CaseEventCompletionTaskReassignedComponent_Factory(t) { return new (t || CaseEventCompletionTaskReassignedComponent)(i0.ɵɵdirectiveInject(COMPONENT_PORTAL_INJECTION_TOKEN), i0.ɵɵdirectiveInject(i1$1.ActivatedRoute), i0.ɵɵdirectiveInject(WorkAllocationService), i0.ɵɵdirectiveInject(SessionStorageService), i0.ɵɵdirectiveInject(JudicialworkerService), i0.ɵɵdirectiveInject(CaseworkerService), i0.ɵɵdirectiveInject(AlertService)); };
-    static ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: CaseEventCompletionTaskReassignedComponent, selectors: [["app-case-event-completion-task-reassigned"]], decls: 1, vars: 1, consts: [["class", "govuk-!-margin-9", 4, "ngIf"], [1, "govuk-!-margin-9"], ["aria-labelledby", "error-summary-title", "role", "alert", "tabindex", "-1", "data-module", "error-summary", 1, "govuk-error-summary"], ["id", "error-summary-title", 1, "govuk-error-summary__title"], [1, "govuk-error-summary__body"], [1, "govuk-list", "govuk-error-summary__list"], ["href", "#"], [1, "govuk-form-group", "govuk-form-group--error"], [1, "govuk-heading-m"], [1, "form-group", "form-group-related"], ["data-module", "govuk-button", 1, "govuk-button", "govuk-!-margin-right-2", 3, "click"], ["data-module", "govuk-button", 1, "govuk-button", "govuk-button--secondary", 3, "routerLink"]], template: function CaseEventCompletionTaskReassignedComponent_Template(rf, ctx) { if (rf & 1) {
+    static ɵfac = function CaseEventCompletionTaskReassignedComponent_Factory(t) { return new (t || CaseEventCompletionTaskReassignedComponent)(i0.ɵɵdirectiveInject(SessionStorageService), i0.ɵɵdirectiveInject(JudicialworkerService), i0.ɵɵdirectiveInject(CaseworkerService)); };
+    static ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: CaseEventCompletionTaskReassignedComponent, selectors: [["app-case-event-completion-task-reassigned"]], inputs: { context: "context" }, outputs: { notifyEventCompletionReassigned: "notifyEventCompletionReassigned" }, decls: 1, vars: 1, consts: [["class", "govuk-!-margin-9", 4, "ngIf"], [1, "govuk-!-margin-9"], ["aria-labelledby", "error-summary-title", "role", "alert", "tabindex", "-1", "data-module", "error-summary", 1, "govuk-error-summary"], ["id", "error-summary-title", 1, "govuk-error-summary__title"], [1, "govuk-error-summary__body"], [1, "govuk-list", "govuk-error-summary__list"], ["href", "#"], [1, "govuk-form-group", "govuk-form-group--error"], [1, "govuk-heading-m"], [1, "form-group", "form-group-related"], ["data-module", "govuk-button", 1, "govuk-button", "govuk-!-margin-right-2", 3, "click"], ["data-module", "govuk-button", 1, "govuk-button", "govuk-button--secondary", 3, "routerLink"]], template: function CaseEventCompletionTaskReassignedComponent_Template(rf, ctx) { if (rf & 1) {
             i0.ɵɵtemplate(0, CaseEventCompletionTaskReassignedComponent_div_0_Template, 31, 28, "div", 0);
         } if (rf & 2) {
             i0.ɵɵproperty("ngIf", ctx.assignedUserName);
@@ -11563,92 +11702,12 @@ class CaseEventCompletionTaskReassignedComponent {
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(CaseEventCompletionTaskReassignedComponent, [{
         type: Component,
         args: [{ selector: 'app-case-event-completion-task-reassigned', template: "<div class=\"govuk-!-margin-9\" *ngIf=\"assignedUserName\">\n  <div class=\"govuk-error-summary\" aria-labelledby=\"error-summary-title\" role=\"alert\" tabindex=\"-1\"\n    data-module=\"error-summary\">\n    <h2 class=\"govuk-error-summary__title\" id=\"error-summary-title\">\n      {{'There is a problem' | rpxTranslate}}\n    </h2>\n    <div class=\"govuk-error-summary__body\">\n      <ul class=\"govuk-list govuk-error-summary__list\">\n        <li>\n          <a href=\"#\">{{'Task reassigned' | rpxTranslate}}</a>\n        </li>\n      </ul>\n    </div>\n  </div>\n\n  <div class=\"govuk-form-group govuk-form-group--error\">\n    <h2 class=\"govuk-heading-m\">{{'Task reassigned' | rpxTranslate}}</h2>\n    <p>{{'This task has been reassigned to' | rpxTranslate}} {{assignedUserName}}.</p>\n    <p>{{'Click Continue to reassign the task to you and save your progress.' | rpxTranslate}}</p>\n    <p>{{'Alternatively, click Cancel to return to the tasks tab without saving your progress.' | rpxTranslate}}</p>\n    <div class=\"form-group form-group-related\">\n      <button class=\"govuk-button govuk-!-margin-right-2\" data-module=\"govuk-button\" (click)=\"onContinue()\">\n        {{'Continue' | rpxTranslate}}\n      </button>\n      <a [routerLink]=\"['/', 'cases', 'case-details', caseId, 'tasks']\"\n              class=\"govuk-button govuk-button--secondary\" data-module=\"govuk-button\">\n        {{'Cancel' | rpxTranslate}}\n      </a>\n    </div>\n  </div>\n</div>\n" }]
-    }], () => [{ type: CaseEventCompletionComponent, decorators: [{
-                type: Inject,
-                args: [COMPONENT_PORTAL_INJECTION_TOKEN]
-            }] }, { type: i1$1.ActivatedRoute }, { type: WorkAllocationService }, { type: SessionStorageService }, { type: JudicialworkerService }, { type: CaseworkerService }, { type: AlertService }], null); })();
-(() => { (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: 19 }); })();
-
-function CaseEventCompletionComponent_ng_template_0_Template(rf, ctx) { }
-const COMPONENT_PORTAL_INJECTION_TOKEN = new InjectionToken('');
-class CaseEventCompletionComponent {
-    service;
-    router;
-    route;
-    sessionStorageService;
-    workAllocationService;
-    alertService;
-    eventCompletionParams;
-    eventCanBeCompleted = new EventEmitter();
-    stateMachine;
-    context;
-    selectedComponentPortal;
-    constructor(service, router, route, sessionStorageService, workAllocationService, alertService) {
-        this.service = service;
-        this.router = router;
-        this.route = route;
-        this.sessionStorageService = sessionStorageService;
-        this.workAllocationService = workAllocationService;
-        this.alertService = alertService;
-    }
-    ngOnChanges(changes) {
-        if (changes.eventCompletionParams && changes.eventCompletionParams.currentValue) {
-            // Setup the context
-            this.context = {
-                task: this.eventCompletionParams.task,
-                caseId: this.eventCompletionParams.caseId,
-                eventId: this.eventCompletionParams.eventId,
-                reassignedTask: null,
-                router: this.router,
-                route: this.route,
-                sessionStorageService: this.sessionStorageService,
-                workAllocationService: this.workAllocationService,
-                alertService: this.alertService,
-                canBeCompleted: false,
-                component: this
-            };
-            // Initialise state machine
-            this.stateMachine = this.service.initialiseStateMachine(this.context);
-            // Create states
-            this.service.createStates(this.stateMachine);
-            // Add transitions for the states
-            this.service.addTransitions();
-            // Start state machine
-            this.service.startStateMachine(this.stateMachine);
-        }
-    }
-    showPortal(portalType) {
-        const injector = Injector.create({
-            providers: [
-                { provide: COMPONENT_PORTAL_INJECTION_TOKEN, useValue: this }
-            ]
-        });
-        // tslint:disable-next-line:switch-default
-        switch (portalType) {
-            case EventCompletionPortalTypes.TaskCancelled:
-                this.selectedComponentPortal = new ComponentPortal(CaseEventCompletionTaskCancelledComponent, null, injector);
-                break;
-            case EventCompletionPortalTypes.TaskReassigned:
-                this.selectedComponentPortal = new ComponentPortal(CaseEventCompletionTaskReassignedComponent, null, injector);
-                break;
-        }
-    }
-    static ɵfac = function CaseEventCompletionComponent_Factory(t) { return new (t || CaseEventCompletionComponent)(i0.ɵɵdirectiveInject(EventCompletionStateMachineService), i0.ɵɵdirectiveInject(i1$1.Router), i0.ɵɵdirectiveInject(i1$1.ActivatedRoute), i0.ɵɵdirectiveInject(SessionStorageService), i0.ɵɵdirectiveInject(WorkAllocationService), i0.ɵɵdirectiveInject(AlertService)); };
-    static ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: CaseEventCompletionComponent, selectors: [["ccd-case-event-completion"]], inputs: { eventCompletionParams: "eventCompletionParams" }, outputs: { eventCanBeCompleted: "eventCanBeCompleted" }, features: [i0.ɵɵNgOnChangesFeature], decls: 1, vars: 1, consts: [[3, "cdkPortalOutlet"]], template: function CaseEventCompletionComponent_Template(rf, ctx) { if (rf & 1) {
-            i0.ɵɵtemplate(0, CaseEventCompletionComponent_ng_template_0_Template, 0, 0, "ng-template", 0);
-        } if (rf & 2) {
-            i0.ɵɵproperty("cdkPortalOutlet", ctx.selectedComponentPortal);
-        } }, encapsulation: 2 });
-}
-(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(CaseEventCompletionComponent, [{
-        type: Component,
-        args: [{ selector: 'ccd-case-event-completion', template: "<ng-template [cdkPortalOutlet]=\"selectedComponentPortal\"></ng-template>\n" }]
-    }], () => [{ type: EventCompletionStateMachineService }, { type: i1$1.Router }, { type: i1$1.ActivatedRoute }, { type: SessionStorageService }, { type: WorkAllocationService }, { type: AlertService }], { eventCompletionParams: [{
+    }], () => [{ type: SessionStorageService }, { type: JudicialworkerService }, { type: CaseworkerService }], { context: [{
             type: Input
-        }], eventCanBeCompleted: [{
+        }], notifyEventCompletionReassigned: [{
             type: Output
         }] }); })();
-(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(CaseEventCompletionComponent, { className: "CaseEventCompletionComponent", filePath: "lib/shared/components/case-editor/case-event-completion/case-event-completion.component.ts", lineNumber: 21 }); })();
+(() => { (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 }); })();
 
 class AddressOption {
     description;
@@ -17881,6 +17940,9 @@ class UnLinkCasesComponent extends AbstractFieldWriteJourneyComponent {
     }
     getLinkedCases() {
         this.caseId = this.linkedCasesService.caseId;
+        if (this.linkedCasesService.cachedFieldValues && this.linkedCasesService.linkedCases) {
+            this.linkedCasesService.caseFieldValue = this.linkedCasesService.cachedFieldValues;
+        }
         if (this.linkedCasesService.linkedCases.length > 0) {
             this.linkedCases = this.linkedCasesService.linkedCases;
             this.getAllLinkedCaseInformation();
@@ -18413,6 +18475,7 @@ class WriteLinkedCasesFieldComponent extends AbstractFieldWriteJourneyComponent
     }
     submitLinkedCases() {
         if (!this.linkedCasesService.isLinkedCasesEventTrigger) {
+            this.linkedCasesService.cachedFieldValues = this.linkedCasesService.caseFieldValue;
             const unlinkedCaseRefereneIds = this.linkedCasesService.linkedCases.filter(item => item.unlink).map(item => item.caseReference);
             const caseFieldValue = this.linkedCasesService.caseFieldValue;
             this.linkedCasesService.caseFieldValue = caseFieldValue.filter(item => unlinkedCaseRefereneIds.indexOf(item.id) === -1);
@@ -29147,6 +29210,10 @@ i0.ɵɵsetComponentScope(QueryAttachmentsReadComponent, function () { return [i5
 i0.ɵɵsetComponentScope(QueryEventCompletionComponent, function () { return [
     // Case event completion
     CaseEventCompletionComponent]; }, []);
+i0.ɵɵsetComponentScope(
+// Case event completion
+CaseEventCompletionComponent, function () { return [i5.NgIf, CaseEventCompletionTaskCancelledComponent,
+    CaseEventCompletionTaskReassignedComponent]; }, []);
 
 var CaseEditSubmitTitles;
 (function (CaseEditSubmitTitles) {
@@ -34241,12 +34308,18 @@ class EventStartGuard {
         const caseId = route.params['cid'];
         const eventId = route.params['eid'];
         const taskId = route.queryParams['tid'];
+        let userId;
+        const userInfoStr = this.sessionStorageService.getItem('userDetails');
+        if (userInfoStr) {
+            const userInfo = JSON.parse(userInfoStr);
+            userId = userInfo.id ? userInfo.id : userInfo.uid;
+        }
         const caseInfoStr = this.sessionStorageService.getItem('caseInfo');
         if (caseInfoStr) {
             const caseInfo = JSON.parse(caseInfoStr);
             if (caseInfo && caseInfo.cid === caseId) {
                 return this.workAllocationService.getTasksByCaseIdAndEventId(eventId, caseId, caseInfo.caseType, caseInfo.jurisdiction)
-                    .pipe(switchMap((payload) => this.checkForTasks(payload, caseId, eventId, taskId)));
+                    .pipe(switchMap((payload) => this.checkForTasks(payload, caseId, eventId, taskId, userId)));
             }
             else {
                 this.abstractConfig.logMessage(`EventStartGuard: caseId ${caseInfo.cid} in caseInfo not matched with the route parameter caseId ${caseId}`);
@@ -34303,11 +34376,28 @@ class EventStartGuard {
     removeTaskFromSessionStorage() {
         this.sessionStorageService.removeItem(EventStartGuard.CLIENT_CONTEXT);
     }
-    checkForTasks(payload, caseId, eventId, taskId) {
+    checkForTasks(payload, caseId, eventId, taskId, userId) {
         if (taskId && payload?.tasks?.length > 0) {
             const task = payload.tasks.find((t) => t.id == taskId);
             if (task) {
-                this.sessionStorageService.setItem(EventStartGuard.CLIENT_CONTEXT, JSON.stringify(task));
+                // Store task to session
+                const taskEventCompletionInfo = {
+                    caseId: caseId,
+                    eventId: eventId,
+                    userId: userId,
+                    taskId: task.id,
+                    createdTimestamp: Date.now()
+                };
+                const storeClientContext = {
+                    client_context: {
+                        user_task: {
+                            task_data: task,
+                            complete_task: true
+                        }
+                    }
+                };
+                this.sessionStorageService.setItem('taskEventCompletionInfo', JSON.stringify(taskEventCompletionInfo));
+                this.sessionStorageService.setItem(EventStartGuard.CLIENT_CONTEXT, JSON.stringify(storeClientContext));
             }
             else {
                 this.removeTaskFromSessionStorage();
@@ -34486,6 +34576,20 @@ class EventStartStateMachineService {
             }
         };
         context.sessionStorageService.setItem('clientContext', JSON.stringify(clientContext));
+        let userInfo;
+        const userInfoStr = context.sessionStorageService.getItem('userDetails');
+        if (userInfoStr) {
+            userInfo = JSON.parse(userInfoStr);
+        }
+        // Store task to session
+        const taskEventCompletionInfo = {
+            caseId: context.caseId,
+            eventId: context.eventId,
+            userId: userInfo.id ? userInfo.id : userInfo.uid,
+            taskId: task.id,
+            createdTimestamp: Date.now()
+        };
+        context.sessionStorageService.setItem('taskEventCompletionInfo', JSON.stringify(taskEventCompletionInfo));
         // Allow user to perform the event
         context.router.navigate([`/cases/case-details/${context.caseId}/trigger/${context.eventId}`], { relativeTo: context.route });
     }