Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 9028F200CC8 for ; Fri, 14 Jul 2017 21:39:21 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 8E9E816E515; Fri, 14 Jul 2017 19:39:21 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 6089916E511 for ; Fri, 14 Jul 2017 21:39:20 +0200 (CEST) Received: (qmail 80191 invoked by uid 500); 14 Jul 2017 19:39:19 -0000 Mailing-List: contact commits-help@guacamole.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@guacamole.incubator.apache.org Delivered-To: mailing list commits@guacamole.incubator.apache.org Received: (qmail 80182 invoked by uid 99); 14 Jul 2017 19:39:19 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Jul 2017 19:39:19 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 27F01C0096 for ; Fri, 14 Jul 2017 19:39:19 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.222 X-Spam-Level: X-Spam-Status: No, score=-4.222 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001, SPF_PASS=-0.001] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id mYfy64-9ZW0y for ; Fri, 14 Jul 2017 19:39:18 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 04B375FC57 for ; Fri, 14 Jul 2017 19:39:16 +0000 (UTC) Received: (qmail 80077 invoked by uid 99); 14 Jul 2017 19:39:15 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Jul 2017 19:39:15 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8970BF325F; Fri, 14 Jul 2017 19:39:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vnick@apache.org To: commits@guacamole.incubator.apache.org Date: Fri, 14 Jul 2017 19:39:14 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/4] incubator-guacamole-client git commit: GUACAMOLE-338: Allow guacGroupList and guacGroupListFilter to accept GroupListItems in addition to ConnectionGroups. archived-at: Fri, 14 Jul 2017 19:39:21 -0000 Repository: incubator-guacamole-client Updated Branches: refs/heads/master 33e76c4d7 -> 7c162fde9 GUACAMOLE-338: Allow guacGroupList and guacGroupListFilter to accept GroupListItems in addition to ConnectionGroups. Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/5648c36c Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/5648c36c Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/5648c36c Branch: refs/heads/master Commit: 5648c36c267b6becb287542766eba77a4d9a9311 Parents: 303be24 Author: Michael Jumper Authored: Mon Jul 3 16:07:24 2017 -0700 Committer: Michael Jumper Committed: Mon Jul 3 16:07:24 2017 -0700 ---------------------------------------------------------------------- .../app/groupList/directives/guacGroupList.js | 18 +++++++++++++----- .../groupList/directives/guacGroupListFilter.js | 7 ++++++- 2 files changed, 19 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/5648c36c/guacamole/src/main/webapp/app/groupList/directives/guacGroupList.js ---------------------------------------------------------------------- diff --git a/guacamole/src/main/webapp/app/groupList/directives/guacGroupList.js b/guacamole/src/main/webapp/app/groupList/directives/guacGroupList.js index 87adb49..97a4f22 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. + * @type Object. */ 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) http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/5648c36c/guacamole/src/main/webapp/app/groupList/directives/guacGroupListFilter.js ---------------------------------------------------------------------- diff --git a/guacamole/src/main/webapp/app/groupList/directives/guacGroupListFilter.js b/guacamole/src/main/webapp/app/groupList/directives/guacGroupListFilter.js index 818b2ff..0352393 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. + * @type Object. */ 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);