From cd0071f183e624456a750738e8aad8850979b51c Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Thu, 11 Aug 2022 03:38:49 -0400 Subject: [PATCH] fix: use `type` instead of `uid` to get datasource metadata (#53543) (#53562) (cherry picked from commit d7556bd189777b5ff4757e596de94227a42d2766) Co-authored-by: Levente Balogh --- public/app/features/datasources/components/EditDataSource.tsx | 2 +- public/app/features/datasources/state/hooks.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/app/features/datasources/components/EditDataSource.tsx b/public/app/features/datasources/components/EditDataSource.tsx index b7e2dde1e7c..bd5da825deb 100644 --- a/public/app/features/datasources/components/EditDataSource.tsx +++ b/public/app/features/datasources/components/EditDataSource.tsx @@ -45,7 +45,7 @@ export function EditDataSource({ uid, pageId }: Props) { const dispatch = useDispatch(); const dataSource = useDataSource(uid); - const dataSourceMeta = useDataSourceMeta(uid); + const dataSourceMeta = useDataSourceMeta(dataSource.type); const dataSourceSettings = useDataSourceSettings(); const dataSourceRights = useDataSourceRights(uid); const exploreUrl = useDataSourceExploreUrl(uid); diff --git a/public/app/features/datasources/state/hooks.ts b/public/app/features/datasources/state/hooks.ts index 4b55e9377d4..7cf1013c91e 100644 --- a/public/app/features/datasources/state/hooks.ts +++ b/public/app/features/datasources/state/hooks.ts @@ -115,8 +115,8 @@ export const useDataSourceExploreUrl = (uid: string) => { return exploreUrl; }; -export const useDataSourceMeta = (uid: string): DataSourcePluginMeta => { - return useSelector((state: StoreState) => getDataSourceMeta(state.dataSources, uid)); +export const useDataSourceMeta = (pluginType: string): DataSourcePluginMeta => { + return useSelector((state: StoreState) => getDataSourceMeta(state.dataSources, pluginType)); }; export const useDataSourceSettings = () => {