Add player control-plane and dashboard updates

src/web/routes/signage/clients/routes.js

@@ -6,7 +6,7 @@ module.exports = function registerClientsRoutes(app, deps) {
   const pages = deps.pages;
   const buildDashboardState = deps.buildDashboardState;
   const { buildPagination } = require('../../../lib/pagination');
-  const { sortRows, createSearchMatcher } = require('../../../lib/list-query');
+  const { compareSortValues, createSearchMatcher, getComparableSortValue } = require('../../../lib/list-query');
   const requirePermission = deps.requirePermission;
 
   const LIST_PAGE_SIZE = 25;
@@ -29,13 +29,32 @@ module.exports = function registerClientsRoutes(app, deps) {
       connected: function (client) { return String(client && (client.connectedAt || client.lastSeenAt) || '').trim(); }
     };
 
-    if (!accessors[normalizedSortKey]) {
-      return Array.isArray(clients) ? clients.slice() : [];
+    function compareValues(leftValue, rightValue) {
+      return compareSortValues(getComparableSortValue(leftValue), getComparableSortValue(rightValue));
     }
 
-    return sortRows(clients, function (client) {
-      return accessors[normalizedSortKey](client);
-    }, normalizedDirection);
+    const sortKeys = accessors[normalizedSortKey]
+      ? [normalizedSortKey]
+      : ['client'];
+
+    if (sortKeys[0] === 'client') {
+      sortKeys.push('ip');
+    } else if (sortKeys[0] === 'ip') {
+      sortKeys.push('client');
+    }
+
+    return (Array.isArray(clients) ? clients.slice() : []).sort(function (leftClient, rightClient) {
+      for (let index = 0; index < sortKeys.length; index += 1) {
+        const sortKeyName = sortKeys[index];
+        const comparison = compareValues(accessors[sortKeyName](leftClient), accessors[sortKeyName](rightClient));
+
+        if (comparison !== 0) {
+          return index === 0 && normalizedDirection === 'desc' ? comparison * -1 : comparison;
+        }
+      }
+
+      return 0;
+    });
   }
 
   app.get('/clients', requirePermission('clients.read'), async function (req, res, next) {