ux(dashboard): Fixing broken unit test made by changes for dash edit mode, grafana#6442

torkelo · torkelo · commit 18056e53cc75 · 2016-11-01T14:35:35.000+01:00
diff --git a/public/app/features/dashboard/model.ts b/public/app/features/dashboard/model.ts
@@ -158,12 +158,6 @@ export class DashboardModel {
     return null;
   }
 
-  rowSpan(row) {
-    return _.reduce(row.panels, function(p,v) {
-      return p + v.span;
-    },0);
-  };
-
   addPanel(panel, row) {
     panel.id = this.getNextPanelId();
     row.addPanel(panel);
@@ -540,6 +534,7 @@ export class DashboardModel {
         // update graph yaxes changes
         panelUpgrades.push(function(panel) {
           if (panel.type !== 'graph') { return; }
+          if (!panel.grid) { return; }
 
           panel.thresholds = [];
           var t1: any = {}, t2: any = {};
diff --git a/public/app/features/dashboard/row/add_panel.ts b/public/app/features/dashboard/row/add_panel.ts
@@ -81,13 +81,13 @@ export class AddPanelCtrl {
 
   addPanel(panelPluginInfo) {
     var defaultSpan = 12;
-    var _as = 12 - this.dashboard.rowSpan(this.row);
+    var span = 12 - this.row.span;
 
     var panel = {
       id: null,
       title: config.new_panel_title,
       error: false,
-      span: _as < defaultSpan && _as > 0 ? _as : defaultSpan,
+      span: span < defaultSpan && span > 0 ? span : defaultSpan,
       editable: true,
       type: panelPluginInfo.id,
       isNew: true,
diff --git a/public/app/features/dashboard/row/row_ctrl.ts b/public/app/features/dashboard/row/row_ctrl.ts
@@ -198,7 +198,7 @@ coreModule.directive('panelDropZone', function($timeout) {
           return showPanel(12, 'Empty Space');
         }
 
-        var dropZoneSpan = 12 - scope.ctrl.dashboard.rowSpan(scope.ctrl.row);
+        var dropZoneSpan = 12 - row.span;
         if (dropZoneSpan > 0) {
           if (indrag)  {
             return showPanel(dropZoneSpan, 'Drop Here');
@@ -209,7 +209,7 @@ coreModule.directive('panelDropZone', function($timeout) {
       }
 
       if (indrag === true) {
-        var dropZoneSpan = 12 - scope.ctrl.dashboard.rowSpan(scope.ctrl.row);
+        var dropZoneSpan = 12 - row.span;
         if (dropZoneSpan > 1) {
           return showPanel(dropZoneSpan, 'Drop Here');
         }
diff --git a/public/app/features/dashboard/specs/dashboard_srv_specs.ts b/public/app/features/dashboard/specs/dashboard_srv_specs.ts
@@ -51,18 +51,13 @@ describe('dashboardSrv', function() {
       dashboard = _dashboardSrv.create({});
     });
 
-    it('row span should sum spans', function() {
-      var spanLeft = dashboard.rowSpan({ panels: [{ span: 2 }, { span: 3 }] });
-      expect(spanLeft).to.be(5);
-    });
-
     it('adding default should split span in half', function() {
-      dashboard.rows = [{ panels: [{ span: 12, id: 7 }] }];
-      dashboard.addPanel({span: 4}, dashboard.rows[0]);
+      dashboard.addEmptyRow();
+      dashboard.rows[0].addPanel({span: 12});
+      dashboard.rows[0].addPanel({span: 12});
 
       expect(dashboard.rows[0].panels[0].span).to.be(6);
       expect(dashboard.rows[0].panels[1].span).to.be(6);
-      expect(dashboard.rows[0].panels[1].id).to.be(8);
     });
 
     it('duplicate panel should try to add it to same row', function() {
diff --git a/public/app/features/dashboard/specs/exporter_specs.ts b/public/app/features/dashboard/specs/exporter_specs.ts
@@ -3,6 +3,7 @@ import {describe, beforeEach, it, sinon, expect, angularMocks} from 'test/lib/co
 import _ from 'lodash';
 import config from 'app/core/config';
 import {DashboardExporter} from '../export/exporter';
+import {DashboardModel} from '../model';
 
 describe('given dashboard with repeated panels', function() {
   var dash, exported;
@@ -77,6 +78,7 @@ describe('given dashboard with repeated panels', function() {
       info: {version: "1.1.0"}
     };
 
+    dash = new DashboardModel(dash, {});
     var exporter = new DashboardExporter(datasourceSrvStub);
     exporter.makeExportable(dash).then(clean => {
       exported = clean;
diff --git a/public/app/features/dashboard/specs/row_model_specs.ts b/public/app/features/dashboard/specs/row_model_specs.ts
@@ -0,0 +1,10 @@
+import {describe, beforeEach, it, sinon, expect, angularMocks} from 'test/lib/common';
+
+import _ from 'lodash';
+import {DashboardRow} from '../row/row_model';
+
+describe('DashboardRow', function() {
+
+});
+
+
diff --git a/public/app/features/dashboard/unsavedChangesSrv.js b/public/app/features/dashboard/unsavedChangesSrv.js
@@ -9,7 +9,7 @@ function(angular, _) {
 
   module.service('unsavedChangesSrv', function($rootScope, $q, $location, $timeout, contextSrv, $window) {
 
-    function Tracker(dashboard, scope) {
+    function Tracker(dashboard, scope, originalCopyDelay) {
       var self = this;
 
       this.current = dashboard;
@@ -44,10 +44,14 @@ function(angular, _) {
         }
       });
 
-      // wait for different services to patch the dashboard (missing properties)
-      $timeout(function() {
+      if (originalCopyDelay) {
+        $timeout(function() {
+          // wait for different services to patch the dashboard (missing properties)
+          self.original = dashboard.getSaveModelClone();
+        }, originalCopyDelay);
+      } else {
         self.original = dashboard.getSaveModelClone();
-      }, 1000);
+      }
     }
 
     var p = Tracker.prototype;
@@ -157,7 +161,7 @@ function(angular, _) {
 
     this.Tracker = Tracker;
     this.init = function(dashboard, scope) {
-      new Tracker(dashboard, scope);
+      return new Tracker(dashboard, scope, 1000);
     };
   });
 });
diff --git a/public/app/features/panel/panel_directive.ts b/public/app/features/panel/panel_directive.ts
@@ -143,7 +143,8 @@ module.directive('panelResizer', function($rootScope) {
         ctrl.panel.span = originalWidth + (((e.pageX - handleOffset.left) / maxWidth) * 12);
         ctrl.panel.span = Math.min(Math.max(ctrl.panel.span, 1), 12);
 
-        var rowSpan = ctrl.dashboard.rowSpan(ctrl.row);
+        ctrl.row.updateRowSpan();
+        var rowSpan = ctrl.row.span;
 
         // auto adjust other panels
         if (Math.floor(rowSpan) < 14) {
@@ -170,12 +171,6 @@ module.directive('panelResizer', function($rootScope) {
           lastPanel.span = Math.round(lastPanel.span);
         }
 
-        // if close to 12
-        var rowSpan = ctrl.dashboard.rowSpan(ctrl.row);
-        if (rowSpan < 12 && rowSpan > 11) {
-          lastPanel.span +=  12 - rowSpan;
-        }
-
         ctrl.row.panelSpanChanged();
 
         // first digest to propagate panel width change
diff --git a/public/test/specs/row-ctrl-specs.js b/public/test/specs/row-ctrl-specs.js
diff --git a/public/test/specs/unsavedChangesSrv-specs.js b/public/test/specs/unsavedChangesSrv-specs.js
@@ -77,7 +77,8 @@ define([
     });
 
     it('Should ignore row repeats', function() {
-      dash.rows.push({repeatRowId: 10});
+      dash.addEmptyRow();
+      dash.rows[1].repeatRowId = 10;
       expect(tracker.hasChanges()).to.be(false);
     });
 

Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@ coreModule.directive('panelDropZone', function($timeout) {`
`198`	`198`	`return showPanel(12, 'Empty Space');`
`199`	`199`	`}`
`200`	`200`
`201`		`- var dropZoneSpan = 12 - scope.ctrl.dashboard.rowSpan(scope.ctrl.row);`
	`201`	`+ var dropZoneSpan = 12 - row.span;`
`202`	`202`	`if (dropZoneSpan > 0) {`
`203`	`203`	`if (indrag) {`
`204`	`204`	`return showPanel(dropZoneSpan, 'Drop Here');`
`@@ -209,7 +209,7 @@ coreModule.directive('panelDropZone', function($timeout) {`
`209`	`209`	`}`
`210`	`210`
`211`	`211`	`if (indrag === true) {`
`212`		`- var dropZoneSpan = 12 - scope.ctrl.dashboard.rowSpan(scope.ctrl.row);`
	`212`	`+ var dropZoneSpan = 12 - row.span;`
`213`	`213`	`if (dropZoneSpan > 1) {`
`214`	`214`	`return showPanel(dropZoneSpan, 'Drop Here');`
`215`	`215`	`}`