From 9f2baeb1b874b2b2ff9038b54d8478c04025d366 Mon Sep 17 00:00:00 2001 From: James Muehlner Date: Wed, 26 Apr 2023 00:07:39 +0000 Subject: [PATCH] GUACAMOLE-926: Fix invalid group identifier error message and upgrade yaml npm dependency. --- guacamole/src/main/frontend/package-lock.json | 14 +++++++------- guacamole/src/main/frontend/package.json | 2 +- .../app/import/services/connectionParseService.js | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/guacamole/src/main/frontend/package-lock.json b/guacamole/src/main/frontend/package-lock.json index 32b9bee38..9ad15bdce 100644 --- a/guacamole/src/main/frontend/package-lock.json +++ b/guacamole/src/main/frontend/package-lock.json @@ -19,7 +19,7 @@ "jquery": "^3.6.4", "jstz": "^2.1.1", "lodash": "^4.17.21", - "yaml": "^2.2.1" + "yaml": "^2.2.2" }, "devDependencies": { "@babel/core": "^7.20.12", @@ -11419,9 +11419,9 @@ "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" }, "node_modules/yaml": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.2.1.tgz", - "integrity": "sha512-e0WHiYql7+9wr4cWMx3TVQrNwejKaEe7/rHNmQmqRjazfOP5W8PB6Jpebb5o6fIapbz9o9+2ipcaTM2ZwDI6lw==", + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.2.2.tgz", + "integrity": "sha512-CBKFWExMn46Foo4cldiChEzn7S7SRV+wqiluAb6xmueD/fGyRHIhX8m14vVGgeFWjN540nKCNVj6P21eQjgTuA==", "engines": { "node": ">= 14" } @@ -20241,9 +20241,9 @@ "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" }, "yaml": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.2.1.tgz", - "integrity": "sha512-e0WHiYql7+9wr4cWMx3TVQrNwejKaEe7/rHNmQmqRjazfOP5W8PB6Jpebb5o6fIapbz9o9+2ipcaTM2ZwDI6lw==" + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.2.2.tgz", + "integrity": "sha512-CBKFWExMn46Foo4cldiChEzn7S7SRV+wqiluAb6xmueD/fGyRHIhX8m14vVGgeFWjN540nKCNVj6P21eQjgTuA==" }, "yocto-queue": { "version": "0.1.0", diff --git a/guacamole/src/main/frontend/package.json b/guacamole/src/main/frontend/package.json index 617cf308b..4b7f98630 100644 --- a/guacamole/src/main/frontend/package.json +++ b/guacamole/src/main/frontend/package.json @@ -18,7 +18,7 @@ "jquery": "^3.6.4", "jstz": "^2.1.1", "lodash": "^4.17.21", - "yaml": "^2.2.1" + "yaml": "^2.2.2" }, "devDependencies": { "@babel/core": "^7.20.12", diff --git a/guacamole/src/main/frontend/src/app/import/services/connectionParseService.js b/guacamole/src/main/frontend/src/app/import/services/connectionParseService.js index c5765c2c7..a9b2b7241 100644 --- a/guacamole/src/main/frontend/src/app/import/services/connectionParseService.js +++ b/guacamole/src/main/frontend/src/app/import/services/connectionParseService.js @@ -252,9 +252,9 @@ angular.module('import').factory('connectionParseService', // If a parent group identifier is present, but not valid else if (providedIdentifier && !groupPathsByIdentifier[providedIdentifier]) throw new ParseError({ - message: 'No group with identifier: ' + parentIdentifier, + message: 'No group with identifier: ' + providedIdentifier, key: 'IMPORT.ERROR_INVALID_GROUP_IDENTIFIER', - variables: { IDENTIFIER: parentIdentifier } + variables: { IDENTIFIER: providedIdentifier } }); // If the parent identifier is valid, use it to determine the path