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

AccessControl: don't pull builtin role assignments when refactor is enabled (#48675)

Browse Source
This commit is contained in:
Jguer 2022-05-05 11:02:34 +00:00 committed by GitHub
parent 02aa1cd1c5
commit 8ed3fb1f2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/core/services/context_srv.ts
View File

@ -112,6 +112,10 @@ export class ContextSrv {
return Boolean(config.featureToggles['accesscontrol']);
}
accessControlBuiltinRefactorEnabled(): boolean {
return Boolean(config.featureToggles['accesscontrol-builtins']);
}
licensedAccessControlEnabled(): boolean {
return featureEnabled('accesscontrol') && Boolean(config.featureToggles['accesscontrol']);
}

1
public/app/features/serviceaccounts/state/actions.ts
View File

@ -32,6 +32,7 @@ export function fetchACOptions(): ThunkResult<void> {
dispatch(acOptionsLoaded(options));
}
if (
!contextSrv.accessControlBuiltinRefactorEnabled() &&
contextSrv.licensedAccessControlEnabled() &&
contextSrv.hasPermission(AccessControlAction.ActionBuiltinRolesList)
) {

5
public/app/features/users/UsersTable.tsx
View File

@ -30,7 +30,10 @@ const UsersTable: FC<Props> = (props) => {
setRoleOptions(options);
}
if (contextSrv.hasPermission(AccessControlAction.ActionBuiltinRolesList)) {
if (
!contextSrv.accessControlBuiltinRefactorEnabled() &&
contextSrv.hasPermission(AccessControlAction.ActionBuiltinRolesList)
) {
const builtInRoles = await fetchBuiltinRoles(orgId);
setBuiltinRoles(builtInRoles);
}