From afb58724689621839d86d4306400996c166c29ed Mon Sep 17 00:00:00 2001 From: sanke1 <22073083+sankerust@users.noreply.github.com> Date: Wed, 30 Jan 2019 19:31:10 +0300 Subject: [PATCH] Table legend is not shown #149 (#151) --- src/graph_legend.ts | 6 ++---- src/graph_renderer.ts | 4 +--- src/module.ts | 3 ++- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/graph_legend.ts b/src/graph_legend.ts index c150d05..0685a56 100644 --- a/src/graph_legend.ts +++ b/src/graph_legend.ts @@ -140,13 +140,11 @@ export class GraphLegend { } if (this.panel.legend.sort) { - this.seriesList = _.sortBy(this.seriesList, function(series) { - return series.stats[this.panel.legend.sort]; - }); + this.seriesList = _.sortBy(this.seriesList, series => series.stats[this.panel.legend.sort]); if (this.panel.legend.sortDesc) { this.seriesList = this.seriesList.reverse(); - } } + } // render first time for getting proper legend height if (!this.panel.legend.rightSide) { diff --git a/src/graph_renderer.ts b/src/graph_renderer.ts index 2605935..7688d20 100644 --- a/src/graph_renderer.ts +++ b/src/graph_renderer.ts @@ -122,7 +122,6 @@ export class GraphRenderer { } else { this._analyticController.addLabelSegment(segment); } - this._renderPanel(); return; } @@ -202,7 +201,6 @@ export class GraphRenderer { // this.annotations = this.ctrl.annotations || []; this._buildFlotPairs(this.data); updateLegendValues(this.data, this.panel); - this._renderPanel(); if(this.tooltip.visible) { var pos = this.plot.c2p(this._graphMousePosition); var canvasOffset = this.$elem.find('.flot-overlay').offset(); @@ -314,7 +312,7 @@ export class GraphRenderer { } // Function for rendering panel - private _renderPanel() { + public renderPanel() { this.panelWidth = this.$elem.width(); if (this._shouldAbortRender()) { diff --git a/src/module.ts b/src/module.ts index e2de3ae..fbe999c 100644 --- a/src/module.ts +++ b/src/module.ts @@ -386,8 +386,9 @@ class GraphCtrl extends MetricsPanelCtrl { } if(!this.analyticsController.graphLocked) { - this._graphLegend.render(); this._graphRenderer.render(data); + this._graphLegend.render(); + this._graphRenderer.renderPanel(); } }