From 646bc54d0961420f36b525b8b44dc61cf07fbe54 Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Thu, 13 Jan 2022 10:43:12 +0100 Subject: [PATCH] only push default datasources to the list if they're not undefined (#43966) (#43990) (cherry picked from commit 8f1468df6aaebe8c59f5bb67bbfcdd4517913c37) Co-authored-by: Ashley Harrison --- public/app/features/plugins/datasource_srv.ts | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/public/app/features/plugins/datasource_srv.ts b/public/app/features/plugins/datasource_srv.ts index dd17b7faa0d..7db01beddeb 100644 --- a/public/app/features/plugins/datasource_srv.ts +++ b/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); + } } }