+ */
+ $scope.attributeMap = new Map();
+
+ /**
+ * All available user attributes. This is only the set of attribute
+ * definitions, organized as logical groupings of attributes, not attribute
+ * values.
+ *
+ * @type Form[]
+ */
+ $scope.attributes = null;
+
/**
* The fields which should be displayed for choosing locale
* preferences. Each field name must be a property on
@@ -197,7 +226,82 @@ angular.module('settings').directive('guacSettingsPreferences', [function guacSe
};
+
+ /**
+ * Saves the current user, displaying an acknowledgement message if
+ * saving was successful, or an error if the save failed.
+ */
+ $scope.saveUser = function saveUser() {
+ return userService.saveUser(dataSource, $scope.user)
+ .then(() => guacNotification.showStatus({
+ text : {
+ key : 'SETTINGS_PREFERENCES.INFO_PREFERENCE_ATTRIBUTES_CHANGED'
+ },
+ actions : [ ACKNOWLEDGE_ACTION ]
+ }),
+ guacNotification.SHOW_REQUEST_ERROR);
+ };
+
+ // Fetch the user record
+ userService.getUser(dataSource, username).then(function saveUserData(user) {
+ $scope.user = user;
+ })
+
+ // Get all datasources that are available for this user
+ authenticationService.getAvailableDataSources().forEach(function loadAttributesForDataSource(dataSource) {
+
+ // Fetch all user attribute forms defined for the datasource
+ schemaService.getUserPreferenceAttributes(dataSource).then(function saveAttributes(attributes) {
+
+ // Iterate through all attribute forms
+ attributes.forEach(function addAttribute(attributeForm) {
+
+ // If the form with the retrieved name already exists
+ if ($scope.attributeMap.has(attributeForm.name)) {
+ const existingFields = $scope.attributeMap.get(attributeForm.name).fields;
+
+ // Add each field to the existing list for this form
+ attributeForm.fields.forEach(function addAllFieldsToExistingMap(field) {
+ existingFields.set(field.name, field);
+ })
+ }
+
+ else {
+
+ // Create a new entry for the form
+ $scope.attributeMap.set(attributeForm.name, {
+ name: attributeForm.name,
+
+ // With the field array from the API converted into a Map
+ fields: attributeForm.fields.reduce(
+ function addFieldToMap(currentFieldMap, field) {
+ currentFieldMap.set(field.name, field);
+ return currentFieldMap;
+ }, new Map()
+ )
+
+ })
+ }
+
+ });
+
+ // Re-generate the attributes array every time
+ $scope.attributes = Array.of(...$scope.attributeMap.values()).map(function convertFieldsToArray(formObject) {
+
+ // Convert each temporary form object to a Form type
+ return new Form({
+ name: formObject.name,
+
+ // Convert the field map to a simple array of fields
+ fields: Array.of(...formObject.fields.values())
+ })
+ });
+
+ });
+
+ });
+
}]
};
-
+
}]);
diff --git a/guacamole/src/main/frontend/src/app/settings/templates/settingsPreferences.html b/guacamole/src/main/frontend/src/app/settings/templates/settingsPreferences.html
index cabd2ae9f..ac5cc4f59 100644
--- a/guacamole/src/main/frontend/src/app/settings/templates/settingsPreferences.html
+++ b/guacamole/src/main/frontend/src/app/settings/templates/settingsPreferences.html
@@ -89,4 +89,14 @@
+
+
+
+ {{'SETTINGS_PREFERENCES.ACTION_SAVE' | translate}}
+
+
diff --git a/guacamole/src/main/frontend/src/translations/en.json b/guacamole/src/main/frontend/src/translations/en.json
index 05a9fa279..7f52fea11 100644
--- a/guacamole/src/main/frontend/src/translations/en.json
+++ b/guacamole/src/main/frontend/src/translations/en.json
@@ -916,6 +916,7 @@
"ACTION_ACKNOWLEDGE" : "@:APP.ACTION_ACKNOWLEDGE",
"ACTION_CANCEL" : "@:APP.ACTION_CANCEL",
+ "ACTION_SAVE" : "@:APP.ACTION_SAVE",
"ACTION_UPDATE_PASSWORD" : "@:APP.ACTION_UPDATE_PASSWORD",
"DIALOG_HEADER_ERROR" : "@:APP.DIALOG_HEADER_ERROR",
@@ -942,6 +943,7 @@
"HELP_UPDATE_PASSWORD" : "If you wish to change your password, enter your current password and the desired new password below, and click \"Update Password\". The change will take effect immediately.",
"INFO_PASSWORD_CHANGED" : "Password changed.",
+ "INFO_PREFERENCE_ATTRIBUTES_CHANGED" : "User attributes saved.",
"NAME_INPUT_METHOD_NONE" : "@:CLIENT.NAME_INPUT_METHOD_NONE",
"NAME_INPUT_METHOD_OSK" : "@:CLIENT.NAME_INPUT_METHOD_OSK",
@@ -949,6 +951,7 @@
"SECTION_HEADER_DEFAULT_INPUT_METHOD" : "Default Input Method",
"SECTION_HEADER_DEFAULT_MOUSE_MODE" : "Default Mouse Emulation Mode",
+ "SECTION_HEADER_UPDATE_ATTRIBUTES" : "User Attributes",
"SECTION_HEADER_UPDATE_PASSWORD" : "Change Password"
},
diff --git a/guacamole/src/main/frontend/webpack.config.js b/guacamole/src/main/frontend/webpack.config.js
index 29bb8ddd5..3f1574fa1 100644
--- a/guacamole/src/main/frontend/webpack.config.js
+++ b/guacamole/src/main/frontend/webpack.config.js
@@ -77,18 +77,6 @@ module.exports = {
]
},
optimization: {
- minimizer: [
-
- // Minify using Google Closure Compiler
- new ClosureWebpackPlugin({ mode: 'STANDARD' }, {
- languageIn: 'ECMASCRIPT_2020',
- languageOut: 'ECMASCRIPT5',
- compilationLevel: 'SIMPLE'
- }),
-
- new CssMinimizerPlugin()
-
- ],
splitChunks: {
cacheGroups: {
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/schema/SchemaResource.java b/guacamole/src/main/java/org/apache/guacamole/rest/schema/SchemaResource.java
index 9086ac93e..edc125127 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/schema/SchemaResource.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/schema/SchemaResource.java
@@ -77,6 +77,26 @@ public class SchemaResource {
}
+ /**
+ * Retrieves the possible user preference attributes of a user object.
+ *
+ * @return
+ * A collection of forms which describe the possible preference attributes of a
+ * user object.
+ *
+ * @throws GuacamoleException
+ * If an error occurs while retrieving the possible attributes.
+ */
+ @GET
+ @Path("userPreferenceAttributes")
+ public Collection