Fixed Bug 5536: Manage User/Manage my Account - Group Access tab - Se…

…rvices are not displayed in order as Individual Access (#1289)
Crown-Commercial-Service · Apr 27, 2023 · 4349773 · 4349773
1 parent 5819106
commit 4349773
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 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
@@ -361,6 +361,9 @@ export class ManageUserAddSingleUserDetailComponent
       } else {
         this.noneGroupsMember.data.push(group)
       }
+      if(this.orgUserGroupRoles.length > 0){
+        this.orgUserGroupRoles = this.orgUserGroupRoles.sort(function(a,b){ return a.displayOrder - b.displayOrder});
+      } 
     }
   }
 

diff --git a/src/app/pages/user-profile/user-profile-component.html b/src/app/pages/user-profile/user-profile-component.html
@@ -283,7 +283,7 @@ <h2 class="govuk-tabs__title">
                         <div class="govuk-grid-row">
                             <div class="govuk-grid-column-full">
 
-                                <p class="govuk-hints" *ngIf="isAdminUser == true">{{ 'ACCESS_TO_USER_SERVICE'| translate }}</p>
+                                <p class="govuk-hints" *ngIf="isAdminUser == true">{{ 'ACCESS_TO_USER_SERVICE_MANAGE_MY_ACCOUNT'| translate }}</p>
                                 <p class="govuk-hints" *ngIf="isAdminUser == false">{{ 'ACCESS_TO_REGULAR_USER_SERVICE'| translate }}</p>
 
                                 <div *ngIf="roleDataList.length > 0 && isAdminUser==false">

diff --git a/src/app/pages/user-profile/user-profile-component.ts b/src/app/pages/user-profile/user-profile-component.ts
@@ -683,6 +683,9 @@ export class UserProfileComponent extends FormBaseComponent implements OnInit {
         }
       }
     }
+    if(this.orgUserGroupRoles.length > 0){
+      this.orgUserGroupRoles = this.orgUserGroupRoles.sort(function(a,b){ return a.displayOrder - b.displayOrder});
+    }    
     this.groupsMember.isAdmin = this.isAdminUser;
     this.noneGroupsMember.isAdmin = this.isAdminUser;
   }

diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
@@ -383,5 +383,6 @@
   "ORG_ADMIN_GROUP_ACCESS": "You have access to the following services through your membership of one or more groups. You can manage group membership, and access to services, through the dashboard.",
   "ORG_ADMIN_GROUP_ACCESS_NONE": "You do not have access to any service through your membership of a group. You can manage group membership, and access to services, through the dashboard.",  
   "PENDING_LABEL" : "Pending Approval",
-  "ACCESS_TO_REGULAR_USER_SERVICE": "These services are assigned to you as an individual, rather than through your membership of a group."
+  "ACCESS_TO_REGULAR_USER_SERVICE": "These services are assigned to you as an individual, rather than through your membership of a group.",
+  "ACCESS_TO_USER_SERVICE_MANAGE_MY_ACCOUNT": "Select the services that you need access to as an individual, rather than through your membership of a group."
 }