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>
pull/43993/head
Grot (@grafanabot) 4 years ago committed by GitHub
parent d4a1fad604
commit 646bc54d09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 15
      public/app/features/plugins/datasource_srv.ts

@ -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);
}
}
}

Loading…
Cancel
Save