This is an automated email from the ASF dual-hosted git repository. mjumper pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
commit 76ff86ec6b927acad7493cf2d684d47a369f2fb4 Merge: a98761275 449675c79 Author: Mike Jumper <[email protected]> AuthorDate: Thu Apr 13 09:49:36 2023 -0700 GUACAMOLE-926: Merge support for importing connections via CSV/JSON/YAML. doc/licenses/base64-js-1.5.1/LICENSE | 22 + doc/licenses/base64-js-1.5.1/README | 8 + doc/licenses/base64-js-1.5.1/dep-coordinates.txt | 1 + doc/licenses/buffer-4.9.2/LICENSE | 21 + doc/licenses/buffer-4.9.2/README | 7 + doc/licenses/buffer-4.9.2/dep-coordinates.txt | 1 + doc/licenses/core-util-is-1.0.3/LICENSE | 19 + doc/licenses/core-util-is-1.0.3/README | 7 + .../core-util-is-1.0.3/dep-coordinates.txt | 1 + doc/licenses/csv-6.2.5/LICENSE | 21 + doc/licenses/csv-6.2.5/README | 7 + doc/licenses/csv-6.2.5/dep-coordinates.txt | 2 + doc/licenses/events-3.3.0/LICENSE | 22 + doc/licenses/events-3.3.0/README | 7 + doc/licenses/events-3.3.0/dep-coordinates.txt | 1 + doc/licenses/ieee754-1.2.1/LICENSE | 11 + doc/licenses/ieee754-1.2.1/README | 7 + doc/licenses/ieee754-1.2.1/dep-coordinates.txt | 1 + doc/licenses/inherits-2.0.4/LICENSE | 15 + doc/licenses/inherits-2.0.4/README | 8 + doc/licenses/inherits-2.0.4/dep-coordinates.txt | 1 + doc/licenses/isarray-1.0.0/LICENSE | 21 + doc/licenses/isarray-1.0.0/README | 8 + doc/licenses/isarray-1.0.0/dep-coordinates.txt | 1 + doc/licenses/process-nextick-args-2.0.1/README | 8 + .../process-nextick-args-2.0.1/dep-coordinates.txt | 1 + doc/licenses/process-nextick-args-2.0.1/license.md | 19 + doc/licenses/readable-stream-2.3.7/LICENSE | 47 + doc/licenses/readable-stream-2.3.7/README | 8 + .../readable-stream-2.3.7/dep-coordinates.txt | 1 + doc/licenses/safe-buffer-5.1.2/LICENSE | 21 + doc/licenses/safe-buffer-5.1.2/README | 8 + doc/licenses/safe-buffer-5.1.2/dep-coordinates.txt | 1 + doc/licenses/setimmediate-1.0.5/LICENSE.txt | 20 + doc/licenses/setimmediate-1.0.5/README | 8 + .../setimmediate-1.0.5/dep-coordinates.txt | 1 + doc/licenses/stream-browserify-2.0.2/LICENSE | 20 + doc/licenses/stream-browserify-2.0.2/README | 8 + .../stream-browserify-2.0.2/dep-coordinates.txt | 1 + doc/licenses/string_decoder-1.1.1/LICENSE | 47 + doc/licenses/string_decoder-1.1.1/README | 8 + .../string_decoder-1.1.1/dep-coordinates.txt | 1 + doc/licenses/timers-browserify-2.0.12/LICENSE.md | 23 + doc/licenses/timers-browserify-2.0.12/README | 8 + .../timers-browserify-2.0.12/dep-coordinates.txt | 1 + doc/licenses/util-deprecate-1.0.2/LICENSE | 24 + doc/licenses/util-deprecate-1.0.2/README | 8 + .../util-deprecate-1.0.2/dep-coordinates.txt | 1 + .../jdbc/JDBCAuthenticationProviderModule.java | 6 + .../ActiveConnectionDirectory.java | 6 +- .../guacamole/auth/jdbc/base/JDBCDirectory.java | 45 + .../auth/jdbc/connection/ConnectionDirectory.java | 6 +- .../connectiongroup/ConnectionGroupDirectory.java | 6 +- .../sharingprofile/SharingProfileDirectory.java | 6 +- .../guacamole/auth/jdbc/user/UserDirectory.java | 6 +- .../auth/jdbc/usergroup/UserGroupDirectory.java | 6 +- .../net/auth/AtomicDirectoryOperation.java | 57 + .../guacamole/net/auth/DelegatingDirectory.java | 6 + .../org/apache/guacamole/net/auth/Directory.java | 23 +- guacamole/src/main/frontend/package-lock.json | 16937 ++++++++++++------- guacamole/src/main/frontend/package.json | 7 +- .../src/app/element/directives/guacDrop.js | 171 + .../src/app/element/directives/guacUpload.js | 29 +- .../controllers/importConnectionsController.js | 665 + .../import/directives/connectionImportErrors.js | 252 + .../indexModule.js => import/importModule.js} | 35 +- .../app/import/services/connectionCSVService.js | 432 + .../app/import/services/connectionParseService.js | 395 + .../indexModule.js => import/styles/help.css} | 58 +- .../main/frontend/src/app/import/styles/import.css | 160 + .../src/app/import/templates/connectionErrors.html | 45 + .../src/app/import/templates/connectionImport.html | 60 + .../import/templates/connectionImportFileHelp.html | 29 + .../src/app/import/types/DisplayErrorList.js | 91 + .../src/app/import/types/ImportConnection.js | 109 + .../src/app/import/types/ImportConnectionError.js | 78 + .../frontend/src/app/import/types/ParseError.js | 75 + .../frontend/src/app/import/types/ParseResult.js | 89 + .../src/app/index/config/indexRouteConfig.js | 17 + .../src/main/frontend/src/app/index/indexModule.js | 1 + .../src/app/rest/services/connectionService.js | 44 +- .../src/app/rest/services/userGroupService.js | 37 + .../frontend/src/app/rest/services/userService.js | 37 + .../{RelatedObjectPatch.js => DirectoryPatch.js} | 48 +- .../src/app/rest/types/DirectoryPatchOutcome.js | 79 + .../src/app/rest/types/DirectoryPatchResponse.js | 50 + .../src/main/frontend/src/app/rest/types/Error.js | 9 + .../src/app/rest/types/RelatedObjectPatch.js | 2 +- .../connectionHistoryPlayerController.js | 2 +- .../app/settings/controllers/settingsController.js | 2 +- .../frontend/src/app/settings/styles/buttons.css | 10 +- .../settings/templates/settingsConnections.html | 4 + .../src/images/action-icons/guac-file-import.svg | 1 + .../src/main/frontend/src/translations/en.json | 64 +- guacamole/src/main/frontend/webpack.config.js | 16 + .../java/org/apache/guacamole/rest/APIError.java | 24 + .../rest/directory/DirectoryResource.java | 314 +- .../rest/identifier/RelatedObjectSetResource.java | 2 +- .../guacamole/rest/{ => jsonpatch}/APIPatch.java | 6 +- .../guacamole/rest/jsonpatch/APIPatchError.java | 73 + .../rest/jsonpatch/APIPatchFailureException.java | 66 + .../guacamole/rest/jsonpatch/APIPatchOutcome.java | 114 + .../guacamole/rest/jsonpatch/APIPatchResponse.java | 56 + .../guacamole/rest/jsonpatch/package-info.java} | 35 +- .../rest/permission/PermissionSetResource.java | 2 +- 105 files changed, 14812 insertions(+), 6706 deletions(-)
