sort by port #949

jokob-sk · Jan 10, 2025 · ea2e845 · ea2e845
1 parent 16d06e8
commit ea2e845
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 10 deletions.
diff --git a/front/network.php b/front/network.php
@@ -11,7 +11,11 @@
 
 ?>
 
-<!-- ----------------------------------------------------------------------- -->
+<script>
+  // show spinning icon
+  showSpinner()
+</script> 
+
 
 
 <!-- Page ------------------------------------------------------------------ -->
@@ -484,6 +488,8 @@ function createPane($node_mac, $node_name, $node_status, $node_type, $node_ports
       return;
     }
 
+    sortTopologyBy = createArray(getSetting("UI_TOPOLOGY_SORT"))
+
     devicesListnew = rawData["data"].map(item =>  { 
       return {
           "name": item[0], 
@@ -497,13 +503,30 @@ function createPane($node_mac, $node_name, $node_status, $node_type, $node_ports
           "port": item[18]
         };
     }).sort((a, b) => {
-        // First sort by name alphabetically
-        const nameCompare = a.name.localeCompare(b.name);
-        if (nameCompare !== 0) {
+      // Helper to safely parse port into an integer; invalid ports become Infinity for sorting
+      const parsePort = (port) => {
+        const parsed = parseInt(port, 10);
+        return isNaN(parsed) ? Infinity : parsed;
+      };
+
+      switch (sortTopologyBy[0]) {
+        case "Name":
+          // 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;
+          }
+          // If names are the same, sort by port numerically
+          return parsePort(a.port) - parsePort(b.port);
+
+        case "Port":
+          // Sort by port numerically
+          return parsePort(a.port) - parsePort(b.port);
+
+        default:
+          // Default: Sort by rowid (as a fallback)
+          return a.rowid - b.rowid;
+      }
     });
 
     setCache('devicesListNew', JSON.stringify(devicesListnew));
@@ -885,9 +908,6 @@ function updateLeaf(leafMac,nodeMac)
     }
   }
 
-  // show spinning icon
-  showSpinner()
-
   // init device names where macs are used
   initDeviceNamesFromMACs();
 

diff --git a/front/plugins/ui_settings/config.json b/front/plugins/ui_settings/config.json
@@ -493,6 +493,34 @@
           "string": "UI theme to use. System will auto switch between Light and Dark."
         }
       ]
+    },
+    {
+      "function": "TOPOLOGY_SORT",
+      "type": {
+        "dataType": "array",
+        "elements": [
+          {
+            "elementType": "select",
+            "elementOptions": [{ "multiple": "false", "orderable": "false" }],
+            "transformers": []
+          }
+        ]
+      },
+      "default_value": "Name",
+      "options": ["Name","Port"],
+      "localized": ["name", "description"],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Sort by in Network"
+        }
+      ],
+      "description": [
+        {
+          "language_code": "en_us",
+          "string": "Based on which value should the network topology view be ordered."
+        }
+      ]
     }
   ]
 }