From be3f91b86246e85baa1e2960489e8e9fe8e78454 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Thu, 27 Dec 2018 17:54:37 +0300 Subject: [PATCH] problems: show loading only on initial state --- src/panel-triggers/triggers_panel_ctrl.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/panel-triggers/triggers_panel_ctrl.js b/src/panel-triggers/triggers_panel_ctrl.js index 5f3a31c..b44d476 100644 --- a/src/panel-triggers/triggers_panel_ctrl.js +++ b/src/panel-triggers/triggers_panel_ctrl.js @@ -590,6 +590,7 @@ export class TriggerPanelCtrl extends PanelCtrl { const fontSizeProp = fontSize && fontSize !== 100 ? fontSize : null; const pageSize = panel.pageSize || 10; + const loading = ctrl.loading && (!ctrl.triggerList || !ctrl.triggerList.length) let panelOptions = {}; for (let prop in PANEL_DEFAULTS) { @@ -599,8 +600,8 @@ export class TriggerPanelCtrl extends PanelCtrl { problems: ctrl.triggerList, panelOptions, timeRange: { timeFrom, timeTo }, - loading: ctrl.loading, - pageSize: pageSize, + loading, + pageSize, fontSize: fontSizeProp, getProblemEvents: ctrl.getProblemEvents.bind(ctrl), onPageSizeChange: ctrl.handlePageSizeChange.bind(ctrl),