diff --git a/public/app/core/specs/time_series.jest.ts b/public/app/core/specs/time_series.jest.ts index 5043953071a..6214c687add 100644 --- a/public/app/core/specs/time_series.jest.ts +++ b/public/app/core/specs/time_series.jest.ts @@ -281,6 +281,20 @@ describe('TimeSeries', function() { expect(series.zindex).toBe(2); }); }); + + describe('override color', function() { + beforeEach(function() { + series.applySeriesOverrides([{ alias: 'test', color: '#112233' }]); + }); + + it('should set color', function() { + expect(series.color).toBe('#112233'); + }); + + it('should set bars.fillColor', function() { + expect(series.bars.fillColor).toBe('#112233'); + }); + }); }); describe('value formatter', function() { diff --git a/public/app/core/time_series2.ts b/public/app/core/time_series2.ts index 3e02b1ec939..4da64850e59 100644 --- a/public/app/core/time_series2.ts +++ b/public/app/core/time_series2.ts @@ -99,6 +99,7 @@ export default class TimeSeries { this.alias = opts.alias; this.aliasEscaped = _.escape(opts.alias); this.color = opts.color; + this.bars = { fillColor: opts.color }; this.valueFormater = kbn.valueFormats.none; this.stats = {}; this.legend = true; @@ -112,11 +113,11 @@ export default class TimeSeries { dashLength: [], }; this.points = {}; - this.bars = {}; this.yaxis = 1; this.zindex = 0; this.nullPointMode = null; delete this.stack; + delete this.bars.show; for (var i = 0; i < overrides.length; i++) { var override = overrides[i]; @@ -168,7 +169,7 @@ export default class TimeSeries { this.fillBelowTo = override.fillBelowTo; } if (override.color !== void 0) { - this.color = override.color; + this.setColor(override.color); } if (override.transform !== void 0) { this.transform = override.transform; @@ -346,4 +347,9 @@ export default class TimeSeries { return false; } + + setColor(color) { + this.color = color; + this.bars.fillColor = color; + } } diff --git a/public/app/plugins/panel/graph/module.ts b/public/app/plugins/panel/graph/module.ts index 6cebbe65ab8..ef82fb395a5 100644 --- a/public/app/plugins/panel/graph/module.ts +++ b/public/app/plugins/panel/graph/module.ts @@ -235,7 +235,7 @@ class GraphCtrl extends MetricsPanelCtrl { } changeSeriesColor(series, color) { - series.color = color; + series.setColor(color); this.panel.aliasColors[series.alias] = series.color; this.render(); }