@hmcts/ccd-case-ui-toolkit 7.0.38-client-context-2 → 7.0.38-default-tab-fix

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

@@ -3909,13 +3909,6 @@ class FieldsUtils {
                 return '';
         }
     }
-    static getUserTaskFromClientContext(clientContextStr) {
-        if (clientContextStr) {
-            let clientContext = JSON.parse(clientContextStr);
-            return clientContext.client_context.user_task;
-        }
-        return null;
-    }
     buildCanShowPredicate(eventTrigger, form) {
         const currentState = this.getCurrentEventState(eventTrigger, form);
         return (page) => {
@@ -6808,7 +6801,6 @@ class ProfileService {
             .set('experimental', 'true')
             .set('Accept', ProfileService.V2_MEDIATYPE_USER_PROFILE)
             .set('Content-Type', 'application/json');
-        // Not adding client context header because header is added to call immediately afterwards
         return this.httpService
             .get(url, { headers, observe: 'body' })
             .pipe(map((p) => plainToClass(Profile, p)));
@@ -7675,7 +7667,6 @@ class CasesService {
         let headers = new HttpHeaders();
         headers = headers.set('experimental', 'true');
         headers = headers.set('Content-Type', 'application/json');
-        headers = this.addClientContextHeader(headers);
         if (Draft.isDraft(caseId)) {
             headers = headers.set('Accept', CasesService.V2_MEDIATYPE_START_DRAFT_TRIGGER);
         }
@@ -7686,10 +7677,9 @@ class CasesService {
             headers = headers.set('Accept', CasesService.V2_MEDIATYPE_START_CASE_TRIGGER);
         }
         return this.http
-            .get(url, { headers, observe: 'response' })
-            .pipe(map((response) => {
-            this.updateClientContextStorage(response.headers);
-            return FieldsUtils.handleNestedDynamicLists(response.body);
+            .get(url, { headers, observe: 'body' })
+            .pipe(map(body => {
+            return FieldsUtils.handleNestedDynamicLists(body);
         }), catchError(error => {
             this.errorService.setError(error);
             return throwError(error);
@@ -7698,17 +7688,13 @@ class CasesService {
     createEvent(caseDetails, eventData) {
         const caseId = caseDetails.case_id;
         const url = `${this.appConfig.getCaseDataUrl()}/cases/${caseId}/events`;
-        let headers = new HttpHeaders()
+        const headers = new HttpHeaders()
             .set('experimental', 'true')
             .set('Accept', CasesService.V2_MEDIATYPE_CREATE_EVENT)
             .set('Content-Type', 'application/json');
-        headers = this.addClientContextHeader(headers);
         return this.http
-            .post(url, eventData, { headers, observe: 'response' })
-            .pipe(map((response) => {
-            this.updateClientContextStorage(response.headers);
-            return response.body;
-        }), catchError(error => {
+            .post(url, eventData, { headers, observe: 'body' })
+            .pipe(catchError(error => {
             this.errorService.setError(error);
             return throwError(error);
         }));
@@ -7716,17 +7702,13 @@ class CasesService {
     validateCase(ctid, eventData, pageId) {
         const pageIdString = pageId ? `?pageId=${pageId}` : '';
         const url = `${this.appConfig.getCaseDataUrl()}/case-types/${ctid}/validate${pageIdString}`;
-        let headers = new HttpHeaders()
+        const headers = new HttpHeaders()
             .set('experimental', 'true')
             .set('Accept', CasesService.V2_MEDIATYPE_CASE_DATA_VALIDATE)
             .set('Content-Type', 'application/json');
-        headers = this.addClientContextHeader(headers);
         return this.http
-            .post(url, eventData, { headers, observe: 'response' })
-            .pipe(map((response) => {
-            this.updateClientContextStorage(response.headers);
-            return response.body;
-        }), catchError(error => {
+            .post(url, eventData, { headers, observe: 'body' })
+            .pipe(catchError(error => {
             this.errorService.setError(error);
             return throwError(error);
         }));
@@ -7737,34 +7719,26 @@ class CasesService {
             ignoreWarning = 'true';
         }
         const url = `${this.appConfig.getCaseDataUrl()}/case-types/${ctid}/cases?ignore-warning=${ignoreWarning}`;
-        let headers = new HttpHeaders()
+        const headers = new HttpHeaders()
             .set('experimental', 'true')
             .set('Accept', CasesService.V2_MEDIATYPE_CREATE_CASE)
             .set('Content-Type', 'application/json');
-        headers = this.addClientContextHeader(headers);
         return this.http
-            .post(url, eventData, { headers, observe: 'response' })
-            .pipe(map((response) => {
-            this.updateClientContextStorage(response.headers);
-            return response.body;
-        }), catchError(error => {
+            .post(url, eventData, { headers, observe: 'body' })
+            .pipe(catchError(error => {
             this.errorService.setError(error);
             return throwError(error);
         }));
     }
     getPrintDocuments(caseId) {
         const url = `${this.appConfig.getCaseDataUrl()}/cases/${caseId}/documents`;
-        let headers = new HttpHeaders()
+        const headers = new HttpHeaders()
             .set('experimental', 'true')
             .set('Accept', CasesService.V2_MEDIATYPE_CASE_DOCUMENTS)
             .set('Content-Type', 'application/json');
-        headers = this.addClientContextHeader(headers);
         return this.http
-            .get(url, { headers, observe: 'response' })
-            .pipe(map((response) => {
-            this.updateClientContextStorage(response.headers);
-            return response.body.documentResources;
-        }), catchError(error => {
+            .get(url, { headers, observe: 'body' })
+            .pipe(map(body => body.documentResources), catchError(error => {
             this.errorService.setError(error);
             return throwError(error);
         }));
@@ -7797,6 +7771,17 @@ class CasesService {
             wizardPage.case_fields = this.orderService.sort(this.wizardPageFieldToCaseFieldMapper.mapAll(wizardPage.wizard_page_fields, eventTrigger.case_fields));
         });
     }
+    /*
+    Checks if the user has role of pui-case-manager and returns true or false
+    */
+    isPuiCaseManager() {
+        const userInfoStr = this.sessionStorageService.getItem('userDetails');
+        if (userInfoStr) {
+            const userInfo = JSON.parse(userInfoStr);
+            return userInfo && userInfo.roles && (userInfo.roles.indexOf(CasesService.PUI_CASE_MANAGER) !== -1);
+        }
+        return false;
+    }
     getCourtOrHearingCentreName(locationId) {
         return this.http.post(`/api/locations/getLocationsById`, { locations: [{ locationId }] });
     }
@@ -7863,25 +7848,6 @@ class CasesService {
             .get(url)
             .pipe(catchError(error => throwError(error)));
     }
-    addClientContextHeader(headers) {
-        const clientContextDetails = this.sessionStorageService.getItem('clientContext');
-        if (clientContextDetails) {
-            // may require URI encoding in certain circumstances
-            const clientContext = window.btoa(clientContextDetails);
-            if (clientContext) {
-                headers = headers.set('Client-Context', clientContext);
-            }
-        }
-        return headers;
-    }
-    updateClientContextStorage(headers) {
-        // for mocking - TODO: Kasi Remove/Uncomment for testing
-        // headers = this.setMockClientContextHeader(headers);
-        if (headers && headers.get('Client-Context')) {
-            const clientContextString = window.atob(headers.get('Client-Context'));
-            this.sessionStorageService.setItem('clientContext', clientContextString);
-        }
-    }
 }
 // Internal (UI) API
 CasesService.V2_MEDIATYPE_CASE_VIEW = 'application/vnd.uk.gov.hmcts.ccd-data-store-api.ui-case-view.v2+json';
@@ -8372,9 +8338,8 @@ class EventCompletionStateMachineService {
     entryActionForStateCompleteEventAndTask(state, context) {
         // Trigger final state to complete processing of state machine
         state.trigger(EventCompletionStates.Final);
-        const clientContextStr = context.sessionStorageService.getItem('clientContext');
-        const userTask = FieldsUtils.getUserTaskFromClientContext(clientContextStr);
-        if (userTask?.task_data) {
+        const taskStr = context.sessionStorageService.getItem('taskToComplete');
+        if (taskStr) {
             context.sessionStorageService.setItem('assignNeeded', 'false');
             // just set event can be completed
             context.component.eventCanBeCompleted.emit(true);
@@ -8393,9 +8358,9 @@ class EventCompletionStateMachineService {
     entryActionForStateTaskUnassigned(state, context) {
         // Trigger final state to complete processing of state machine
         state.trigger(EventCompletionStates.Final);
-        const clientContextStr = context.sessionStorageService.getItem('clientContext');
-        const userTask = FieldsUtils.getUserTaskFromClientContext(clientContextStr);
-        if (userTask?.task_data) {
+        // Get task details
+        const taskStr = context.sessionStorageService.getItem('taskToComplete');
+        if (taskStr) {
             context.sessionStorageService.setItem('assignNeeded', 'true');
             context.component.eventCanBeCompleted.emit(true);
         }
@@ -8430,12 +8395,6 @@ class EventCompletionStateMachineService {
     addTransitionsForStateTaskUnassigned() {
         this.stateTaskUnassigned.addTransition(EventCompletionStates.Final, this.stateFinal);
     }
-    taskPresentInSessionStorage(context) {
-        const clientContextStr = context.sessionStorageService.getItem('clientContext');
-        console.log('clienht cintedt ', clientContextStr);
-        const userTask = FieldsUtils.getUserTaskFromClientContext(clientContextStr);
-        return !!userTask.task_data;
-    }
 }
 EventCompletionStateMachineService.ɵfac = function EventCompletionStateMachineService_Factory(t) { return new (t || EventCompletionStateMachineService)(); };
 EventCompletionStateMachineService.ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: EventCompletionStateMachineService, factory: EventCompletionStateMachineService.ɵfac });
@@ -8894,9 +8853,11 @@ class CaseEditComponent {
         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
-        const clientContextStr = this.sessionStorageService.getItem('clientContext');
-        const userTask = FieldsUtils.getUserTaskFromClientContext(clientContextStr);
-        const taskInSessionStorage = userTask ? userTask.task_data : null;
+        let taskInSessionStorage;
+        const taskStr = this.sessionStorageService.getItem('taskToComplete');
+        if (taskStr) {
+            taskInSessionStorage = JSON.parse(taskStr);
+        }
         if (taskInSessionStorage && taskInSessionStorage.case_id === this.getCaseId(caseDetails)) {
             // Show event completion component to perform event completion checks
             this.eventCompletionParams = ({
@@ -9095,16 +9056,14 @@ class CaseEditComponent {
         });
     }
     postCompleteTaskIfRequired() {
-        const clientContextStr = this.sessionStorageService.getItem('clientContext');
-        const userTask = FieldsUtils.getUserTaskFromClientContext(clientContextStr);
-        const [task, taskToBeCompleted] = userTask ? [userTask.task_data, userTask.complete_task] : [null, false];
+        const taskStr = this.sessionStorageService.getItem('taskToComplete');
         const assignNeeded = this.sessionStorageService.getItem('assignNeeded') === 'true';
-        if (task && assignNeeded && taskToBeCompleted) {
-            // const task: Task = JSON.parse(taskStr);
+        if (taskStr && assignNeeded) {
+            const task = JSON.parse(taskStr);
             return this.workAllocationService.assignAndCompleteTask(task.id);
         }
-        else if (task && taskToBeCompleted) {
-            // const task: Task = JSON.parse(taskStr);
+        else if (taskStr) {
+            const task = JSON.parse(taskStr);
             return this.workAllocationService.completeTask(task.id);
         }
         return of(true);
@@ -10628,12 +10587,8 @@ class CaseEventCompletionTaskReassignedComponent {
     }
     onContinue() {
         // Get task details
-        const clientContextStr = this.sessionStorageService.getItem('clientContext');
-        const userTask = FieldsUtils.getUserTaskFromClientContext(clientContextStr);
-        const task = userTask ? userTask.task_data : null;
-        // not complete_task not utilised here as related to event completion
-        // service wanting task associated with event to not be completed not directly relevant
-        if (task) {
+        const taskStr = this.sessionStorageService.getItem('taskToComplete');
+        if (taskStr) {
             this.sessionStorageService.setItem('assignNeeded', 'true');
             // set event can be completed to true
             this.parentComponent.eventCanBeCompleted.emit(true);
@@ -31378,8 +31333,8 @@ class CaseFullAccessViewComponent {
             else {
                 // sort with the order of CCD predefined tabs
                 this.caseDetails.tabs.sort((aTab, bTab) => aTab.order > bTab.order ? 1 : (bTab.order > aTab.order ? -1 : 0));
-                // preselect the 1st order of CCD predefined tabs
-                const preSelectTab = this.caseDetails.tabs[0];
+                // select the first tab checking if the tab is visible
+                const preSelectTab = this.findPreSelectedActiveTab();
                 this.router.navigate(['cases', 'case-details', this.caseDetails.case_id], { fragment: preSelectTab.label }).then(() => {
                     matTab = this.tabGroup._tabs.find((x) => x.textLabel === preSelectTab.label);
                     // Update selectedIndex only if matTab.position is a non-zero number (positive or negative); this means the
@@ -31410,6 +31365,11 @@ class CaseFullAccessViewComponent {
             }
         }
     }
+    findPreSelectedActiveTab() {
+        const unOrderedTabsInSortedTabs = this.caseDetails.tabs
+            .filter((tab) => !tab.order && this.sortedTabs.some((sortedTab) => sortedTab.id === tab.id));
+        return unOrderedTabsInSortedTabs.length ? unOrderedTabsInSortedTabs[0] : this.sortedTabs[0];
+    }
     // Refactored under EXUI-110 to address infinite tab loop to use tabIndexChanged instead
     tabChanged(tabIndexChanged) {
         const matTab = this.tabGroup._tabs.find(tab => tab.isActive);
@@ -32357,26 +32317,18 @@ class EventStartGuard {
                 task = tasksAssignedToUser[0];
             }
             // if one task assigned to user, allow user to complete event
-            const storeClientContext = {
-                client_context: {
-                    user_task: {
-                        task_data: task,
-                        complete_task: true
-                    }
-                }
-            };
-            this.sessionStorageService.setItem(EventStartGuard.CLIENT_CONTEXT, JSON.stringify(storeClientContext));
+            this.sessionStorageService.setItem(EventStartGuard.TASK_TO_COMPLETE, JSON.stringify(task));
             return true;
         }
     }
     removeTaskFromSessionStorage() {
-        this.sessionStorageService.removeItem(EventStartGuard.CLIENT_CONTEXT);
+        this.sessionStorageService.removeItem(EventStartGuard.TASK_TO_COMPLETE);
     }
     checkForTasks(payload, caseId, eventId, taskId) {
         if (taskId && payload?.tasks?.length > 0) {
             const task = payload.tasks.find((t) => t.id == taskId);
             if (task) {
-                this.sessionStorageService.setItem(EventStartGuard.CLIENT_CONTEXT, JSON.stringify(task));
+                this.sessionStorageService.setItem(EventStartGuard.TASK_TO_COMPLETE, JSON.stringify(task));
             }
             else {
                 this.removeTaskFromSessionStorage();
@@ -32398,7 +32350,7 @@ class EventStartGuard {
         }
     }
 }
-EventStartGuard.CLIENT_CONTEXT = 'clientContext';
+EventStartGuard.TASK_TO_COMPLETE = 'taskToComplete';
 EventStartGuard.ɵfac = function EventStartGuard_Factory(t) { return new (t || EventStartGuard)(i0.ɵɵinject(WorkAllocationService), i0.ɵɵinject(i1$1.Router), i0.ɵɵinject(SessionStorageService)); };
 EventStartGuard.ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: EventStartGuard, factory: EventStartGuard.ɵfac });
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(EventStartGuard, [{
@@ -32536,17 +32488,9 @@ class EventStartStateMachineService {
             task = context.tasks[0];
         }
         const taskStr = JSON.stringify(task);
-        console.log('entryActionForStateOneTaskAssignedToUser: setting client context task_data to ' + taskStr);
+        console.log('entryActionForStateOneTaskAssignedToUser: setting taskToComplete to ' + taskStr);
         // Store task to session
-        const clientContext = {
-            client_context: {
-                user_task: {
-                    task_data: task,
-                    complete_task: true
-                }
-            }
-        };
-        context.sessionStorageService.setItem('clientContext', JSON.stringify(clientContext));
+        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 });
     }