@sap-ux/create 0.10.12 → 0.11.0

package/dist/cli/add/annotations-to-odata.js

@@ -2,9 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addAnnotationsToOdataCommand = addAnnotationsToOdataCommand;
 const adp_tooling_1 = require("@sap-ux/adp-tooling");
+const system_access_1 = require("@sap-ux/system-access");
 const odata_service_writer_1 = require("@sap-ux/odata-service-writer");
-const tracing_1 = require("../../tracing");
 const common_1 = require("../../common");
+const tracing_1 = require("../../tracing");
 const validation_1 = require("../../validation/validation");
 let loginAttempts = 3;
 /**
@@ -35,8 +36,11 @@ async function addAnnotationsToOdata(basePath, simulate, yamlPath) {
         }
         await (0, validation_1.validateAdpProject)(basePath);
         const variant = (0, adp_tooling_1.getVariant)(basePath);
-        const adpConfig = await (0, adp_tooling_1.getAdpConfig)(basePath, yamlPath);
-        const manifestService = await adp_tooling_1.ManifestService.initMergedManifest(basePath, variant, adpConfig, logger);
+        const { target, ignoreCertErrors = false } = await (0, adp_tooling_1.getAdpConfig)(basePath, yamlPath);
+        const provider = await (0, system_access_1.createAbapServiceProvider)(target, {
+            ignoreCertErrors
+        }, true, logger);
+        const manifestService = await adp_tooling_1.ManifestService.initMergedManifest(provider, basePath, variant, logger);
         const dataSources = manifestService.getManifestDataSources();
         const answers = await (0, common_1.promptYUIQuestions)((0, adp_tooling_1.getPromptsForAddAnnotationsToOData)(basePath, dataSources), false);
         let namespaces = [];

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

@@ -1,8 +1,22 @@
 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,12 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addInboundNavigationConfigCommand = addInboundNavigationConfigCommand;
-const mem_fs_editor_1 = require("mem-fs-editor");
+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");
 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 common_1 = require("../../common");
 const validation_1 = require("../../validation");
+const prompts_1 = require("../../common/prompts");
 const tracing_1 = require("../../tracing");
 /**
  * Add the "add inbound-navigation" command to a passed command.
@@ -25,25 +31,38 @@ function addInboundNavigationConfigCommand(cmd) {
     });
 }
 /**
- * Adds an inbound navigation config to an app. To prevent overwriting existing inbounds will be checked.
+ * Adds an inbound navigation configuration to an app. Checks existing inbounds to prevent overwriting.
  *
- * @param basePath - path to application root
- * @param simulate - if true, do not write but just show what would be changed; otherwise write
+ * @param {string} basePath - The path to the application root.
+ * @param {boolean} simulate - If true, simulates the changes without writing them; otherwise, writes changes.
+ * @returns {Promise<void>} A promise that resolves when the operation is complete.
  */
 async function addInboundNavigationConfig(basePath, simulate) {
     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 && (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 (0, app_config_writer_1.readManifest)(basePath, fs);
-        const inbounds = manifest?.['sap.app']?.crossNavigation?.inbounds;
-        const config = await getUserConfig(inbounds);
+        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) {
             logger.info('User chose not to overwrite existing inbound navigation configuration.');
             return;
         }
-        await (0, app_config_writer_1.generateInboundNavigationConfig)(basePath, config, true, fs);
+        if (isAdp) {
+            await (0, adp_tooling_1.generateInboundConfig)(basePath, config, fs);
+        }
+        else {
+            await (0, app_config_writer_1.generateInboundNavigationConfig)(basePath, config, true, fs);
+        }
         if (!simulate) {
             fs.commit(() => logger.info(`Inbound navigation configuration complete.`));
         }
@@ -56,14 +75,72 @@ async function addInboundNavigationConfig(basePath, simulate) {
         logger.debug(error);
     }
 }
+/**
+ * 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.
+ */
+async function getManifest(basePath, isAdp, fs, logger) {
+    if (isAdp) {
+        return retrieveMergedManifest(basePath, logger);
+    }
+    return retrieveManifest(basePath, fs);
+}
+/**
+ * Retrieves the manifest for a Fiori project.
+ *
+ * @param {string} basePath - The base path to the project.
+ * @param {Editor} fs - The mem-fs editor instance.
+ * @returns {Promise<Manifest>} The base project manifest.
+ */
+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 = (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 inbounds - The existing inbounds to avoid conflicts.
- * @returns {Promise<FLPConfigAnswers | undefined>} The user-provided configuration or undefined if skipped.
+ * @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.
+ * @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) {
-    const config = await (0, common_1.promptYUIQuestions)(await (0, flp_config_inquirer_1.getPrompts)(Object.keys(inbounds ?? {})), false);
+async function getUserConfig(inbounds, isAdp, appId) {
+    let promptOptions;
+    if (!isAdp) {
+        promptOptions = {
+            inboundId: { hide: true },
+            additionalParameters: { hide: true },
+            createAnotherInbound: { hide: true },
+            emptyInboundsInfo: { hide: true }
+        };
+    }
+    else {
+        promptOptions = { overwrite: { hide: true }, createAnotherInbound: { hide: true } };
+    }
+    const prompts = await (0, prompts_1.filterLabelTypeQuestions)(await (0, flp_config_inquirer_1.getPrompts)(inbounds, appId, promptOptions));
+    const config = await (0, common_1.promptYUIQuestions)(prompts, false);
     if (config?.subTitle === '') {
         config.subTitle = undefined;
     }

package/dist/cli/change/change-data-source.js

@@ -5,6 +5,7 @@ const adp_tooling_1 = require("@sap-ux/adp-tooling");
 const tracing_1 = require("../../tracing");
 const common_1 = require("../../common");
 const validation_1 = require("../../validation/validation");
+const system_access_1 = require("@sap-ux/system-access");
 let loginAttempts = 3;
 /**
  * Add a new sub-command to change the data source of an adaptation project to the given command.
@@ -34,8 +35,11 @@ async function changeDataSource(basePath, simulate, yamlPath) {
         }
         await (0, validation_1.validateAdpProject)(basePath);
         const variant = (0, adp_tooling_1.getVariant)(basePath);
-        const adpConfig = await (0, adp_tooling_1.getAdpConfig)(basePath, yamlPath);
-        const manifestService = await adp_tooling_1.ManifestService.initBaseManifest(variant.reference, adpConfig, logger);
+        const { target, ignoreCertErrors = false } = await (0, adp_tooling_1.getAdpConfig)(basePath, yamlPath);
+        const provider = await (0, system_access_1.createAbapServiceProvider)(target, {
+            ignoreCertErrors
+        }, true, logger);
+        const manifestService = await adp_tooling_1.ManifestService.initBaseManifest(provider, variant.reference, logger);
         const dataSources = manifestService.getManifestDataSources();
         const answers = await (0, common_1.promptYUIQuestions)((0, adp_tooling_1.getPromptsForChangeDataSource)(dataSources), false);
         const fs = await (0, adp_tooling_1.generateChange)(basePath, "appdescr_app_changeDataSource" /* ChangeType.CHANGE_DATA_SOURCE */, {

package/dist/common/prompts.d.ts

@@ -5,6 +5,14 @@ type AutoCompleteCallbackFn = (answers: Answers, input: string) => Promise<Array
     name: string;
     value: unknown;
 }>>;
+/**
+ * Filters out questions from an array that are marked with the type 'label' in their GUI options.
+ *
+ * @param {YUIQuestion<T>[]} questions - An array of questions or prompts, where each question can contain various GUI options.
+ * @returns {Promise<YUIQuestion<T>[]>} A promise that resolves to an array of questions, excluding those with a 'label' type.
+ * @template T - The generic type parameter that extends Answers, used to type the questions array.
+ */
+export declare function filterLabelTypeQuestions<T extends Answers>(questions: YUIQuestion<T>[]): Promise<YUIQuestion<T>[]>;
 /**
  * Converts a YUI question to a simple prompts question.
  *

package/dist/common/prompts.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.filterLabelTypeQuestions = filterLabelTypeQuestions;
 exports.convertQuestion = convertQuestion;
 exports.promptYUIQuestions = promptYUIQuestions;
 const prompts_1 = __importDefault(require("prompts"));
@@ -34,6 +35,16 @@ function mapChoices(choices) {
         value: typeof choice === 'object' ? choice.value : choice
     }));
 }
+/**
+ * Filters out questions from an array that are marked with the type 'label' in their GUI options.
+ *
+ * @param {YUIQuestion<T>[]} questions - An array of questions or prompts, where each question can contain various GUI options.
+ * @returns {Promise<YUIQuestion<T>[]>} A promise that resolves to an array of questions, excluding those with a 'label' type.
+ * @template T - The generic type parameter that extends Answers, used to type the questions array.
+ */
+async function filterLabelTypeQuestions(questions) {
+    return questions.filter((question) => question?.guiOptions?.type !== 'label');
+}
 /**
  * Enhances the new prompt with the choices from the original list question.
  *

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sap-ux/create",
   "description": "SAP Fiori tools module to add or remove features",
-  "version": "0.10.12",
+  "version": "0.11.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -30,21 +30,20 @@
     "mem-fs": "2.1.0",
     "mem-fs-editor": "9.4.0",
     "prompts": "2.4.2",
-    "@sap-ux/abap-deploy-config-inquirer": "1.1.9",
+    "@sap-ux/abap-deploy-config-inquirer": "1.1.10",
     "@sap-ux/abap-deploy-config-writer": "0.0.68",
-    "@sap-ux/adp-tooling": "0.12.94",
+    "@sap-ux/adp-tooling": "0.12.95",
     "@sap-ux/app-config-writer": "0.5.5",
     "@sap-ux/cap-config-writer": "0.7.64",
     "@sap-ux/cards-editor-config-writer": "0.4.8",
-    "@sap-ux/inquirer-common": "0.5.10",
     "@sap-ux/logger": "0.6.0",
     "@sap-ux/mockserver-config-writer": "0.7.0",
     "@sap-ux/odata-service-writer": "0.24.1",
-    "@sap-ux/preview-middleware": "0.16.146",
+    "@sap-ux/preview-middleware": "0.16.147",
     "@sap-ux/project-access": "1.28.9",
     "@sap-ux/system-access": "0.5.22",
     "@sap-ux/ui5-config": "0.26.0",
-    "@sap-ux/flp-config-inquirer": "0.1.6"
+    "@sap-ux/flp-config-inquirer": "0.2.0"
   },
   "devDependencies": {
     "@types/diff": "5.0.9",
@@ -52,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.5.10",
+    "@sap-ux/inquirer-common": "0.5.11",
     "@sap-ux/store": "0.9.3"
   },
   "scripts": {