Skip to content

Commit

Permalink
GUACAMOLE-1866: Allow recent connections to be removed.
Browse files Browse the repository at this point in the history
  • Loading branch information
necouchman committed Apr 13, 2024
1 parent 0e12f48 commit 29737b4
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,22 @@ angular.module('history').factory('guacHistory', ['$injector',
*/
service.recentConnections = [];

/**
* Remove from the list of connection history the item having the given
* identfier.
*
* @param {String} id
* The identifier of the item to remove from the history list.
*
* @returns {boolean}
* True if the removal was successful, otherwise false.
*/
service.removeEntry = function removeEntry(id) {

return _.remove(service.recentConnections, entry => entry.id === id).length > 0;

};

/**
* Updates the thumbnail and access time of the history entry for the
* connection with the given ID.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,21 @@ angular.module('home').directive('guacRecentConnections', [function guacRecentCo
*/
$scope.recentConnections = [];

/**
* Remove the connection from the recent connection list having the
* given identifier.
*
* @param {!RecentConnection} recentConnection
* The recent connection to remove from the history list.
*
* @returns {boolean}
* True if the removal was successful, otherwise false.
*/
$scope.removeRecentConnection = function removeRecentConnection(recentConnection) {
return ($scope.recentConnections.splice($scope.recentConnections.indexOf(recentConnection), 1)
&& guacHistory.removeEntry(recentConnection.entry.id));
};

/**
* Returns whether or not recent connections should be displayed.
*
Expand Down
18 changes: 18 additions & 0 deletions guacamole/src/main/frontend/src/app/home/styles/home.css
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ div.recent-connections div.connection {
text-align: center;
max-width: 75%;
overflow: hidden;
position: relative;
}

a.home-connection, .empty.balancer a.home-connection-group {
Expand Down Expand Up @@ -79,4 +80,21 @@ a.home-connection, .empty.balancer a.home-connection-group {
.header-app-name {
font-size: 0.85em;
box-shadow: none;
}

.recent-connections .connection .x-thumbnail {
background-color: red;
display: flex;
height: 1em;
width: 1em;
position: absolute;
top: 10px;
z-index: 10;
float: right;
right: 10px;
opacity: .2;
}

.recent-connections .connection .x-thumbnail:hover {
opacity: 1.0;
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<!-- Connection thumbnail -->
<div class="thumbnail">
<img alt="{{recentConnection.name}}" ng-src="{{recentConnection.entry.thumbnail}}">
<img alt="{{recentConnection.name}}" ng-src="{{recentConnection.entry.thumbnail}}"/>
</div>

<!-- Connection name -->
Expand All @@ -18,6 +18,10 @@
</div>

</a>
<!-- Remove thumbnail -->
<div class="x-thumbnail" ng-click="removeRecentConnection(recentConnection)">
<img alt="X" src="images/x.svg"/>
</div>
</div>

</div>

0 comments on commit 29737b4

Please sign in to comment.