@sap-ux/adp-tooling 0.18.1 → 0.18.2

package/dist/types.d.ts

@@ -77,7 +77,6 @@ export interface AdpWriterConfig {
         name?: string;
         description?: string;
     };
-    flp?: FlpConfig;
     customConfig?: CustomConfig;
     /**
      * Optional: configuration for deployment to ABAP
@@ -195,7 +194,6 @@ export interface InternalInboundNavigation extends NewInboundNavigation {
     /** Identifier for the inbound navigation. */
     inboundId: string;
 }
-export type FlpConfig = ChangeInboundNavigation | NewInboundNavigation;
 export interface Language {
     sap: string;
     i18n: string;

package/dist/writer/inbound-navigation.d.ts

@@ -5,11 +5,11 @@ import type { InternalInboundNavigation, DescriptorVariantContent } from '../typ
  * Generates and writes the inbound configuration to the manifest.appdescr_variant file.
  *
  * @param basePath - The base path of the project.
- * @param config - The inbound configuration properties.
+ * @param configs - The inbound configuration properties.
  * @param fs - Optional mem-fs editor instance.
  * @returns The mem-fs editor instance.
  */
-export declare function generateInboundConfig(basePath: string, config: InternalInboundNavigation, fs?: Editor): Promise<Editor>;
+export declare function generateInboundConfig(basePath: string, configs: InternalInboundNavigation[], fs?: Editor): Promise<Editor>;
 /**
  * Generates i18n entries for FLP configuration based on the provided configuration and application ID.
  *
@@ -23,11 +23,11 @@ export declare function getFlpI18nKeys(config: InternalInboundNavigation, appId:
  *
  * @param {string} basePath - The base path of the project.
  * @param {string} appId - The application ID used to generate i18n keys.
- * @param {InternalInboundNavigation} config - The inbound configuration properties.
+ * @param {InternalInboundNavigation[]} configs - The inbound configuration properties.
  * @param {Editor} fs - The mem-fs editor instance for file operations.
  * @returns {Promise<void>} A promise that resolves when the i18n file is updated.
  */
-export declare function updateI18n(basePath: string, appId: string, config: InternalInboundNavigation, fs: Editor): Promise<void>;
+export declare function updateI18n(basePath: string, appId: string, configs: InternalInboundNavigation[], fs: Editor): Promise<void>;
 /**
  * Removes elements with changeType 'appdescr_app_addNewInbound', 'appdescr_app_removeAllInboundsExceptOne' and 'appdescr_app_changeInbound' from the given array.
  *

package/dist/writer/inbound-navigation.js

@@ -17,22 +17,25 @@ const options_1 = require("./options");
  * Generates and writes the inbound configuration to the manifest.appdescr_variant file.
  *
  * @param basePath - The base path of the project.
- * @param config - The inbound configuration properties.
+ * @param configs - The inbound configuration properties.
  * @param fs - Optional mem-fs editor instance.
  * @returns The mem-fs editor instance.
  */
-async function generateInboundConfig(basePath, config, fs) {
+async function generateInboundConfig(basePath, configs, fs) {
     if (!fs) {
         fs = (0, mem_fs_editor_1.create)((0, mem_fs_1.create)());
     }
     const variant = await (0, __1.getVariant)(basePath, fs);
     variant.content = removeInboundChangeTypes(variant.content);
-    if (!config?.inboundId) {
-        config.inboundId = `${variant.id}.InboundID`;
+    // Set default inbound IDs if missing
+    for (const config of configs) {
+        if (!config?.inboundId) {
+            config.inboundId = `${variant.id}.InboundID`;
+        }
     }
-    (0, options_1.enhanceManifestChangeContentWithFlpConfig)(config, variant.id, variant.content);
+    (0, options_1.enhanceManifestChangeContentWithFlpConfig)(configs, variant.id, variant.content);
     await (0, __1.updateVariant)(basePath, variant, fs);
-    await updateI18n(basePath, variant.id, config, fs);
+    await updateI18n(basePath, variant.id, configs, fs);
     return fs;
 }
 /**
@@ -64,12 +67,15 @@ function getFlpI18nKeys(config, appId) {
  *
  * @param {string} basePath - The base path of the project.
  * @param {string} appId - The application ID used to generate i18n keys.
- * @param {InternalInboundNavigation} config - The inbound configuration properties.
+ * @param {InternalInboundNavigation[]} configs - The inbound configuration properties.
  * @param {Editor} fs - The mem-fs editor instance for file operations.
  * @returns {Promise<void>} A promise that resolves when the i18n file is updated.
  */
-async function updateI18n(basePath, appId, config, fs) {
-    const newEntries = getFlpI18nKeys(config, appId);
+async function updateI18n(basePath, appId, configs, fs) {
+    let newEntries = [];
+    for (const config of configs) {
+        newEntries = newEntries.concat(getFlpI18nKeys(config, appId));
+    }
     const i18nPath = node_path_1.default.join(basePath, 'webapp', 'i18n', 'i18n.properties');
     const keysToRemove = [`${appId}_sap.app.crossNavigation.inbounds`];
     await (0, i18n_1.removeAndCreateI18nEntries)(i18nPath, newEntries, keysToRemove, basePath, fs);

package/dist/writer/index.js

@@ -6,7 +6,6 @@ const node_path_1 = require("node:path");
 const mem_fs_1 = require("mem-fs");
 const mem_fs_editor_1 = require("mem-fs-editor");
 const manifest_1 = require("./manifest");
-const options_1 = require("./options");
 const i18n_1 = require("./i18n");
 const project_utils_1 = require("./project-utils");
 const source_1 = require("../source");
@@ -24,7 +23,6 @@ function setDefaults(config) {
         ui5: { ...config.ui5 },
         deploy: config.deploy ? { ...config.deploy } : undefined,
         options: { ...config.options },
-        flp: config.flp ? { ...config.flp } : undefined,
         customConfig: config.customConfig ? { ...config.customConfig } : undefined
     };
     configWithDefaults.app.title ??= `Adaptation of ${config.app.reference}`;
@@ -36,12 +34,6 @@ function setDefaults(config) {
     configWithDefaults.app.i18nDescription ??= (0, i18n_1.getI18nDescription)(configWithDefaults.app.layer, configWithDefaults.app.title);
     configWithDefaults.app.appType ??= (0, source_1.getApplicationType)(configWithDefaults.app.manifest);
     configWithDefaults.app.content ??= (0, manifest_1.getManifestContent)(configWithDefaults);
-    if (configWithDefaults.flp && !configWithDefaults.flp.inboundId) {
-        configWithDefaults.flp.inboundId = `${configWithDefaults.app.id}.InboundID`;
-    }
-    if (configWithDefaults.customConfig?.adp.environment === 'C' && configWithDefaults.flp) {
-        (0, options_1.enhanceManifestChangeContentWithFlpConfig)(configWithDefaults.flp, configWithDefaults.app.id, configWithDefaults.app.content);
-    }
     return configWithDefaults;
 }
 /**

package/dist/writer/options.d.ts

@@ -56,11 +56,11 @@ export declare function enhanceUI5DeployYaml(ui5Config: UI5Config, config: AdpWr
 /**
  * Generate Inbound change content required for manifest.appdescriptor.
  *
- * @param flpConfiguration FLP cloud project configuration
+ * @param flpConfigurations FLP cloud project configuration
  * @param appId Application variant id
  * @param manifestChangeContent Application variant change content
  */
-export declare function enhanceManifestChangeContentWithFlpConfig(flpConfiguration: InternalInboundNavigation, appId: string, manifestChangeContent?: Content[]): void;
+export declare function enhanceManifestChangeContentWithFlpConfig(flpConfigurations: InternalInboundNavigation[], appId: string, manifestChangeContent?: Content[]): void;
 /**
  * Generate custom configuration required for the ui5.yaml.
  *

package/dist/writer/options.js

@@ -267,13 +267,13 @@ function getInboundChangeContentWithNewInboundID(flpConfiguration, appId) {
 /**
  * Generate Inbound change content required for manifest.appdescriptor.
  *
- * @param flpConfiguration FLP cloud project configuration
+ * @param flpConfigurations FLP cloud project configuration
  * @param appId Application variant id
  * @param manifestChangeContent Application variant change content
  */
-function enhanceManifestChangeContentWithFlpConfig(flpConfiguration, appId, manifestChangeContent = []) {
-    const inboundChangeContent = getInboundChangeContentWithNewInboundID(flpConfiguration, appId);
-    if (inboundChangeContent) {
+function enhanceManifestChangeContentWithFlpConfig(flpConfigurations, appId, manifestChangeContent = []) {
+    for (const [index, flpConfig] of flpConfigurations.entries()) {
+        const inboundChangeContent = getInboundChangeContentWithNewInboundID(flpConfig, appId);
         const addInboundChange = {
             changeType: 'appdescr_app_addNewInbound',
             content: inboundChangeContent,
@@ -281,15 +281,19 @@ function enhanceManifestChangeContentWithFlpConfig(flpConfiguration, appId, mani
                 'i18n': 'i18n/i18n.properties'
             }
         };
-        const removeOtherInboundsChange = {
-            changeType: 'appdescr_app_removeAllInboundsExceptOne',
-            content: {
-                'inboundId': flpConfiguration.inboundId
-            },
-            texts: {}
-        };
         manifestChangeContent.push(addInboundChange);
-        manifestChangeContent.push(removeOtherInboundsChange);
+        // Remove all inbounds except one should be only after the first inbound is added
+        // This is implemented this way to avoid issues with the merged on ABAP side
+        if (index === 0) {
+            const removeOtherInboundsChange = {
+                changeType: 'appdescr_app_removeAllInboundsExceptOne',
+                content: {
+                    'inboundId': flpConfig.inboundId
+                },
+                texts: {}
+            };
+            manifestChangeContent.push(removeOtherInboundsChange);
+        }
     }
 }
 /**

package/package.json

@@ -9,7 +9,7 @@
   "bugs": {
     "url": "https://github.com/SAP/open-ux-tools/issues?q=is%3Aopen+is%3Aissue+label%3Abug+label%3Aadp-tooling"
   },
-  "version": "0.18.1",
+  "version": "0.18.2",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",

package/templates/project/webapp/i18n/i18n.properties

@@ -4,9 +4,3 @@
 
 #XTIT: Application name
 <%- app.id %>_sap.app.title=<%- app.title %>
-<% if (customConfig?.adp.environment === "C" && flp) { %>
-# FLP Configuration
-
-<%= app.id %>_sap.app.crossNavigation.inbounds.<%= flp.inboundId  %>.title=<%= flp.title %><% if (flp.subTitle) { %>
-<%= app.id %>_sap.app.crossNavigation.inbounds.<%= flp.inboundId %>.subTitle=<%= flp.subTitle %><% } %>
-<% } %>