From ebf93167141d9bdb64579e8fcce570196b9e2a64 Mon Sep 17 00:00:00 2001 From: palash-signoz Date: Thu, 5 May 2022 14:06:22 +0530 Subject: [PATCH] feat: sorting is updated (#1095) --- frontend/src/container/ListAlertRules/ListAlert.tsx | 10 +--------- .../src/container/TriggeredAlerts/NoFilterTable.tsx | 3 ++- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/frontend/src/container/ListAlertRules/ListAlert.tsx b/frontend/src/container/ListAlertRules/ListAlert.tsx index dd6d2e878c..8ec1fa9987 100644 --- a/frontend/src/container/ListAlertRules/ListAlert.tsx +++ b/frontend/src/container/ListAlertRules/ListAlert.tsx @@ -71,7 +71,7 @@ function ListAlert({ allAlertRules, refetch }: ListAlertProps): JSX.Element { title: 'Alert Name', dataIndex: 'name', key: 'name', - sorter: (a, b): number => a.name.length - b.name.length, + sorter: (a, b): number => a.name.charCodeAt(0) - b.name.charCodeAt(0), }, { title: 'Severity', @@ -92,14 +92,6 @@ function ListAlert({ allAlertRules, refetch }: ListAlertProps): JSX.Element { dataIndex: 'labels', key: 'tags', align: 'center', - sorter: (a, b): number => { - const alength = Object.keys(a.labels).filter((e) => e !== 'severity') - .length; - const blength = Object.keys(b.labels).filter((e) => e !== 'severity') - .length; - - return blength - alength; - }, render: (value): JSX.Element => { const objectKeys = Object.keys(value); const withOutSeverityKeys = objectKeys.filter((e) => e !== 'severity'); diff --git a/frontend/src/container/TriggeredAlerts/NoFilterTable.tsx b/frontend/src/container/TriggeredAlerts/NoFilterTable.tsx index 9d5183e5e8..a9c8064616 100644 --- a/frontend/src/container/TriggeredAlerts/NoFilterTable.tsx +++ b/frontend/src/container/TriggeredAlerts/NoFilterTable.tsx @@ -31,7 +31,8 @@ function NoFilterTable({ dataIndex: 'labels', key: 'alertName', sorter: (a, b): number => - (a.labels?.alertname?.length || 0) - (b.labels?.alertname?.length || 0), + (a.labels?.alertname?.charCodeAt(0) || 0) - + (b.labels?.alertname?.charCodeAt(0) || 0), render: (data): JSX.Element => { const name = data?.alertname || ''; return {name};