From 39be5959b8ca18d19621a264a025ce18e44012bd Mon Sep 17 00:00:00 2001 From: ryan Date: Thu, 7 Mar 2019 15:01:36 -0800 Subject: [PATCH] better sort function --- public/app/plugins/panel/table2/sortable.tsx | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/public/app/plugins/panel/table2/sortable.tsx b/public/app/plugins/panel/table2/sortable.tsx index f83df1ce830..24253b54708 100644 --- a/public/app/plugins/panel/table2/sortable.tsx +++ b/public/app/plugins/panel/table2/sortable.tsx @@ -7,18 +7,14 @@ export function sortTableData(data: TableData, sortIndex?: number, reverse = fal if (isNumber(sortIndex)) { const copy = { ...data, - rows: data.rows.map((row, index) => { - return row; + rows: [...data.rows].sort((a, b) => { + a = a[sortIndex]; + b = b[sortIndex]; + // Sort null or undefined separately from comparable values + return +(a == null) - +(b == null) || +(a > b) || -(a < b); }), }; - copy.rows.sort((a, b) => { - a = a[sortIndex]; - b = b[sortIndex]; - // Sort null or undefined separately from comparable values - return +(a == null) - +(b == null) || +(a > b) || -(a < b); - }); - if (reverse) { copy.rows.reverse(); }