@hmcts/ccd-case-ui-toolkit 7.0.29-move-file-path-fix → 7.0.29-task-comp-2

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

@@ -8514,6 +8514,7 @@ class WorkAllocationService {
         if (!this.isWAEnabled()) {
             return of(null);
         }
+        console.log(`completeTask: completing ${taskId}`);
         const url = `${this.appConfig.getWorkAllocationApiUrl()}/task/${taskId}/complete`;
         return this.http
             .post(url, {})
@@ -20959,8 +20960,7 @@ class CaseFileViewFolderSelectorComponent {
         return [];
     }
     containsDocument(cat, document) {
-        if (cat.documents.findIndex((doc) => (doc.document_binary_url === document.document_binary_url)
-            && (doc.attribute_path === document.attribute_path)) > -1) {
+        if (cat.documents.findIndex((doc) => doc.document_binary_url === document.document_binary_url) > -1) {
             return [cat.category_id];
         }
         for (const c of cat.sub_categories) {
@@ -32139,25 +32139,22 @@ class EventStartGuard {
         const caseId = route.params['cid'];
         const eventId = route.params['eid'];
         const taskId = route.queryParams['tid'];
-        // TODO: NavigationExtras should be used once Angular upgrade changes have been incorporated
-        const isComplete = route.queryParams['isComplete'];
         const caseInfoStr = this.sessionStorageService.getItem('caseInfo');
         if (caseInfoStr) {
             const caseInfo = JSON.parse(caseInfoStr);
             if (caseInfo && caseInfo.cid === caseId) {
-                if (isComplete) {
-                    return of(true);
-                }
                 return this.workAllocationService.getTasksByCaseIdAndEventId(eventId, caseId, caseInfo.caseType, caseInfo.jurisdiction).pipe(switchMap((payload) => this.checkForTasks(payload, caseId, eventId, taskId)));
             }
         }
         return of(false);
     }
     checkTaskInEventNotRequired(payload, caseId, taskId) {
+        console.log('checkTaskInEventNotRequired: start');
         if (!payload || !payload.tasks) {
             return true;
         }
         const taskNumber = payload.tasks.length;
+        console.log(`checkTaskInEventNotRequired: found ${taskNumber} tasks`);
         if (taskNumber === 0) {
             // if there are no tasks just carry on
             return true;
@@ -32166,11 +32163,13 @@ class EventStartGuard {
         const userInfoStr = this.sessionStorageService.getItem('userDetails');
         const userInfo = JSON.parse(userInfoStr);
         const tasksAssignedToUser = payload.tasks.filter(x => x.task_state !== 'unassigned' && x.assignee === userInfo.id || x.assignee === userInfo.uid);
+        console.log(`checkTaskInEventNotRequired: ${tasksAssignedToUser} tasks assigned to user`);
         if (tasksAssignedToUser.length === 0) {
             // if no tasks assigned to user carry on
             return true;
         }
         else if (tasksAssignedToUser.length > 1 && !taskId) {
+            console.log(`checkTaskInEventNotRequired: more than one task assigned, taskId: ${taskId}`);
             // if more than one task assigned to the user then give multiple tasks error
             this.router.navigate([`/cases/case-details/${caseId}/multiple-tasks-exist`]);
             return false;
@@ -32183,26 +32182,30 @@ class EventStartGuard {
             else {
                 task = tasksAssignedToUser[0];
             }
+            console.log(`checkTaskInEventNotRequired: storing task ${task} in session`);
             // if one task assigned to user, allow user to complete event
             this.sessionStorageService.setItem('taskToComplete', JSON.stringify(task));
             return true;
         }
     }
     checkForTasks(payload, caseId, eventId, taskId) {
-        // Clear taskToComplete from session as we will be starting the process for new task
-        this.sessionStorageService.removeItem('taskToComplete');
         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')) {
+                console.log(`checkForTasks: event-start again check is true: ${this.router.url} : taskId = ${taskId}`);
                 return of(true);
             }
             this.router.navigate([`/cases/case-details/${caseId}/event-start`], { queryParams: { caseId, eventId, taskId } });
             return of(false);
         }
         else {
+            // Clear taskToComplete from session as we will be starting the process for new task
+            console.log(`Removing taskToComplete from session storage for case:event:task ${caseId}:${eventId}:${taskId}`);
+            this.sessionStorageService.removeItem('taskToComplete');
+            console.log("checkForTasks: no task required for event");
             return of(this.checkTaskInEventNotRequired(payload, caseId, taskId));
         }
     }
@@ -32343,10 +32346,12 @@ class EventStartStateMachineService {
         if (!task) {
             task = context.tasks[0];
         }
+        const taskStr = JSON.stringify(task);
+        console.log('entryActionForStateOneTaskAssignedToUser: setting taskToComplete to ' + taskStr);
         // Store task to session
-        context.sessionStorageService.setItem('taskToComplete', JSON.stringify(task));
+        context.sessionStorageService.setItem('taskToComplete', taskStr);
         // Allow user to perform the event
-        context.router.navigate([`/cases/case-details/${context.caseId}/trigger/${context.eventId}`], { queryParams: { isComplete: true }, relativeTo: context.route });
+        context.router.navigate([`/cases/case-details/${context.caseId}/trigger/${context.eventId}`], { relativeTo: context.route });
     }
     entryActionForStateMultipleTasksAssignedToUser(state, context) {
         // Trigger final state to complete processing of state machine