public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Authorization: Fix filtered role display (#104953)

Browse Source 
* handle null or empty group and displayName properties on roles

* fix display name bug for fixed roles with a period
This commit is contained in:
Cory Forseth
2025-05-07 16:35:50 +03:00
committed by GitHub
parent eb240aaa3c
commit 9c5e34f513
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/core/components/RolePicker/utils.ts
+7 -3
View File
@@ -7,21 +7,25 @@ export const isNotDelegatable = (role: Role) => {
// addDisplayNameForFixedRole provides a fallback name for fixed roles // addDisplayNameForFixedRole provides a fallback name for fixed roles
// this is "incase" a fixed role is introduced but without a displayname set // this is "incase" a fixed role is introduced but without a displayname set
// example: currently this would give: // example: currently this would give:
// fixed:datasources:name -> datasources name // fixed:datasources:name -> datasources name
// fixed:datasources:admin -> datasources admin // fixed:datasources:admin -> datasources admin
// fixed:support.bundles:writer -> support bundles writer
export const addDisplayNameForFixedRole = (role: Role) => { export const addDisplayNameForFixedRole = (role: Role) => {
const fixedRolePrefix = 'fixed:'; const fixedRolePrefix = 'fixed:';
if (!role.displayName && role.name.startsWith(fixedRolePrefix)) { if (!role.displayName && role.name.startsWith(fixedRolePrefix)) {
let newRoleName = ''; let newRoleName = '';
let rNameWithoutFixedPrefix = role.name.replace(fixedRolePrefix, ''); let rNameWithoutFixedPrefix = role.name.replace(fixedRolePrefix, '');
newRoleName = rNameWithoutFixedPrefix.replace(/:/g, ' '); newRoleName = rNameWithoutFixedPrefix.replace(/[:\\.]/g, ' ');
role.displayName = newRoleName; role.displayName = newRoleName;
} }
return role; return role;
}; };
// Adds a display name for use when the list of roles is filtered // Adds a display name for use when the list of roles is filtered
// If either group or displayName are undefined, we fall back (see RoleMenuOption.tsx)
export const addFilteredDisplayName = (role: Role) => { export const addFilteredDisplayName = (role: Role) => {
role.filteredDisplayName = role.group + ':' + role.displayName; if (role.group && role.displayName) {
role.filteredDisplayName = role.group + ':' + role.displayName;
}
return role; return role;
}; };