From 9390b1eef5a724d03525b2f47ddf99783cf47e24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Thu, 14 Aug 2014 12:15:46 +0200
Subject: [PATCH] Small cleanup of dashboard partial, removed unused stuff

---
 src/app/controllers/console-ctrl.js | 15 +----------
 src/app/controllers/dash.js         |  4 +++
 src/app/controllers/grafanaCtrl.js  | 40 ++++++++++++++++++++++++++++-
 src/app/partials/dashboard.html     |  2 +-
 src/app/partials/load.html          |  4 ---
 src/app/partials/roweditor.html     |  2 --
 src/app/services/panelSrv.js        |  6 +++++
 7 files changed, 51 insertions(+), 22 deletions(-)
 delete mode 100644 src/app/partials/load.html

diff --git a/src/app/controllers/console-ctrl.js b/src/app/controllers/console-ctrl.js
index e2194b8eca9..5b2d277f9d1 100644
--- a/src/app/controllers/console-ctrl.js
+++ b/src/app/controllers/console-ctrl.js
@@ -15,20 +15,6 @@ function (angular, _, moment) {
 
   var events = [];
 
-  var oldLog = console.log;
-  console.log = function (message) {
-    try {
-      if (_.isObject(message)) {
-        message = angular.toJson(message);
-        if (message.length > 50) {
-          message = message.substring(0, 50);
-        }
-      }
-      events.push(new ConsoleEvent('log', message, {}));
-      oldLog.apply(console, arguments);
-    } catch (e) { }
-  };
-
   function ConsoleEvent(type, title, data) {
     this.type = type;
     this.title = title;
@@ -112,6 +98,7 @@ function (angular, _, moment) {
     $httpProvider.interceptors.push('mupp');
   });
 
+
   module.controller('ConsoleCtrl', function($scope) {
 
     $scope.events = events;
diff --git a/src/app/controllers/dash.js b/src/app/controllers/dash.js
index 3706a0a4109..177b5b4fec7 100644
--- a/src/app/controllers/dash.js
+++ b/src/app/controllers/dash.js
@@ -26,6 +26,10 @@ function (angular, $, config, _) {
     $scope.setupDashboard = function(event, dashboardData) {
       timer.cancel_all();
 
+      $scope.performance.dashboardLoadStart = new Date().getTime();
+      $scope.performance.panelsInitialized = 0;
+      $scope.performance.panelsRendered= 0;
+
       $scope.dashboard = dashboardSrv.create(dashboardData);
       $scope.dashboardViewState = dashboardViewStateSrv.create($scope);
 
diff --git a/src/app/controllers/grafanaCtrl.js b/src/app/controllers/grafanaCtrl.js
index eaf3dfd0422..3c8630d71f0 100644
--- a/src/app/controllers/grafanaCtrl.js
+++ b/src/app/controllers/grafanaCtrl.js
@@ -2,8 +2,9 @@ define([
   'angular',
   'config',
   'lodash',
+  'jquery',
 ],
-function (angular, config, _) {
+function (angular, config, _, $) {
   "use strict";
 
   var module = angular.module('grafana.controllers');
@@ -11,6 +12,20 @@ function (angular, config, _) {
   module.controller('GrafanaCtrl', function($scope, alertSrv, grafanaVersion, $rootScope) {
 
     $scope.grafanaVersion = grafanaVersion[0] === '@' ? 'master' : grafanaVersion;
+    $scope.performance = { loadStart: new Date().getTime() };
+
+    var count = 0;
+    $scope.$watch(function() {
+      console.log(1);
+      count++;
+    }, function() {
+    });
+
+    setTimeout(function() {
+      console.log("Dashboard::Performance Total Digests: " + count);
+      console.log("Dashboard::Performance Total Watchers: " + $scope.getTotalWatcherCount());
+      console.log("Dashboard::Performance Total ScopeCount: " + $scope.performance.scopeCount);
+    }, 3000);
 
     $scope.init = function() {
       $scope._ = _;
@@ -46,6 +61,29 @@ function (angular, config, _) {
       "#E0F9D7","#FCEACA","#CFFAFF","#F9E2D2","#FCE2DE","#BADFF4","#F9D9F9","#DEDAF7"  //7
     ];
 
+    $scope.getTotalWatcherCount = function() {
+      var count = 0;
+      var scopes = 0;
+      var root = $(document.getElementsByTagName('body'));
+
+      var f = function (element) {
+        if (element.data().hasOwnProperty('$scope')) {
+          scopes++;
+          angular.forEach(element.data().$scope.$$watchers, function () {
+            count++;
+          });
+        }
+
+        angular.forEach(element.children(), function (childElement) {
+          f($(childElement));
+        });
+      };
+
+      f(root);
+      $scope.performance.scopeCount = scopes;
+      return count;
+    };
+
     $scope.init();
 
   });
diff --git a/src/app/partials/dashboard.html b/src/app/partials/dashboard.html
index b6a7287f536..7a4d9fb92ca 100644
--- a/src/app/partials/dashboard.html
+++ b/src/app/partials/dashboard.html
@@ -98,7 +98,7 @@
 							</div>
 
               <!-- Panels -->
-              <div ng-repeat="(name, panel) in row.panels|filter:isPanel" ng-hide="panel.hide" class="panel nospace" ng-style="{'width':(panel.span/1.2)*10+'%'}" data-drop="true" ng-model="row.panels" data-jqyoui-options jqyoui-droppable="{index:$index,mutate:false,onDrop:'panelMoveDrop',onOver:'panelMoveOver(true)',onOut:'panelMoveOut'}" ng-class="{'dragInProgress':dashboard.$$panelDragging}">
+              <div ng-repeat="(name, panel) in row.panels" class="panel nospace" ng-style="{'width':(panel.span/1.2)*10+'%'}" data-drop="true" ng-model="row.panels" data-jqyoui-options jqyoui-droppable="{index:$index,mutate:false,onDrop:'panelMoveDrop',onOver:'panelMoveOver(true)',onOut:'panelMoveOut'}" ng-class="{'dragInProgress':dashboard.$$panelDragging}">
                 <!-- Content Panel -->
                 <div style="position:relative">
                   <grafana-panel type="panel.type" ng-cloak></grafana-panel>
diff --git a/src/app/partials/load.html b/src/app/partials/load.html
deleted file mode 100644
index 27d012b845d..00000000000
--- a/src/app/partials/load.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<div style="margin-top:50px" ng-controller="dashcontrol">
-    <strong>type: </strong>{{type}} <br>
-    <strong>id: </strong>{{id}} <br>
-</div>
\ No newline at end of file
diff --git a/src/app/partials/roweditor.html b/src/app/partials/roweditor.html
index eb3bc9258a6..f47e2901ea6 100644
--- a/src/app/partials/roweditor.html
+++ b/src/app/partials/roweditor.html
@@ -31,7 +31,6 @@
           <th>Delete</th>
           <th>Move</th>
           <th></th>
-          <th>Hide</th>
         </thead>
         <tr ng-repeat="panel in row.panels">
           <td>{{panel.title}}</td>
@@ -40,7 +39,6 @@
           <td><i ng-click="row.panels = _.without(row.panels,panel)" class="pointer icon-remove"></i></td>
           <td><i ng-click="_.move(row.panels,$index,$index-1)" ng-hide="$first" class="pointer icon-arrow-up"></i></td>
           <td><i ng-click="_.move(row.panels,$index,$index+1)" ng-hide="$last" class="pointer icon-arrow-down"></i></td>
-          <td><input type="checkbox" ng-model="panel.hide" ng-checked="panel.hide"></td>
         </tr>
       </table>
     </div>
diff --git a/src/app/services/panelSrv.js b/src/app/services/panelSrv.js
index fd0c732f43b..04948132bea 100644
--- a/src/app/services/panelSrv.js
+++ b/src/app/services/panelSrv.js
@@ -129,6 +129,12 @@ function (angular, _) {
           $scope.get_data();
         }
       }
+
+      $scope.performance.panelsInitialized++;
+      if ($scope.performance.panelsInitialized === $scope.dashboard.rows.length) {
+        var timeTaken = new Date().getTime() - $scope.performance.dashboardLoadStart;
+        console.log("Dashboard::Performance - All panels initialized in " + timeTaken + " ms");
+      }
     };
   });