fix(graph): fixed issue with toggling series on and off would loose stacking, fixes grafana#4557

torkelo · torkelo · commit ebb373eedb25 · 2016-04-09T14:37:30.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@
 * **Graph Panel**: Fixed issue where newly added graph panels shared same axes config, fixes [#4582](https://github.com/grafana/grafana/issues/4582)
 * **Graph Panel**: Fixed issue with axis labels overlapping Y-axis, fixes [#4626](https://github.com/grafana/grafana/issues/4626)
 * **InfluxDB**: Fixed issue with templating query containing template variable, fixes [#4602](https://github.com/grafana/grafana/issues/4602)
+* **Graph Panel**: Fixed issue with hiding series and stacking, fixes [#4557](https://github.com/grafana/grafana/issues/4557)
 
 # 3.0.0-beta2 (2016-04-04)
 
diff --git a/public/app/plugins/panel/graph/module.ts b/public/app/plugins/panel/graph/module.ts
@@ -116,6 +116,7 @@ class GraphCtrl extends MetricsPanelCtrl {
 
     this.colors = $scope.$root.colors;
 
+    this.events.on('render', this.onRender.bind(this));
     this.events.on('data-received', this.onDataReceived.bind(this));
     this.events.on('data-error', this.onDataError.bind(this));
     this.events.on('data-snapshot-load', this.onDataSnapshotLoad.bind(this));
@@ -215,20 +216,15 @@ class GraphCtrl extends MetricsPanelCtrl {
       this.panel.tooltip.msResolution = this.panel.tooltip.msResolution || series.isMsResolutionNeeded();
     }
 
-    series.applySeriesOverrides(this.panel.seriesOverrides);
     return series;
   }
 
-  seriesOverrideChanged() {
-    if (!this.seriesList) {
-      return;
-    }
+  onRender() {
+    if (!this.seriesList) { return; }
 
     for (let series of this.seriesList) {
       series.applySeriesOverrides(this.panel.seriesOverrides);
     }
-
-    this.render();
   }
 
   changeSeriesColor(series, color) {
@@ -247,7 +243,6 @@ class GraphCtrl extends MetricsPanelCtrl {
     } else {
       this.toggleSeriesExclusiveMode(serie);
     }
-
     this.render();
   }
 
diff --git a/public/app/plugins/panel/graph/series_overrides_ctrl.js b/public/app/plugins/panel/graph/series_overrides_ctrl.js
@@ -43,7 +43,7 @@ define([
       }
 
       $scope.updateCurrentOverrides();
-      $scope.ctrl.seriesOverrideChanged();
+      $scope.ctrl.render();
     };
 
     $scope.colorSelected = function(color) {
@@ -62,7 +62,7 @@ define([
           colorSelected: $scope.colorSelected,
         },
         onClose: function() {
-          $scope.ctrl.seriesOverrideChanged();
+          $scope.ctrl.render();
         }
       });
     };
diff --git a/public/test/specs/seriesOverridesCtrl-specs.js b/public/test/specs/seriesOverridesCtrl-specs.js
@@ -22,7 +22,6 @@ define([
       ctx.scope.ctrl = {
         refresh: sinon.spy(),
         render: sinon.spy(),
-        seriesOverrideChanged: sinon.spy(),
         seriesList: []
       };
       ctx.scope.render = function() {};

Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,7 @@ class GraphCtrl extends MetricsPanelCtrl {`
`116`	`116`
`117`	`117`	`this.colors = $scope.$root.colors;`
`118`	`118`
	`119`	`+ this.events.on('render', this.onRender.bind(this));`
`119`	`120`	`this.events.on('data-received', this.onDataReceived.bind(this));`
`120`	`121`	`this.events.on('data-error', this.onDataError.bind(this));`
`121`	`122`	`this.events.on('data-snapshot-load', this.onDataSnapshotLoad.bind(this));`
`@@ -215,20 +216,15 @@ class GraphCtrl extends MetricsPanelCtrl {`
`215`	`216`	`this.panel.tooltip.msResolution = this.panel.tooltip.msResolution \|\| series.isMsResolutionNeeded();`
`216`	`217`	`}`
`217`	`218`
`218`		`- series.applySeriesOverrides(this.panel.seriesOverrides);`
`219`	`219`	`return series;`
`220`	`220`	`}`
`221`	`221`
`222`		`- seriesOverrideChanged() {`
`223`		`- if (!this.seriesList) {`
`224`		`- return;`
`225`		`- }`
	`222`	`+ onRender() {`
	`223`	`+ if (!this.seriesList) { return; }`
`226`	`224`
`227`	`225`	`for (let series of this.seriesList) {`
`228`	`226`	`series.applySeriesOverrides(this.panel.seriesOverrides);`
`229`	`227`	`}`
`230`		`-`
`231`		`- this.render();`
`232`	`228`	`}`
`233`	`229`
`234`	`230`	`changeSeriesColor(series, color) {`
`@@ -247,7 +243,6 @@ class GraphCtrl extends MetricsPanelCtrl {`
`247`	`243`	`} else {`
`248`	`244`	`this.toggleSeriesExclusiveMode(serie);`
`249`	`245`	`}`
`250`		`-`
`251`	`246`	`this.render();`
`252`	`247`	`}`
`253`	`248`