@hmcts/ccd-case-ui-toolkit 7.3.68-user-by-idam-rework → 7.3.69-inconsistent-validation-error-message

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

@@ -8651,33 +8651,31 @@ class CaseAccessUtils {
     static CTSC_ROLE = 'ctsc';
     static CTSC_ROLE_CATEGORY = 'CTSC';
     static CTSC_ROLE_NAME = 'ctsc';
-    // fallback purely if roleCategories is not available in 
-    getMappedRoleCategories(roles = []) {
+    getMappedRoleCategory(roles = [], roleCategories = []) {
         const roleKeywords = roles.join().split('-').join().split(',');
-        const roleCategoryList = [];
-        if (this.roleOrCategoryExists(CaseAccessUtils.JUDGE_ROLE, roleKeywords)) {
-            roleCategoryList.push(CaseAccessUtils.JUDGE_ROLE_CATEGORY);
+        if (this.roleOrCategoryExists(CaseAccessUtils.JUDGE_ROLE, CaseAccessUtils.JUDGE_ROLE_CATEGORY, roleKeywords, roleCategories)) {
+            return CaseAccessUtils.JUDGE_ROLE_CATEGORY;
         }
-        if (this.roleOrCategoryExists(CaseAccessUtils.PROFESSIONAL_ROLE, roleKeywords)) {
-            roleCategoryList.push(CaseAccessUtils.PROFESSIONAL_ROLE_CATEGORY);
+        else if (this.roleOrCategoryExists(CaseAccessUtils.PROFESSIONAL_ROLE, CaseAccessUtils.PROFESSIONAL_ROLE_CATEGORY, roleKeywords, roleCategories)) {
+            return CaseAccessUtils.PROFESSIONAL_ROLE_CATEGORY;
         }
-        if (this.roleOrCategoryExists(CaseAccessUtils.CITIZEN_ROLE, roleKeywords)) {
-            roleCategoryList.push(CaseAccessUtils.CITIZEN_ROLE_CATEGORY);
+        else if (this.roleOrCategoryExists(CaseAccessUtils.CITIZEN_ROLE, CaseAccessUtils.CITIZEN_ROLE_CATEGORY, roleKeywords, roleCategories)) {
+            return CaseAccessUtils.CITIZEN_ROLE_CATEGORY;
         }
-        if (this.roleOrCategoryExists(CaseAccessUtils.ADMIN_ROLE, roleKeywords)) {
-            roleCategoryList.push(CaseAccessUtils.ADMIN_ROLE_CATEGORY);
+        else if (this.roleOrCategoryExists(CaseAccessUtils.ADMIN_ROLE, CaseAccessUtils.ADMIN_ROLE_CATEGORY, roleKeywords, roleCategories)) {
+            return CaseAccessUtils.ADMIN_ROLE_CATEGORY;
         }
-        if (this.roleOrCategoryExists(CaseAccessUtils.CTSC_ROLE, roleKeywords)) {
-            roleCategoryList.push(CaseAccessUtils.CTSC_ROLE_CATEGORY);
+        else if (this.roleOrCategoryExists(CaseAccessUtils.CTSC_ROLE, CaseAccessUtils.CTSC_ROLE_CATEGORY, roleKeywords, roleCategories)) {
+            return CaseAccessUtils.CTSC_ROLE_CATEGORY;
         }
-        if (this.roleOrCategoryExists(CaseAccessUtils.LEGAL_OPERATIONS_ROLE, roleKeywords)) {
-            roleCategoryList.push(CaseAccessUtils.LEGAL_OPERATIONS_ROLE_CATEGORY);
+        else {
+            return CaseAccessUtils.LEGAL_OPERATIONS_ROLE_CATEGORY;
         }
-        return roleCategoryList;
     }
-    roleOrCategoryExists(roleKeyword, roleKeywords) {
+    roleOrCategoryExists(roleKeyword, roleCategory, roleKeywords, roleCategories) {
+        const categoryExists = roleCategories.indexOf(roleCategory) > -1;
         const keywordExists = roleKeywords.indexOf(roleKeyword) > -1;
-        return keywordExists;
+        return categoryExists ? categoryExists : keywordExists;
     }
     getAMRoleName(accessType, aMRole) {
         let roleName = '';
@@ -9107,10 +9105,10 @@ class CaseworkerService {
         this.appConfig = appConfig;
         this.errorService = errorService;
     }
-    getUserByIdamId(idamId) {
-        const url = `${this.appConfig.getWorkAllocationApiUrl()}/caseworker/getUserByIdamId`;
+    getCaseworkers(serviceId) {
+        const url = `${this.appConfig.getWorkAllocationApiUrl()}/caseworker/getUsersByServiceName`;
         return this.http
-            .post(url, idamId)
+            .post(url, { services: [serviceId] })
             .pipe(catchError(error => {
             this.errorService.setError(error);
             return throwError(error);
@@ -10565,21 +10563,16 @@ class CasesService {
         const userInfoStr = this.sessionStorageService.getItem('userDetails');
         const camUtils = new CaseAccessUtils();
         let userInfo;
-        userInfo = userInfoStr ? JSON.parse(userInfoStr) : null;
-        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 (userInfoStr) {
+            userInfo = JSON.parse(userInfoStr);
+        }
+        const roleCategory = userInfo.roleCategory || camUtils.getMappedRoleCategory(userInfo.roles, userInfo.roleCategories);
+        const roleName = camUtils.getAMRoleName('challenged', roleCategory);
         const beginTime = new Date();
         const endTime = new Date(new Date().setUTCHours(23, 59, 59, 999));
         const id = userInfo.id ? userInfo.id : userInfo.uid;
         const isNew = true;
-        const payload = camUtils.getAMPayload(id, id, roleName, 
-        // EXUI-4758 - Return first roleCategory as the roleCategory
-        roleCategories[0], 'CHALLENGED', caseId, request, beginTime, endTime, isNew);
+        const payload = camUtils.getAMPayload(id, id, roleName, roleCategory, 'CHALLENGED', caseId, request, beginTime, endTime, isNew);
         return this.http.post(`/api/challenged-access-request`, payload);
     }
     createSpecificAccessRequest(caseId, sar) {
@@ -10587,14 +10580,10 @@ class CasesService {
         const userInfoStr = this.sessionStorageService.getItem('userDetails');
         const camUtils = new CaseAccessUtils();
         let userInfo;
-        userInfo = userInfoStr ? JSON.parse(userInfoStr) : null;
-        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];
+        if (userInfoStr) {
+            userInfo = JSON.parse(userInfoStr);
+        }
+        const roleCategory = userInfo.roleCategory || camUtils.getMappedRoleCategory(userInfo.roles, userInfo.roleCategories);
         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);
@@ -11743,6 +11732,11 @@ class CaseEditPageComponent {
                     this.caseEditDataService.addFormValidationError({ id, message: `%FIELDLABEL% exceeds the maximum length`, label });
                     fieldElement.markAsDirty();
                 }
+                else if (fieldElement.hasError('markDownPattern')) {
+                    this.caseEditDataService.addFormValidationError({
+                        id, message: `The data entered is not valid for %FIELDLABEL%. Link mark up characters are not allowed in this field.`, label
+                    });
+                }
                 else if (fieldElement.invalid) {
                     if (casefield.isComplex()) {
                         errorPresent = this.generateErrorMessage(casefield.field_type.complex_fields, fieldElement, id, true);
@@ -12668,9 +12662,12 @@ class CaseEventCompletionTaskReassignedComponent {
         this.jurisdiction = task.jurisdiction;
         this.caseType = task.case_type_id;
         // Current user is a caseworker?
-        this.caseworkerSubscription = this.caseworkerService.getUserByIdamId(task.assignee).subscribe(caseworker => {
-            if (caseworker) {
-                this.assignedUserName = `${caseworker.firstName} ${caseworker.lastName}`;
+        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}`;
+                }
             }
             if (!this.assignedUserName) {
                 // Current user is a judicial user?
@@ -37792,9 +37789,12 @@ class TaskAssignedComponent {
         // Current user is a caseworker?
         this.jurisdiction = this.task.jurisdiction;
         this.caseType = this.task.case_type_id;
-        this.caseworkerSubscription = this.caseworkerService.getUserByIdamId(this.task.assignee).subscribe(caseworker => {
-            if (caseworker) {
-                this.assignedUserName = `${caseworker.firstName} ${caseworker.lastName}`;
+        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}`;
+                }
             }
             if (!this.assignedUserName) {
                 // Current user is a judicial user?