root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 266 Packages Projects Releases Wiki Activity

graph: fix series sorting issue (#10617)

This commit is contained in:
Alexander Zobnin 2018-01-26 11:23:56 +03:00 committed by Torkel Ödegaard
parent ac2b36c271
commit b79017e4a4
1 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
public/app/plugins/panel/graph/graph.ts
View File

@ -355,33 +355,16 @@ function graphDirective(timeSrv, popoverSrv, contextSrv) {
function sortSeries(series, panel) { function sortSeries(series, panel) {
var sortBy = panel.legend.sort; var sortBy = panel.legend.sort;
var sortOrder = panel.legend.sortDesc; var sortOrder = panel.legend.sortDesc;
var haveSortBy = sortBy !== null || sortBy !== undefined; var haveSortBy = sortBy !== null && sortBy !== undefined;
var haveSortOrder = sortOrder !== null || sortOrder !== undefined; var haveSortOrder = sortOrder !== null && sortOrder !== undefined;
var shouldSortBy = panel.stack && haveSortBy && haveSortOrder; var shouldSortBy = panel.stack && haveSortBy && haveSortOrder;
var sortDesc = panel.legend.sortDesc === true ? -1 : 1; var sortDesc = panel.legend.sortDesc === true ? -1 : 1;
series.sort((x, y) => { if (shouldSortBy) {
if (x.zindex > y.zindex) { return _.sortBy(series, s => s.stats[sortBy] * sortDesc);
return 1; } else {
} return _.sortBy(series, s => s.zindex);
}
if (x.zindex < y.zindex) {
return -1;
}
if (shouldSortBy) {
if (x.stats[sortBy] > y.stats[sortBy]) {
return 1 * sortDesc;
}
if (x.stats[sortBy] < y.stats[sortBy]) {
return -1 * sortDesc;
}
}
return 0;
});
return series;
} }
function translateFillOption(fill) { function translateFillOption(fill) {