From e5a127647be51de45dc86db18c06e7a0ffd390a0 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mjumper@apache.org>
Date: Sun, 4 Jul 2021 19:04:04 -0700
Subject: [PATCH] GUACAMOLE-724: Restore sorting client panel by last used
 timestamp.

Sorting by last used (rather than relying on internal sorting) ensures
that the DOM is only modified as necessary and that CSS animations only
affect client groups that are newly visible in the panel.
---
 .../src/app/client/controllers/clientController.js     |  1 +
 .../src/app/client/templates/guacClientPanel.html      |  2 +-
 .../src/app/client/types/ManagedClientGroup.js         | 10 ++++++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/guacamole/src/main/frontend/src/app/client/controllers/clientController.js b/guacamole/src/main/frontend/src/app/client/controllers/clientController.js
index 66e4d5e31..2221029b5 100644
--- a/guacamole/src/main/frontend/src/app/client/controllers/clientController.js
+++ b/guacamole/src/main/frontend/src/app/client/controllers/clientController.js
@@ -307,6 +307,7 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams
         if (managedClientGroup) {
             $scope.clientGroup = managedClientGroup;
             $scope.clientGroup.attached = true;
+            $scope.clientGroup.lastUsed = new Date().getTime();
         }
 
     };
diff --git a/guacamole/src/main/frontend/src/app/client/templates/guacClientPanel.html b/guacamole/src/main/frontend/src/app/client/templates/guacClientPanel.html
index e741e4cb9..0705969ac 100644
--- a/guacamole/src/main/frontend/src/app/client/templates/guacClientPanel.html
+++ b/guacamole/src/main/frontend/src/app/client/templates/guacClientPanel.html
@@ -6,7 +6,7 @@
 
     <!-- List of connection thumbnails -->
     <ul class="client-panel-connection-list">
-        <li ng-repeat="clientGroup in clientGroups"
+        <li ng-repeat="clientGroup in clientGroups | orderBy: '-lastUsed'"
             ng-if="!clientGroup.attached"
             ng-class="{ 'needs-attention' : hasStatusUpdate(clientGroup) }"
             class="client-panel-connection">
diff --git a/guacamole/src/main/frontend/src/app/client/types/ManagedClientGroup.js b/guacamole/src/main/frontend/src/app/client/types/ManagedClientGroup.js
index 289604cd7..14ff4ea95 100644
--- a/guacamole/src/main/frontend/src/app/client/types/ManagedClientGroup.js
+++ b/guacamole/src/main/frontend/src/app/client/types/ManagedClientGroup.js
@@ -38,6 +38,16 @@ angular.module('client').factory('ManagedClientGroup', ['$injector', function de
         // Use empty object by default
         template = template || {};
 
+        /**
+         * The time that this group was last brought to the foreground of
+         * the current tab, as the number of milliseconds elapsed since
+         * midnight of January 1, 1970 UTC. If the group has not yet been
+         * viewed, this will be 0.
+         *
+         * @type Number
+         */
+        this.lastUsed = template.lastUsed || 0;
+
         /**
          * Whether this ManagedClientGroup is currently attached to the client
          * interface (true) or is running in the background (false).