From df959ea1024855b9f37a1125bb9dd7f866cbcb50 Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Fri, 26 Nov 2021 04:59:06 -0500 Subject: [PATCH] PanelEdit: Query now correctly initializes data source (#42291) (#42347) (cherry picked from commit 0516ad822b38d52c74ebfec3c94ad33628dd4a45) Co-authored-by: Ashley Harrison --- .../PanelEditor/PanelEditorQueries.tsx | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/public/app/features/dashboard/components/PanelEditor/PanelEditorQueries.tsx b/public/app/features/dashboard/components/PanelEditor/PanelEditorQueries.tsx index abdf6ffc6bb..85029438a59 100644 --- a/public/app/features/dashboard/components/PanelEditor/PanelEditorQueries.tsx +++ b/public/app/features/dashboard/components/PanelEditor/PanelEditorQueries.tsx @@ -19,20 +19,18 @@ export class PanelEditorQueries extends PureComponent { } buildQueryOptions(panel: PanelModel): QueryGroupOptions { - const dataSource: QueryGroupDataSource = panel.datasource?.uid - ? { - default: false, - ...panel.datasource, - } - : { - default: true, - }; - - const datasourceSettings = getDatasourceSrv().getInstanceSettings(dataSource.uid); + const dataSource: QueryGroupDataSource = panel.datasource ?? { + default: true, + }; + const datasourceSettings = getDatasourceSrv().getInstanceSettings(dataSource); return { cacheTimeout: datasourceSettings?.meta.queryOptions?.cacheTimeout ? panel.cacheTimeout : undefined, - dataSource, + dataSource: { + default: datasourceSettings?.isDefault, + type: datasourceSettings?.type, + uid: datasourceSettings?.uid, + }, queries: panel.targets, maxDataPoints: panel.maxDataPoints, minInterval: panel.interval,