From fa813024ca1f241880114f7b052da79abe74216c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Thu, 6 Nov 2014 12:30:42 +0100
Subject: [PATCH] SingleStatPanel: various fixes

---
 src/app/panels/stats/module.js                      |  4 +++-
 src/app/panels/stats/statsDirective.js              | 12 +++---------
 src/app/services/dashboard/dashboardSrv.js          |  5 +++++
 src/app/services/dashboard/dashboardViewStateSrv.js |  4 +++-
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/app/panels/stats/module.js b/src/app/panels/stats/module.js
index 31ebf0aeba6..a98a636f370 100644
--- a/src/app/panels/stats/module.js
+++ b/src/app/panels/stats/module.js
@@ -169,7 +169,9 @@ function (angular, app, _, TimeSeries, kbn) {
       var data = {};
 
       if (!$scope.series || $scope.series.length === 0) {
-        data.series = { mainValue: null, datapoints: [] };
+        data.flotpairs = [];
+        data.mainValue = Number.NaN;
+        data.mainValueFormated = 'NaN';
       }
       else {
         var series = $scope.series[0];
diff --git a/src/app/panels/stats/statsDirective.js b/src/app/panels/stats/statsDirective.js
index 7049471b999..27cc61456b1 100644
--- a/src/app/panels/stats/statsDirective.js
+++ b/src/app/panels/stats/statsDirective.js
@@ -21,14 +21,6 @@ function (angular, app, _, kbn, $) {
         var $panelContainer = elem.parents('.panel-container');
 
         scope.$on('render', function() {
-          data = scope.data;
-          panel = scope.panel;
-
-          if (!data || data.flotpairs.length === 0) {
-            elem.html('no data');
-            return;
-          }
-
           render();
         });
 
@@ -148,9 +140,11 @@ function (angular, app, _, kbn, $) {
         }
 
         function render() {
+          data = scope.data;
+          panel = scope.panel;
+
           setElementHeight();
 
-          var panel = scope.panel;
           var body = getBigValueHtml();
 
           if (panel.colorBackground && data.mainValue) {
diff --git a/src/app/services/dashboard/dashboardSrv.js b/src/app/services/dashboard/dashboardSrv.js
index 687a4931397..7ebe337b432 100644
--- a/src/app/services/dashboard/dashboardSrv.js
+++ b/src/app/services/dashboard/dashboardSrv.js
@@ -99,10 +99,15 @@ function (angular, $, kbn, _, moment) {
             result.panel = panel;
             result.row = row;
             result.index = index;
+            return;
           }
         });
       });
 
+      if (!result.panel) {
+        return null;
+      }
+
       return result;
     };
 
diff --git a/src/app/services/dashboard/dashboardViewStateSrv.js b/src/app/services/dashboard/dashboardViewStateSrv.js
index 6eafcc8dd66..1176ca9450b 100644
--- a/src/app/services/dashboard/dashboardViewStateSrv.js
+++ b/src/app/services/dashboard/dashboardViewStateSrv.js
@@ -39,7 +39,9 @@ function (angular, _, $) {
       if (!this.state.panelId) { return; }
 
       var panelInfo = this.$scope.dashboard.getPanelInfoById(this.state.panelId);
-      panelInfo.row.collapse = false;
+      if (panelInfo) {
+        panelInfo.row.collapse = false;
+      }
     };
 
     DashboardViewState.prototype.needsSync = function(urlState) {