@sap-ux/adp-flp-config-sub-generator 0.1.219 → 0.1.221

package/generators/app/index.d.ts

@@ -25,6 +25,7 @@ export default class AdpFlpConfigGenerator extends Generator {
     private variant;
     private tileSettingsAnswers?;
     private provider;
+    private isCfProject;
     /**
      * Creates an instance of the generator.
      *
@@ -119,6 +120,18 @@ export default class AdpFlpConfigGenerator extends Generator {
      * @returns {Promise<void>} A promise that resolves when the initialization is complete.
      */
     private _initializeStandAloneGenerator;
+    /**
+     * Initializes the ABAP-specific parts of the standalone generator.
+     *
+     * @returns {Promise<void>} A promise that resolves when initialization is complete.
+     */
+    private _initializeAbapGenerator;
+    /**
+     * Initializes the CF-specific parts of the standalone generator.
+     *
+     * @returns {Promise<void>} A promise that resolves when initialization is complete.
+     */
+    private _initializeCfGenerator;
     /**
      * Initializes the AbapServiceProvider for the generator. If the generator is launched as a sub-generator, the provider is taken from the options.
      * If the provider is cached in the app wizard, it is retrieved from the cache, otherwise, a new AbapServiceProvider is created using the ui5.yaml configuration.

package/generators/app/index.js

@@ -45,6 +45,7 @@ class AdpFlpConfigGenerator extends yeoman_generator_1.default {
     variant;
     tileSettingsAnswers;
     provider;
+    isCfProject = false;
     /**
      * Creates an instance of the generator.
      *
@@ -62,6 +63,7 @@ class AdpFlpConfigGenerator extends yeoman_generator_1.default {
         this.vscode = opts.vscode;
         this.inbounds = opts.inbounds;
         this.layer = opts.layer;
+        this.isCfProject = !!opts.isCfProject;
         (0, appWizardCache_1.initAppWizardCache)(this.logger, this.appWizard);
         this._setupFLPConfigPrompts();
         this._setupLogging();
@@ -96,7 +98,7 @@ class AdpFlpConfigGenerator extends yeoman_generator_1.default {
         if (this.abort) {
             return;
         }
-        if (!this.launchAsSubGen) {
+        if (!this.launchAsSubGen && !this.isCfProject) {
             await this._validateCloudProject();
             if (this.abort) {
                 return;
@@ -358,9 +360,11 @@ class AdpFlpConfigGenerator extends yeoman_generator_1.default {
      */
     async _validateProjectType() {
         const isFioriAdaptation = (await (0, project_access_1.getAppType)(this.projectRootPath)) === 'Fiori Adaptation';
-        if (!isFioriAdaptation || (await (0, adp_tooling_1.isCFEnvironment)(this.projectRootPath))) {
+        if (!isFioriAdaptation) {
             this._abortExecution((0, utils_1.t)('error.projectNotSupported'));
+            return;
         }
+        this.isCfProject = await (0, adp_tooling_1.isCFEnvironment)(this.projectRootPath);
     }
     /**
      * Validates the project is cloud ready.
@@ -380,10 +384,26 @@ class AdpFlpConfigGenerator extends yeoman_generator_1.default {
      */
     async _initializeStandAloneGenerator() {
         await this._validateProjectType();
-        this.ui5Yaml = await (0, adp_tooling_1.getAdpConfig)(this.projectRootPath, (0, node_path_1.join)(this.projectRootPath, project_access_1.FileName.Ui5Yaml));
+        if (this.abort) {
+            return;
+        }
         this.variant = await (0, adp_tooling_1.getVariant)(this.projectRootPath, this.fs);
         this.appId = this.variant.reference;
         this.layer = this.variant.layer;
+        if (this.isCfProject) {
+            await this._initializeCfGenerator();
+        }
+        else {
+            await this._initializeAbapGenerator();
+        }
+    }
+    /**
+     * Initializes the ABAP-specific parts of the standalone generator.
+     *
+     * @returns {Promise<void>} A promise that resolves when initialization is complete.
+     */
+    async _initializeAbapGenerator() {
+        this.ui5Yaml = await (0, adp_tooling_1.getAdpConfig)(this.projectRootPath, (0, node_path_1.join)(this.projectRootPath, project_access_1.FileName.Ui5Yaml));
         await this._initAbapServiceProvider();
         try {
             this.inbounds = this.inbounds ?? (await (0, adp_tooling_1.getBaseAppInbounds)(this.appId, this.provider));
@@ -396,6 +416,32 @@ class AdpFlpConfigGenerator extends yeoman_generator_1.default {
             this._handleFetchingError(error);
         }
     }
+    /**
+     * Initializes the CF-specific parts of the standalone generator.
+     *
+     * @returns {Promise<void>} A promise that resolves when initialization is complete.
+     */
+    async _initializeCfGenerator() {
+        const cfConfig = (0, adp_tooling_1.loadCfConfig)(this.toolsLogger);
+        if (!cfConfig?.token) {
+            this._abortExecution((0, utils_1.t)('error.cfLoginRequired'));
+            return;
+        }
+        const appParams = (0, adp_tooling_1.getAppParamsFromUI5Yaml)(this.projectRootPath);
+        if (!appParams.appHostId) {
+            this._abortExecution((0, utils_1.t)('error.cfAppHostIdMissing'));
+            return;
+        }
+        try {
+            this.inbounds =
+                this.inbounds ??
+                    (await (0, adp_tooling_1.getCfBaseAppInbounds)(this.appId, appParams.appHostId, cfConfig, this.toolsLogger));
+        }
+        catch (e) {
+            this.toolsLogger.error(`CF inbounds fetching failed: ${e}`);
+            this._abortExecution((0, utils_1.t)('error.cfInboundsFetchFailed', { error: e.message }));
+        }
+    }
     /**
      * Initializes the AbapServiceProvider for the generator. If the generator is launched as a sub-generator, the provider is taken from the options.
      * If the provider is cached in the app wizard, it is retrieved from the cache, otherwise, a new AbapServiceProvider is created using the ui5.yaml configuration.

package/generators/app/types.d.ts

@@ -39,6 +39,10 @@ export interface FlpConfigOptions extends Generator.GeneratorOptions {
     data?: {
         projectRootPath: string;
     };
+    /**
+     * Flag indicating whether this is a CF environment project
+     */
+    isCfProject?: boolean;
 }
 export interface State {
     provider?: AbapServiceProvider;

package/generators/translations/adp-flp-config-sub-generator.i18n.json

@@ -25,6 +25,10 @@
         "authenticationFailed": "Authentication failed.",
         "projectNotCloudReady": "FLP Configuration is supported for Cloud Ready adaptation projects only",
         "baseAppInboundsFetching": "Error while fetching base application inbounds",
+        "cfConfigRequired": "Cloud Foundry configuration is required for Cloud Foundry adaptation projects.",
+        "cfLoginRequired": "Cloud Foundry login required. Please run `cf login` and try again.",
+        "cfAppHostIdMissing": "Could not determine the `appHostId` from the project's `ui5.yaml` configuration.",
+        "cfInboundsFetchFailed": "Failed to fetch inbounds for the Cloud Foundry application: {{error}}",
         "warningCachingNotSupported": "Warning: caching is not supported"
     }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sap-ux/adp-flp-config-sub-generator",
   "description": "Generator for adding FLP configuration to an Adaptation Project",
-  "version": "0.1.219",
+  "version": "0.1.221",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -22,15 +22,15 @@
     "@sap-devx/yeoman-ui-types": "1.23.0",
     "i18next": "25.10.10",
     "yeoman-generator": "5.10.0",
-    "@sap-ux/adp-tooling": "0.18.107",
+    "@sap-ux/adp-tooling": "0.18.109",
     "@sap-ux/axios-extension": "1.25.28",
     "@sap-ux/btp-utils": "1.1.12",
     "@sap-ux/feature-toggle": "0.3.8",
-    "@sap-ux/fiori-generator-shared": "0.13.94",
-    "@sap-ux/flp-config-inquirer": "0.4.166",
-    "@sap-ux/inquirer-common": "0.11.32",
+    "@sap-ux/fiori-generator-shared": "0.13.95",
+    "@sap-ux/flp-config-inquirer": "0.4.168",
+    "@sap-ux/inquirer-common": "0.11.33",
     "@sap-ux/logger": "0.8.4",
-    "@sap-ux/project-access": "1.35.17",
+    "@sap-ux/project-access": "1.35.18",
     "@sap-ux/store": "1.5.12",
     "@sap-ux/system-access": "0.7.4"
   },