@hmcts/ccd-case-ui-toolkit 7.1.32-rc1 → 7.1.32-return-application-task-not-completing

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

@@ -9396,8 +9396,9 @@ class CaseEditComponent {
         // EXUI-2668 - Ensure description for task includes event ID
         // Note - This is a failsafe for an edge case that may never occur again
         // Description may not include eventId in some cases which may mean task not completed (however this will be easy to check)
+        // In instances of the above taskEventCompletionInfo will be created to block this check from occurring
         this.abstractConfig.logMessage(`checking taskIsForEvent: task ID ${task.id}, task description ${task.description}, event name ${eventDetails.eventId}`);
-        return task.case_id === eventDetails.caseId && task.description?.includes(eventDetails.eventId);
+        return task.case_id === eventDetails.caseId && (task.description && task.description.includes(eventDetails.eventId));
     }
     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), i0.ɵɵdirectiveInject(ReadCookieService)); };
     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) {
@@ -34470,7 +34471,7 @@ class EventStartGuard {
         }
         return of(false);
     }
-    checkTaskInEventNotRequired(payload, caseId, taskId) {
+    checkTaskInEventNotRequired(payload, caseId, taskId, eventId, userId) {
         if (!payload || !payload.tasks) {
             return true;
         }
@@ -34500,20 +34501,7 @@ class EventStartGuard {
             else {
                 task = tasksAssignedToUser[0];
             }
-            const currentLanguage = this.cookieService.getCookie('exui-preferred-language');
-            // if one task assigned to user, allow user to complete event
-            const storeClientContext = {
-                client_context: {
-                    user_task: {
-                        task_data: task,
-                        complete_task: true
-                    },
-                    user_language: {
-                        language: currentLanguage
-                    }
-                }
-            };
-            this.sessionStorageService.setItem(CaseEditComponent.CLIENT_CONTEXT, JSON.stringify(storeClientContext));
+            this.setClientContextStorage(task, caseId, eventId, userId);
             return true;
         }
     }
@@ -34521,28 +34509,7 @@ class EventStartGuard {
         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()
-                };
-                const currentLanguage = this.cookieService.getCookie('exui-preferred-language');
-                const storeClientContext = {
-                    client_context: {
-                        user_task: {
-                            task_data: task,
-                            complete_task: true
-                        },
-                        user_language: {
-                            language: currentLanguage
-                        }
-                    }
-                };
-                this.sessionStorageService.setItem(CaseEditComponent.TASK_EVENT_COMPLETION_INFO, JSON.stringify(taskEventCompletionInfo));
-                this.sessionStorageService.setItem(CaseEditComponent.CLIENT_CONTEXT, JSON.stringify(storeClientContext));
+                this.setClientContextStorage(task, caseId, eventId, userId);
             }
             else {
                 removeTaskFromClientContext(this.sessionStorageService);
@@ -34560,9 +34527,34 @@ class EventStartGuard {
             return of(false);
         }
         else {
-            return of(this.checkTaskInEventNotRequired(payload, caseId, taskId));
+            return of(this.checkTaskInEventNotRequired(payload, caseId, taskId, eventId, userId));
         }
     }
+    // EXUI-2743 - Make taskEventCompletionInfo always available in session storage with client context
+    setClientContextStorage(task, caseId, eventId, userId) {
+        // Store task to session
+        const taskEventCompletionInfo = {
+            caseId: caseId,
+            eventId: eventId,
+            userId: userId,
+            taskId: task.id,
+            createdTimestamp: Date.now()
+        };
+        const currentLanguage = this.cookieService.getCookie('exui-preferred-language');
+        const storeClientContext = {
+            client_context: {
+                user_task: {
+                    task_data: task,
+                    complete_task: true
+                },
+                user_language: {
+                    language: currentLanguage
+                }
+            }
+        };
+        this.sessionStorageService.setItem(CaseEditComponent.TASK_EVENT_COMPLETION_INFO, JSON.stringify(taskEventCompletionInfo));
+        this.sessionStorageService.setItem(CaseEditComponent.CLIENT_CONTEXT, JSON.stringify(storeClientContext));
+    }
     static ɵfac = function EventStartGuard_Factory(t) { return new (t || EventStartGuard)(i0.ɵɵinject(WorkAllocationService), i0.ɵɵinject(i1$1.Router), i0.ɵɵinject(SessionStorageService), i0.ɵɵinject(AbstractAppConfig), i0.ɵɵinject(ReadCookieService)); };
     static ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: EventStartGuard, factory: EventStartGuard.ɵfac });
 }