From 80bdfbe2eb9a06b37cebed123c2c8091f99d861e Mon Sep 17 00:00:00 2001 From: Yulia Shanyrova Date: Mon, 10 Jun 2024 14:27:17 +0200 Subject: [PATCH] Plugins: Fix Explore button visibility for datasource plugins (#88614) Use hasAccessToExplore method at datasource list --- .../datasources/components/DataSourceTestingStatus.tsx | 3 +-- public/app/features/datasources/components/DataSourcesList.tsx | 2 +- .../features/datasources/components/EditDataSourceActions.tsx | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/public/app/features/datasources/components/DataSourceTestingStatus.tsx b/public/app/features/datasources/components/DataSourceTestingStatus.tsx index 4b32028ffa0..591e7991a0e 100644 --- a/public/app/features/datasources/components/DataSourceTestingStatus.tsx +++ b/public/app/features/datasources/components/DataSourceTestingStatus.tsx @@ -7,7 +7,6 @@ import { TestingStatus, config } from '@grafana/runtime'; import { AlertVariant, Alert, useTheme2, Link } from '@grafana/ui'; import { contextSrv } from '../../../core/core'; -import { AccessControlAction } from '../../../types'; import { trackCreateDashboardClicked } from '../tracking'; export type Props = { @@ -43,7 +42,7 @@ const AlertSuccessMessage = ({ title, exploreUrl, dataSourceId, onDashboardLinkC const theme = useTheme2(); const hasTitle = Boolean(title); const styles = getStyles(theme, hasTitle); - const canExploreDataSources = contextSrv.hasPermission(AccessControlAction.DataSourcesExplore); + const canExploreDataSources = contextSrv.hasAccessToExplore(); return (
diff --git a/public/app/features/datasources/components/DataSourcesList.tsx b/public/app/features/datasources/components/DataSourcesList.tsx index 97c2d7f4690..cb4454dab38 100644 --- a/public/app/features/datasources/components/DataSourcesList.tsx +++ b/public/app/features/datasources/components/DataSourcesList.tsx @@ -22,7 +22,7 @@ export function DataSourcesList() { const dataSourcesCount = useSelector(({ dataSources }: StoreState) => getDataSourcesCount(dataSources)); const hasCreateRights = contextSrv.hasPermission(AccessControlAction.DataSourcesCreate); const hasWriteRights = contextSrv.hasPermission(AccessControlAction.DataSourcesWrite); - const hasExploreRights = contextSrv.hasPermission(AccessControlAction.DataSourcesExplore); + const hasExploreRights = contextSrv.hasAccessToExplore(); return (