Simplify the UI a bit

Author: jedisct1

dnscrypt-proxy/static/js/monitoring.js

@@ -140,41 +140,55 @@ function safeUpdateDashboard(data) {
             : (Array.isArray(data.servers) ? data.servers : []);
 
         if (resolverRows.length > 0) {
-            resolverRows.forEach(resolver => {
+            // Sort by total queries (desc), then avg response, name, and last seen.
+            const sortedResolvers = resolverRows.slice().sort((a, b) => {
+                const totalQueries = resolver => {
+                    if (typeof resolver.total_queries === 'number') {
+                        return resolver.total_queries;
+                    }
+                    if (typeof resolver.queries === 'number') {
+                        return resolver.queries;
+                    }
+                    return -1;
+                };
+                const avgResponse = resolver => {
+                    return typeof resolver.avg_response_ms === 'number' ? resolver.avg_response_ms : Number.POSITIVE_INFINITY;
+                };
+                const name = resolver => (resolver.name || '').toLowerCase();
+                const lastSeen = resolver => {
+                    const value = resolver.last_update;
+                    if (!value) {
+                        return 0;
+                    }
+                    const parsed = Date.parse(value);
+                    return Number.isNaN(parsed) ? 0 : parsed;
+                };
+
+                return (
+                    (totalQueries(b) - totalQueries(a)) ||
+                    (avgResponse(a) - avgResponse(b)) ||
+                    (name(a) > name(b) ? 1 : name(a) < name(b) ? -1 : 0) ||
+                    (lastSeen(b) - lastSeen(a))
+                );
+            });
+
+            sortedResolvers.forEach(resolver => {
                 const row = resolverTable.insertRow();
                 row.insertCell(0).textContent = resolver.name || 'Unknown';
                 row.insertCell(1).textContent = formatStatus(resolver.status);
                 row.insertCell(2).textContent = formatPercent(resolver.success_rate);
                 row.insertCell(3).textContent = formatNumber(resolver.total_queries !== undefined ? resolver.total_queries : resolver.queries);
                 row.insertCell(4).textContent = formatNumber(resolver.failed_queries);
                 row.insertCell(5).textContent = formatMilliseconds(resolver.avg_response_ms);
-                row.insertCell(6).textContent = formatMilliseconds(resolver.avg_rtt_ms);
-                row.insertCell(7).textContent = formatTimestamp(resolver.last_update);
+                row.insertCell(6).textContent = formatTimestamp(resolver.last_update);
             });
         } else {
             const row = resolverTable.insertRow();
             const cell = row.insertCell(0);
-            cell.colSpan = 8;
+            cell.colSpan = 7;
             cell.textContent = 'No resolver data yet';
         }
 
-        // Update server performance table
-        const serverTable = document.getElementById('server-table').getElementsByTagName('tbody')[0];
-        serverTable.innerHTML = '';
-        if (data.servers && Array.isArray(data.servers) && data.servers.length > 0) {
-            data.servers.forEach(server => {
-                const row = serverTable.insertRow();
-                row.insertCell(0).textContent = server.name || 'Unknown';
-                row.insertCell(1).textContent = formatNumber(server.queries);
-                row.insertCell(2).textContent = formatMilliseconds(server.avg_response_ms);
-            });
-        } else {
-            const row = serverTable.insertRow();
-            const cell = row.insertCell(0);
-            cell.colSpan = 3;
-            cell.textContent = 'No server samples yet';
-        }
-
         // Update query types table
         const queryTypesTable = document.getElementById('query-types-table').getElementsByTagName('tbody')[0];
         queryTypesTable.innerHTML = '';

dnscrypt-proxy/static/templates/dashboard.html

@@ -132,7 +132,6 @@ <h1>DNSCrypt Proxy Monitoring Dashboard</h1>
             <a href="#cache-performance">Cache</a>
             <a href="#query-types">Query Types</a>
             <a href="#resolver-health">Resolvers</a>
-            <a href="#server-performance">Servers</a>
             <a href="#top-domains">Top Domains</a>
             <a href="#source-refresh">Sources</a>
             <a href="#recent-queries">Recent Queries</a>
@@ -238,7 +237,6 @@ <h2 id="resolver-health">Resolver Health</h2>
                         <th>Total</th>
                         <th>Failures</th>
                         <th>Avg Response</th>
-                        <th>Baseline RTT</th>
                         <th>Last Seen</th>
                     </tr>
                 </thead>
@@ -247,21 +245,6 @@ <h2 id="resolver-health">Resolver Health</h2>
             </table>
         </div>
 
-        <div class="card">
-            <h2 id="server-performance">Server Performance</h2>
-            <table id="server-table">
-                <thead>
-                    <tr>
-                        <th>Server</th>
-                        <th>Queries</th>
-                        <th>Avg Response</th>
-                    </tr>
-                </thead>
-                <tbody>
-                </tbody>
-            </table>
-        </div>
-
         <div class="card">
             <h2 id="top-domains">Top Domains</h2>
             <table id="domains-table">