only push default datasources to the list if they're not undefined (#43966) (#43990)

(cherry picked from commit 8f1468df6a)

Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
This commit is contained in:
Grot (@grafanabot)
2022-01-13 10:43:12 +01:00
committed by GitHub
co-authored by Ashley Harrison
parent d4a1fad604
commit 646bc54d09
+12 -3
View File
@@ -268,15 +268,24 @@ export class DatasourceSrv implements DataSourceService {
if (!filters.pluginId && !filters.alerting) {
if (filters.mixed) {
base.push(this.getInstanceSettings('-- Mixed --')!);
const mixedInstanceSettings = this.getInstanceSettings('-- Mixed --');
if (mixedInstanceSettings) {
base.push(mixedInstanceSettings);
}
}
if (filters.dashboard) {
base.push(this.getInstanceSettings('-- Dashboard --')!);
const dashboardInstanceSettings = this.getInstanceSettings('-- Dashboard --');
if (dashboardInstanceSettings) {
base.push(dashboardInstanceSettings);
}
}
if (!filters.tracing) {
base.push(this.getInstanceSettings('-- Grafana --')!);
const grafanaInstanceSettings = this.getInstanceSettings('-- Grafana --');
if (grafanaInstanceSettings) {
base.push(grafanaInstanceSettings);
}
}
}