Bug/ex UI 2624 user task missing (#1822)

* Update event-start.guard.ts Fix regression issue that overwrites user_task * Change version * Update event-start.guard.ts Add 'en' even if no cookie Add language to existing client_context object, not just object with user_task * Add version * Update event-start.guard.spec.ts Add helpful test * update to rel name --------- Co-authored-by: Josh <[email protected]>
hmcts · Dec 9, 2024 · 4d5c79d · 4d5c79d
1 parent e73c77b
commit 4d5c79d
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 11 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hmcts/ccd-case-ui-toolkit",
-  "version": "7.0.75-exui-2315",
+  "version": "7.0.75-user-task-missing-rel",
   "engines": {
     "node": ">=18.19.0"
   },

diff --git a/projects/ccd-case-ui-toolkit/package.json b/projects/ccd-case-ui-toolkit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hmcts/ccd-case-ui-toolkit",
-  "version": "7.0.75-exui-2315",
+  "version": "7.0.75-user-task-missing-rel",
   "engines": {
     "node": ">=18.19.0"
   },

diff --git a/...se-ui-toolkit/src/lib/shared/components/event-start/event-guard/event-start.guard.spec.ts b/...se-ui-toolkit/src/lib/shared/components/event-start/event-guard/event-start.guard.spec.ts
@@ -75,7 +75,21 @@ describe('EventStartGuard', () => {
     const result$ = guard.canActivate(route);
     result$.subscribe(result => {
       expect(result).toEqual(false);
-      // check client contesxt is set correctly
+      // check client context is set correctly
+      expect(sessionStorageService.setItem).toHaveBeenCalledWith('clientContext', JSON.stringify(mockClientContext));
+    });
+  });
+
+  it('client context should be set with language regardless if client context already exists', () => {
+    const mockClientContext: any = { client_context: { user_task: {}, additional_field: 'test' } };
+    sessionStorageService.getItem.and.returnValues(null, null, JSON.stringify(mockClientContext));
+    mockCookieService.getCookie.and.returnValue('cookieString');
+    const route = createActivatedRouteSnapshot('caseId', 'eventId');
+    const result$ = guard.canActivate(route);
+    mockClientContext.client_context.user_language = { language: 'cookieString' };
+    result$.subscribe(result => {
+      expect(result).toEqual(false);
+      // check client context is set correctly
       expect(sessionStorageService.setItem).toHaveBeenCalledWith('clientContext', JSON.stringify(mockClientContext));
     });
   });

diff --git a/...cd-case-ui-toolkit/src/lib/shared/components/event-start/event-guard/event-start.guard.ts b/...cd-case-ui-toolkit/src/lib/shared/components/event-start/event-guard/event-start.guard.ts
@@ -31,16 +31,34 @@ export class EventStartGuard implements CanActivate {
       userId = userInfo.id ? userInfo.id : userInfo.uid;
     }
     const caseInfoStr = this.sessionStorageService.getItem('caseInfo');
-    const currentLanguage = this.cookieService.getCookie('exui-preferred-language');
-    // if one task assigned to user, allow user to complete event
-    const storeClientContext = {
-      client_context: {
-        user_language: {
-          language: currentLanguage
+    const languageCookie = this.cookieService.getCookie('exui-preferred-language');
+    const currentLanguage = !!languageCookie && languageCookie !== '' ? languageCookie : 'en';
+    const preClientContext = this.sessionStorageService.getItem(EventStartGuard.CLIENT_CONTEXT);
+    if (!preClientContext) {
+      // creates client context for language if not already existing
+      const storeClientContext = {
+        client_context: {
+          user_language: {
+            language: currentLanguage
+          }
         }
+      };
+      this.sessionStorageService.setItem(EventStartGuard.CLIENT_CONTEXT, JSON.stringify(storeClientContext));
+    } else {
+      const clientContextObj = JSON.parse(preClientContext);
+      if (!clientContextObj?.client_context?.user_language) {
+        const clientContextAddLanguage = {
+          ...clientContextObj,
+          client_context: {
+            ...clientContextObj.client_context,
+            user_language: {
+              language: currentLanguage
+            }
+          }
+        }
+        this.sessionStorageService.setItem(EventStartGuard.CLIENT_CONTEXT, JSON.stringify(clientContextAddLanguage));
       }
-    };
-    this.sessionStorageService.setItem(EventStartGuard.CLIENT_CONTEXT, JSON.stringify(storeClientContext));
+    }
     if (caseInfoStr) {
       const caseInfo = JSON.parse(caseInfoStr);
       if (caseInfo && caseInfo.cid === caseId) {