From 74f0e0aec3add80bf56f88f504b012b13227bd11 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mjumper@apache.org>
Date: Sun, 4 Jul 2021 18:22:16 -0700
Subject: [PATCH] GUACAMOLE-724: Preserve current focus states when
 adding/removing connections from attached group.

---
 .../client/controllers/clientController.js    | 35 +++++++++++--------
 1 file changed, 21 insertions(+), 14 deletions(-)

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 d14cda8f6..66e4d5e31 100644
--- a/guacamole/src/main/frontend/src/app/client/controllers/clientController.js
+++ b/guacamole/src/main/frontend/src/app/client/controllers/clientController.js
@@ -250,10 +250,9 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams
     var reparseRoute = function reparseRoute() {
 
         var previousClients = $scope.clientGroup ? $scope.clientGroup.clients.slice() : [];
-        detachCurrentGroup();
 
-        $scope.clientGroup = guacClientManager.getManagedClientGroup($routeParams.id);
-        $scope.clientGroup.attached = true;
+        // Replace existing group with new group
+        setAttachedGroup(guacClientManager.getManagedClientGroup($routeParams.id));
 
         // Store current set of attached clients for later use within the
         // Guacamole menu
@@ -275,21 +274,21 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams
     };
 
     /**
-     * Detaches the ManagedClientGroup currently attached to the client
-     * interface via $scope.clientGroup such that the interface can be safely
-     * cleaned up or another ManagedClientGroup can take its place.
+     * Replaces the ManagedClientGroup currently attached to the client
+     * interface via $scope.clientGroup with the given ManagedClientGroup,
+     * safely cleaning up after the previous group. If no ManagedClientGroup is
+     * provided, the existing group is simply removed.
+     *
+     * @param {ManagedClientGroup} [managedClientGroup]
+     *     The ManagedClientGroup to attach to the interface, if any.
      */
-    var detachCurrentGroup = function detachCurrentGroup() {
+    var setAttachedGroup = function setAttachedGroup(managedClientGroup) {
 
-        var managedClientGroup = $scope.clientGroup;
-        if (managedClientGroup) {
-
-            // Flag group as detached
-            managedClientGroup.attached = false;
+        if ($scope.clientGroup) {
 
             // Remove all disconnected clients from management (the user has
             // seen their status)
-            _.filter(managedClientGroup.clients, client => {
+            _.filter($scope.clientGroup.clients, client => {
 
                 var connectionState = client.clientState.connectionState;
                 return connectionState === ManagedClientState.ConnectionState.DISCONNECTED
@@ -300,6 +299,14 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams
                 guacClientManager.removeManagedClient(client.id);
             });
 
+            // Flag group as detached
+            $scope.clientGroup.attached = false;
+
+        }
+
+        if (managedClientGroup) {
+            $scope.clientGroup = managedClientGroup;
+            $scope.clientGroup.attached = true;
         }
 
     };
@@ -807,7 +814,7 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams
 
     // Clean up when view destroyed
     $scope.$on('$destroy', function clientViewDestroyed() {
-        detachCurrentGroup();
+        setAttachedGroup(null);
     });
 
 }]);