@hmcts/ccd-case-ui-toolkit 7.3.74-multiple-role-categories → 7.3.74-user-by-idam-rework

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

@@ -1856,13 +1856,13 @@ function getUserDetails(sessionStorageService) {
 }
 function isInternalUser(sessionStorageService) {
     const userDetails = getUserDetails(sessionStorageService);
-    return userDetails && userDetails?.roles
+    return !!userDetails?.roles
         && !(userDetails.roles.includes(PUI_CASE_MANAGER)
             || userDetails.roles.some((role) => role.toLowerCase().includes(JUDGE)));
 }
 function isJudiciaryUser(sessionStorageService) {
     const userDetails = getUserDetails(sessionStorageService);
-    return userDetails && userDetails?.roles
+    return !!userDetails?.roles
         && (userDetails.roles.some((role) => role.toLowerCase().includes(JUDGE)));
 }
 
@@ -8675,29 +8675,28 @@ class CaseAccessUtils {
     getMappedRoleCategories(roles = []) {
         const roleKeywords = roles.join().split('-').join().split(',');
         const roleCategoryList = [];
-        if (this.roleOrCategoryExists(CaseAccessUtils.JUDGE_ROLE, roleKeywords)) {
+        if (this.roleHasKeyword(CaseAccessUtils.JUDGE_ROLE, roleKeywords)) {
             roleCategoryList.push(CaseAccessUtils.JUDGE_ROLE_CATEGORY);
         }
-        if (this.roleOrCategoryExists(CaseAccessUtils.PROFESSIONAL_ROLE, roleKeywords)) {
+        if (this.roleHasKeyword(CaseAccessUtils.PROFESSIONAL_ROLE, roleKeywords)) {
             roleCategoryList.push(CaseAccessUtils.PROFESSIONAL_ROLE_CATEGORY);
         }
-        if (this.roleOrCategoryExists(CaseAccessUtils.CITIZEN_ROLE, roleKeywords)) {
+        if (this.roleHasKeyword(CaseAccessUtils.CITIZEN_ROLE, roleKeywords)) {
             roleCategoryList.push(CaseAccessUtils.CITIZEN_ROLE_CATEGORY);
         }
-        if (this.roleOrCategoryExists(CaseAccessUtils.ADMIN_ROLE, roleKeywords)) {
+        if (this.roleHasKeyword(CaseAccessUtils.ADMIN_ROLE, roleKeywords)) {
             roleCategoryList.push(CaseAccessUtils.ADMIN_ROLE_CATEGORY);
         }
-        if (this.roleOrCategoryExists(CaseAccessUtils.CTSC_ROLE, roleKeywords)) {
+        if (this.roleHasKeyword(CaseAccessUtils.CTSC_ROLE, roleKeywords)) {
             roleCategoryList.push(CaseAccessUtils.CTSC_ROLE_CATEGORY);
         }
-        if (this.roleOrCategoryExists(CaseAccessUtils.LEGAL_OPERATIONS_ROLE, roleKeywords)) {
+        if (this.roleHasKeyword(CaseAccessUtils.LEGAL_OPERATIONS_ROLE, roleKeywords)) {
             roleCategoryList.push(CaseAccessUtils.LEGAL_OPERATIONS_ROLE_CATEGORY);
         }
         return roleCategoryList;
     }
-    roleOrCategoryExists(roleKeyword, roleKeywords) {
-        const keywordExists = roleKeywords.indexOf(roleKeyword) > -1;
-        return keywordExists;
+    roleHasKeyword(keyword, roleWords) {
+        return roleWords.includes(keyword);
     }
     getAMRoleName(accessType, aMRole) {
         let roleName = '';
@@ -9127,10 +9126,10 @@ class CaseworkerService {
         this.appConfig = appConfig;
         this.errorService = errorService;
     }
-    getCaseworkers(serviceId) {
-        const url = `${this.appConfig.getWorkAllocationApiUrl()}/caseworker/getUsersByServiceName`;
+    getUserByIdamId(idamId) {
+        const url = `${this.appConfig.getWorkAllocationApiUrl()}/caseworker/getUserByIdamId`;
         return this.http
-            .post(url, { services: [serviceId] })
+            .post(url, idamId)
             .pipe(catchError(error => {
             this.errorService.setError(error);
             return throwError(error);
@@ -10582,17 +10581,16 @@ class CasesService {
     }
     createChallengedAccessRequest(caseId, request) {
         // Assignment API endpoint
-        const userInfoStr = this.sessionStorageService.getItem('userDetails');
         const camUtils = new CaseAccessUtils();
-        let userInfo;
-        userInfo = userInfoStr ? JSON.parse(userInfoStr) : null;
+        let userInfo = getUserDetails(this.sessionStorageService);
         if (!userInfo) {
             return throwError(() => new Error('User info not found in session storage'));
         }
         // EXUI-4758 - getMappedRoleCategories no longer returns a single string, checks all roles to get the most likely roleCategory
         // Unsure whether we should be using mapped role categories any more - should trust the roleCategories from userInfo if they exist
         const roleCategories = userInfo.roleCategories || camUtils.getMappedRoleCategories(userInfo.roles);
-        const roleName = camUtils.getAMRoleName('challenged', roleCategories[0]);
+        // If user has no role categories, default to LEGAL_OPERATIONS
+        const roleName = camUtils.getAMRoleName('challenged', roleCategories?.length > 0 ? roleCategories[0] : "LEGAL_OPERATIONS");
         const beginTime = new Date();
         const endTime = new Date(new Date().setUTCHours(23, 59, 59, 999));
         const id = userInfo.id ? userInfo.id : userInfo.uid;
@@ -10603,18 +10601,15 @@ class CasesService {
         return this.http.post(`/api/challenged-access-request`, payload);
     }
     createSpecificAccessRequest(caseId, sar) {
-        // Assignment API endpoint
-        const userInfoStr = this.sessionStorageService.getItem('userDetails');
         const camUtils = new CaseAccessUtils();
-        let userInfo;
-        userInfo = userInfoStr ? JSON.parse(userInfoStr) : null;
+        let userInfo = getUserDetails(this.sessionStorageService);
         if (!userInfo) {
             return throwError(() => new Error('User info not found in session storage'));
         }
         // EXUI-4758 - See above comment
         const roleCategories = userInfo.roleCategories || camUtils.getMappedRoleCategories(userInfo.roles);
-        // EXUI-4758 - Return first roleCategory as the roleCategory for now
-        const roleCategory = roleCategories[0];
+        // EXUI-4758 - Return first roleCategory as the roleCategory for now, unless not present, in which case default to LEGAL_OPERATIONS
+        const roleCategory = roleCategories?.length > 0 ? roleCategories[0] : "LEGAL_OPERATIONS";
         const roleName = camUtils.getAMRoleName('specific', roleCategory);
         const id = userInfo.id ? userInfo.id : userInfo.uid;
         const payload = camUtils.getAMPayload(null, id, roleName, roleCategory, 'SPECIFIC', caseId, sar, null, null, true);
@@ -12709,12 +12704,9 @@ class CaseEventCompletionTaskReassignedComponent {
         this.jurisdiction = task.jurisdiction;
         this.caseType = task.case_type_id;
         // Current user is a caseworker?
-        this.caseworkerSubscription = this.caseworkerService.getCaseworkers(task.jurisdiction).subscribe(result => {
-            if (result && result[0].service === task.jurisdiction && result[0].caseworkers) {
-                const caseworker = result[0].caseworkers.find(x => x.idamId === task.assignee);
-                if (caseworker) {
-                    this.assignedUserName = `${caseworker.firstName} ${caseworker.lastName}`;
-                }
+        this.caseworkerSubscription = this.caseworkerService.getUserByIdamId(task.assignee).subscribe(caseworker => {
+            if (caseworker) {
+                this.assignedUserName = `${caseworker.firstName} ${caseworker.lastName}`;
             }
             if (!this.assignedUserName) {
                 // Current user is a judicial user?
@@ -37838,12 +37830,9 @@ class TaskAssignedComponent {
         // Current user is a caseworker?
         this.jurisdiction = this.task.jurisdiction;
         this.caseType = this.task.case_type_id;
-        this.caseworkerSubscription = this.caseworkerService.getCaseworkers(this.task.jurisdiction).subscribe(result => {
-            if (result && result[0].service === this.task.jurisdiction && result[0].caseworkers) {
-                const caseworker = result[0].caseworkers.find(x => x.idamId === this.task.assignee);
-                if (caseworker) {
-                    this.assignedUserName = `${caseworker.firstName} ${caseworker.lastName}`;
-                }
+        this.caseworkerSubscription = this.caseworkerService.getUserByIdamId(this.task.assignee).subscribe(caseworker => {
+            if (caseworker) {
+                this.assignedUserName = `${caseworker.firstName} ${caseworker.lastName}`;
             }
             if (!this.assignedUserName) {
                 // Current user is a judicial user?