From 81afb47ef39d8abfd92f59b075034a1327eaa4e9 Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Tue, 16 Aug 2022 03:42:31 -0400 Subject: [PATCH] Fix initDashboard bug (#53722) (#53759) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Erik Sundell (cherry picked from commit c8fc840865abba5e85f90acb82baa4a9ab86a7d2) Co-authored-by: Torkel Ödegaard --- public/app/features/dashboard/state/initDashboard.test.ts | 4 ++++ public/app/features/dashboard/state/initDashboard.ts | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/public/app/features/dashboard/state/initDashboard.test.ts b/public/app/features/dashboard/state/initDashboard.test.ts index 468634c22a2..4425f8491a7 100644 --- a/public/app/features/dashboard/state/initDashboard.test.ts +++ b/public/app/features/dashboard/state/initDashboard.test.ts @@ -160,6 +160,10 @@ function describeInitScenario(description: string, scenarioFn: ScenarioFn) { title: 'Redshift and Azure', type: 'stat', }, + { + id: 9, + type: 'text', + }, ], title: 'Collapsed Panel', type: 'row', diff --git a/public/app/features/dashboard/state/initDashboard.ts b/public/app/features/dashboard/state/initDashboard.ts index 7593c199573..12a8d0d48e3 100644 --- a/public/app/features/dashboard/state/initDashboard.ts +++ b/public/app/features/dashboard/state/initDashboard.ts @@ -115,7 +115,7 @@ const getQueriesByDatasource = ( panels.forEach((panel) => { if (panel.panels) { getQueriesByDatasource(panel.panels, queries); - } else { + } else if (panel.targets) { panel.targets.forEach((target) => { if (target.datasource?.type) { if (queries[target.datasource.type]) {