Order tables by device order

app.js

@@ -456,7 +456,15 @@ function buildTables(filtered, chartsShown) {
     const groupFilterCfg = config.filters.find(f => f.column === GROUP_BY);
     const groupVal  = filters[GROUP_BY];
     const opts      = availableOptions(filters.family);
-    const groupVals = groupVal === "all" ? (opts[GROUP_BY] || []) : [groupVal];
+    let groupVals = groupVal === "all" ? (opts[GROUP_BY] || []) : [groupVal];
+    if (groupVal === "all" && groupFilterCfg?.value_labels) {
+        const labelOrder = Object.keys(groupFilterCfg.value_labels);
+        groupVals = [...groupVals].sort((a, b) => {
+            const ai = labelOrder.indexOf(String(a));
+            const bi = labelOrder.indexOf(String(b));
+            return (ai === -1 ? Infinity : ai) - (bi === -1 ? Infinity : bi);
+        });
+    }
 
     // Determine which display columns are visible given current filter state
     const visibleDisplay = (config.display_columns || []).filter(dc => {