From ef7a2bda3979590a05cb4ec4d68c45eb9527c6aa Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Thu, 23 Sep 2021 05:10:24 -0400 Subject: [PATCH] PieChart: Fix sorting for null values in piechart (#39516) (#39556) * Fix sorting for null values in piechart Co-authored-by: Ashley Harrison (cherry picked from commit 4a6e354497f93d3b4005ed732015fccd62a61440) Co-authored-by: Oscar Kilhed --- public/app/plugins/panel/piechart/PieChartPanel.tsx | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/public/app/plugins/panel/piechart/PieChartPanel.tsx b/public/app/plugins/panel/piechart/PieChartPanel.tsx index 69f80843757..cc5192aaa3a 100644 --- a/public/app/plugins/panel/piechart/PieChartPanel.tsx +++ b/public/app/plugins/panel/piechart/PieChartPanel.tsx @@ -90,7 +90,15 @@ function getLegend(props: Props, displayValues: FieldDisplay[]) { const legendItems = displayValues // Since the pie chart is always sorted, let's sort the legend as well. - .sort((a, b) => b.display.numeric - a.display.numeric) + .sort((a, b) => { + if (isNaN(a.display.numeric)) { + return 1; + } else if (isNaN(b.display.numeric)) { + return -1; + } else { + return b.display.numeric - a.display.numeric; + } + }) .map((value, idx) => { const hidden = value.field.custom.hideFrom.viz; const display = value.display;