From 54b677bda468fc5756fa2fe3747fef5666def058 Mon Sep 17 00:00:00 2001 From: Ryan McKinley Date: Tue, 15 Sep 2020 11:55:34 -0700 Subject: [PATCH] Graph: show range warning when all data is outside time range (#27603) --- public/app/plugins/panel/graph/module.ts | 50 ++++++++++++------------ 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/public/app/plugins/panel/graph/module.ts b/public/app/plugins/panel/graph/module.ts index 08ec86d6969..42a2ecc3f8b 100644 --- a/public/app/plugins/panel/graph/module.ts +++ b/public/app/plugins/panel/graph/module.ts @@ -271,35 +271,35 @@ export class GraphCtrl extends MetricsPanelCtrl { }; } - // Look for data points outside time range + // If any data is in range, do not return an error for (const series of this.seriesList) { if (!series.isOutsideRange) { - continue; + return undefined; } - - const dataWarning: DataWarning = { - title: 'Data outside time range', - tip: 'Can be caused by timezone mismatch or missing time filter in query', - }; - - const range = getDataTimeRange(this.dataList); - - if (range) { - dataWarning.actionText = 'Zoom to data'; - dataWarning.action = () => { - getLocationSrv().update({ - partial: true, - query: { - from: range.from, - to: range.to, - }, - }); - }; - } - - return dataWarning; } - return undefined; + + // All data is outside the time range + const dataWarning: DataWarning = { + title: 'Data outside time range', + tip: 'Can be caused by timezone mismatch or missing time filter in query', + }; + + const range = getDataTimeRange(this.dataList); + + if (range) { + dataWarning.actionText = 'Zoom to data'; + dataWarning.action = () => { + getLocationSrv().update({ + partial: true, + query: { + from: range.from, + to: range.to, + }, + }); + }; + } + + return dataWarning; } onRender() {