From e9631fdf7c32987c4bb0d105c9fd6a53f9f681ac Mon Sep 17 00:00:00 2001 From: Gabriel MABILLE Date: Wed, 8 Sep 2021 09:47:55 +0200 Subject: [PATCH] AccessControl: "Add data source" button needs create and write rights to be enabled (#38934) --- public/app/features/datasources/DataSourcesListPage.tsx | 5 ++++- public/app/features/explore/NoDataSourceCallToAction.tsx | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/public/app/features/datasources/DataSourcesListPage.tsx b/public/app/features/datasources/DataSourcesListPage.tsx index 85b2c458496..475b5808271 100644 --- a/public/app/features/datasources/DataSourcesListPage.tsx +++ b/public/app/features/datasources/DataSourcesListPage.tsx @@ -71,7 +71,10 @@ export class DataSourcesListPage extends PureComponent { hasFetched, } = this.props; - const canCreateDataSource = contextSrv.hasPermission(AccessControlAction.DataSourcesCreate); + const canCreateDataSource = + contextSrv.hasPermission(AccessControlAction.DataSourcesCreate) && + contextSrv.hasPermission(AccessControlAction.DataSourcesWrite); + const linkButton = { href: 'datasources/new', title: 'Add data source', diff --git a/public/app/features/explore/NoDataSourceCallToAction.tsx b/public/app/features/explore/NoDataSourceCallToAction.tsx index 5916f4fb7c1..d2d61d3936f 100644 --- a/public/app/features/explore/NoDataSourceCallToAction.tsx +++ b/public/app/features/explore/NoDataSourceCallToAction.tsx @@ -8,7 +8,9 @@ import { AccessControlAction } from 'app/types'; export const NoDataSourceCallToAction = () => { const theme = useTheme2(); - const canCreateDataSource = contextSrv.hasPermission(AccessControlAction.DataSourcesCreate); + const canCreateDataSource = + contextSrv.hasPermission(AccessControlAction.DataSourcesCreate) && + contextSrv.hasPermission(AccessControlAction.DataSourcesWrite); const message = 'Explore requires at least one data source. Once you have added a data source, you can query it here.';