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

Explore: Fix datasource selector being empty with single datasource

Browse Source 
- The "missing" action was triggered unless the number of datasource >1 🤦
- Made datasource preselection more robust in case the requested datasource is already gone
This commit is contained in:
David Kaltschmidt 2019-01-17 12:07:42 +01:00
parent af8425da08
commit 648a775acb
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
public/app/features/explore/state/actions.ts
View File

@ -161,11 +161,17 @@ export function initializeExplore(
}, },
}); });
if (exploreDatasources.length > 1) { if (exploreDatasources.length >= 1) {
let instance; let instance;
if (datasource) { if (datasource) {
instance = await getDatasourceSrv().get(datasource); try {
} else { instance = await getDatasourceSrv().get(datasource);
} catch (error) {
console.error(error);
}
}
// Checking on instance here because requested datasource could be deleted already
if (!instance) {
instance = await getDatasourceSrv().get(); instance = await getDatasourceSrv().get();
} }
dispatch(loadDatasource(exploreId, instance)); dispatch(loadDatasource(exploreId, instance));