From 51cd3a0d0c8af63ae1cac0dd1537037fb345dc88 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Tue, 9 Jan 2018 15:58:24 +0300
Subject: [PATCH] alert list: fix rendering timeout when share panel (#10467)

---
 public/app/plugins/panel/alertlist/module.ts | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/public/app/plugins/panel/alertlist/module.ts b/public/app/plugins/panel/alertlist/module.ts
index 1b18c4183a73..35fbaead3b12 100644
--- a/public/app/plugins/panel/alertlist/module.ts
+++ b/public/app/plugins/panel/alertlist/module.ts
@@ -74,13 +74,19 @@ class AlertListPanel extends PanelCtrl {
   }
 
   onRefresh() {
+    let getAlertsPromise;
+
     if (this.panel.show === 'current') {
-      this.getCurrentAlertState();
+      getAlertsPromise = this.getCurrentAlertState();
     }
 
     if (this.panel.show === 'changes') {
-      this.getStateChanges();
+      getAlertsPromise = this.getStateChanges();
     }
+
+    getAlertsPromise.then(() => {
+      this.renderingCompleted();
+    });
   }
 
   getStateChanges() {
@@ -97,7 +103,7 @@ class AlertListPanel extends PanelCtrl {
     params.from = dateMath.parse(this.dashboard.time.from).unix() * 1000;
     params.to = dateMath.parse(this.dashboard.time.to).unix() * 1000;
 
-    this.backendSrv.get(`/api/annotations`, params).then(res => {
+    return this.backendSrv.get(`/api/annotations`, params).then(res => {
       this.alertHistory = _.map(res, al => {
         al.time = this.dashboard.formatDate(al.time, 'MMM D, YYYY HH:mm:ss');
         al.stateModel = alertDef.getStateDisplayModel(al.newState);
@@ -105,6 +111,8 @@ class AlertListPanel extends PanelCtrl {
         return al;
       });
       this.noAlertsMessage = this.alertHistory.length === 0 ? 'No alerts in current time range' : '';
+
+      return this.alertHistory;
     });
   }
 
@@ -117,7 +125,7 @@ class AlertListPanel extends PanelCtrl {
       params.dashboardId = this.dashboard.id;
     }
 
-    this.backendSrv.get(`/api/alerts`, params).then(res => {
+    return this.backendSrv.get(`/api/alerts`, params).then(res => {
       this.currentAlerts = this.sortResult(
         _.map(res, al => {
           al.stateModel = alertDef.getStateDisplayModel(al.state);
@@ -128,6 +136,8 @@ class AlertListPanel extends PanelCtrl {
         })
       );
       this.noAlertsMessage = this.currentAlerts.length === 0 ? 'No alerts' : '';
+
+      return this.currentAlerts;
     });
   }