@hmcts/ccd-case-ui-toolkit 7.0.52-task-event-completion-info → 7.0.52-task-event-completion-info-2

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

@@ -9351,7 +9351,8 @@ class CaseEditComponent {
                 eventId,
                 task: taskInSessionStorage
             });
-            // add taskEvent to link current event with task id
+            // 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,
@@ -9524,9 +9525,9 @@ class CaseEditComponent {
             return this.postCompleteTaskIfRequired();
         }), finalize(() => {
             this.loadingService.unregister(loadingSpinnerToken);
-            // on event completion ensure the previous event taskToComplete/taskEvent removed
+            // on event completion ensure the previous event taskToComplete/taskEventCompletionInfo removed
             this.sessionStorageService.removeItem('taskToComplete');
-            this.sessionStorageService.removeItem('taskEvent');
+            this.sessionStorageService.removeItem('taskEventCompletionInfo');
             this.isSubmitting = false;
         }))
             .subscribe(() => {
@@ -9601,7 +9602,6 @@ class CaseEditComponent {
             else if ((taskEventCompletionInfo.taskId === taskInSessionStorage.id &&
                 this.eventDetailsDoNotMatch(taskEventCompletionInfo, eventDetails))
                 || this.eventMoreThanDayAgo(taskEventCompletionInfo.createdTimestamp)) {
-                console.log('howdy there');
                 // if the session storage not related to event, ignore it and remove
                 this.sessionStorageService.removeItem('taskToComplete');
                 this.sessionStorageService.removeItem('taskEventCompletionInfo');
@@ -9629,9 +9629,7 @@ class CaseEditComponent {
     }
     eventMoreThanDayAgo(timestamp) {
         let dayAgoDate = new Date().getTime() - (24 * 60 * 60 * 1000);
-        console.log(dayAgoDate, 'decent', timestamp);
         if (dayAgoDate > timestamp) {
-            console.log('jeffrey');
             return true;
         }
         return false;
@@ -9640,7 +9638,6 @@ class CaseEditComponent {
         if (taskEventCompletionInfo.eventId !== eventDetails.eventId
             || taskEventCompletionInfo.caseId !== eventDetails.caseId
             || taskEventCompletionInfo.userId !== eventDetails.userId) {
-            console.log(taskEventCompletionInfo, 'yee-haw 2', eventDetails);
             return true;
         }
         return false;
@@ -33591,12 +33588,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?.uid ? userInfo.uid : null;
+        }
         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)));
             }
         }
         return of(false);
@@ -33639,10 +33642,19 @@ class EventStartGuard {
     removeTaskFromSessionStorage() {
         this.sessionStorageService.removeItem(EventStartGuard.TASK_TO_COMPLETE);
     }
-    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) {
+                // Store task to session
+                const taskEventCompletionInfo = {
+                    caseId: caseId,
+                    eventId: eventId,
+                    userId: userId,
+                    taskId: task.id,
+                    createdTimestamp: Date.now()
+                };
+                this.sessionStorageService.setItem('taskEventCompletionInfo', JSON.stringify(taskEventCompletionInfo));
                 this.sessionStorageService.setItem(EventStartGuard.TASK_TO_COMPLETE, JSON.stringify(task));
             }
             else {
@@ -33811,8 +33823,22 @@ class EventStartStateMachineService {
             task = context.tasks[0];
         }
         const taskStr = JSON.stringify(task);
+        let userInfo;
+        const userInfoStr = context.sessionStorageService.getItem('userDetails');
+        if (userInfoStr) {
+            userInfo = JSON.parse(userInfoStr);
+        }
         console.log('entryActionForStateOneTaskAssignedToUser: setting taskToComplete to ' + taskStr);
         // Store task to session
+        const taskEventCompletionInfo = {
+            caseId: context.caseId,
+            eventId: context.eventId,
+            userId: userInfo.uid,
+            taskId: task.id,
+            createdTimestamp: Date.now()
+        };
+        context.sessionStorageService.setItem('taskEventCompletionInfo', JSON.stringify(taskEventCompletionInfo));
+        console.log('have added', taskEventCompletionInfo);
         context.sessionStorageService.setItem('taskToComplete', taskStr);
         // Allow user to perform the event
         context.router.navigate([`/cases/case-details/${context.caseId}/trigger/${context.eventId}`], { relativeTo: context.route });