From d06f0698ab8bb3b3293343896400f3715fb53385 Mon Sep 17 00:00:00 2001
From: Lathan Britz <jucallme@gmail.com>
Date: Sat, 25 May 2024 00:14:08 -0400
Subject: [PATCH 1/3] sort the nodes table

---
 src/containers/Network/NodesTable.tsx      | 179 +++++++++++++++++----
 src/containers/Network/css/nodesTable.scss |  20 +++
 2 files changed, 172 insertions(+), 27 deletions(-)

diff --git a/src/containers/Network/NodesTable.tsx b/src/containers/Network/NodesTable.tsx
index 6ae11303a..3b8b88c43 100644
--- a/src/containers/Network/NodesTable.tsx
+++ b/src/containers/Network/NodesTable.tsx
@@ -1,4 +1,4 @@
-import { FC } from 'react'
+import { FC, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Loader } from '../shared/components/Loader'
 import { durationToHuman } from '../shared/utils'
@@ -15,21 +15,28 @@ const renderLastLedger = (ledger) =>
   ) : (
     <i>unknown</i>
   )
-
-const renderLedgerHistory = (ledgers, range) => {
+const getLedgerHistory = (ledgers, range, MAX_WIDTH = 160) => {
   let count = 0
-  const MAX_WIDTH = 160
+  let boxes = ''
   const min = Math.max(range[1] - 10000000, range[0])
   const diff = range[1] - min
 
   if (ledgers) {
-    const boxes = ledgers.map((l) => {
+    boxes = ledgers.map((l) => {
       const [low, high] = l
       const width = Math.min((high - low + 1) / diff, 1) * MAX_WIDTH
       const left = Math.max((low - min) / diff, 0) * MAX_WIDTH
       count += high - low
       return <div key={low} style={{ left, width }} />
     })
+  }
+  return { boxes, count }
+}
+const renderLedgerHistory = (ledgers, range) => {
+  const MAX_WIDTH = 160
+
+  if (ledgers) {
+    const { boxes, count } = getLedgerHistory(ledgers, range, MAX_WIDTH)
 
     if (count < 0) {
       return null
@@ -99,19 +106,38 @@ export const NodesTable: FC<{ nodes: NodeData[] }> = ({
 }) => {
   const nodes = unformattedNodes ? formatLedgerHistory(unformattedNodes) : null
   const ledgerRange = nodes && getLedgerRange(nodes)
+  const [sortedField, setSortedField] = useState(null)
+  const [sortOrder, setSortOrder] = useState(null)
+
+  const requestSort = (key) => {
+    let direction = 'desc'
+    if (sortedField === key && sortOrder === 'desc') {
+      direction = 'asc'
+    }
+    setSortOrder(direction)
+    setSortedField(key)
+  }
 
   const { t } = useTranslation()
   const renderNode = (node) => (
     <tr key={node.node_public_key}>
-      <td className="pubkey text-truncate">{node.node_public_key}</td>
-      <td className="ip text-truncate">{node.ip}</td>
-      <td className="state center">
+      <td className={getClassNamesFor('pubkey text-truncate', 'pubkey')}>
+        {node.node_public_key}
+      </td>
+      <td className={getClassNamesFor('ip text-truncate', 'ip')}>{node.ip}</td>
+      <td className={getClassNamesFor('state center', 'server_state')}>
         <span className={node.server_state}>{node.server_state}</span>
       </td>
-      <td className="version">{getVersion(node.version)}</td>
-      <td className="last-ledger">{renderLastLedger(node.validated_ledger)}</td>
-      <td className="uptime">{durationToHuman(node.uptime)}</td>
-      <td className="peers right">
+      <td className={getClassNamesFor('version', 'rippled_version')}>
+        {getVersion(node.version)}
+      </td>
+      <td className={getClassNamesFor('last-ledger', 'last_ledger')}>
+        {renderLastLedger(node.validated_ledger)}
+      </td>
+      <td className={getClassNamesFor('uptime', 'uptime')}>
+        {durationToHuman(node.uptime)}
+      </td>
+      <td className={getClassNamesFor('peers right', 'peers')}>
         {node.inbound_count + node.outbound_count}
       </td>
       <td className="in-out">
@@ -119,39 +145,138 @@ export const NodesTable: FC<{ nodes: NodeData[] }> = ({
           ({node.inbound_count}:{node.outbound_count})
         </small>
       </td>
-      <td className="ledgers">
+      <td className={getClassNamesFor('ledgers', 'ledger_history')}>
         {renderLedgerHistory(node.ledgers, ledgerRange)}
       </td>
-      <td className="quorum right">{node.quorum}</td>
-      <td className="load-factor right">
+      <td className={getClassNamesFor('quorum right', 'quorum')}>
+        {node.quorum}
+      </td>
+      <td className={getClassNamesFor('load-factor right', 'load')}>
         {node.load_factor && node.load_factor > 1
           ? node.load_factor.toFixed(2)
           : ''}
       </td>
-      <td className="latency right">
+      <td className={getClassNamesFor('latency right', 'latency')}>
         {node.io_latency_ms && node.io_latency_ms > 1}
       </td>
     </tr>
   )
 
+  if (nodes !== null) {
+    const sort = (key: any, order: string) => {
+      const returnValue = order === 'desc' ? 1 : -1
+
+      if (key === 'peers') {
+        nodes.sort((a, b) =>
+          a.inbound_count + a.outbound_count >
+          b.inbound_count + b.outbound_count
+            ? returnValue * -1
+            : returnValue,
+        )
+      } else if (key === 'ledger_history') {
+        nodes.sort((a, b) =>
+          getLedgerHistory(a.ledgers, ledgerRange).count >
+          getLedgerHistory(b.ledgers, ledgerRange).count
+            ? returnValue * -1
+            : returnValue,
+        )
+      } else {
+        nodes.sort((a, b) => (a[key] > b[key] ? returnValue * -1 : returnValue))
+      }
+    }
+
+    // console.log('sortingg....')
+    // console.log(nodes)
+    sort(sortedField, sortOrder)
+  }
+
+  const getClassNamesFor = (name, order) =>
+    sortedField === order ? `${name} sorted` : name
+  const getClassArrowFor = (field) => {
+    if (sortedField === field && sortOrder === 'desc') {
+      return 'arrow down'
+    }
+    if (sortedField === field && sortOrder === 'asc') {
+      return 'arrow up'
+    }
+    return ''
+  }
+
   const content = nodes ? (
     <table className="basic">
       <thead>
         <tr>
-          <th className="pubkey">{t('node_pubkey')}</th>
-          <th className="ip">{t('ip')}</th>
-          <th className="server-state center">{t('state')}</th>
-          <th className="version">{t('rippled_version')}</th>
-          <th className="last-ledger">{t('last_ledger')}</th>
-          <th className="uptime">{t('uptime')}</th>
-          <th className="peers right">{t('peers')}</th>
+          <th className={getClassNamesFor('pubkey', 'pubkey')}>
+            <a href="#" onClick={() => requestSort('pubkey')}>
+              <i className={getClassArrowFor('pubkey')} />
+              {t('node_pubkey')}
+            </a>
+          </th>
+          <th className={getClassNamesFor('ip', 'ip')}>
+            <a href="#" onClick={() => requestSort('ip')}>
+              <i className={getClassArrowFor('ip')} />
+              {t('ip')}
+            </a>
+          </th>
+          <th
+            className={getClassNamesFor('server-state center', 'server_state')}
+          >
+            <a href="#" onClick={() => requestSort('server_state')}>
+              <i className={getClassArrowFor('server_state')} />
+              {t('state')}
+            </a>
+          </th>
+          <th className={getClassNamesFor('version', 'rippled_version')}>
+            <a href="#" onClick={() => requestSort('rippled_version')}>
+              <i className={getClassArrowFor('rippled_version')} />
+              {t('rippled_version')}{' '}
+            </a>
+          </th>
+          <th className={getClassNamesFor('last-ledger', 'last_ledger')}>
+            <a href="#" onClick={() => requestSort('last_ledger')}>
+              <i className={getClassArrowFor('last_ledger')} />
+              {t('last_ledger')}
+            </a>
+          </th>
+          <th className={getClassNamesFor('uptime', 'uptime')}>
+            <a href="#" onClick={() => requestSort('uptime')}>
+              <i className={getClassArrowFor('uptime')} />
+              {t('uptime')}
+            </a>
+          </th>
+          <th className={getClassNamesFor('peers right', 'peers')}>
+            <a href="#" onClick={() => requestSort('peers')}>
+              <i className={getClassArrowFor('peers')} />
+              {t('peers')}
+            </a>
+          </th>
           <th className="in-out">
             <small>{t('in_out')}</small>
           </th>
-          <th className="ledgers">{t('ledger_history')}</th>
-          <th className="quorum right">{t('quorum')}</th>
-          <th className="load-factor right">{t('load')}</th>
-          <th className="latency right">{t('latency')}</th>
+          <th className={getClassNamesFor('ledgers', 'ledger_history')}>
+            <a href="#" onClick={() => requestSort('ledger_history')}>
+              <i className={getClassArrowFor('ledger_history')} />
+              {t('ledger_history')}
+            </a>
+          </th>
+          <th className={getClassNamesFor('quorum right', 'quorum')}>
+            <a href="#" onClick={() => requestSort('quorum')}>
+              <i className={getClassArrowFor('quorum')} />
+              {t('quorum')}
+            </a>
+          </th>
+          <th className={getClassNamesFor('load-factor right', 'load')}>
+            <a href="#" onClick={() => requestSort('load')}>
+              <i className={getClassArrowFor('load')} />
+              {t('load')}
+            </a>
+          </th>
+          <th className={getClassNamesFor('latency right', 'latency')}>
+            <a href="#" onClick={() => requestSort('latency')}>
+              <i className={getClassArrowFor('latency')} />
+              {t('latency')}
+            </a>
+          </th>
         </tr>
       </thead>
       <tbody>{nodes.map(renderNode)}</tbody>
diff --git a/src/containers/Network/css/nodesTable.scss b/src/containers/Network/css/nodesTable.scss
index 7d8757b25..ed1d0962c 100644
--- a/src/containers/Network/css/nodesTable.scss
+++ b/src/containers/Network/css/nodesTable.scss
@@ -6,6 +6,26 @@
   min-height: 150px;
 
   table {
+    .sorted {
+      background-color: $black-90;
+    }
+
+    .arrow {
+      display: inline-block;
+      padding: 3px;
+      border: solid $white;
+      border-width: 0 3px 3px 0;
+      margin-right: 5px;
+    }
+
+    .up {
+      transform: rotate(-135deg);
+    }
+
+    .down {
+      transform: rotate(45deg);
+    }
+
     .pubkey {
       max-width: 70px;
 

From e8b9d40b360bb2cc43320ba4a77b580abb3926bd Mon Sep 17 00:00:00 2001
From: Lathan Britz <jucallme@gmail.com>
Date: Sat, 25 May 2024 10:07:57 -0400
Subject: [PATCH 2/3] version column needed custom sort

---
 src/containers/Network/NodesTable.tsx | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/containers/Network/NodesTable.tsx b/src/containers/Network/NodesTable.tsx
index 3b8b88c43..ac8d83b8d 100644
--- a/src/containers/Network/NodesTable.tsx
+++ b/src/containers/Network/NodesTable.tsx
@@ -162,6 +162,27 @@ export const NodesTable: FC<{ nodes: NodeData[] }> = ({
     </tr>
   )
 
+  const compareSemanticVersions = (
+    a: string,
+    b: string,
+    returnValue: string,
+  ) => {
+    const a1 = a.split('.')
+    const b1 = b.split('.')
+
+    const len = Math.min(a1.length, b1.length)
+
+    for (let i = 0; i < len; i++) {
+      const a2 = +a1[i] || 0
+      const b2 = +b1[i] || 0
+
+      if (a2 !== b2) {
+        return a2 > b2 ? returnValue : returnValue * -1
+      }
+    }
+    return b1.length - a1.length
+  }
+
   if (nodes !== null) {
     const sort = (key: any, order: string) => {
       const returnValue = order === 'desc' ? 1 : -1
@@ -180,13 +201,15 @@ export const NodesTable: FC<{ nodes: NodeData[] }> = ({
             ? returnValue * -1
             : returnValue,
         )
+      } else if (key === 'rippled_version') {
+        nodes.sort((a, b) =>
+          compareSemanticVersions(a.version, b.version, returnValue),
+        )
       } else {
         nodes.sort((a, b) => (a[key] > b[key] ? returnValue * -1 : returnValue))
       }
     }
 
-    // console.log('sortingg....')
-    // console.log(nodes)
     sort(sortedField, sortOrder)
   }
 

From 2771dc9c471956114794f654615393fc8c43db92 Mon Sep 17 00:00:00 2001
From: Lathan Britz <jucallme@gmail.com>
Date: Wed, 26 Jun 2024 15:32:11 -0400
Subject: [PATCH 3/3] add tests

---
 src/containers/Network/NodesTable.tsx     |  2 +-
 src/containers/Network/test/nodes.test.js | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/containers/Network/NodesTable.tsx b/src/containers/Network/NodesTable.tsx
index ac8d83b8d..bb20b02ee 100644
--- a/src/containers/Network/NodesTable.tsx
+++ b/src/containers/Network/NodesTable.tsx
@@ -165,7 +165,7 @@ export const NodesTable: FC<{ nodes: NodeData[] }> = ({
   const compareSemanticVersions = (
     a: string,
     b: string,
-    returnValue: string,
+    returnValue: number,
   ) => {
     const a1 = a.split('.')
     const b1 = b.split('.')
diff --git a/src/containers/Network/test/nodes.test.js b/src/containers/Network/test/nodes.test.js
index 7455912d5..30e955e56 100644
--- a/src/containers/Network/test/nodes.test.js
+++ b/src/containers/Network/test/nodes.test.js
@@ -76,6 +76,19 @@ describe('Nodes Page container', () => {
       expect(wrapper.find('.nodes-map .tooltip').length).toBe(0)
       expect(wrapper.find('.nodes-map path.node').length).toBe(2)
       expect(wrapper.find('.nodes-table table tr').length).toBe(4)
+      wrapper.find('.nodes-table table th.version a').simulate('click')
+      const rows = wrapper.find('.nodes-table table tbody tr td.version')
+      const expected = [
+        '<td class="version sorted">1.1.2</td>',
+        '<td class="version sorted">1.2.0-rc2</td>',
+        '<td class="version sorted">1.2.0-rc2</td>',
+      ]
+      let index = 0
+      rows.forEach((element) => {
+        expect(element.html()).toBe(expected[index])
+        // eslint-disable-next-line no-plusplus
+        index++
+      })
       wrapper.unmount()
       done()
     })