Misthios/grafana-zabbix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

problems: show loading indicator

Browse Source
This commit is contained in:
Alexander Zobnin
2018-12-27 14:37:58 +03:00
parent 837e98861c
commit b04ecc7abe
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/panel-triggers/triggers_panel_ctrl.js
View File

@@ -171,11 +171,13 @@ export class TriggerPanelCtrl extends PanelCtrl {
this.pageIndex = 0; this.pageIndex = 0;
return this.getTriggers() return this.getTriggers()
.then(triggers => this.renderTriggers(triggers)) .then(triggers => {
.then(() => {
// Notify panel that request is finished // Notify panel that request is finished
this.loading = false; this.loading = false;
this.setTimeQueryEnd(); this.setTimeQueryEnd();
return this.renderTriggers(triggers)
})
.then(() => {
this.$timeout(() => { this.$timeout(() => {
this.renderingCompleted(); this.renderingCompleted();
}); });
@@ -719,7 +721,6 @@ export class TriggerPanelCtrl extends PanelCtrl {
function renderProblems() { function renderProblems() {
console.debug('rendering ProblemsList React component'); console.debug('rendering ProblemsList React component');
// console.log(ctrl);
const timeFrom = Math.ceil(dateMath.parse(ctrl.range.from) / 1000); const timeFrom = Math.ceil(dateMath.parse(ctrl.range.from) / 1000);
const timeTo = Math.ceil(dateMath.parse(ctrl.range.to) / 1000); const timeTo = Math.ceil(dateMath.parse(ctrl.range.to) / 1000);
@@ -731,6 +732,7 @@ export class TriggerPanelCtrl extends PanelCtrl {
problems: ctrl.triggerList, problems: ctrl.triggerList,
panelOptions, panelOptions,
timeRange: { timeFrom, timeTo }, timeRange: { timeFrom, timeTo },
loading: ctrl.loading,
getProblemEvents: ctrl.getProblemEvents.bind(ctrl), getProblemEvents: ctrl.getProblemEvents.bind(ctrl),
onProblemAck: (trigger, data) => { onProblemAck: (trigger, data) => {
const message = data.message; const message = data.message;