From e225c1ee1bd2fbcdf7a9ad491fdc4b23373db22f Mon Sep 17 00:00:00 2001
From: fmtabbara <fmtabbara@hotmail.co.uk>
Date: Thu, 16 Feb 2023 15:10:07 +0000
Subject: [PATCH] use minor version as latest comparator

---
 explorer/package.json                 |  7 ++---
 explorer/src/pages/Gateways/index.tsx | 38 ++++++++++++++++++---------
 2 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/explorer/package.json b/explorer/package.json
index f2ca75b38b..56901cdec1 100644
--- a/explorer/package.json
+++ b/explorer/package.json
@@ -15,6 +15,7 @@
     "@nymproject/mui-theme": "^1.0.0",
     "@nymproject/nym-validator-client": "^0.18.0",
     "@nymproject/react": "^1.0.0",
+    "big.js": "^6.2.1",
     "d3-scale": "^4.0.0",
     "date-fns": "^2.24.0",
     "i18n-iso-countries": "^6.8.0",
@@ -26,8 +27,8 @@
     "react-router-dom": "6",
     "react-simple-maps": "^2.3.0",
     "react-tooltip": "^4.2.21",
-    "use-clipboard-copy": "^0.2.0",
-    "big.js": "^6.2.1"
+    "semver": "^7.3.8",
+    "use-clipboard-copy": "^0.2.0"
   },
   "devDependencies": {
     "@babel/core": "^7.15.0",
@@ -120,4 +121,4 @@
       "last 1 safari version"
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/explorer/src/pages/Gateways/index.tsx b/explorer/src/pages/Gateways/index.tsx
index e9d98b1652..0da5a3bb5d 100644
--- a/explorer/src/pages/Gateways/index.tsx
+++ b/explorer/src/pages/Gateways/index.tsx
@@ -4,6 +4,7 @@ import { Box, Button, Card, Grid, Link as MuiLink } from '@mui/material';
 import { CopyToClipboard } from '@nymproject/react/clipboard/CopyToClipboard';
 import { GridColDef, GridRenderCellParams } from '@mui/x-data-grid';
 import { SelectChangeEvent } from '@mui/material/Select';
+import { diff, rcompare } from 'semver';
 import { useMainContext } from '../../context/main';
 import { gatewayToGridRow } from '../../components/Gateways';
 import { GatewayResponse } from '../../typeDefs/explorer-api';
@@ -28,24 +29,37 @@ export const PageGateways: FCWithChildren = () => {
     setSearchTerm(str.toLowerCase());
   };
 
-  const versionToNumber = (version: string) => Number(version.split('.').join(''));
-
-  // TODO Get this value from somewhere
-
-  const getCurrentVersion = React.useCallback(() => {
-    let version = 0;
+  const highestVersion = React.useMemo(() => {
     if (gateways?.data) {
-      version = Math.max(...gateways.data.reduce((a: number[], b) => [...a, versionToNumber(b?.gateway.version)], []));
+      const versions = gateways.data.reduce((a: string[], b) => [...a, b.gateway.version], []);
+      const [lastestVersion] = versions.sort(rcompare);
+      return lastestVersion;
     }
-    return version;
+    // fallback value
+    return '2.0.0';
   }, [gateways]);
 
-  React.useEffect(() => {
-    const filteredByVersion = gateways?.data?.filter((g) => {
-      if (versionFilter === 'Latest version') return versionToNumber(g.gateway.version) === getCurrentVersion();
-      return versionToNumber(g.gateway.version) < getCurrentVersion();
+  const filterByLatestVersions = (latestVersion: string) =>
+    gateways?.data?.filter((gw) => {
+      const versionDiff = diff(latestVersion, gw.gateway.version);
+      return versionDiff === 'patch' || versionDiff === null;
     });
 
+  const filterByOlderVersions = (latestVersion: string) =>
+    gateways?.data?.filter((gw) => {
+      const versionDiff = diff(latestVersion, gw.gateway.version);
+      return versionDiff === 'major' || versionDiff === 'minor';
+    });
+
+  const filterByVersion = (option: VersionSelectOptions) => {
+    if (option === VersionSelectOptions.latestVersion) {
+      return filterByLatestVersions(highestVersion);
+    }
+    return filterByOlderVersions(highestVersion);
+  };
+
+  React.useEffect(() => {
+    const filteredByVersion = filterByVersion(versionFilter);
     if (searchTerm === '' && filteredByVersion) {
       setFilteredGateways(filteredByVersion);
     } else {