From d147f3d366452795af5cc9870da0b704c2a00791 Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Thu, 24 Nov 2022 16:46:36 +0200 Subject: [PATCH] [v9.3.x] Navigation: Support rbac for new dashboard, import dashboard and new folder (#59305) Navigation: Support rbac for new dashboard, import dashboard and new folder (#59303) RBAC: Support rbac for new dashboard, import dashboard and new folder page (cherry picked from commit a53f57cc430ec458a63144aa040516eaef14f075) Co-authored-by: Karl Persson --- public/app/routes/routes.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/app/routes/routes.tsx b/public/app/routes/routes.tsx index dfd9b3ba078..fc1f0644a28 100644 --- a/public/app/routes/routes.tsx +++ b/public/app/routes/routes.tsx @@ -83,7 +83,7 @@ export function getAppRoutes(): RouteDescriptor[] { }, { path: '/dashboard/new', - roles: () => ['Editor', 'Admin'], + roles: () => contextSrv.evaluatePermission(() => ['Editor', 'Admin'], [AccessControlAction.DashboardsCreate]), pageClass: 'page-dashboard', routeName: DashboardRoutes.New, component: SafeDynamicImport( @@ -120,7 +120,7 @@ export function getAppRoutes(): RouteDescriptor[] { }, { path: '/dashboard/import', - roles: () => ['Editor', 'Admin'], + roles: () => contextSrv.evaluatePermission(() => ['Editor', 'Admin'], [AccessControlAction.DashboardsCreate]), component: SafeDynamicImport( () => import(/* webpackChunkName: "DashboardImport"*/ 'app/features/manage-dashboards/DashboardImportPage') ), @@ -170,7 +170,7 @@ export function getAppRoutes(): RouteDescriptor[] { }, { path: '/dashboards/folder/new', - roles: () => ['Editor', 'Admin'], + roles: () => contextSrv.evaluatePermission(() => ['Editor', 'Admin'], [AccessControlAction.FoldersCreate]), component: SafeDynamicImport( () => import(/* webpackChunkName: "NewDashboardsFolder"*/ 'app/features/folders/components/NewDashboardsFolder') ),