IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Access Control: use role groups in role picker (#41912) (#41941)

Browse Source 
* use role groups in role picker UI

* Update public/app/core/components/RolePicker/RolePickerMenu.tsx

Co-authored-by: kay delaney <45561153+kaydelaney@users.noreply.github.com>

Co-authored-by: kay delaney <45561153+kaydelaney@users.noreply.github.com>
(cherry picked from commit 11f133b406)

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
This commit is contained in:
Grot (@grafanabot) 2021-11-19 04:15:07 -05:00 committed by GitHub
parent 8cfc96fa61
commit ed00b3cf50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/app/core/components/RolePicker/RolePickerMenu.tsx
View File

@ -498,8 +498,7 @@ export const RoleMenuGroupOption = React.forwardRef<HTMLDivElement, RoleMenuGrou
RoleMenuGroupOption.displayName = 'RoleMenuGroupOption';
const getRoleGroup = (role: Role) => {
const parts = role.name.split(':');
return parts.length > 1 ? parts[1] : '';
return role.group ?? 'Other';
};
const capitalize = (s: string): string => {

1
public/app/types/accessControl.ts
View File

@ -55,6 +55,7 @@ export interface Role {
name: string;
displayName: string;
description: string;
group: string;
global: boolean;
version: number;
created: string;