Sfoglia il codice sorgente

fix: fix log sorting (#195)

quzard 2 anni fa
parent
commit
f2ba0c0300
1 ha cambiato i file con 11 aggiunte e 3 eliminazioni
  1. 11 3
      web/src/components/LogsTable.js

+ 11 - 3
web/src/components/LogsTable.js

@@ -169,9 +169,17 @@ const LogsTable = () => {
     if (logs.length === 0) return;
     if (logs.length === 0) return;
     setLoading(true);
     setLoading(true);
     let sortedLogs = [...logs];
     let sortedLogs = [...logs];
-    sortedLogs.sort((a, b) => {
-      return ('' + a[key]).localeCompare(b[key]);
-    });
+    if (typeof sortedLogs[0][key] === 'string'){
+      sortedLogs.sort((a, b) => {
+        return ('' + a[key]).localeCompare(b[key]);
+      });
+    } else {
+      sortedLogs.sort((a, b) => {
+        if (a[key] === b[key]) return 0;
+        if (a[key] > b[key]) return -1;
+        if (a[key] < b[key]) return 1;
+      });
+    }
     if (sortedLogs[0].id === logs[0].id) {
     if (sortedLogs[0].id === logs[0].id) {
       sortedLogs.reverse();
       sortedLogs.reverse();
     }
     }