From c40b53eb575e62f216ff38c1b4c77106e70dbdb7 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Thu, 31 Mar 2016 21:40:02 +0300
Subject: [PATCH] Fixed Triggers panel refreshing.

---
 src/panel-triggers/editor.html | 20 ++++++++++----------
 src/panel-triggers/editor.js   |  8 ++++----
 src/panel-triggers/module.js   | 15 ++++++++++++++-
 3 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/src/panel-triggers/editor.html b/src/panel-triggers/editor.html
index 9a0c00c..fc55d3e 100644
--- a/src/panel-triggers/editor.html
+++ b/src/panel-triggers/editor.html
@@ -98,7 +98,7 @@
             <select class="input-medium tight-form-input"
                     ng-model="editor.panel.showTriggers"
                     ng-options="f for f in editor.ackFilters"
-                    ng-change="editor.panelCtrl.refreshData()">
+                    ng-change="editor.panelCtrl.refresh()">
             </select>
           </li>
           <li class="tight-form-item" style="width: 13em">
@@ -109,7 +109,7 @@
                     type="number"
                     ng-model="editor.panel.limit"
                     ng-model-onblur
-                    ng-change="editor.panelCtrl.refreshData()">
+                    ng-change="editor.panelCtrl.refresh()">
           </li>
         </ul>
         <div class="clearfix"></div>
@@ -123,7 +123,7 @@
             <select class="input-medium tight-form-input"
                     ng-model="editor.panel.sortTriggersBy"
                     ng-options="f.text for f in editor.sortByFields track by f.value"
-                    ng-change="editor.panelCtrl.refreshData()">
+                    ng-change="editor.panelCtrl.refresh()">
             </select>
           </li>
           <li class="tight-form-item" style="width: 13em">
@@ -133,7 +133,7 @@
             <select class="tight-form-input input-medium"
                     ng-model="editor.panel.showEvents"
                     ng-options="f.text for f in editor.showEventsFields track by f.value"
-                    ng-change="editor.panelCtrl.refreshData()">
+                    ng-change="editor.panelCtrl.refresh()">
             </select>
           </li>
         </ul>
@@ -209,7 +209,7 @@
             <input  class="cr1"
                     id="customLastChangeFormat"
                     type="checkbox"
-                    ng-change="editor.panelCtrl.refreshData()"
+                    ng-change="editor.panelCtrl.refresh()"
                     ng-model="editor.panel.customLastChangeFormat"
                     ng-checked="editor.panel.customLastChangeFormat">
             <label for="customLastChangeFormat" class="cr1"></label>
@@ -217,7 +217,7 @@
           <li ng-if="editor.panel.customLastChangeFormat">
             <input  type="text"
                     ng-model="editor.panel.lastChangeFormat"
-                    ng-blur="editor.panelCtrl.refreshData()"
+                    ng-blur="editor.panelCtrl.refresh()"
                     placeholder="dddd, MMMM Do YYYY, h:mm:ss a"
                     class="tight-form-input"
                     style="width: 300px"
@@ -250,10 +250,10 @@
                   style="color: white"
                   ng-style="{background: trigger.color}"
                   ng-model-onblur
-                  ng-change="editor.panelCtrl.refreshData()">
+                  ng-change="editor.panelCtrl.refresh()">
         </li>
         <li class="tight-form-item">
-          <spectrum-picker ng-model="trigger.color" ng-change="editor.panelCtrl.refreshData()"></spectrum-picker>
+          <spectrum-picker ng-model="trigger.color" ng-change="editor.panelCtrl.refresh()"></spectrum-picker>
         </li>
         <li class="tight-form-item last" style="width: 28px">
           <label class="checkbox-label" for="{{ 'trigger-show-' + $index }}"></label>
@@ -262,7 +262,7 @@
                     type="checkbox"
                     ng-model="trigger.show"
                     ng-checked="trigger.show"
-                    ng-change="editor.panelCtrl.refreshData()">
+                    ng-change="editor.panelCtrl.refresh()">
             <label for="{{ 'trigger-show-' + $index }}" class="cr1"></label>
         </li>
       </ul>
@@ -278,7 +278,7 @@
         <li class="tight-form-item">
           <spectrum-picker
             ng-model="editor.panel.okEventColor"
-            ng-change="editor.panelCtrl.refreshData()">
+            ng-change="editor.panelCtrl.refresh()">
           </spectrum-picker>
         </li>
       </ul>
diff --git a/src/panel-triggers/editor.js b/src/panel-triggers/editor.js
index 65cbecc..df53ff5 100644
--- a/src/panel-triggers/editor.js
+++ b/src/panel-triggers/editor.js
@@ -73,7 +73,7 @@ class TriggerPanelEditorCtrl{
     this.datasourceSrv.get(this.panel.datasource).then(function (datasource) {
       self.datasource = datasource;
       self.initFilters();
-      self.panelCtrl.refreshData();
+      self.panelCtrl.refresh();
     });
   }
 
@@ -119,7 +119,7 @@ class TriggerPanelEditorCtrl{
     var newTarget = _.cloneDeep(this.panel.triggers);
     if (!_.isEqual(this.oldTarget, this.panel.triggers)) {
       this.oldTarget = newTarget;
-      this.panelCtrl.refreshData();
+      this.panelCtrl.refresh();
     }
   }
 
@@ -128,11 +128,11 @@ class TriggerPanelEditorCtrl{
       trigger.color = this.panel.triggerSeverity[trigger.priority].color;
       trigger.severity = this.panel.triggerSeverity[trigger.priority].severity;
     });
-    this.panelCtrl.refreshData();
+    this.panelCtrl.refresh();
   }
 
   datasourceChanged() {
-    this.panelCtrl.refreshData();
+    this.panelCtrl.refresh();
   }
 
   changeTriggerSeverityColor(trigger, color) {
diff --git a/src/panel-triggers/module.js b/src/panel-triggers/module.js
index 7d791fe..b29c0b0 100644
--- a/src/panel-triggers/module.js
+++ b/src/panel-triggers/module.js
@@ -80,7 +80,19 @@ class TriggerPanelCtrl extends MetricsPanelCtrl {
     this.addEditorTab('Options', triggerPanelEditor, 2);
   }
 
+  refresh() {
+    this.onMetricsPanelRefresh();
+  }
+
   onMetricsPanelRefresh() {
+    // ignore fetching data if another panel is in fullscreen
+    if (this.otherPanelInFullscreenMode()) { return; }
+
+    // clear loading/error state
+    delete this.error;
+    this.loading = true;
+    this.setTimeQueryStart();
+
     this.refreshData();
   }
 
@@ -196,7 +208,8 @@ class TriggerPanelCtrl extends MetricsPanelCtrl {
                 // Limit triggers number
                 self.triggerList  = _.first(triggerList, self.panel.limit);
 
-                self.renderingCompleted();
+                this.setTimeQueryEnd();
+                this.loading = false;
               });
           });
       });