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

DataSources: fix DataSourceAddButton component (#60176)

Browse Source 
* fix DataSourceAddButton component

This component implicitly returned `false` when `canCreateDataSource`
was false, and that way it didn't qualify as a function component.
We fixed it to explicitly return null in this case.

* DataSourceAddButton: update function signature

This is more consistent with other code in this codebase.
This commit is contained in:
mikkancso
2022-12-15 09:25:03 +01:00
committed by GitHub
parent 171cd60480
commit edb86d4bf3
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/features/connections/pages/DataSourcesListPage.tsx
View File

@@ -6,7 +6,7 @@ import { DataSourceAddButton } from 'app/features/datasources/components/DataSou
import { DataSourcesList } from 'app/features/datasources/components/DataSourcesList';
export function DataSourcesListPage() {
const actions = config.featureToggles.topnav ? DataSourceAddButton() : undefined;
const actions = config.featureToggles.topnav ? <DataSourceAddButton /> : undefined;
return (
<Page navId={'connections-your-connections-datasources'} actions={actions}>
<Page.Contents>

14
public/app/features/datasources/components/DataSourceAddButton.tsx
View File

@@ -6,15 +6,13 @@ import { AccessControlAction } from 'app/types';
import { useDataSourcesRoutes } from '../state';
export function DataSourceAddButton() {
export function DataSourceAddButton(): JSX.Element | null {
const canCreateDataSource = contextSrv.hasPermission(AccessControlAction.DataSourcesCreate);
const dataSourcesRoutes = useDataSourcesRoutes();
return (
canCreateDataSource && (
<LinkButton icon="plus" href={dataSourcesRoutes.New}>
Add new data source
</LinkButton>
)
);
return canCreateDataSource ? (
<LinkButton icon="plus" href={dataSourcesRoutes.New}>
Add new data source
</LinkButton>
) : null;
}

2
public/app/features/datasources/pages/DataSourcesListPage.tsx
View File

@@ -7,7 +7,7 @@ import { DataSourceAddButton } from '../components/DataSourceAddButton';
import { DataSourcesList } from '../components/DataSourcesList';
export function DataSourcesListPage() {
const actions = config.featureToggles.topnav ? DataSourceAddButton() : undefined;
const actions = config.featureToggles.topnav ? <DataSourceAddButton /> : undefined;
return (
<Page navId="datasources" actions={actions}>
<Page.Contents>