Network diagram - Alphabetical sorting #860

jokob-sk · Oct 24, 2024 · 8404138 · 8404138
1 parent 4c46b27
commit 8404138
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 614 deletions.
diff --git a/front/network.php b/front/network.php
@@ -481,21 +481,31 @@ function createPane($node_mac, $node_name, $node_status, $node_type, $node_ports
       return;
     }
 
-    devicesListnew = rawData["data"].map(item =>  { return {
-                                                            "name":item[0], 
-                                                            "type":item[2], 
-                                                            "icon":item[3], 
-                                                            "mac":item[11], 
-                                                            "parentMac":item[14], 
-                                                            "rowid":item[13], 
-                                                            "status":item[10],
-                                                            "childrenQty":item[15],
-                                                            "port":item[18]                                                              
-                                                            }})
-
-    setCache('devicesListNew', JSON.stringify(devicesListnew))
-
-    // init global variable
+    devicesListnew = rawData["data"].map(item =>  { 
+      return {
+          "name": item[0], 
+          "type": item[2], 
+          "icon": item[3], 
+          "mac": item[11], 
+          "parentMac": item[14], 
+          "rowid": item[13], 
+          "status": item[10],
+          "childrenQty": item[15],
+          "port": item[18]
+        };
+    }).sort((a, b) => {
+        // First sort by name alphabetically
+        const nameCompare = a.name.localeCompare(b.name);
+        if (nameCompare !== 0) {
+            return nameCompare;
+        }
+        // If names are the same, sort by port numerically
+        return a.port - b.port;
+    });
+
+    setCache('devicesListNew', JSON.stringify(devicesListnew));
+
+    // Init global variable
     deviceListGlobal = devicesListnew;