@sap-ux/generator-adp 0.9.26 → 0.9.27

package/generators/app/questions/cf-services.js

@@ -1,10 +1,6 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CFServicesPrompter = void 0;
-const node_path_1 = __importDefault(require("node:path"));
 const adp_tooling_1 = require("@sap-ux/adp-tooling");
 const project_input_validator_1 = require("@sap-ux/project-input-validator");
 const i18n_1 = require("../../utils/i18n");
@@ -170,8 +166,7 @@ class CFServicesPrompter {
             choices: (0, choices_1.getAppRouterChoices)(this.isInternalUsage),
             when: () => {
                 const modules = (0, adp_tooling_1.getModuleNames)(mtaProjectPath);
-                const mtaProjectName = node_path_1.default.basename(mtaProjectPath);
-                const hasRouter = (0, adp_tooling_1.hasApprouter)(mtaProjectName, modules);
+                const hasRouter = (0, adp_tooling_1.hasApprouter)(modules);
                 if (hasRouter) {
                     this.approuter = (0, adp_tooling_1.getApprouterType)(mtaProjectPath);
                 }
@@ -262,6 +257,9 @@ class CFServicesPrompter {
                     }
                     this.apps = await (0, adp_tooling_1.getCfApps)(this.businessServiceInfo.serviceKeys, cfConfig, this.logger);
                     this.logger?.log(`Available applications: ${JSON.stringify(this.apps)}`);
+                    if (this.apps.length === 0) {
+                        return (0, i18n_1.t)('error.noAppsFoundForBusinessService');
+                    }
                 }
                 catch (e) {
                     this.apps = [];

package/generators/app/questions/helper/validators.d.ts

@@ -1,5 +1,5 @@
 import type { ToolsLogger } from '@sap-ux/logger';
-import { type SystemLookup } from '@sap-ux/adp-tooling';
+import type { CfConfig, SystemLookup } from '@sap-ux/adp-tooling';
 interface JsonInputParams {
     projectName: string;
     targetFolder: string;
@@ -46,9 +46,10 @@ export declare function validateJsonInput(systemLookup: SystemLookup, isCustomer
  *
  * @param {string} value - The value to validate.
  * @param {boolean} isCFLoggedIn - Whether Cloud Foundry is logged in.
+ * @param {CfConfig} cfConfig - The CF configuration.
  * @returns {Promise<string | boolean>} Returns true if the environment is valid, otherwise returns an error message.
  */
-export declare function validateEnvironment(value: string, isCFLoggedIn: boolean): Promise<string | boolean>;
+export declare function validateEnvironment(value: string, isCFLoggedIn: boolean, cfConfig?: CfConfig): Promise<string | boolean>;
 /**
  * Validates the project path.
  *

package/generators/app/questions/helper/validators.js

@@ -68,12 +68,16 @@ async function validateJsonInput(systemLookup, isCustomerBase, { projectName, ta
  *
  * @param {string} value - The value to validate.
  * @param {boolean} isCFLoggedIn - Whether Cloud Foundry is logged in.
+ * @param {CfConfig} cfConfig - The CF configuration.
  * @returns {Promise<string | boolean>} Returns true if the environment is valid, otherwise returns an error message.
  */
-async function validateEnvironment(value, isCFLoggedIn) {
+async function validateEnvironment(value, isCFLoggedIn, cfConfig) {
     if (value === 'CF' && !isCFLoggedIn) {
         return (0, i18n_1.t)('error.cfNotLoggedIn');
     }
+    if (value === 'CF' && isCFLoggedIn && (!cfConfig?.org?.Name || !cfConfig?.space?.Name)) {
+        return (0, i18n_1.t)('error.cfOrgSpaceMissing');
+    }
     return true;
 }
 /**
@@ -117,10 +121,10 @@ function validateBusinessSolutionName(value) {
     if (typeof validationResult === 'string') {
         return validationResult;
     }
-    const parts = String(value)
-        .split('.')
-        .filter((p) => p.length > 0);
-    if (parts.length < 2) {
+    if (!/^[a-zA-Z0-9]+(\.[a-zA-Z0-9]+)+$/.test(value)) {
+        if (/\s/.test(value) || /[^a-zA-Z0-9.]/.test(value)) {
+            return (0, i18n_1.t)('error.businessSolutionNameInvalidChars');
+        }
         return (0, i18n_1.t)('error.businessSolutionNameInvalid');
     }
     return true;

package/generators/app/questions/target-env.js

@@ -30,7 +30,7 @@ function getTargetEnvPrompt(appWizard, isCfInstalled, isCFLoggedIn, cfConfig) {
             hint: (0, i18n_1.t)('prompts.targetEnvTooltip'),
             breadcrumb: (0, i18n_1.t)('prompts.targetEnvBreadcrumb')
         },
-        validate: (value) => (0, validators_1.validateEnvironment)(value, isCFLoggedIn),
+        validate: (value) => (0, validators_1.validateEnvironment)(value, isCFLoggedIn, cfConfig),
         additionalMessages: (value) => (0, additional_messages_1.getTargetEnvAdditionalMessages)(value, isCFLoggedIn, cfConfig)
     };
 }

package/generators/translations/generator-adp.i18n.json

@@ -109,14 +109,17 @@
         "pleaseProvideAllRequiredData": "Please provide the required data and try again.",
         "cfNotInstalled": "Cloud Foundry is not installed in your space. Please install it to continue.",
         "cfNotLoggedIn": "You are not logged in to Cloud Foundry. Please login to continue.",
+        "cfOrgSpaceMissing": "You are logged in to the Cloud Foundry API endpoint but no organization and space are targeted. Target an organization and space to continue.",
         "baseAppHasToBeSelected": "Base application has to be selected. Please select a base application.",
         "businessServiceHasToBeSelected": "Business service has to be selected. Please select a business service.",
         "businessServiceDoesNotExist": "The service chosen does not exist in cockpit or the user is not member of the needed space.",
         "businessSolutionNameInvalid": "Business solution name must consist of at least two segments and they should be separated by period.",
+        "businessSolutionNameInvalidChars": "Business solution name must only contain alphanumeric characters separated by periods. Spaces and special characters are not allowed.",
         "cfLoginCannotBeDetected": "CF Login cannot be detected as an extension in Visual Studio Code. For more information, see (link not yet available).",
         "projectDoesNotExist": "The project does not exist. Please select an MTA project.",
         "projectDoesNotExistMta": "Provide the path to the MTA project where you want to have your Adaptation Project created.",
         "noAdaptableBusinessServiceFoundInMta": "No adaptable business service found in the MTA.",
+        "noAppsFoundForBusinessService": "No applications were found for the selected business service. Please check the service configuration.",
         "fetchBaseInboundsFailed": "Fetching base application inbounds failed: {{error}}.",
         "keyUserNoChangesDefault": "Only a single adaptation ('DEFAULT') was found and no key-user changes were found for it. Please select a different system to continue, or navigate back to the 'Project Attributes' page and choose not to import key-user changes.",
         "keyUserNoChangesAdaptation": "No key-user changes have been found for the '{{adaptationId}}' adaptation. Please select a different adaptation.",

package/package.json

@@ -3,7 +3,7 @@
   "displayName": "SAPUI5 Adaptation Project",
   "homepage": "https://help.sap.com/viewer/584e0bcbfd4a4aff91c815cefa0bce2d/Cloud/en-US/ada9567b767941aba8d49fdb4fdedea7.html",
   "description": "Adaptation project allows you to create an app variant for an existing SAP Fiori elements-based or SAPUI5 freestyle application, without changing the original application.",
-  "version": "0.9.26",
+  "version": "0.9.27",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -30,7 +30,7 @@
     "i18next": "25.8.12",
     "yeoman-generator": "5.10.0",
     "uuid": "11.1.0",
-    "@sap-ux/adp-tooling": "0.18.89",
+    "@sap-ux/adp-tooling": "0.18.90",
     "@sap-ux/axios-extension": "1.25.22",
     "@sap-ux/btp-utils": "1.1.9",
     "@sap-ux/feature-toggle": "0.3.7",
@@ -57,7 +57,7 @@
     "fs-extra": "11.3.4",
     "rimraf": "6.1.3",
     "yeoman-test": "6.3.0",
-    "@sap-ux/deploy-config-sub-generator": "0.5.107"
+    "@sap-ux/deploy-config-sub-generator": "0.5.109"
   },
   "engines": {
     "node": ">=20.x"