@sap-ux/adp-tooling 0.12.43 → 0.12.44

package/dist/prompts/change-data-source/index.js

@@ -4,6 +4,38 @@ exports.getPrompts = void 0;
 const i18n_1 = require("../../i18n");
 const project_access_1 = require("@sap-ux/project-access");
 const project_input_validator_1 = require("@sap-ux/project-input-validator");
+/**
+ * Validates the OData Source URI prompt.
+ *
+ * @param value The value to validate.
+ * @returns {boolean | string} True if the value is a valid URI, or an error message if not a valid URI or empty.
+ */
+function validatePromptOdataURI(value) {
+    const validationResult = (0, project_input_validator_1.validateEmptyString)(value);
+    if (typeof validationResult === 'string') {
+        return validationResult;
+    }
+    if (!(0, project_input_validator_1.isDataSourceURI)(value)) {
+        return (0, i18n_1.t)('validators.errorInvalidDataSourceURI');
+    }
+    return true;
+}
+/**
+ * Validates the Annotation URI prompt.
+ *
+ * @param value The value to validate.
+ * @returns {boolean | string} True if the value is a valid URI or empty, or an error message if not a valid URI.
+ */
+function validatePromptAnnotationURI(value) {
+    const validationResult = (0, project_input_validator_1.validateEmptyString)(value);
+    if (typeof validationResult === 'string') {
+        return true;
+    }
+    if (!(0, project_input_validator_1.isDataSourceURI)(value)) {
+        return (0, i18n_1.t)('validators.errorInvalidDataSourceURI');
+    }
+    return true;
+}
 /**
  * Gets the prompts for changing the data source.
  *
@@ -33,7 +65,7 @@ function getPrompts(dataSources) {
                 mandatory: true,
                 hint: (0, i18n_1.t)('prompts.oDataSourceURITooltip')
             },
-            validate: project_input_validator_1.validateEmptyString,
+            validate: validatePromptOdataURI,
             when: !!dataSourceIds.length,
             store: false
         },
@@ -52,7 +84,8 @@ function getPrompts(dataSources) {
             message: (0, i18n_1.t)('prompts.oDataAnnotationSourceURILabel'),
             guiOptions: {
                 hint: (0, i18n_1.t)('prompts.oDataAnnotationSourceURITooltip')
-            }
+            },
+            validate: validatePromptAnnotationURI
         }
     ];
 }

package/dist/translations/adp-tooling.i18n.json

@@ -3,32 +3,32 @@
         "oDataSourceLabel": "Target OData Service",
         "oDataSourceTooltip": "Select the OData service you want to replace",
         "oDataSourceURILabel": "OData Source URI",
-        "oDataSourceURITooltip": "Enter the URI for the new OData source",
+        "oDataSourceURITooltip": "Enter the URI for the new OData source. The URI should start and end with '/' and should not contain any whitespaces or parameters",
         "maxAgeLabel": "New maxAge",
         "maxAgeTooltip": "(Optional) Enter the time in seconds it takes for a cached response of the service to expire.",
         "oDataAnnotationSourceURILabel": "OData Annotation Data Source URI",
-        "oDataAnnotationSourceURITooltip": "Server side annotations have been detected for the selected OData service. If needed, enter new annotation data source URI  for the changed service",
+        "oDataAnnotationSourceURITooltip": "Server side annotations have been detected for the selected OData service. If needed, enter new annotation data source URI for the changed service. The URI should start and end with '/' and should not contain any whitespaces or parameters",
         "fileSelectOptionLabel": "Annotation XML",
         "fileSelectOptionTooltip": "Select the annotation file source",
         "filePathLabel": "Annotation File path",
         "filePathTooltip": "Select the annotation file from your workspace",
-        "addAnnotationOdataSourceTooltip": "Select the annotation file from your workspace",
+        "addAnnotationOdataSourceTooltip": "Select the OData service you want to add annotation file to",
         "oDataServiceNameLabel": "OData Service Name",
         "oDataServiceNameTooltip": "Enter a name for the OData service you want to add",
         "oDataServiceUriLabel": "OData Service URI",
-        "oDataServiceUriTooltip": "Enter the URI for the OData service you want to add, e.g. /path/to/odata/",
+        "oDataServiceUriTooltip": "Enter the URI for the OData service you want to add. The URI should start and end with '/' and should not contain any whitespaces or parameters",
         "oDataServiceVersionLabel": "OData Version",
         "oDataServiceVersionTooltip": "Select the version of OData of the service you want to add",
         "oDataServiceModelNameLabel": "OData Service SAPUI5 Model Name",
         "oDataServiceModelNameTooltip": "Enter a name for the SAPUI5 model you want to use from the service",
         "oDataServiceModelSettingsLabel": "OData Service SAPUI5 Model Settings",
-        "oDataServiceModelSettingsTooltip": "If needed enter any additional model settings in the 'key1':'value1','key2':'value2' format",
+        "oDataServiceModelSettingsTooltip": "If needed enter any additional model settings in the \"key1\":\"value1\",\"key2\":\"value2\" format",
         "oDataAnnotationDataSourceNameLabel": "OData Annotation Data Source Name",
         "oDataAnnotationDataSourceNameTooltip": "Enter a name for the OData annotation data source",
         "oDataAnnotationDataSourceUriLabel": "OData Annotation Data Source URI",
-        "oDataAnnotationDataSourceUriTooltip": "Enter URI for the OData annotation data source",
+        "oDataAnnotationDataSourceUriTooltip": "Enter URI for the OData annotation data source. The URI should start and end with '/' and should not contain any whitespaces or parameters",
         "oDataAnnotationSettingsLabel": "OData Annotation Settings",
-        "oDataAnnotationSettingsTooltip": "If needed enter any additional {{value}} settings in the 'key':'value1','key2':'value2' format",
+        "oDataAnnotationSettingsTooltip": "If needed enter any additional {{value}} settings in the \"key1\":\"value1\",\"key2\":\"value2\" format",
         "component": {
             "usage": "Component usage",
             "usageIdLabel": "Component Usage ID",

package/package.json

@@ -9,7 +9,7 @@
   "bugs": {
     "url": "https://github.com/SAP/open-ux-tools/issues?q=is%3Aopen+is%3Aissue+label%3Abug+label%3Aadp-tooling"
   },
-  "version": "0.12.43",
+  "version": "0.12.44",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",