@hmcts/ccd-case-ui-toolkit 7.1.1-query-management → 7.1.2-query-management

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

@@ -4341,6 +4341,13 @@ 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) => {
@@ -7177,6 +7184,7 @@ 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)));
@@ -8073,6 +8081,7 @@ 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);
         }
@@ -8083,9 +8092,10 @@ class CasesService {
             headers = headers.set('Accept', CasesService.V2_MEDIATYPE_START_CASE_TRIGGER);
         }
         return this.http
-            .get(url, { headers, observe: 'body' })
-            .pipe(map(body => {
-            return FieldsUtils.handleNestedDynamicLists(body);
+            .get(url, { headers, observe: 'response' })
+            .pipe(map((response) => {
+            this.updateClientContextStorage(response.headers);
+            return FieldsUtils.handleNestedDynamicLists(response.body);
         }), catchError(error => {
             this.errorService.setError(error);
             return throwError(error);
@@ -8094,13 +8104,17 @@ class CasesService {
     createEvent(caseDetails, eventData) {
         const caseId = caseDetails.case_id;
         const url = `${this.appConfig.getCaseDataUrl()}/cases/${caseId}/events`;
-        const headers = new HttpHeaders()
+        let 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: 'body' })
-            .pipe(catchError(error => {
+            .post(url, eventData, { headers, observe: 'response' })
+            .pipe(map((response) => {
+            this.updateClientContextStorage(response.headers);
+            return response.body;
+        }), catchError(error => {
             this.errorService.setError(error);
             return throwError(error);
         }));
@@ -8108,13 +8122,17 @@ class CasesService {
     validateCase(ctid, eventData, pageId) {
         const pageIdString = pageId ? `?pageId=${pageId}` : '';
         const url = `${this.appConfig.getCaseDataUrl()}/case-types/${ctid}/validate${pageIdString}`;
-        const headers = new HttpHeaders()
+        let 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: 'body' })
-            .pipe(catchError(error => {
+            .post(url, eventData, { headers, observe: 'response' })
+            .pipe(map((response) => {
+            this.updateClientContextStorage(response.headers);
+            return response.body;
+        }), catchError(error => {
             this.errorService.setError(error);
             return throwError(error);
         }));
@@ -8125,26 +8143,34 @@ class CasesService {
             ignoreWarning = 'true';
         }
         const url = `${this.appConfig.getCaseDataUrl()}/case-types/${ctid}/cases?ignore-warning=${ignoreWarning}`;
-        const headers = new HttpHeaders()
+        let 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: 'body' })
-            .pipe(catchError(error => {
+            .post(url, eventData, { headers, observe: 'response' })
+            .pipe(map((response) => {
+            this.updateClientContextStorage(response.headers);
+            return response.body;
+        }), catchError(error => {
             this.errorService.setError(error);
             return throwError(error);
         }));
     }
     getPrintDocuments(caseId) {
         const url = `${this.appConfig.getCaseDataUrl()}/cases/${caseId}/documents`;
-        const headers = new HttpHeaders()
+        let 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: 'body' })
-            .pipe(map(body => body.documentResources), catchError(error => {
+            .get(url, { headers, observe: 'response' })
+            .pipe(map((response) => {
+            this.updateClientContextStorage(response.headers);
+            return response.body.documentResources;
+        }), catchError(error => {
             this.errorService.setError(error);
             return throwError(error);
         }));
@@ -8177,17 +8203,6 @@ 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 }] });
     }
@@ -8254,6 +8269,25 @@ 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);
+        }
+    }
     static ɵfac = function CasesService_Factory(t) { return new (t || CasesService)(i0.ɵɵinject(HttpService), i0.ɵɵinject(AbstractAppConfig), i0.ɵɵinject(OrderService), i0.ɵɵinject(HttpErrorService), i0.ɵɵinject(WizardPageFieldToCaseFieldMapper), i0.ɵɵinject(LoadingService), i0.ɵɵinject(SessionStorageService), i0.ɵɵinject(RetryUtil)); };
     static ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: CasesService, factory: CasesService.ɵfac });
 }
@@ -8766,8 +8800,9 @@ class EventCompletionStateMachineService {
     entryActionForStateCompleteEventAndTask(state, context) {
         // Trigger final state to complete processing of state machine
         state.trigger(EventCompletionStates.Final);
-        const taskStr = context.sessionStorageService.getItem('taskToComplete');
-        if (taskStr) {
+        const clientContextStr = context.sessionStorageService.getItem('clientContext');
+        const userTask = FieldsUtils.getUserTaskFromClientContext(clientContextStr);
+        if (userTask?.task_data) {
             context.sessionStorageService.setItem('assignNeeded', 'false');
             // just set event can be completed
             context.component.eventCanBeCompleted.emit(true);
@@ -8786,9 +8821,9 @@ class EventCompletionStateMachineService {
     entryActionForStateTaskUnassigned(state, context) {
         // Trigger final state to complete processing of state machine
         state.trigger(EventCompletionStates.Final);
-        // Get task details
-        const taskStr = context.sessionStorageService.getItem('taskToComplete');
-        if (taskStr) {
+        const clientContextStr = context.sessionStorageService.getItem('clientContext');
+        const userTask = FieldsUtils.getUserTaskFromClientContext(clientContextStr);
+        if (userTask?.task_data) {
             context.sessionStorageService.setItem('assignNeeded', 'true');
             context.component.eventCanBeCompleted.emit(true);
         }
@@ -8823,6 +8858,11 @@ class EventCompletionStateMachineService {
     addTransitionsForStateTaskUnassigned() {
         this.stateTaskUnassigned.addTransition(EventCompletionStates.Final, this.stateFinal);
     }
+    taskPresentInSessionStorage(context) {
+        const clientContextStr = context.sessionStorageService.getItem('clientContext');
+        const userTask = FieldsUtils.getUserTaskFromClientContext(clientContextStr);
+        return !!userTask.task_data;
+    }
     static ɵfac = function EventCompletionStateMachineService_Factory(t) { return new (t || EventCompletionStateMachineService)(); };
     static ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: EventCompletionStateMachineService, factory: EventCompletionStateMachineService.ɵfac });
 }
@@ -8949,8 +8989,14 @@ class WorkAllocationService {
     }
     isWAEnabled(jurisdiction, caseType) {
         this.features = this.appConfig.getWAServiceConfig();
-        const ftstr = JSON.stringify(this.features);
-        this.appConfig.logMessage(`isWAEnabled: wa-service-config returning ${ftstr.length > 0}`);
+        if (this.features) {
+            const ftstr = JSON.stringify(this.features);
+            this.appConfig?.logMessage(`isWAEnabled: wa-service-config returning ${ftstr?.length > 0}`);
+        }
+        else {
+            this.appConfig?.logMessage(`isWAEnabled: wa-service-config returning no features`);
+            return false;
+        }
         let enabled = false;
         if (!jurisdiction || !caseType) {
             const caseInfo = JSON.parse(this.sessionStorageService.getItem('caseInfo'));
@@ -9332,13 +9378,12 @@ 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
-        let taskInSessionStorage;
+        const clientContextStr = this.sessionStorageService.getItem('clientContext');
+        const userTask = FieldsUtils.getUserTaskFromClientContext(clientContextStr);
+        const taskInSessionStorage = userTask ? userTask.task_data : null;
         let taskEventInSessionStorage;
         const taskStr = this.sessionStorageService.getItem('taskToComplete');
         const taskEventStr = this.sessionStorageService.getItem('taskEvent');
-        if (taskStr) {
-            taskInSessionStorage = JSON.parse(taskStr);
-        }
         if (taskEventStr) {
             taskEventInSessionStorage = JSON.parse(taskEventStr);
         }
@@ -9549,15 +9594,15 @@ class CaseEditComponent {
         });
     }
     postCompleteTaskIfRequired() {
-        const taskStr = this.sessionStorageService.getItem('taskToComplete');
+        const clientContextStr = this.sessionStorageService.getItem('clientContext');
+        const userTask = FieldsUtils.getUserTaskFromClientContext(clientContextStr);
+        const [task, taskToBeCompleted] = userTask ? [userTask.task_data, userTask.complete_task] : [null, false];
         const assignNeeded = this.sessionStorageService.getItem('assignNeeded') === 'true';
-        if (taskStr && assignNeeded) {
-            const task = JSON.parse(taskStr);
+        if (task && assignNeeded && taskToBeCompleted) {
             this.abstractConfig.logMessage(`postCompleteTaskIfRequired with assignNeeded: taskId ${task.id} and event name ${this.eventTrigger.name}`);
             return this.workAllocationService.assignAndCompleteTask(task.id, this.eventTrigger.name);
         }
-        else if (taskStr) {
-            const task = JSON.parse(taskStr);
+        else if (task && taskToBeCompleted) {
             this.abstractConfig.logMessage(`postCompleteTaskIfRequired: taskId ${task.id} and event name ${this.eventTrigger.name}`);
             return this.workAllocationService.completeTask(task.id, this.eventTrigger.name);
         }
@@ -11159,8 +11204,12 @@ class CaseEventCompletionTaskReassignedComponent {
     }
     onContinue() {
         // Get task details
-        const taskStr = this.sessionStorageService.getItem('taskToComplete');
-        if (taskStr) {
+        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) {
             this.sessionStorageService.setItem('assignNeeded', 'true');
             // set event can be completed to true
             this.parentComponent.eventCanBeCompleted.emit(true);
@@ -11184,7 +11233,7 @@ class CaseEventCompletionTaskReassignedComponent {
                 type: Inject,
                 args: [COMPONENT_PORTAL_INJECTION_TOKEN]
             }] }, { type: i1$1.ActivatedRoute }, { type: WorkAllocationService }, { type: SessionStorageService }, { type: JudicialworkerService }, { type: CaseworkerService }, { type: AlertService }], null); })();
-(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(CaseEventCompletionTaskReassignedComponent, { className: "CaseEventCompletionTaskReassignedComponent", filePath: "lib/shared/components/case-editor/case-event-completion/components/case-event-completion-task-reassigned/case-event-completion-task-reassigned.component.ts", lineNumber: 16 }); })();
+(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(CaseEventCompletionTaskReassignedComponent, { className: "CaseEventCompletionTaskReassignedComponent", filePath: "lib/shared/components/case-editor/case-event-completion/components/case-event-completion-task-reassigned/case-event-completion-task-reassigned.component.ts", lineNumber: 19 }); })();
 
 function CaseEventCompletionComponent_ng_template_0_Template(rf, ctx) { }
 const COMPONENT_PORTAL_INJECTION_TOKEN = new InjectionToken('');
@@ -20109,6 +20158,7 @@ class QueryCheckYourAnswersComponent {
     }
     extractIdBasedOnConditions(data) {
         // Check if field_type.id is 'CaseQueriesCollection' and field_type.type is 'Complex'
+        console.log('data ------', data);
         if (data.field_type.id === this.CASE_QUERIES_COLLECTION_ID &&
             data.field_type.type === this.FIELD_TYPE_COMPLEX) {
             // Set the field ID dynamically based on the extracted data
@@ -33892,7 +33942,7 @@ class EventStartGuard {
     workAllocationService;
     router;
     sessionStorageService;
-    static TASK_TO_COMPLETE = 'taskToComplete';
+    static CLIENT_CONTEXT = 'clientContext';
     constructor(workAllocationService, router, sessionStorageService) {
         this.workAllocationService = workAllocationService;
         this.router = router;
@@ -33943,18 +33993,26 @@ class EventStartGuard {
                 task = tasksAssignedToUser[0];
             }
             // if one task assigned to user, allow user to complete event
-            this.sessionStorageService.setItem(EventStartGuard.TASK_TO_COMPLETE, JSON.stringify(task));
+            const storeClientContext = {
+                client_context: {
+                    user_task: {
+                        task_data: task,
+                        complete_task: true
+                    }
+                }
+            };
+            this.sessionStorageService.setItem(EventStartGuard.CLIENT_CONTEXT, JSON.stringify(storeClientContext));
             return true;
         }
     }
     removeTaskFromSessionStorage() {
-        this.sessionStorageService.removeItem(EventStartGuard.TASK_TO_COMPLETE);
+        this.sessionStorageService.removeItem(EventStartGuard.CLIENT_CONTEXT);
     }
     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.TASK_TO_COMPLETE, JSON.stringify(task));
+                this.sessionStorageService.setItem(EventStartGuard.CLIENT_CONTEXT, JSON.stringify(task));
             }
             else {
                 this.removeTaskFromSessionStorage();
@@ -34122,9 +34180,17 @@ class EventStartStateMachineService {
             task = context.tasks[0];
         }
         const taskStr = JSON.stringify(task);
-        console.log('entryActionForStateOneTaskAssignedToUser: setting taskToComplete to ' + taskStr);
+        console.log('entryActionForStateOneTaskAssignedToUser: setting client context task_data to ' + taskStr);
         // Store task to session
-        context.sessionStorageService.setItem('taskToComplete', taskStr);
+        const clientContext = {
+            client_context: {
+                user_task: {
+                    task_data: task,
+                    complete_task: true
+                }
+            }
+        };
+        context.sessionStorageService.setItem('clientContext', JSON.stringify(clientContext));
         // Allow user to perform the event
         context.router.navigate([`/cases/case-details/${context.caseId}/trigger/${context.eventId}`], { relativeTo: context.route });
     }