GUAC-963: List active connections within recent connections.

guacamole/src/main/webapp/app/home/directives/guacRecentConnections.js

@@ -42,9 +42,50 @@ angular.module('home').directive('guacRecentConnections', [function guacRecentCo
         },
 
         templateUrl: 'app/home/templates/guacRecentConnections.html',
-        controller: ['$scope', '$injector', 'guacHistory', 'RecentConnection',
-            function guacRecentConnectionsController($scope, $injector, guacHistory, RecentConnection) {
+        controller: ['$scope', '$injector', function guacRecentConnectionsController($scope, $injector) {
 
+            // Required types
+            var ActiveConnection = $injector.get('ActiveConnection');
+            var RecentConnection = $injector.get('RecentConnection');
+
+            // Required services
+            var guacClientManager = $injector.get('guacClientManager');
+            var guacHistory       = $injector.get('guacHistory');
+
+            /**
+             * Array of all known and visible active connections.
+             *
+             * @type ActiveConnection[]
+             */
+            $scope.activeConnections = [];
+
+            /**
+             * Array of all known and visible recently-used connections.
+             *
+             * @type RecentConnection[]
+             */
+            $scope.recentConnections = [];
+
+            /**
+             * Returns whether recent connections are available for display.
+             * Note that, for the sake of this directive, recent connections
+             * include any currently-active connections, even if they are not
+             * yet in the history.
+             *
+             * @returns {Boolean}
+             *     true if recent (or active) connections are present, false
+             *     otherwise.
+             */
+            $scope.hasRecentConnections = function hasRecentConnections() {
+                return !!($scope.activeConnections.length || $scope.recentConnections.length);
+            };
+
+            /**
+             * Map of all visible objects, connections or connection groups, by
+             * object identifier.
+             *
+             * @type Object.<String, Connection|ConnectionGroup>
+             */
             var visibleObjects = {};
 
             /**
@@ -87,6 +128,8 @@ angular.module('home').directive('guacRecentConnections', [function guacRecentCo
             // Update visible objects when root group is set
             $scope.$watch("rootGroup", function setRootGroup(rootGroup) {
 
+                // Clear connection arrays
+                $scope.activeConnections = [];
                 $scope.recentConnections = [];
 
                 // Produce collection of visible objects
@@ -94,11 +137,27 @@ angular.module('home').directive('guacRecentConnections', [function guacRecentCo
                 if (rootGroup)
                     addVisibleConnectionGroup(rootGroup);
 
+                // Add all active connections
+                for (var id in guacClientManager.managedClients) {
+
+                    // Get corresponding managed client
+                    var client = guacClientManager.managedClients[id];
+
+                    // Add active connections for clients with associated visible objects
+                    if (id in visibleObjects) {
+
+                        var object = visibleObjects[id];
+                        $scope.activeConnections.push(new ActiveConnection(object.name, client));
+
+                    }
+
+                }
+
                 // Add any recent connections that are visible
                 guacHistory.recentConnections.forEach(function addRecentConnection(historyEntry) {
 
                     // Add recent connections for history entries with associated visible objects
-                    if (historyEntry.id in visibleObjects) {
+                    if (historyEntry.id in visibleObjects && !(historyEntry.id in guacClientManager.managedClients)) {
 
                         var object = visibleObjects[historyEntry.id];
                         $scope.recentConnections.push(new RecentConnection(object.name, historyEntry));

guacamole/src/main/webapp/app/home/homeModule.js

@@ -20,4 +20,4 @@
  * THE SOFTWARE.
  */
 
-angular.module('home', ['history', 'groupList', 'rest']);
+angular.module('home', ['client', 'history', 'groupList', 'rest']);

guacamole/src/main/webapp/app/home/templates/guacRecentConnections.html

@@ -22,11 +22,28 @@
     -->
 
     <!-- Text displayed if no recent connections exist -->
-    <p class="no-recent" ng-hide="recentConnections.length">{{'HOME.INFO_NO_RECENT_CONNECTIONS' | translate}}</p>
+    <p class="no-recent" ng-hide="hasRecentConnections()">{{'HOME.INFO_NO_RECENT_CONNECTIONS' | translate}}</p>
 
+    <!-- All active connections -->
+    <div ng-repeat="activeConnection in activeConnections" class="connection">
+        <a href="#/client/{{activeConnection.client.id}}">
+
+            <!-- Connection thumbnail -->
+            <div class="thumbnail">
+                <guac-thumbnail client="activeConnection.client"/></guac-thumbnail>
+            </div>
+
+            <!-- Connection name -->
+            <div class="caption">
+                <span class="name">{{activeConnection.name}}</span>
+            </div>
+
+        </a>
+    </div>
+    
     <!-- All recent connections -->
     <div ng-repeat="recentConnection in recentConnections" class="connection">
-        <a href="#/client/{{recentConnection.entry.id}}/{{recentConnection.name}}">
+        <a href="#/client/{{recentConnection.entry.id}}">
 
             <!-- Connection thumbnail -->
             <div class="thumbnail">

guacamole/src/main/webapp/app/home/types/ActiveConnection.js

@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2014 Glyptodon LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+/**
+ * Provides the ActiveConnection class used by the guacRecentConnections
+ * directive.
+ */
+angular.module('home').factory('ActiveConnection', [function defineActiveConnection() {
+
+    /**
+     * A recently-user connection, visible to the current user, with an
+     * associated history entry.
+     * 
+     * @constructor
+     */
+    var ActiveConnection = function ActiveConnection(name, client) {
+
+        /**
+         * The human-readable name of this connection.
+         * 
+         * @type String
+         */
+        this.name = name;
+
+        /**
+         * The client associated with this active connection.
+         * 
+         * @type ManagedClient 
+         */
+        this.client = client;
+
+    };
+
+    return ActiveConnection;
+
+}]);