@hmcts/ccd-case-ui-toolkit 4.12.8-task-event-completion → 4.12.10-task-event-completion

package/RELEASE-NOTES.md

@@ -3,7 +3,7 @@
 ### Version 4.12.0
 Add refunds functionality
 
-### Version 4.12.8-task-event-completion"
+### Version 4.12.10-task-event-completion"
 **Task event completion and state machine** Task event completion and state machine
 
 ### Version 4.7.6-tab-not-defined-error"

package/dist/index.umd.js

@@ -1,6 +1,6 @@
 /**
  * @hmcts/ccd-case-ui-toolkit - Case UI Toolkit
- * @version v4.12.8-task-event-completion
+ * @version v4.12.10-task-event-completion
  * @link undefined
  * @license MIT
  */
@@ -20205,6 +20205,7 @@ var CaseEventCompletionComponent = /** @class */ (function () {
                 task: this.eventCompletionParams.task,
                 caseId: this.eventCompletionParams.caseId,
                 eventId: this.eventCompletionParams.eventId,
+                reassignedTask: null,
                 router: this.router,
                 route: this.route,
                 sessionStorageService: this.sessionStorageService,
@@ -20348,7 +20349,7 @@ var CaseEventCompletionTaskReassignedComponent = /** @class */ (function () {
         var _this = this;
         // Get case id and task from the parent component
         this.caseId = this.parentComponent.context.caseId;
-        var task = this.parentComponent.context.task;
+        var task = this.parentComponent.context.reassignedTask;
         // Current user is a caseworker?
         this.caseworkerSubscription = this.caseworkerService.getCaseworkers(task.jurisdiction).subscribe(function (result) {
             if (result && result[0].service === task.jurisdiction && result[0].caseworkers) {
@@ -21409,9 +21410,15 @@ var EventCompletionStateMachineService = /** @class */ (function () {
                         break;
                     case Task_1.TaskState.Assigned:
                         // Task is in assigned state
-                        taskResponse.task.assignee === context.task.assignee
-                            ? state.trigger(domain_1.EventCompletionStates.CompleteEventAndTask)
-                            : state.trigger(domain_1.EventCompletionStates.TaskAssignedToAnotherUser);
+                        if (taskResponse.task.assignee === context.task.assignee) {
+                            // Task still assigned to current user, complete event and task
+                            state.trigger(domain_1.EventCompletionStates.CompleteEventAndTask);
+                        }
+                        else {
+                            // Task has been reassigned to another user, display error message
+                            context.reassignedTask = taskResponse.task;
+                            state.trigger(domain_1.EventCompletionStates.TaskAssignedToAnotherUser);
+                        }
                         break;
                     default:
                         // Allow user to complete the event