Merge pull request #1077 from Crown-Commercial-Service/p3sprint4

Multiple approval role save button not working (#1076)
Crown-Commercial-Service · Jan 30, 2023 · a7a0090 · a7a0090
2 parents 9624865 + ccfe95b
commit a7a0090
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/...e-user/manage-user-add-single-user-detail/manage-user-add-single-user-detail.component.ts b/...e-user/manage-user-add-single-user-detail/manage-user-add-single-user-detail.component.ts
@@ -470,8 +470,10 @@ export class ManageUserAddSingleUserDetailComponent
   }
 
   private invalidDomainConfig(role: any) {
-    let filterRole = this.approveRequiredRole.find((element: { roleKey: any; }) => element.roleKey == role.roleKey)
-    if (filterRole === undefined) {
+    let filterRole = this.approveRequiredRole.find((element: { roleKey: any; }) => element.roleKey == role.roleKey);
+    let roleAlredyApprovedAndAssigned = this.userProfileResponseInfo?.detail?.rolePermissionInfo?.find(x => x.roleKey == role.roleKey);
+
+    if (filterRole === undefined || (filterRole && roleAlredyApprovedAndAssigned)) {
       this.selectedRoleIds.push(role.roleId)
     } else {
       this.pendingRolecheck(role)
@@ -487,8 +489,9 @@ export class ManageUserAddSingleUserDetailComponent
   }
 
   private whenPendingRoleHavingLength(role: any) {
-    let filterAlreadyExistRole = this.pendingRoleDetails.find((element: { roleKey: any; }) => element.roleKey == role.roleKey)
-    if (filterAlreadyExistRole.roleKey != role.roleKey) {
+    let filterAlreadyExistRole = this.pendingRoleDetails.find((element: { roleKey: any; }) => element.roleKey == role.roleKey);
+
+    if (!filterAlreadyExistRole) {
       this.selectedApproveRequiredRole.push(role.roleId)
     }
   }