From 1a166366925425493169a970a5ca77de8f27aa01 Mon Sep 17 00:00:00 2001 From: Karl Persson Date: Wed, 15 Mar 2023 15:52:52 +0100 Subject: [PATCH] Routes: Always add rbac component to route if enabled (#64817) --- public/app/routes/routes.tsx | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/public/app/routes/routes.tsx b/public/app/routes/routes.tsx index 20fff70cf77..ea620348f38 100644 --- a/public/app/routes/routes.tsx +++ b/public/app/routes/routes.tsx @@ -185,15 +185,14 @@ export function getAppRoutes(): RouteDescriptor[] { }, { path: '/dashboards/f/:uid/:slug/permissions', - component: - config.rbacEnabled && contextSrv.hasPermission(AccessControlAction.FoldersPermissionsRead) - ? SafeDynamicImport( - () => - import(/* webpackChunkName: "FolderPermissions"*/ 'app/features/folders/AccessControlFolderPermissions') - ) - : SafeDynamicImport( - () => import(/* webpackChunkName: "FolderPermissions"*/ 'app/features/folders/FolderPermissions') - ), + component: config.rbacEnabled + ? SafeDynamicImport( + () => + import(/* webpackChunkName: "FolderPermissions"*/ 'app/features/folders/AccessControlFolderPermissions') + ) + : SafeDynamicImport( + () => import(/* webpackChunkName: "FolderPermissions"*/ 'app/features/folders/FolderPermissions') + ), }, { path: '/dashboards/f/:uid/:slug/settings',