@sap-ux/generator-adp 0.3.28 → 0.3.30

package/generators/app/index.d.ts

@@ -1,5 +1,5 @@
 import Generator from 'yeoman-generator';
-import type { AdpGeneratorOptions } from './types';
+import { type AdpGeneratorOptions } from './types';
 /**
  * Generator for creating an Adaptation Project.
  *
@@ -67,6 +67,10 @@ export default class extends Generator {
      * Indicates if the current layer is based on a customer base.
      */
     private isCustomerBase;
+    /**
+     * Base application inbounds, if the base application is an FLP app.
+     */
+    private baseAppInbounds?;
     /**
      * Creates an instance of the generator.
      *
@@ -99,6 +103,11 @@ export default class extends Generator {
      * Initialize the project generator from a json.
      */
     private _initFromJson;
+    /**
+     * Updates the FLP wizard steps in the prompt sequence if the FLP configuration page(s) does not already exist.
+     *
+     */
+    private _updateWizardStepsAfterNavigation;
 }
 export type { AdpGeneratorOptions };
 //# sourceMappingURL=index.d.ts.map

package/generators/app/index.js

@@ -91,6 +91,10 @@ class default_1 extends yeoman_generator_1.default {
      * Indicates if the current layer is based on a customer base.
      */
     isCustomerBase;
+    /**
+     * Base application inbounds, if the base application is an FLP app.
+     */
+    baseAppInbounds;
     /**
      * Creates an instance of the generator.
      *
@@ -161,19 +165,25 @@ class default_1 extends yeoman_generator_1.default {
             prompts: this.prompts
         };
         const defaultFolder = (0, fiori_generator_shared_1.getDefaultTargetFolder)(this.options.vscode) ?? process.cwd();
+        if (this.prompter.isCloud) {
+            this.baseAppInbounds = await (0, adp_tooling_1.getBaseAppInbounds)(this.configAnswers.application.id, this.prompter.provider);
+        }
         const options = {
             targetFolder: { default: defaultFolder },
             ui5ValidationCli: { hide: !isCLI },
-            enableTypeScript: { hide: this.shouldCreateExtProject }
+            enableTypeScript: { hide: this.shouldCreateExtProject },
+            addFlpConfig: { hasBaseAppInbounds: !!this.baseAppInbounds }
         };
         const attributesQuestions = (0, attributes_1.getPrompts)(this.destinationPath(), promptConfig, options);
         this.attributeAnswers = await this.prompt(attributesQuestions);
+        // Steps need to be updated here to be available after back navigation in Yeoman UI.
+        this._updateWizardStepsAfterNavigation();
         this.logger.info(`Project Attributes: ${JSON.stringify(this.attributeAnswers, null, 2)}`);
         if (this.attributeAnswers?.addFlpConfig) {
             (0, subgenHelpers_1.addFlpGen)({
+                vscode: this.vscode,
                 projectRootPath: this._getProjectPath(),
-                system: this.configAnswers.system,
-                manifest: this.prompter.manifest
+                inbounds: this.baseAppInbounds
             }, this.composeWith.bind(this), this.logger, this.appWizard);
         }
         if (this.attributeAnswers.addDeployConfig) {
@@ -335,6 +345,21 @@ class default_1 extends yeoman_generator_1.default {
             enableTypeScript: false
         };
     }
+    /**
+     * Updates the FLP wizard steps in the prompt sequence if the FLP configuration page(s) does not already exist.
+     *
+     */
+    _updateWizardStepsAfterNavigation() {
+        const pages = this.prompts['items'];
+        const flpPagesExist = pages.some((p) => p.name === (0, i18n_1.t)('yuiNavSteps.flpConfigName'));
+        const deployPageExists = pages.some((p) => p.name === (0, i18n_1.t)('yuiNavSteps.deployConfigName'));
+        if (!deployPageExists) {
+            (0, steps_1.updateWizardSteps)(this.prompts, (0, steps_1.getDeployPage)(), (0, i18n_1.t)('yuiNavSteps.projectAttributesName'), this.attributeAnswers.addDeployConfig);
+        }
+        if (!flpPagesExist) {
+            (0, steps_1.updateFlpWizardSteps)(!!this.baseAppInbounds, this.prompts, this.attributeAnswers.projectName, this.attributeAnswers.addFlpConfig);
+        }
+    }
 }
 exports.default = default_1;
 //# sourceMappingURL=index.js.map

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

@@ -30,9 +30,9 @@ export declare function getAddDeployConfigPrompt(prompts: YeomanUiSteps, _?: Add
  *
  * @param {YeomanUiSteps} prompts - The Yeoman UI pages.
  * @param {boolean} isCloudProject - Whether the project is for a cloud-based system.
- * @param {AddFlpConfigPromptOptions} [_] - Optional prompt options to control visibility.
+ * @param {AddFlpConfigPromptOptions} options - Optional prompt options to control visibility.
  * @returns {AttributesQuestion} The prompt configuration for Add FLP config confirmation.
  */
-export declare function getFlpConfigPrompt(prompts: YeomanUiSteps, isCloudProject: boolean, _?: AddFlpConfigPromptOptions): AttributesQuestion;
+export declare function getFlpConfigPrompt(prompts: YeomanUiSteps, isCloudProject: boolean, options?: AddFlpConfigPromptOptions): AttributesQuestion;
 export {};
 //# sourceMappingURL=attributes.d.ts.map

package/generators/app/questions/attributes.js

@@ -226,10 +226,10 @@ function getAddDeployConfigPrompt(prompts, _) {
  *
  * @param {YeomanUiSteps} prompts - The Yeoman UI pages.
  * @param {boolean} isCloudProject - Whether the project is for a cloud-based system.
- * @param {AddFlpConfigPromptOptions} [_] - Optional prompt options to control visibility.
+ * @param {AddFlpConfigPromptOptions} options - Optional prompt options to control visibility.
  * @returns {AttributesQuestion} The prompt configuration for Add FLP config confirmation.
  */
-function getFlpConfigPrompt(prompts, isCloudProject, _) {
+function getFlpConfigPrompt(prompts, isCloudProject, options) {
     return {
         type: 'confirm',
         name: types_1.attributePromptNames.addFlpConfig,
@@ -239,8 +239,8 @@ function getFlpConfigPrompt(prompts, isCloudProject, _) {
             breadcrumb: true
         },
         when: () => isCloudProject,
-        validate: (value) => {
-            (0, steps_1.updateWizardSteps)(prompts, (0, steps_1.getFlpPage)(), (0, i18n_1.t)('yuiNavSteps.deployConfigName'), value);
+        validate: (value, answers) => {
+            (0, steps_1.updateFlpWizardSteps)(!!options?.hasBaseAppInbounds, prompts, answers.projectName, value);
             return true;
         }
     };

package/generators/app/types.d.ts

@@ -124,6 +124,7 @@ export interface AddDeployConfigPromptOptions {
 }
 export interface AddFlpConfigPromptOptions {
     hide?: boolean;
+    hasBaseAppInbounds?: boolean;
 }
 export type AttributePromptOptions = Partial<{
     [attributePromptNames.projectName]: ProjectNamePromptOptions;

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

@@ -5,7 +5,7 @@
         "projectAttributesName": "Project Attributes",
         "projectAttributesDescr": "Configure the main project attributes.",
         "flpConfigName": "SAP Fiori Launchpad Configuration",
-        "flpConfigDescr": "Configure SAP Fiori launchpad settings for {{- projectName}}.",
+        "tileSettingsName": "SAP Fiori Launchpad Configuration - Tile Settings for {{- projectName}}",
         "deployConfigName": "Deployment Configuration",
         "deployConfigDescr": "Configure deployment settings."
     },

package/generators/utils/steps.d.ts

@@ -8,9 +8,20 @@ export declare function getWizardPages(): IPrompt[];
 /**
  * Returns the FLP configuration page step.
  *
+ * @param {boolean} showTileSettingsPage - Flag to determine if the tile settings page should be shown.
+ * @param {string} projectName - The name of the project.
  * @returns {IPrompt} The FLP configuration wizard page.
  */
-export declare function getFlpPage(): IPrompt;
+export declare function getFlpPages(showTileSettingsPage: boolean, projectName: string): IPrompt[];
+/**
+ * Updates the FLP wizard steps by adding or removing FLP-related pages based on the presence of a base app inbound.
+ *
+ * @param {boolean} hasBaseAppInbound - Indicates if the base app inbound exists.
+ * @param {YeomanUiSteps} prompts - The Yeoman UI Prompts container object.
+ * @param {string} projectName - The name of the project.
+ * @param {boolean} [shouldAdd] - Whether to add (`true`) or remove (`false`) the steps.
+ */
+export declare function updateFlpWizardSteps(hasBaseAppInbound: boolean, prompts: YeomanUiSteps, projectName: string, shouldAdd?: boolean): void;
 /**
  * Returns the deploy configuration page step.
  *

package/generators/utils/steps.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getWizardPages = getWizardPages;
-exports.getFlpPage = getFlpPage;
+exports.getFlpPages = getFlpPages;
+exports.updateFlpWizardSteps = updateFlpWizardSteps;
 exports.getDeployPage = getDeployPage;
 exports.updateWizardSteps = updateWizardSteps;
 const i18n_1 = require("./i18n");
@@ -25,13 +26,41 @@ function getWizardPages() {
 /**
  * Returns the FLP configuration page step.
  *
+ * @param {boolean} showTileSettingsPage - Flag to determine if the tile settings page should be shown.
+ * @param {string} projectName - The name of the project.
  * @returns {IPrompt} The FLP configuration wizard page.
  */
-function getFlpPage() {
-    return {
-        name: (0, i18n_1.t)('yuiNavSteps.flpConfigName'),
-        description: (0, i18n_1.t)('yuiNavSteps.flpConfigDescr')
-    };
+function getFlpPages(showTileSettingsPage, projectName) {
+    const pages = [
+        {
+            name: (0, i18n_1.t)('yuiNavSteps.flpConfigName'),
+            description: ''
+        }
+    ];
+    if (showTileSettingsPage) {
+        pages.unshift({
+            name: (0, i18n_1.t)('yuiNavSteps.tileSettingsName', { projectName }),
+            description: ''
+        });
+    }
+    return pages;
+}
+/**
+ * Updates the FLP wizard steps by adding or removing FLP-related pages based on the presence of a base app inbound.
+ *
+ * @param {boolean} hasBaseAppInbound - Indicates if the base app inbound exists.
+ * @param {YeomanUiSteps} prompts - The Yeoman UI Prompts container object.
+ * @param {string} projectName - The name of the project.
+ * @param {boolean} [shouldAdd] - Whether to add (`true`) or remove (`false`) the steps.
+ */
+function updateFlpWizardSteps(hasBaseAppInbound, prompts, projectName, shouldAdd = true) {
+    const pages = getFlpPages(hasBaseAppInbound, projectName);
+    if (pages.length === 2) {
+        updateWizardSteps(prompts, pages[0], (0, i18n_1.t)('yuiNavSteps.deployConfigName'), shouldAdd);
+        updateWizardSteps(prompts, pages[1], (0, i18n_1.t)('yuiNavSteps.tileSettingsName'), shouldAdd);
+        return;
+    }
+    updateWizardSteps(prompts, pages[0], (0, i18n_1.t)('yuiNavSteps.deployConfigName'), shouldAdd);
 }
 /**
  * Returns the deploy configuration page step.

package/generators/utils/subgenHelpers.d.ts

@@ -1,6 +1,6 @@
 import type Generator from 'yeoman-generator';
-import { type AppWizard } from '@sap-devx/yeoman-ui-types';
-import type { Manifest } from '@sap-ux/project-access';
+import type { AppWizard } from '@sap-devx/yeoman-ui-types';
+import type { ManifestNamespace } from '@sap-ux/project-access';
 import type { ILogWrapper } from '@sap-ux/fiori-generator-shared';
 import type { ConfigAnswers, AttributesAnswers, SystemLookup } from '@sap-ux/adp-tooling';
 /**
@@ -15,9 +15,9 @@ interface ExtProjectGenProps {
  * Parameters required for composing the FLP config generator.
  */
 interface FlpGenProps {
+    vscode: unknown;
     projectRootPath: string;
-    system: string;
-    manifest: Manifest;
+    inbounds?: ManifestNamespace.Inbound;
 }
 /**
  * Options required to invoke the deploy-config subgenerator.
@@ -41,7 +41,7 @@ interface DeployGenOptions {
  * @param {ILogWrapper} logger - Logger instance for tracking operations and errors.
  * @param {AppWizard} appWizard - AppWizard instance for interacting with the UI (optional).
  */
-export declare function addFlpGen({ projectRootPath, system, manifest }: FlpGenProps, composeWith: Generator['composeWith'], logger: ILogWrapper, appWizard: AppWizard): void;
+export declare function addFlpGen({ projectRootPath, vscode, inbounds }: FlpGenProps, composeWith: Generator['composeWith'], logger: ILogWrapper, appWizard: AppWizard): 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

@@ -17,15 +17,15 @@ const extension_project_1 = require("../app/extension-project");
  * @param {ILogWrapper} logger - Logger instance for tracking operations and errors.
  * @param {AppWizard} appWizard - AppWizard instance for interacting with the UI (optional).
  */
-function addFlpGen({ projectRootPath, system, manifest }, composeWith, logger, appWizard) {
+function addFlpGen({ projectRootPath, vscode, inbounds }, composeWith, logger, appWizard) {
     try {
         /**
          * We are using this namespace for now because '@sap-ux/adp-flp-config-sub-generator' is not yet bundled in '@sap/generator-fiori'.
          */
         composeWith(require.resolve('@sap-ux/adp-flp-config-sub-generator/generators/app'), {
             launchAsSubGen: true,
-            manifest,
-            system,
+            vscode,
+            inbounds,
             data: { projectRootPath },
             appWizard
         });

package/package.json

@@ -2,7 +2,7 @@
   "name": "@sap-ux/generator-adp",
   "displayName": "SAPUI5 Adaptation Project",
   "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.28",
+  "version": "0.3.30",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -29,18 +29,18 @@
     "i18next": "23.5.1",
     "yeoman-generator": "5.10.0",
     "uuid": "10.0.0",
-    "@sap-ux/adp-tooling": "0.14.28",
-    "@sap-ux/axios-extension": "1.22.2",
+    "@sap-ux/adp-tooling": "0.14.30",
+    "@sap-ux/axios-extension": "1.22.3",
     "@sap-ux/btp-utils": "1.1.0",
     "@sap-ux/feature-toggle": "0.3.0",
-    "@sap-ux/inquirer-common": "0.7.13",
+    "@sap-ux/inquirer-common": "0.7.15",
     "@sap-ux/logger": "0.7.0",
-    "@sap-ux/project-access": "1.30.2",
+    "@sap-ux/project-access": "1.30.3",
     "@sap-ux/store": "1.1.0",
-    "@sap-ux/system-access": "0.6.7",
-    "@sap-ux/project-input-validator": "0.6.3",
-    "@sap-ux/fiori-generator-shared": "0.12.8",
-    "@sap-ux/adp-flp-config-sub-generator": "0.1.28"
+    "@sap-ux/system-access": "0.6.8",
+    "@sap-ux/project-input-validator": "0.6.4",
+    "@sap-ux/fiori-generator-shared": "0.12.10",
+    "@sap-ux/adp-flp-config-sub-generator": "0.1.30"
   },
   "devDependencies": {
     "@jest/types": "29.6.3",
@@ -55,7 +55,7 @@
     "fs-extra": "10.0.0",
     "rimraf": "5.0.5",
     "yeoman-test": "6.3.0",
-    "@sap-ux/deploy-config-sub-generator": "0.3.22"
+    "@sap-ux/deploy-config-sub-generator": "0.3.24"
   },
   "engines": {
     "node": ">=20.x"