From 99f9a0b4e6f354d2406a95605b113a7d3912c5ba Mon Sep 17 00:00:00 2001
From: Bogdan <mynameisbogdan@users.noreply.github.com>
Date: Fri, 23 Aug 2024 02:52:59 +0300
Subject: [PATCH] Improve sorting indexer by status

---
 .../Indexer/Index/Table/IndexerStatusCell.tsx | 36 ++++++++++++++-----
 frontend/src/Store/Actions/indexerActions.js  | 18 ++++++++--
 2 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/frontend/src/Indexer/Index/Table/IndexerStatusCell.tsx b/frontend/src/Indexer/Index/Table/IndexerStatusCell.tsx
index 8a05600df..1a2350302 100644
--- a/frontend/src/Indexer/Index/Table/IndexerStatusCell.tsx
+++ b/frontend/src/Indexer/Index/Table/IndexerStatusCell.tsx
@@ -8,6 +8,30 @@ import translate from 'Utilities/String/translate';
 import DisabledIndexerInfo from './DisabledIndexerInfo';
 import styles from './IndexerStatusCell.css';
 
+function getIconKind(enabled: boolean, redirect: boolean) {
+  if (enabled) {
+    return redirect ? kinds.INFO : kinds.SUCCESS;
+  }
+
+  return kinds.DEFAULT;
+}
+
+function getIconName(enabled: boolean, redirect: boolean) {
+  if (enabled) {
+    return redirect ? icons.REDIRECT : icons.CHECK;
+  }
+
+  return icons.BLOCKLIST;
+}
+
+function getIconTooltip(enabled: boolean, redirect: boolean) {
+  if (enabled) {
+    return redirect ? translate('EnabledRedirected') : translate('Enabled');
+  }
+
+  return translate('Disabled');
+}
+
 interface IndexerStatusCellProps {
   className: string;
   enabled: boolean;
@@ -30,19 +54,13 @@ function IndexerStatusCell(props: IndexerStatusCellProps) {
     ...otherProps
   } = props;
 
-  const enableKind = redirect ? kinds.INFO : kinds.SUCCESS;
-  const enableIcon = redirect ? icons.REDIRECT : icons.CHECK;
-  const enableTitle = redirect
-    ? translate('EnabledRedirected')
-    : translate('Enabled');
-
   return (
     <Component className={className} {...otherProps}>
       <Icon
         className={styles.statusIcon}
-        kind={enabled ? enableKind : kinds.DEFAULT}
-        name={enabled ? enableIcon : icons.BLOCKLIST}
-        title={enabled ? enableTitle : translate('Disabled')}
+        kind={getIconKind(enabled, redirect)}
+        name={getIconName(enabled, redirect)}
+        title={getIconTooltip(enabled, redirect)}
       />
       {status ? (
         <Popover
diff --git a/frontend/src/Store/Actions/indexerActions.js b/frontend/src/Store/Actions/indexerActions.js
index c8cde2ee3..e535262c7 100644
--- a/frontend/src/Store/Actions/indexerActions.js
+++ b/frontend/src/Store/Actions/indexerActions.js
@@ -100,8 +100,22 @@ export const filterPredicates = {
 };
 
 export const sortPredicates = {
-  vipExpiration: function(item) {
-    return item.fields.find((field) => field.name === 'vipExpiration')?.value ?? '';
+  status: function({ enable, redirect }) {
+    let result = 0;
+
+    if (redirect) {
+      result++;
+    }
+
+    if (enable) {
+      result += 2;
+    }
+
+    return result;
+  },
+
+  vipExpiration: function({ fields = [] }) {
+    return fields.find((field) => field.name === 'vipExpiration')?.value ?? '';
   }
 };