From 8e0dbfc36ee25a4023ea59f0db5cff74a2513dd2 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Tue, 8 Dec 2015 13:55:33 -0800
Subject: [PATCH] GUAC-1406: Add filtering to connection permissions within
 user edit screen.

---
 .../controllers/manageUserController.js       | 21 ++++++++++++++++++-
 .../app/manage/templates/manageUser.html      | 11 ++++++++--
 .../src/main/webapp/translations/de.json      |  2 ++
 .../src/main/webapp/translations/en.json      |  2 ++
 .../src/main/webapp/translations/fr.json      |  2 ++
 .../src/main/webapp/translations/it.json      |  2 ++
 .../src/main/webapp/translations/nl.json      |  2 ++
 .../src/main/webapp/translations/ru.json      |  2 ++
 8 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/guacamole/src/main/webapp/app/manage/controllers/manageUserController.js b/guacamole/src/main/webapp/app/manage/controllers/manageUserController.js
index 77bd7d1a1..700eecbb3 100644
--- a/guacamole/src/main/webapp/app/manage/controllers/manageUserController.js
+++ b/guacamole/src/main/webapp/app/manage/controllers/manageUserController.js
@@ -119,7 +119,26 @@ angular.module('manage').controller('manageUserController', ['$scope', '$injecto
      * @type Object.<String, ConnectionGroup>
      */
     $scope.rootGroups = null;
-    
+
+    /**
+     * Array of all connection properties that are filterable.
+     *
+     * @type String[]
+     */
+    $scope.filteredConnectionProperties = [
+        'name',
+        'protocol'
+    ];
+
+    /**
+     * Array of all connection group properties that are filterable.
+     *
+     * @type String[]
+     */
+    $scope.filteredConnectionGroupProperties = [
+        'name'
+    ];
+
     /**
      * A map of data source identifiers to the set of all permissions
      * associated with the current user under that data source, or null if the
diff --git a/guacamole/src/main/webapp/app/manage/templates/manageUser.html b/guacamole/src/main/webapp/app/manage/templates/manageUser.html
index 79fb34dcc..6d275e5c1 100644
--- a/guacamole/src/main/webapp/app/manage/templates/manageUser.html
+++ b/guacamole/src/main/webapp/app/manage/templates/manageUser.html
@@ -87,11 +87,18 @@ THE SOFTWARE.
 
         <!-- Connection permissions section -->
         <div class="connection-permissions" ng-show="canChangePermissions()">
-            <h2 class="header">{{'MANAGE_USER.SECTION_HEADER_CONNECTIONS' | translate}}</h2>
+            <div class="header">
+                <h2>{{'MANAGE_USER.SECTION_HEADER_CONNECTIONS' | translate}}</h2>
+                <guac-group-list-filter connection-groups="rootGroups"
+                    filtered-connection-groups="filteredRootGroups"
+                    placeholder="'MANAGE_USER.FIELD_PLACEHOLDER_FILTER' | translate"
+                    connection-properties="filteredConnectionProperties"
+                    connection-group-properties="filteredConnectionGroupProperties"></guac-group-list-filter>
+            </div>
             <div class="section">
                 <guac-group-list
                     context="groupListContext"
-                    connection-groups="rootGroups"
+                    connection-groups="filteredRootGroups"
                     connection-template="'app/manage/templates/connectionPermission.html'"
                     connection-group-template="'app/manage/templates/connectionGroupPermission.html'"
                     page-size="20"/>
diff --git a/guacamole/src/main/webapp/translations/de.json b/guacamole/src/main/webapp/translations/de.json
index 5940dcd2e..996f6adbb 100644
--- a/guacamole/src/main/webapp/translations/de.json
+++ b/guacamole/src/main/webapp/translations/de.json
@@ -254,6 +254,8 @@
         "FIELD_HEADER_PASSWORD_AGAIN"                : "@:APP.FIELD_HEADER_PASSWORD_AGAIN",
         "FIELD_HEADER_USERNAME"                      : "Benutzername:",
         
+        "FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER",
+
         "INFO_READ_ONLY" : "Dieses Benutzerkonto kann nicht bearbeitet werden.",
         
         "SECTION_HEADER_CONNECTIONS" : "Verbindungen",
diff --git a/guacamole/src/main/webapp/translations/en.json b/guacamole/src/main/webapp/translations/en.json
index caf3cbdbd..951b38b03 100644
--- a/guacamole/src/main/webapp/translations/en.json
+++ b/guacamole/src/main/webapp/translations/en.json
@@ -254,6 +254,8 @@
         "FIELD_HEADER_PASSWORD_AGAIN"                : "@:APP.FIELD_HEADER_PASSWORD_AGAIN",
         "FIELD_HEADER_USERNAME"                      : "Username:",
 
+        "FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER",
+
         "INFO_READ_ONLY" : "Sorry, but this user account cannot be edited.",
 
         "SECTION_HEADER_CONNECTIONS" : "Connections",
diff --git a/guacamole/src/main/webapp/translations/fr.json b/guacamole/src/main/webapp/translations/fr.json
index e1a835120..c8fa6be22 100644
--- a/guacamole/src/main/webapp/translations/fr.json
+++ b/guacamole/src/main/webapp/translations/fr.json
@@ -245,6 +245,8 @@
         "FIELD_HEADER_PASSWORD_AGAIN"                : "@:APP.FIELD_HEADER_PASSWORD_AGAIN",
         "FIELD_HEADER_USERNAME"                      : "Identifiant:",
         
+        "FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER",
+
         "SECTION_HEADER_CONNECTIONS" : "Connexions",
         "SECTION_HEADER_EDIT_USER"   : "Modifier Utilisateur",
         "SECTION_HEADER_PERMISSIONS" : "Permissions",
diff --git a/guacamole/src/main/webapp/translations/it.json b/guacamole/src/main/webapp/translations/it.json
index 3c71c0841..0dea25c3f 100644
--- a/guacamole/src/main/webapp/translations/it.json
+++ b/guacamole/src/main/webapp/translations/it.json
@@ -242,6 +242,8 @@
         "FIELD_HEADER_PASSWORD_AGAIN"                : "@:APP.FIELD_HEADER_PASSWORD_AGAIN",
         "FIELD_HEADER_USERNAME"                      : "Username:",
         
+        "FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER",
+
         "SECTION_HEADER_CONNECTIONS" : "Connessioni",
         "SECTION_HEADER_EDIT_USER"   : "Modifica Utente",
         "SECTION_HEADER_PERMISSIONS" : "Permessi",
diff --git a/guacamole/src/main/webapp/translations/nl.json b/guacamole/src/main/webapp/translations/nl.json
index 111b99ae8..4dbdd8c47 100644
--- a/guacamole/src/main/webapp/translations/nl.json
+++ b/guacamole/src/main/webapp/translations/nl.json
@@ -254,6 +254,8 @@
         "FIELD_HEADER_PASSWORD_AGAIN"                : "@:APP.FIELD_HEADER_PASSWORD_AGAIN",
         "FIELD_HEADER_USERNAME"                      : "Gebruikersnaam:",
 
+        "FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER",
+
         "INFO_READ_ONLY" : "Sorry, maar dit gebruikers account kan niet gewijzigd worden",
 
         "SECTION_HEADER_CONNECTIONS" : "Verbindingen",
diff --git a/guacamole/src/main/webapp/translations/ru.json b/guacamole/src/main/webapp/translations/ru.json
index 822faf72b..6ac7fbe0c 100644
--- a/guacamole/src/main/webapp/translations/ru.json
+++ b/guacamole/src/main/webapp/translations/ru.json
@@ -242,6 +242,8 @@
         "FIELD_HEADER_PASSWORD_AGAIN"                : "@:APP.FIELD_HEADER_PASSWORD_AGAIN",
         "FIELD_HEADER_USERNAME"                      : "Имя пользователя:",
 
+        "FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER",
+
         "SECTION_HEADER_CONNECTIONS" : "Подключения",
         "SECTION_HEADER_EDIT_USER"   : "Редактировать пользователя",
         "SECTION_HEADER_PERMISSIONS" : "Разрешения",