@sap-ux/generator-adp 0.3.61 → 0.3.63

package/generators/app/index.js

@@ -184,12 +184,12 @@ class default_1 extends yeoman_generator_1.default {
         this._updateWizardStepsAfterNavigation();
         this.logger.info(`Project Attributes: ${JSON.stringify(this.attributeAnswers, null, 2)}`);
         if (this.attributeAnswers.addDeployConfig) {
-            const client = (await this.systemLookup.getSystemByName(this.configAnswers.system))?.Client;
+            const system = await this.systemLookup.getSystemByName(this.configAnswers.system);
             (0, subgenHelpers_1.addDeployGen)({
                 projectName: this.attributeAnswers.projectName,
-                targetFolder: this.attributeAnswers.targetFolder,
+                projectPath: this.attributeAnswers.targetFolder,
                 connectedSystem: this.configAnswers.system,
-                client
+                system
             }, this.composeWith.bind(this), this.logger, this.appWizard);
         }
         if (this.attributeAnswers?.addFlpConfig) {

package/generators/utils/subgenHelpers.d.ts

@@ -2,7 +2,7 @@ import type Generator from 'yeoman-generator';
 import type { AppWizard } from '@sap-devx/yeoman-ui-types';
 import type { ToolsLogger } from '@sap-ux/logger';
 import type { ManifestNamespace } from '@sap-ux/project-access';
-import type { ConfigAnswers, AttributesAnswers, SystemLookup, FlexLayer } from '@sap-ux/adp-tooling';
+import type { ConfigAnswers, AttributesAnswers, SystemLookup, FlexLayer, Endpoint } from '@sap-ux/adp-tooling';
 /**
  * Parameters required for composing the extension project generator.
  */
@@ -25,10 +25,9 @@ interface FlpGenProps {
  */
 interface DeployGenOptions {
     projectName: string;
-    targetFolder: string;
-    client?: string;
+    projectPath: string;
     connectedSystem: string;
-    destinationName?: string;
+    system?: Endpoint;
 }
 /**
  * Composes the FLP config sub-generator using `composeWith`. This generator is used to scaffold
@@ -49,15 +48,13 @@ export declare function addFlpGen({ projectRootPath, vscode, inbounds, layer }:
  * @param {DeployGenOptions} options - Deployment generator input options
  * @param {string} options.projectName - Project name
  * @param {string} options.targetFolder - Folder where project will be generated
- * @param {string} options.applicationType - Type of application being deployed
- * @param {string} options.client - (Optional) ABAP client number
- * @param {string} options.connectedSystem - (Optional) Connected system data
- * @param {string} options.destinationName - (Optional) Destination name for deployment
+ * @param {string} options.connectedSystem - Connected system data
+ * @param {Endpoint} options.system - (Optional) System endpoint with connection details
  * @param {Generator['composeWith']} composeWith - Yeoman composeWith method from generator context
  * @param {ToolsLogger} logger - Logger for info and error output
  * @param {AppWizard} appWizard - Optional AppWizard instance for displaying UI messages
  */
-export declare function addDeployGen({ projectName, targetFolder, client, connectedSystem, destinationName }: DeployGenOptions, composeWith: Generator['composeWith'], logger: ToolsLogger, appWizard: AppWizard): void;
+export declare function addDeployGen({ projectName, projectPath, connectedSystem, system }: DeployGenOptions, composeWith: Generator['composeWith'], logger: ToolsLogger, appWizard: AppWizard): void;
 /**
  * Composes the extension project sub-generator if the base app is unsupported.
  *

package/generators/utils/subgenHelpers.js

@@ -5,6 +5,14 @@ exports.addDeployGen = addDeployGen;
 exports.addExtProjectGen = addExtProjectGen;
 const i18n_1 = require("./i18n");
 const extension_project_1 = require("../app/extension-project");
+/**
+ * Static validation configuration for package prompts in ADP deployment.
+ */
+const PACKAGE_ADDITIONAL_VALIDATION = {
+    shouldValidatePackageForStartingPrefix: true,
+    shouldValidatePackageType: true,
+    shouldValidateFormatAndSpecialCharacters: true
+};
 /**
  * Composes the FLP config sub-generator using `composeWith`. This generator is used to scaffold
  * the FLP (Fiori Launchpad) configuration for the project.
@@ -43,27 +51,39 @@ function addFlpGen({ projectRootPath, vscode, inbounds, layer }, composeWith, lo
  * @param {DeployGenOptions} options - Deployment generator input options
  * @param {string} options.projectName - Project name
  * @param {string} options.targetFolder - Folder where project will be generated
- * @param {string} options.applicationType - Type of application being deployed
- * @param {string} options.client - (Optional) ABAP client number
- * @param {string} options.connectedSystem - (Optional) Connected system data
- * @param {string} options.destinationName - (Optional) Destination name for deployment
+ * @param {string} options.connectedSystem - Connected system data
+ * @param {Endpoint} options.system - (Optional) System endpoint with connection details
  * @param {Generator['composeWith']} composeWith - Yeoman composeWith method from generator context
  * @param {ToolsLogger} logger - Logger for info and error output
  * @param {AppWizard} appWizard - Optional AppWizard instance for displaying UI messages
  */
-function addDeployGen({ projectName, targetFolder, client, connectedSystem, destinationName }, composeWith, logger, appWizard) {
+function addDeployGen({ projectName, projectPath, connectedSystem, system }, composeWith, logger, appWizard) {
     try {
+        const subGenPromptOptions = {
+            ui5AbapRepo: { hideIfOnPremise: true },
+            transportInputChoice: { hideIfOnPremise: true },
+            overwriteAbapConfig: { hide: true },
+            packageAutocomplete: {
+                additionalValidation: PACKAGE_ADDITIONAL_VALIDATION
+            },
+            packageManual: {
+                additionalValidation: PACKAGE_ADDITIONAL_VALIDATION
+            },
+            targetSystem: { additionalValidation: { shouldRestrictDifferentSystemType: true } }
+        };
         const generatorOptions = {
             launchDeployConfigAsSubGenerator: true,
             projectName,
-            projectPath: targetFolder,
+            projectPath,
             telemetryData: { appType: 'Fiori Adaptation' },
             appWizard,
             logWrapper: logger,
             target: 'abap',
-            ...(client && { appGenClient: client }),
+            subGenPromptOptions,
             ...(connectedSystem && { connectedSystem }),
-            ...(destinationName && { appGenDestination: destinationName })
+            ...(system?.Name && { appGenDestination: system.Name }),
+            ...(system?.Client && { appGenClient: system.Client }),
+            ...(system?.Url && { appGenServiceHost: system.Url })
         };
         composeWith('@sap/fiori:deploy-config', generatorOptions);
         logger.info(`'@sap/fiori:deploy-config' was called.`);

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.3.61",
+  "version": "0.3.63",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -30,18 +30,18 @@
     "i18next": "25.3.0",
     "yeoman-generator": "5.10.0",
     "uuid": "10.0.0",
-    "@sap-ux/adp-tooling": "0.15.14",
+    "@sap-ux/adp-tooling": "0.15.15",
     "@sap-ux/axios-extension": "1.22.5",
     "@sap-ux/btp-utils": "1.1.0",
     "@sap-ux/feature-toggle": "0.3.0",
-    "@sap-ux/inquirer-common": "0.7.32",
+    "@sap-ux/inquirer-common": "0.7.33",
     "@sap-ux/logger": "0.7.0",
     "@sap-ux/project-access": "1.30.10",
     "@sap-ux/store": "1.1.2",
     "@sap-ux/system-access": "0.6.12",
     "@sap-ux/project-input-validator": "0.6.15",
     "@sap-ux/fiori-generator-shared": "0.13.7",
-    "@sap-ux/adp-flp-config-sub-generator": "0.1.60",
+    "@sap-ux/adp-flp-config-sub-generator": "0.1.61",
     "@sap-ux/odata-service-writer": "0.27.15"
   },
   "devDependencies": {
@@ -57,7 +57,7 @@
     "fs-extra": "10.0.0",
     "rimraf": "5.0.5",
     "yeoman-test": "6.3.0",
-    "@sap-ux/deploy-config-sub-generator": "0.3.56"
+    "@sap-ux/deploy-config-sub-generator": "0.3.57"
   },
   "engines": {
     "node": ">=20.x"