@sap-ux/adp-tooling 0.19.3 → 0.19.6

package/dist/prompts/add-new-model/index.d.ts

@@ -1,5 +1,6 @@
 import type { YUIQuestion } from '@sap-ux/inquirer-common';
 import type { UI5FlexLayer } from '@sap-ux/project-access';
+import { type AppWizard } from '@sap-devx/yeoman-ui-types';
 import type { ToolsLogger } from '@sap-ux/logger';
 import { ServiceType, type DescriptorVariant, type NewModelAnswers, type NewModelData } from '../../types';
 /**
@@ -16,9 +17,10 @@ export declare function getODataVersionFromServiceType(serviceType: ServiceType)
  * @param {string} projectPath - The root path of the project.
  * @param {UI5FlexLayer} layer - UI5 Flex layer.
  * @param {ToolsLogger} [logger] - Optional logger.
+ * @param {AppWizard} [appWizard] - Optional AppWizard instance for showing notifications.
  * @returns {YUIQuestion<NewModelAnswers>[]} The questions/prompts.
  */
-export declare function getPrompts(projectPath: string, layer: UI5FlexLayer, logger?: ToolsLogger): Promise<YUIQuestion<NewModelAnswers>[]>;
+export declare function getPrompts(projectPath: string, layer: UI5FlexLayer, logger?: ToolsLogger, appWizard?: AppWizard): Promise<YUIQuestion<NewModelAnswers>[]>;
 /**
  * Builds the NewModelData object from the prompts answers.
  *

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

@@ -175,7 +175,7 @@ async function getAbapServiceUrl(projectPath) {
         if (!target) {
             return undefined;
         }
-        if (target.url) {
+        if (!(0, btp_utils_1.isAppStudio)()) {
             return target.url;
         }
         if (target.destination) {
@@ -216,9 +216,10 @@ async function getDestinationChoices(projectPath, logger) {
  * @param {string} projectPath - The root path of the project.
  * @param {UI5FlexLayer} layer - UI5 Flex layer.
  * @param {ToolsLogger} [logger] - Optional logger.
+ * @param {AppWizard} [appWizard] - Optional AppWizard instance for showing notifications.
  * @returns {YUIQuestion<NewModelAnswers>[]} The questions/prompts.
  */
-async function getPrompts(projectPath, layer, logger) {
+async function getPrompts(projectPath, layer, logger, appWizard) {
     const isCustomerBase = "CUSTOMER_BASE" /* FlexLayer.CUSTOMER_BASE */ === layer;
     const defaultSeviceName = isCustomerBase ? "customer." /* NamespacePrefix.CUSTOMER */ : "" /* NamespacePrefix.EMPTY */;
     const isCFEnv = await (0, cf_1.isCFEnvironment)(projectPath);
@@ -231,6 +232,9 @@ async function getPrompts(projectPath, layer, logger) {
     let destinationChoices;
     if (isCFEnv) {
         ({ choices: destinationChoices, error: destinationError } = await getDestinationChoices(projectPath, logger));
+        if (destinationError) {
+            appWizard?.showError(destinationError, yeoman_ui_types_1.MessageType.notification);
+        }
     }
     const buildResultingUrlMessage = (i18nKey, uri, previousAnswers) => {
         const destinationUrl = isCFEnv ? previousAnswers?.destination?.Host : abapServiceUrl;
@@ -266,7 +270,7 @@ async function getPrompts(projectPath, layer, logger) {
                 mandatory: true,
                 hint: (0, i18n_1.t)('prompts.destinationTooltip')
             },
-            validate: (value) => destinationError ?? (0, project_input_validator_1.validateEmptyString)(value?.Name)
+            validate: (value) => (0, project_input_validator_1.validateEmptyString)(value?.Name)
         },
         {
             type: 'input',

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

@@ -130,7 +130,7 @@
         "failedToListBtpDestinations": "Failed to list BTP destinations. Error: {{error}}",
         "destinationServiceNotFoundInMtaYaml": "Destination service instance not found in mta.yaml. Ensure a resource with 'service: destination' is declared.",
         "noServiceKeysFoundForDestination": "No service keys found for destination service instance '{{serviceInstanceName}}'. Ensure the service is provisioned and try again.",
-        "errorFetchingDestinations": "Error fetching destinations. Check log for details.",
+        "errorFetchingDestinations": "An error occurred when fetching destinations. For more information, see the logs.",
         "cfPushFailed": "cf push failed for the '{{appName}}' app: {{error}}",
         "cfEnableSshFailed": "cf enable-ssh failed for the '{{appName}}' app: {{error}}",
         "cfRestartFailed": "cf restart failed for the '{{appName}}' app: {{error}}"

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.19.3",
+  "version": "0.19.6",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -39,15 +39,15 @@
     "@sap-ux/axios-extension": "1.26.0",
     "@sap-ux/btp-utils": "1.2.0",
     "@sap-ux/i18n": "0.4.0",
-    "@sap-ux/inquirer-common": "0.13.1",
+    "@sap-ux/inquirer-common": "0.13.2",
     "@sap-ux/logger": "0.9.0",
     "@sap-ux/nodejs-utils": "0.3.0",
-    "@sap-ux/odata-service-writer": "0.32.1",
-    "@sap-ux/project-access": "1.38.0",
-    "@sap-ux/project-input-validator": "0.7.1",
+    "@sap-ux/odata-service-writer": "0.32.2",
+    "@sap-ux/project-access": "1.38.1",
+    "@sap-ux/project-input-validator": "0.7.2",
     "@sap-ux/store": "1.6.0",
     "@sap-ux/system-access": "0.8.0",
-    "@sap-ux/ui5-config": "0.31.0",
+    "@sap-ux/ui5-config": "0.31.1",
     "@sap-ux/ui5-info": "0.14.0"
   },
   "devDependencies": {