IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Plugins: Fix Explore button visibility for datasource plugins (#88614)

Browse Source 
Use hasAccessToExplore method at datasource list
This commit is contained in:
Yulia Shanyrova 2024-06-10 14:27:17 +02:00 committed by GitHub
parent 60bec80672
commit 80bdfbe2eb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/app/features/datasources/components/DataSourceTestingStatus.tsx
View File

@ -7,7 +7,6 @@ import { TestingStatus, config } from '@grafana/runtime';
import { AlertVariant, Alert, useTheme2, Link } from '@grafana/ui'; import { AlertVariant, Alert, useTheme2, Link } from '@grafana/ui';
import { contextSrv } from '../../../core/core'; import { contextSrv } from '../../../core/core';
import { AccessControlAction } from '../../../types';
import { trackCreateDashboardClicked } from '../tracking'; import { trackCreateDashboardClicked } from '../tracking';
export type Props = { export type Props = {
@ -43,7 +42,7 @@ const AlertSuccessMessage = ({ title, exploreUrl, dataSourceId, onDashboardLinkC
const theme = useTheme2(); const theme = useTheme2();
const hasTitle = Boolean(title); const hasTitle = Boolean(title);
const styles = getStyles(theme, hasTitle); const styles = getStyles(theme, hasTitle);
const canExploreDataSources = contextSrv.hasPermission(AccessControlAction.DataSourcesExplore); const canExploreDataSources = contextSrv.hasAccessToExplore();
return ( return (
<div className={styles.content}> <div className={styles.content}>

2
public/app/features/datasources/components/DataSourcesList.tsx
View File

@ -22,7 +22,7 @@ export function DataSourcesList() {
const dataSourcesCount = useSelector(({ dataSources }: StoreState) => getDataSourcesCount(dataSources)); const dataSourcesCount = useSelector(({ dataSources }: StoreState) => getDataSourcesCount(dataSources));
const hasCreateRights = contextSrv.hasPermission(AccessControlAction.DataSourcesCreate); const hasCreateRights = contextSrv.hasPermission(AccessControlAction.DataSourcesCreate);
const hasWriteRights = contextSrv.hasPermission(AccessControlAction.DataSourcesWrite); const hasWriteRights = contextSrv.hasPermission(AccessControlAction.DataSourcesWrite);
const hasExploreRights = contextSrv.hasPermission(AccessControlAction.DataSourcesExplore); const hasExploreRights = contextSrv.hasAccessToExplore();
return ( return (
<DataSourcesListView <DataSourcesListView

3
public/app/features/datasources/components/EditDataSourceActions.tsx
View File

@ -3,7 +3,6 @@ import React from 'react';
import { config } from '@grafana/runtime'; import { config } from '@grafana/runtime';
import { LinkButton } from '@grafana/ui'; import { LinkButton } from '@grafana/ui';
import { contextSrv } from 'app/core/core'; import { contextSrv } from 'app/core/core';
import { AccessControlAction } from 'app/types';
import { useDataSource } from '../state'; import { useDataSource } from '../state';
import { trackCreateDashboardClicked, trackDsConfigClicked, trackExploreClicked } from '../tracking'; import { trackCreateDashboardClicked, trackDsConfigClicked, trackExploreClicked } from '../tracking';
@ -15,7 +14,7 @@ interface Props {
export function EditDataSourceActions({ uid }: Props) { export function EditDataSourceActions({ uid }: Props) {
const dataSource = useDataSource(uid); const dataSource = useDataSource(uid);
const hasExploreRights = contextSrv.hasPermission(AccessControlAction.DataSourcesExplore); const hasExploreRights = contextSrv.hasAccessToExplore();
return ( return (
<> <>