@sap-ux/adp-tooling 0.12.27 → 0.12.28

package/dist/prompts/add-component-usages/index.js

@@ -33,13 +33,21 @@ function validatePromptId(value, changeFiles, isCustomerBase) {
     if (typeof validationResult === 'string') {
         return validationResult;
     }
-    if (isCustomerBase && !(0, project_input_validator_1.hasCustomerPrefix)(value)) {
-        return (0, i18n_1.t)('validators.errorInputInvalidValuePrefix', {
-            value: (0, i18n_1.t)('prompts.component.usageIdLabel'),
-            prefix: "customer." /* NamespacePrefix.CUSTOMER */
-        });
+    if (isCustomerBase) {
+        if (!(0, project_input_validator_1.hasCustomerPrefix)(value)) {
+            return (0, i18n_1.t)('validators.errorInputInvalidValuePrefix', {
+                value: (0, i18n_1.t)('prompts.component.usageIdLabel'),
+                prefix: "customer." /* NamespacePrefix.CUSTOMER */
+            });
+        }
+        if (!value.replace('customer.', '').length) {
+            return (0, i18n_1.t)('validators.errorCustomerEmptyValue', {
+                value: (0, i18n_1.t)('prompts.component.usageIdLabel'),
+                prefix: "customer." /* NamespacePrefix.CUSTOMER */
+            });
+        }
     }
-    if ((0, project_input_validator_1.hasContentDuplication)(value, 'dataSource', changeFiles)) {
+    if ((0, project_input_validator_1.hasContentDuplication)(value, 'componentUsages', changeFiles)) {
         return (0, i18n_1.t)('validators.errorDuplicateValueComponentId');
     }
     return true;
@@ -49,21 +57,14 @@ function validatePromptId(value, changeFiles, isCustomerBase) {
  *
  * @param value The value to validate.
  * @param changeFiles The change files to check for duplication.
- * @param isCustomerBase Flag to check if the project is customer scenario.
  * @returns {string | boolean} An error message if the value is invalid, or true if it is not.
  */
-function validatePromptLibrary(value, changeFiles, isCustomerBase) {
+function validatePromptLibrary(value, changeFiles) {
     const validationResult = validatePromptInput(value);
     if (typeof validationResult === 'string') {
         return validationResult;
     }
-    if (isCustomerBase && !(0, project_input_validator_1.hasCustomerPrefix)(value)) {
-        return (0, i18n_1.t)('validators.errorInputInvalidValuePrefix', {
-            value: (0, i18n_1.t)('prompts.component.libraryLabel'),
-            prefix: "customer." /* NamespacePrefix.CUSTOMER */
-        });
-    }
-    if ((0, project_input_validator_1.hasContentDuplication)(value, 'dataSource', changeFiles)) {
+    if ((0, project_input_validator_1.hasContentDuplication)(value, 'libraries', changeFiles)) {
         return (0, i18n_1.t)('validators.errorDuplicateValueLibrary');
     }
     return true;
@@ -169,7 +170,7 @@ function getPrompts(basePath, layer) {
                 mandatory: true,
                 hint: (0, i18n_1.t)('prompts.component.libraryTooltip')
             },
-            validate: (value) => validatePromptLibrary(value, libraryChangeFiles, isCustomerBase),
+            validate: (value) => validatePromptLibrary(value, libraryChangeFiles),
             store: false,
             when: (answers) => answers.shouldAddLibrary
         },

package/dist/prompts/add-new-model/index.js

@@ -25,6 +25,28 @@ function validatePromptInput(value) {
     }
     return true;
 }
+/**
+ * Validates if a value has a customer prefix and is empty except for customer prefix.
+ *
+ * @param value The value to validate.
+ * @param label The label of the prompt.
+ * @returns {boolean | string} True if the value is valid, or an error message if validation fails.
+ */
+function validateCustomerValue(value, label) {
+    if (!(0, project_input_validator_1.hasCustomerPrefix)(value)) {
+        return (0, i18n_1.t)('validators.errorInputInvalidValuePrefix', {
+            value: (0, i18n_1.t)(label),
+            prefix: "customer." /* NamespacePrefix.CUSTOMER */
+        });
+    }
+    if (!value.replace('customer.', '').length) {
+        return (0, i18n_1.t)('validators.errorCustomerEmptyValue', {
+            value: (0, i18n_1.t)(label),
+            prefix: "customer." /* NamespacePrefix.CUSTOMER */
+        });
+    }
+    return true;
+}
 /**
  * Validates a JSON string.
  *
@@ -48,15 +70,15 @@ function validatePromptJSON(value) {
  * @returns {boolean | string} True if no duplication is found, or an error message if validation fails.
  */
 function validatePromptODataName(value, answers, isCustomerBase, changeFiles) {
-    const validationResult = validatePromptInput(value);
+    let validationResult = validatePromptInput(value);
     if (typeof validationResult === 'string') {
         return validationResult;
     }
-    if (isCustomerBase && !(0, project_input_validator_1.hasCustomerPrefix)(value)) {
-        return (0, i18n_1.t)('validators.errorInputInvalidValuePrefix', {
-            value: (0, i18n_1.t)('prompts.oDataServiceNameLabel'),
-            prefix: "customer." /* NamespacePrefix.CUSTOMER */
-        });
+    if (isCustomerBase) {
+        validationResult = validateCustomerValue(value, 'prompts.oDataServiceNameLabel');
+        if (typeof validationResult === 'string') {
+            return validationResult;
+        }
     }
     if ((0, project_input_validator_1.hasContentDuplication)(value, 'dataSource', changeFiles)) {
         return (0, i18n_1.t)('validators.errorDuplicatedValueOData');
@@ -76,15 +98,15 @@ function validatePromptODataName(value, answers, isCustomerBase, changeFiles) {
  * @returns {boolean | string} True if no duplication is found, or an error message if validation fails.
  */
 function validatePromptODataAnnotationsName(value, answers, isCustomerBase, changeFiles) {
-    const validationResult = validatePromptInput(value);
+    let validationResult = validatePromptInput(value);
     if (typeof validationResult === 'string') {
         return validationResult;
     }
-    if (isCustomerBase && !(0, project_input_validator_1.hasCustomerPrefix)(value)) {
-        return (0, i18n_1.t)('validators.errorInputInvalidValuePrefix', {
-            value: (0, i18n_1.t)('prompts.oDataAnnotationDataSourceNameLabel'),
-            prefix: "customer." /* NamespacePrefix.CUSTOMER */
-        });
+    if (isCustomerBase) {
+        validationResult = validateCustomerValue(value, 'prompts.oDataAnnotationDataSourceNameLabel');
+        if (typeof validationResult === 'string') {
+            return validationResult;
+        }
     }
     if ((0, project_input_validator_1.hasContentDuplication)(value, 'dataSource', changeFiles)) {
         return (0, i18n_1.t)('validators.errorDuplicatedValueOData');
@@ -103,15 +125,15 @@ function validatePromptODataAnnotationsName(value, answers, isCustomerBase, chan
  * @returns {boolean | string} True if no duplication is found, or an error message if validation fails.
  */
 function validatePromptModelName(value, isCustomerBase, changeFiles) {
-    const validationResult = validatePromptInput(value);
+    let validationResult = validatePromptInput(value);
     if (typeof validationResult === 'string') {
         return validationResult;
     }
-    if (isCustomerBase && !(0, project_input_validator_1.hasCustomerPrefix)(value)) {
-        return (0, i18n_1.t)('validators.errorInputInvalidValuePrefix', {
-            value: (0, i18n_1.t)('prompts.oDataServiceModelNameLabel'),
-            prefix: "customer." /* NamespacePrefix.CUSTOMER */
-        });
+    if (isCustomerBase) {
+        validationResult = validateCustomerValue(value, 'prompts.oDataServiceModelNameLabel');
+        if (typeof validationResult === 'string') {
+            return validationResult;
+        }
     }
     if ((0, project_input_validator_1.hasContentDuplication)(value, 'model', changeFiles)) {
         return (0, i18n_1.t)('validators.errorDuplicatedValueSapui5Model');
@@ -240,7 +262,7 @@ function getPrompts(projectPath, layer) {
             type: 'input',
             name: 'dataSourceURI',
             message: (0, i18n_1.t)('prompts.oDataAnnotationDataSourceUriLabel'),
-            validate: project_input_validator_1.validateEmptyString,
+            validate: validatePromptURI,
             store: false,
             guiOptions: {
                 mandatory: true,

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

@@ -66,6 +66,7 @@
         "errorDuplicateValueLibrary": "Library with the same name was already added to the project",
         "errorDuplicateNamesOData": "OData Service Name must be different from OData Annotation Data Source Name",
         "errorInputInvalidValuePrefix": "{{value}} should start with '{{prefix}}'",
+        "errorCustomerEmptyValue": "{{value}} should contain at least one character in addition to '{{prefix}}'",
         "errorInvalidDataSourceURI": "Invalid URI. Should start and end with '/' and contain no spaces"
     },
     "choices": {

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.27",
+  "version": "0.12.28",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -37,7 +37,7 @@
     "@sap-ux/inquirer-common": "0.4.3",
     "@sap-ux/logger": "0.6.0",
     "@sap-ux/project-access": "1.26.4",
-    "@sap-ux/project-input-validator": "0.3.2",
+    "@sap-ux/project-input-validator": "0.3.3",
     "@sap-ux/system-access": "0.5.5",
     "@sap-ux/ui5-config": "0.23.1"
   },