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

Data sources: Dashboards page now loads correctly from direct url (#72264)

Browse Source 
* ensure DataSourceDashboardsPage initialises data source settings

* fix unit test

* apply suggestions from review
This commit is contained in:
Ashley Harrison
2023-07-28 09:37:56 +01:00
committed by GitHub
parent a331c892a0
commit 7406c4ff51
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/app/features/connections/hooks/useDataSourceSettingsNav.ts
View File

@@ -20,7 +20,6 @@ export function useDataSourceSettingsNav(pageId?: string) {
...nav.main,
text: datasource.name,
subTitle: `Type: ${datasourcePlugin?.name}`,
active: true,
children: (nav.main.children || []).map((navModelItem) => ({
...navModelItem,
url: navModelItem.url?.replace('datasources/edit/', '/connections/datasources/edit/'),

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

@@ -8,7 +8,7 @@ import { useDataSourceSettingsNav } from '../hooks/useDataSourceSettingsNav';
export function DataSourceDashboardsPage() {
const { uid } = useParams<{ uid: string }>();
const { navId, pageNav } = useDataSourceSettingsNav();
const { navId, pageNav } = useDataSourceSettingsNav('dashboards');
return (
<Page navId={navId} pageNav={pageNav}>

6
public/app/features/datasources/components/DataSourceDashboards.tsx
View File

@@ -6,7 +6,7 @@ import { loadPluginDashboards } from 'app/features/plugins/admin/state/actions';
import { PluginDashboard, StoreState, useDispatch, useSelector } from 'app/types';
import DashboardTable from '../components/DashboardsTable';
import { useLoadDataSource } from '../state';
import { useInitDataSourceSettings } from '../state';
export type Props = {
// The UID of the data source
@@ -14,7 +14,7 @@ export type Props = {
};
export function DataSourceDashboards({ uid }: Props) {
useLoadDataSource(uid);
useInitDataSourceSettings(uid);
const dispatch = useDispatch();
const dataSource = useSelector((s: StoreState) => s.dataSources.dataSource);
@@ -26,7 +26,7 @@ export function DataSourceDashboards({ uid }: Props) {
if (dataSource.id > 0) {
dispatch(loadPluginDashboards());
}
}, [dispatch, dataSource]);
}, [dispatch, dataSource.id]);
const onImportDashboard = (dashboard: PluginDashboard, overwrite: boolean) => {
dispatch(

4
public/app/features/datasources/pages/DataSourceDashboardsPage.test.tsx
View File

@@ -74,9 +74,9 @@ describe('<DataSourceDashboardsPage>', () => {
});
});
it('should render the dashboards page without an issue', () => {
it('should render the dashboards page without an issue', async () => {
setup(uid, store);
expect(screen.queryByText(dataSourceName)).toBeVisible();
expect(await screen.findByText(dataSourceName)).toBeVisible();
});
});