@sap-ux/generator-adp 0.9.45 → 0.9.46

package/generators/app/index.js

@@ -477,7 +477,9 @@ class default_1 extends yeoman_generator_1.default {
             ui5Version: { hide: true },
             ui5ValidationCli: { hide: true },
             enableTypeScript: { hide: true },
-            addFlpConfig: { hide: true },
+            // In CF flow, inbounds are fetched after base app selection (CF services page), which comes after attributes.
+            // We assume true here so the wizard prepares the tile settings page; actual inbounds availability is handled by the FLP sub-gen.
+            addFlpConfig: { hasBaseAppInbounds: true },
             addDeployConfig: { hide: true },
             importKeyUserChanges: { hide: true }
         };
@@ -494,6 +496,28 @@ class default_1 extends yeoman_generator_1.default {
         const cfServicesQuestions = await this.cfPrompter.getPrompts(projectPath, this.cfConfig);
         this.cfServicesAnswers = await this.prompt(cfServicesQuestions);
         this.logger.info(`CF Services Answers: ${JSON.stringify(this.cfServicesAnswers, null, 2)}`);
+        const selectedApp = this.cfServicesAnswers.baseApp;
+        if (!selectedApp || !this.attributeAnswers?.addFlpConfig) {
+            return;
+        }
+        try {
+            const cfInbounds = await (0, adp_tooling_1.getCfBaseAppInbounds)(selectedApp.appId, selectedApp.appHostId, this.cfConfig, this.logger);
+            // Register FLP wizard pages now that we know if inbounds are available
+            (0, steps_1.updateFlpWizardSteps)(!!cfInbounds, this.prompts, this.attributeAnswers.projectName, true);
+            if (cfInbounds) {
+                await (0, subgenHelpers_1.addFlpGen)({
+                    vscode: this.vscode,
+                    projectRootPath: this._getProjectPath(),
+                    inbounds: cfInbounds,
+                    layer: this.layer,
+                    prompts: this.prompts,
+                    isCfProject: true
+                }, this.composeWith.bind(this), this.logger, this.appWizard);
+            }
+        }
+        catch (e) {
+            this.logger.warn(`Could not fetch CF inbounds for FLP configuration: ${e.message}`);
+        }
     }
     /**
      * Retrieves the ConfigPrompter instance from cache if it exists, otherwise creates a new instance.

package/generators/app/questions/attributes.d.ts

@@ -22,9 +22,10 @@ export declare function getAddDeployConfigPrompt(prompts: YeomanUiSteps, _?: Add
  * Creates the Add FLP Config confirm prompt.
  *
  * @param {YeomanUiSteps} prompts - The Yeoman UI pages.
- * @param {boolean} projectType - The project type.
+ * @param {AdaptationProjectType} projectType - The project type.
  * @param {AddFlpConfigPromptOptions} options - Optional prompt options to control visibility.
+ * @param {boolean} isCfEnv - Whether the project targets Cloud Foundry.
  * @returns {AttributesQuestion} The prompt configuration for Add FLP config confirmation.
  */
-export declare function getFlpConfigPrompt(prompts: YeomanUiSteps, projectType?: AdaptationProjectType, options?: AddFlpConfigPromptOptions): AttributesQuestion;
+export declare function getFlpConfigPrompt(prompts: YeomanUiSteps, projectType?: AdaptationProjectType, options?: AddFlpConfigPromptOptions, isCfEnv?: boolean): AttributesQuestion;
 //# sourceMappingURL=attributes.d.ts.map

package/generators/app/questions/attributes.js

@@ -32,7 +32,7 @@ function getPrompts(path, config, promptOptions) {
         [types_1.attributePromptNames.ui5ValidationCli]: getUi5VersionValidationPromptForCli(),
         [types_1.attributePromptNames.enableTypeScript]: getEnableTypeScriptPrompt(promptOptions?.[types_1.attributePromptNames.enableTypeScript]),
         [types_1.attributePromptNames.addDeployConfig]: getAddDeployConfigPrompt(prompts, promptOptions?.[types_1.attributePromptNames.addDeployConfig]),
-        [types_1.attributePromptNames.addFlpConfig]: getFlpConfigPrompt(prompts, projectType, promptOptions?.[types_1.attributePromptNames.addFlpConfig]),
+        [types_1.attributePromptNames.addFlpConfig]: getFlpConfigPrompt(prompts, projectType, promptOptions?.[types_1.attributePromptNames.addFlpConfig], isCfEnv),
         [types_1.attributePromptNames.importKeyUserChanges]: getImportKeyUserChangesPrompt(prompts, promptOptions?.[types_1.attributePromptNames.importKeyUserChanges])
     };
     const questions = Object.entries(keyedPrompts)
@@ -228,11 +228,12 @@ function getAddDeployConfigPrompt(prompts, _) {
  * Creates the Add FLP Config confirm prompt.
  *
  * @param {YeomanUiSteps} prompts - The Yeoman UI pages.
- * @param {boolean} projectType - The project type.
+ * @param {AdaptationProjectType} projectType - The project type.
  * @param {AddFlpConfigPromptOptions} options - Optional prompt options to control visibility.
+ * @param {boolean} isCfEnv - Whether the project targets Cloud Foundry.
  * @returns {AttributesQuestion} The prompt configuration for Add FLP config confirmation.
  */
-function getFlpConfigPrompt(prompts, projectType, options) {
+function getFlpConfigPrompt(prompts, projectType, options, isCfEnv) {
     return {
         type: 'confirm',
         name: types_1.attributePromptNames.addFlpConfig,
@@ -241,7 +242,7 @@ function getFlpConfigPrompt(prompts, projectType, options) {
         guiOptions: {
             breadcrumb: true
         },
-        when: () => projectType === axios_extension_1.AdaptationProjectType.CLOUD_READY,
+        when: () => isCfEnv || projectType === axios_extension_1.AdaptationProjectType.CLOUD_READY,
         validate: (value, answers) => {
             (0, steps_1.updateFlpWizardSteps)(!!options?.hasBaseAppInbounds, prompts, answers.projectName, value);
             return true;

package/generators/utils/subgenHelpers.d.ts

@@ -21,6 +21,7 @@ interface FlpGenProps {
     inbounds?: ManifestNamespace.Inbound;
     layer: FlexLayer;
     prompts: Prompts;
+    isCfProject?: boolean;
 }
 /**
  * Options required to invoke the deploy-config subgenerator.
@@ -43,7 +44,7 @@ interface DeployGenOptions {
  * @param {ToolsLogger} logger - Logger instance for tracking operations and errors.
  * @param {AppWizard} appWizard - AppWizard instance for interacting with the UI (optional).
  */
-export declare function addFlpGen({ projectRootPath, vscode, inbounds, layer, prompts }: FlpGenProps, composeWith: Generator['composeWith'], logger: ToolsLogger, appWizard: AppWizard): Promise<void>;
+export declare function addFlpGen({ projectRootPath, vscode, inbounds, layer, prompts, isCfProject }: FlpGenProps, composeWith: Generator['composeWith'], logger: ToolsLogger, appWizard: AppWizard): Promise<void>;
 /**
  * Composes the Fiori deploy-config sub-generator using `composeWith`. This sub-generator configures
  * deployment for Fiori applications, such as to ABAP or Cloud Foundry environments.

package/generators/utils/subgenHelpers.js

@@ -25,7 +25,7 @@ const PACKAGE_ADDITIONAL_VALIDATION = {
  * @param {ToolsLogger} logger - Logger instance for tracking operations and errors.
  * @param {AppWizard} appWizard - AppWizard instance for interacting with the UI (optional).
  */
-async function addFlpGen({ projectRootPath, vscode, inbounds, layer, prompts }, composeWith, logger, appWizard) {
+async function addFlpGen({ projectRootPath, vscode, inbounds, layer, prompts, isCfProject }, composeWith, logger, appWizard) {
     try {
         /**
          * We are using this namespace for now because '@sap/fiori:adp-flp-config' is not yet bundled in '@sap/generator-fiori'.
@@ -37,7 +37,8 @@ async function addFlpGen({ projectRootPath, vscode, inbounds, layer, prompts },
             layer,
             prompts,
             data: { projectRootPath },
-            appWizard
+            appWizard,
+            isCfProject
         });
         logger.info(`'@sap/fiori:adp-flp-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.9.45",
+  "version": "0.9.46",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -30,7 +30,7 @@
     "i18next": "25.10.10",
     "yeoman-generator": "5.10.0",
     "uuid": "11.1.0",
-    "@sap-ux/adp-tooling": "0.18.107",
+    "@sap-ux/adp-tooling": "0.18.108",
     "@sap-ux/axios-extension": "1.25.28",
     "@sap-ux/btp-utils": "1.1.12",
     "@sap-ux/feature-toggle": "0.3.8",
@@ -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.128"
+    "@sap-ux/deploy-config-sub-generator": "0.5.129"
   },
   "engines": {
     "node": ">=20.x"