From b6c501bc8a2e535a83d8beb757a46d1d488a7a8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 13 Sep 2019 10:09:25 +0200 Subject: [PATCH] QueryProcessing: Added missing error event for angular editors (#19059) * QueryProcessing: Added missing error event for angular editors * fix if else --- .../features/dashboard/panel_editor/QueryEditorRow.tsx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/public/app/features/dashboard/panel_editor/QueryEditorRow.tsx b/public/app/features/dashboard/panel_editor/QueryEditorRow.tsx index 4f5579b754b..31b0377a032 100644 --- a/public/app/features/dashboard/panel_editor/QueryEditorRow.tsx +++ b/public/app/features/dashboard/panel_editor/QueryEditorRow.tsx @@ -274,8 +274,12 @@ function notifyAngularQueryEditorsOfData(panel: PanelModel, data: PanelData, edi globalLastPanelDataCache = data; - const legacy = data.series.map(v => toLegacyResponseData(v)); - panel.events.emit('data-received', legacy); + if (data.state === LoadingState.Done) { + const legacy = data.series.map(v => toLegacyResponseData(v)); + panel.events.emit('data-received', legacy); + } else if (data.state === LoadingState.Error) { + panel.events.emit('data-error', data.error); + } // Some query controllers listen to data error events and need a digest // for some reason this needs to be done in next tick