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

QueryEditor: Set data source type in mixed query data source ref (#48734)

Browse Source
This commit is contained in:
Josh Hunt 2022-05-05 15:09:00 +01:00 committed by GitHub
parent a98fae32fc
commit b04fb8522d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
public/app/features/query/components/QueryEditorRows.tsx
View File

@ -5,6 +5,7 @@ import {
CoreApp, CoreApp,
DataQuery, DataQuery,
DataSourceInstanceSettings, DataSourceInstanceSettings,
DataSourceRef,
EventBusExtended, EventBusExtended,
HistoryItem, HistoryItem,
PanelData, PanelData,
@ -60,13 +61,18 @@ export class QueryEditorRows extends PureComponent<Props> {
return item; return item;
} }
const dataSourceRef: DataSourceRef = {
type: dataSource.type,
uid: dataSource.uid,
};
if (item.datasource) { if (item.datasource) {
const previous = getDataSourceSrv().getInstanceSettings(item.datasource); const previous = getDataSourceSrv().getInstanceSettings(item.datasource);
if (previous?.type === dataSource.type) { if (previous?.type === dataSource.type) {
return { return {
...item, ...item,
datasource: { uid: dataSource.uid }, datasource: dataSourceRef,
}; };
} }
} }
@ -74,7 +80,7 @@ export class QueryEditorRows extends PureComponent<Props> {
return { return {
refId: item.refId, refId: item.refId,
hide: item.hide, hide: item.hide,
datasource: { uid: dataSource.uid }, datasource: dataSourceRef,
}; };
}) })
); );