From 5648c36c267b6becb287542766eba77a4d9a9311 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mjumper@apache.org>
Date: Mon, 3 Jul 2017 16:07:24 -0700
Subject: [PATCH] GUACAMOLE-338: Allow guacGroupList and guacGroupListFilter to
 accept GroupListItems in addition to ConnectionGroups.

---
 .../app/groupList/directives/guacGroupList.js  | 18 +++++++++++++-----
 .../directives/guacGroupListFilter.js          |  7 ++++++-
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/guacamole/src/main/webapp/app/groupList/directives/guacGroupList.js b/guacamole/src/main/webapp/app/groupList/directives/guacGroupList.js
index 87adb4947..97a4f22d1 100644
--- a/guacamole/src/main/webapp/app/groupList/directives/guacGroupList.js
+++ b/guacamole/src/main/webapp/app/groupList/directives/guacGroupList.js
@@ -32,7 +32,7 @@ angular.module('groupList').directive('guacGroupList', [function guacGroupList()
              * The connection groups to display as a map of data source
              * identifier to corresponding root group.
              *
-             * @type Object.<String, ConnectionGroup>
+             * @type Object.<String, ConnectionGroup|GroupListItem>
              */
             connectionGroups : '=',
 
@@ -167,15 +167,23 @@ angular.module('groupList').directive('guacGroupList', [function guacGroupList()
                     // Add each provided connection group
                     angular.forEach(connectionGroups, function addConnectionGroup(connectionGroup, dataSource) {
 
+                        var rootItem;
+
                         // Prepare data source for active connection counting
                         dataSources.push(dataSource);
                         connectionCount[dataSource] = {};
 
+                        // If the provided connection group is already a
+                        // GroupListItem, no need to create a new item
+                        if (connectionGroup instanceof GroupListItem)
+                            rootItem = connectionGroup;
+
                         // Create root item for current connection group
-                        var rootItem = GroupListItem.fromConnectionGroup(dataSource, connectionGroup,
-                            $scope.isVisible(GroupListItem.Type.CONNECTION),
-                            $scope.isVisible(GroupListItem.Type.SHARING_PROFILE),
-                            countActiveConnections);
+                        else
+                            rootItem = GroupListItem.fromConnectionGroup(dataSource, connectionGroup,
+                                $scope.isVisible(GroupListItem.Type.CONNECTION),
+                                $scope.isVisible(GroupListItem.Type.SHARING_PROFILE),
+                                countActiveConnections);
 
                         // If root group is to be shown, add it as a root item
                         if ($scope.showRootGroup)
diff --git a/guacamole/src/main/webapp/app/groupList/directives/guacGroupListFilter.js b/guacamole/src/main/webapp/app/groupList/directives/guacGroupListFilter.js
index 818b2ff93..03523932d 100644
--- a/guacamole/src/main/webapp/app/groupList/directives/guacGroupListFilter.js
+++ b/guacamole/src/main/webapp/app/groupList/directives/guacGroupListFilter.js
@@ -49,7 +49,7 @@ angular.module('groupList').directive('guacGroupListFilter', [function guacGroup
              * identifier to corresponding root group. A subset of this map
              * will be exposed as filteredConnectionGroups.
              *
-             * @type Object.<String, ConnectionGroup>
+             * @type Object.<String, ConnectionGroup|GroupListItem>
              */
             connectionGroups : '&',
 
@@ -81,6 +81,7 @@ angular.module('groupList').directive('guacGroupListFilter', [function guacGroup
             // Required types
             var ConnectionGroup = $injector.get('ConnectionGroup');
             var FilterPattern   = $injector.get('FilterPattern');
+            var GroupListItem   = $injector.get('GroupListItem');
 
             /**
              * The pattern object to use when filtering connections.
@@ -176,6 +177,10 @@ angular.module('groupList').directive('guacGroupListFilter', [function guacGroup
                 if (connectionGroups) {
                     angular.forEach(connectionGroups, function updateFilteredConnectionGroup(connectionGroup, dataSource) {
 
+                        // Unwrap GroupListItem
+                        if (connectionGroup instanceof GroupListItem)
+                            connectionGroup = connectionGroup.wrappedItem;
+
                         // Flatten hierarchy of connection group
                         var filteredGroup = flattenConnectionGroup(connectionGroup);