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

PanelEdit: making sure the correct datasource query editor is being rendered. (#29500)

Browse Source 
* making sure we try to use the selected db in the query row.

* fixing so we use || instead of ??.
This commit is contained in:
Marcus Andersson 2020-12-02 11:04:42 +01:00 committed by GitHub
parent 63c8945db5
commit 863dbc7ba8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/app/features/query/components/QueryEditorRow.tsx
View File

@ -88,12 +88,13 @@ export class QueryEditorRow extends PureComponent<Props, State> {
} }
async loadDatasource() { async loadDatasource() {
const { query, panel } = this.props; const { query, panel, dataSourceValue } = this.props;
const dataSourceSrv = getDatasourceSrv(); const dataSourceSrv = getDatasourceSrv();
let datasource; let datasource;
try { try {
datasource = await dataSourceSrv.get(query.datasource || panel.datasource); const datasourceName = dataSourceValue || query.datasource || panel.datasource;
datasource = await dataSourceSrv.get(datasourceName);
} catch (error) { } catch (error) {
datasource = await dataSourceSrv.get(); datasource = await dataSourceSrv.get();
} }