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

package/RELEASE-NOTES.md

@@ -3,7 +3,7 @@
 ### Version 4.12.0
 Add refunds functionality
 
-### Version 4.12.10-task-event-completion"
+### Version 4.12.14-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.10-task-event-completion
+ * @version v4.12.14-task-event-completion
  * @link undefined
  * @license MIT
  */
@@ -19489,16 +19489,18 @@ var CaseEditSubmitComponent = /** @class */ (function () {
     CaseEditSubmitComponent.prototype.submit = function () {
         this.isSubmitting = true;
         // We have to run the event completion checks if task in session storage
+        // and if the task is in session storage, then is it associated to the case
+        var taskInSessionStorage;
         var taskStr = this.sessionStorageService.getItem('taskToComplete');
         if (taskStr) {
-            // Task is in session storage
-            var task = JSON.parse(taskStr);
-            this.task = task;
+            taskInSessionStorage = JSON.parse(taskStr);
+        }
+        if (taskInSessionStorage && taskInSessionStorage.case_id === this.getCaseId()) {
             // Show event completion component to perform event completion checks
             this.eventCompletionParams = {
                 caseId: this.getCaseId(),
                 eventId: this.getEventId(),
-                task: task
+                task: taskInSessionStorage
             };
             this.eventCompletionChecksRequired = true;
         }
@@ -26216,6 +26218,13 @@ var EventStartGuard = /** @class */ (function () {
     };
     EventStartGuard.prototype.checkForTasks = function (payload, caseId, eventId, taskId) {
         if (payload.task_required_for_event) {
+            // There are some issues in EventTriggerResolver/CaseService and/or CCD for some events
+            // which triggers the CanActivate guard again.
+            // If event start is initiated again, then we do not need to perform state machine processing again.
+            // https://tools.hmcts.net/jira/browse/EUI-5489
+            if (this.router && this.router.url && this.router.url.includes('event-start')) {
+                return rxjs_1.of(true);
+            }
             this.router.navigate(["/cases/case-details/" + caseId + "/event-start"], { queryParams: { caseId: caseId, eventId: eventId, taskId: taskId } });
             return rxjs_1.of(false);
         }