From 8ed3fb1f2de8b77842c55d663aca232d28371d96 Mon Sep 17 00:00:00 2001
From: Jguer <joao.guerreiro@grafana.com>
Date: Thu, 5 May 2022 11:02:34 +0000
Subject: [PATCH] AccessControl: don't pull builtin role assignments when
 refactor is enabled (#48675)

---
 public/app/core/services/context_srv.ts              | 4 ++++
 public/app/features/serviceaccounts/state/actions.ts | 1 +
 public/app/features/users/UsersTable.tsx             | 5 ++++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/public/app/core/services/context_srv.ts b/public/app/core/services/context_srv.ts
index 6930600ad3d..9cc71e90ba0 100644
--- a/public/app/core/services/context_srv.ts
+++ b/public/app/core/services/context_srv.ts
@@ -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']);
   }
diff --git a/public/app/features/serviceaccounts/state/actions.ts b/public/app/features/serviceaccounts/state/actions.ts
index 9eb5ccb3d9b..6626edad0cc 100644
--- a/public/app/features/serviceaccounts/state/actions.ts
+++ b/public/app/features/serviceaccounts/state/actions.ts
@@ -32,6 +32,7 @@ export function fetchACOptions(): ThunkResult<void> {
         dispatch(acOptionsLoaded(options));
       }
       if (
+        !contextSrv.accessControlBuiltinRefactorEnabled() &&
         contextSrv.licensedAccessControlEnabled() &&
         contextSrv.hasPermission(AccessControlAction.ActionBuiltinRolesList)
       ) {
diff --git a/public/app/features/users/UsersTable.tsx b/public/app/features/users/UsersTable.tsx
index aee80c96897..054e0402f77 100644
--- a/public/app/features/users/UsersTable.tsx
+++ b/public/app/features/users/UsersTable.tsx
@@ -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);
         }