@sap-ux/create 0.13.50 → 0.13.51

package/dist/cli/add/navigation-config.d.ts

@@ -1,22 +1,8 @@
 import type { Command } from 'commander';
-import { type Editor } from 'mem-fs-editor';
-import type { ToolsLogger } from '@sap-ux/logger';
-import type { Manifest } from '@sap-ux/project-access';
 /**
  * Add the "add inbound-navigation" command to a passed command.
  *
  * @param cmd - commander command for adding navigation inbounds config command
  */
 export declare function addInboundNavigationConfigCommand(cmd: Command): void;
-/**
- * Retrieves the project's manifest file, handling both Fiori and Adaptation project scenarios.
- *
- * @param {string} basePath - The base path to the project.
- * @param {boolean} isAdp - Indicates whether the project is an ADP project.
- * @param {Editor} fs - The mem-fs editor instance.
- * @param {ToolsLogger} logger - The logger instance.
- * @returns {Promise<Manifest>} The manifest file content.
- * @throws {Error} If the project is not CloudReady or the manifest cannot be retrieved.
- */
-export declare function getManifest(basePath: string, isAdp: boolean, fs: Editor, logger: ToolsLogger): Promise<Manifest>;
 //# sourceMappingURL=navigation-config.d.ts.map

package/dist/cli/add/navigation-config.js

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addInboundNavigationConfigCommand = addInboundNavigationConfigCommand;
-exports.getManifest = getManifest;
-const path_1 = require("path");
 const mem_fs_1 = require("mem-fs");
 const mem_fs_editor_1 = require("mem-fs-editor");
 const adp_tooling_1 = require("@sap-ux/adp-tooling");
@@ -10,6 +8,7 @@ const flp_config_inquirer_1 = require("@sap-ux/flp-config-inquirer");
 const project_access_1 = require("@sap-ux/project-access");
 const system_access_1 = require("@sap-ux/system-access");
 const app_config_writer_1 = require("@sap-ux/app-config-writer");
+const flp_config_inquirer_2 = require("@sap-ux/flp-config-inquirer");
 const common_1 = require("../../common");
 const validation_1 = require("../../validation");
 const prompts_1 = require("../../common/prompts");
@@ -23,11 +22,12 @@ function addInboundNavigationConfigCommand(cmd) {
     cmd.command('inbound-navigation [path]')
         .option('-s, --simulate', 'simulate only do not write config; sets also --verbose')
         .option('-v, --verbose', 'show verbose information')
+        .option('-c, --config <string>', 'Path to project configuration file in YAML format', project_access_1.FileName.Ui5Yaml)
         .action(async (path, options) => {
         if (options.verbose === true || options.simulate) {
             (0, tracing_1.setLogLevelVerbose)();
         }
-        await addInboundNavigationConfig(path || process.cwd(), !!options.simulate);
+        await addInboundNavigationConfig(path || process.cwd(), !!options.simulate, options.config);
     });
 }
 /**
@@ -35,33 +35,33 @@ function addInboundNavigationConfigCommand(cmd) {
  *
  * @param {string} basePath - The path to the application root.
  * @param {boolean} simulate - If true, simulates the changes without writing them; otherwise, writes changes.
+ * @param {string} yamlPath - The path to the project configuration file in YAML format.
  * @returns {Promise<void>} A promise that resolves when the operation is complete.
  */
-async function addInboundNavigationConfig(basePath, simulate) {
+async function addInboundNavigationConfig(basePath, simulate, yamlPath) {
     const logger = (0, tracing_1.getLogger)();
     try {
         logger.debug(`Called add inbound navigation-config for path '${basePath}', simulate is '${simulate}'`);
         await (0, validation_1.validateBasePath)(basePath);
         const appType = await (0, project_access_1.getAppType)(basePath);
         const isAdp = appType === 'Fiori Adaptation';
-        if (isAdp && (await (0, adp_tooling_1.flpConfigurationExists)(basePath))) {
-            logger.info('FLP Configuration already exists.');
-            return;
-        }
         const fs = (0, mem_fs_editor_1.create)((0, mem_fs_1.create)());
-        const manifest = await getManifest(basePath, isAdp, fs, logger);
-        const inbounds = (0, adp_tooling_1.getInboundsFromManifest)(manifest);
-        const appId = (0, adp_tooling_1.getRegistrationIdFromManifest)(manifest);
-        const config = await getUserConfig(inbounds, isAdp, appId);
-        if (!config) {
+        const inbounds = await getInbounds(basePath, yamlPath, isAdp, fs, logger);
+        let tileSettingsAnswers;
+        if (inbounds && isAdp) {
+            tileSettingsAnswers = await (0, common_1.promptYUIQuestions)((0, flp_config_inquirer_2.getTileSettingsQuestions)(), false);
+        }
+        const answers = await getUserAnswers(inbounds, isAdp, tileSettingsAnswers);
+        if (!answers) {
             logger.info('User chose not to overwrite existing inbound navigation configuration.');
             return;
         }
         if (isAdp) {
+            const config = (0, flp_config_inquirer_2.getAdpFlpInboundsWriterConfig)(answers, tileSettingsAnswers);
             await (0, adp_tooling_1.generateInboundConfig)(basePath, config, fs);
         }
         else {
-            await (0, app_config_writer_1.generateInboundNavigationConfig)(basePath, config, true, fs);
+            await (0, app_config_writer_1.generateInboundNavigationConfig)(basePath, answers, true, fs);
         }
         if (!simulate) {
             fs.commit(() => logger.info(`Inbound navigation configuration complete.`));
@@ -76,20 +76,24 @@ async function addInboundNavigationConfig(basePath, simulate) {
     }
 }
 /**
- * Retrieves the project's manifest file, handling both Fiori and Adaptation project scenarios.
+ * Retrieves the inbounds for the given project, handling both ADP and Fiori scenarios.
  *
  * @param {string} basePath - The base path to the project.
+ * @param {string} yamlPath - The path to the project configuration file in YAML format.
  * @param {boolean} isAdp - Indicates whether the project is an ADP project.
  * @param {Editor} fs - The mem-fs editor instance.
  * @param {ToolsLogger} logger - The logger instance.
- * @returns {Promise<Manifest>} The manifest file content.
- * @throws {Error} If the project is not CloudReady or the manifest cannot be retrieved.
+ * @returns {Promise<ManifestNamespace.Inbound | undefined>} The inbounds from the manifest or mapped from the system.
  */
-async function getManifest(basePath, isAdp, fs, logger) {
+async function getInbounds(basePath, yamlPath, isAdp, fs, logger) {
     if (isAdp) {
-        return retrieveMergedManifest(basePath, logger);
+        const appId = (await (0, adp_tooling_1.getVariant)(basePath)).reference;
+        const { target, ignoreCertErrors = false } = await (0, adp_tooling_1.getAdpConfig)(basePath, yamlPath);
+        const provider = await (0, system_access_1.createAbapServiceProvider)(target, { ignoreCertErrors }, true, logger);
+        return (0, adp_tooling_1.getBaseAppInbounds)(appId, provider);
     }
-    return retrieveManifest(basePath, fs);
+    const manifest = await retrieveManifest(basePath, fs);
+    return (0, adp_tooling_1.getInboundsFromManifest)(manifest);
 }
 /**
  * Retrieves the manifest for a Fiori project.
@@ -102,44 +106,27 @@ async function retrieveManifest(basePath, fs) {
     const { manifest } = await (0, app_config_writer_1.readManifest)(basePath, fs);
     return manifest;
 }
-/**
- * Retrieves the manifest for an Adaptation Project (ADP).
- *
- * @param {string} basePath - The base path to the ADP project.
- * @param {ToolsLogger} logger - The logger instance.
- * @returns {Promise<Manifest>} The merged manifest for the ADP project.
- * @throws {Error} If the project is not CloudReady.
- */
-async function retrieveMergedManifest(basePath, logger) {
-    const variant = await (0, adp_tooling_1.getVariant)(basePath);
-    const { target, ignoreCertErrors = false } = await (0, adp_tooling_1.getAdpConfig)(basePath, (0, path_1.join)(basePath, project_access_1.FileName.Ui5Yaml));
-    const provider = await (0, system_access_1.createAbapServiceProvider)(target, { ignoreCertErrors }, true, logger);
-    const manifestService = await adp_tooling_1.ManifestService.initMergedManifest(provider, basePath, variant, logger);
-    return manifestService.getManifest();
-}
 /**
  * Prompts the user for inbound navigation configuration.
  *
  * @param {ManifestNamespace.Inbound | undefined} inbounds - The existing inbounds if any.
  * @param {boolean} isAdp - Indicates whether the project is an ADP project.
- * @param {string} [appId] - The application ID used for generating prompts specific to the app.
+ * @param {TileSettingsAnswers} [tileSettingsAnswers] - The answers for tile settings.
  * @returns {Promise<FLPConfigAnswers | undefined>} A promise resolving to the user-provided configuration,
  * or `undefined` if the user opts not to overwrite.
  */
-async function getUserConfig(inbounds, isAdp, appId) {
+async function getUserAnswers(inbounds, isAdp, tileSettingsAnswers) {
     let promptOptions;
     if (!isAdp) {
         promptOptions = {
             inboundId: { hide: true },
-            additionalParameters: { hide: true },
-            createAnotherInbound: { hide: true },
-            emptyInboundsInfo: { hide: true }
+            additionalParameters: { hide: true }
         };
     }
     else {
-        promptOptions = { overwrite: { hide: true }, createAnotherInbound: { hide: true } };
+        promptOptions = (0, flp_config_inquirer_2.getAdpFlpConfigPromptOptions)(tileSettingsAnswers, inbounds);
     }
-    const prompts = await (0, prompts_1.filterLabelTypeQuestions)(await (0, flp_config_inquirer_1.getPrompts)(inbounds, appId, promptOptions));
+    const prompts = await (0, prompts_1.filterLabelTypeQuestions)(await (0, flp_config_inquirer_1.getPrompts)(inbounds, promptOptions));
     const config = await (0, common_1.promptYUIQuestions)(prompts, false);
     if (config?.subTitle === '') {
         config.subTitle = undefined;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sap-ux/create",
   "description": "SAP Fiori tools module to add or remove features",
-  "version": "0.13.50",
+  "version": "0.13.51",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -30,20 +30,20 @@
     "mem-fs": "2.1.0",
     "mem-fs-editor": "9.4.0",
     "prompts": "2.4.2",
-    "@sap-ux/abap-deploy-config-inquirer": "1.4.23",
-    "@sap-ux/abap-deploy-config-writer": "0.1.10",
-    "@sap-ux/adp-tooling": "0.14.28",
-    "@sap-ux/app-config-writer": "0.6.14",
-    "@sap-ux/cap-config-writer": "0.10.9",
+    "@sap-ux/abap-deploy-config-inquirer": "1.4.24",
+    "@sap-ux/abap-deploy-config-writer": "0.1.11",
+    "@sap-ux/adp-tooling": "0.14.29",
+    "@sap-ux/app-config-writer": "0.6.15",
+    "@sap-ux/cap-config-writer": "0.10.10",
     "@sap-ux/cards-editor-config-writer": "0.5.2",
     "@sap-ux/logger": "0.7.0",
-    "@sap-ux/mockserver-config-writer": "0.9.2",
-    "@sap-ux/odata-service-writer": "0.27.5",
-    "@sap-ux/preview-middleware": "0.20.40",
-    "@sap-ux/project-access": "1.30.2",
-    "@sap-ux/system-access": "0.6.7",
+    "@sap-ux/mockserver-config-writer": "0.9.3",
+    "@sap-ux/odata-service-writer": "0.27.6",
+    "@sap-ux/preview-middleware": "0.20.41",
+    "@sap-ux/project-access": "1.30.3",
+    "@sap-ux/system-access": "0.6.8",
     "@sap-ux/ui5-config": "0.28.2",
-    "@sap-ux/flp-config-inquirer": "0.3.28"
+    "@sap-ux/flp-config-inquirer": "0.3.29"
   },
   "devDependencies": {
     "@types/diff": "5.0.9",
@@ -51,7 +51,7 @@
     "@types/mem-fs": "1.1.2",
     "@types/mem-fs-editor": "7.0.1",
     "@types/prompts": "2.4.4",
-    "@sap-ux/inquirer-common": "0.7.13",
+    "@sap-ux/inquirer-common": "0.7.14",
     "@sap-ux/store": "1.1.0"
   },
   "scripts": {