@sap-ux/adp-tooling 0.14.28 → 0.14.30

package/dist/abap/client.d.ts

@@ -1,4 +1,5 @@
 import { type AbapServiceProvider } from '@sap-ux/axios-extension';
+import type { ManifestNamespace } from '@sap-ux/project-access';
 import type { FlexUISupportedSystem } from '../types';
 /**
  * Fetches system supports Flex UI features.
@@ -15,4 +16,12 @@ export declare function getFlexUISupportedSystem(provider: AbapServiceProvider,
  * @returns {string | undefined} System UI5 version.
  */
 export declare function getSystemUI5Version(provider: AbapServiceProvider): Promise<string | undefined>;
+/**
+ * Retrieves the list of tile inbounds of the application.
+ *
+ * @param {string} appId - The ID of the application for which to retrieve inbounds.
+ * @param {AbapServiceProvider} provider - Instance of the ABAP provider.
+ * @returns {Promise<ManifestNamespace.Inbound>} list of tile inbounds of the application.
+ */
+export declare function getBaseAppInbounds(appId: string, provider: AbapServiceProvider): Promise<ManifestNamespace.Inbound | undefined>;
 //# sourceMappingURL=client.d.ts.map

package/dist/abap/client.js

@@ -2,7 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFlexUISupportedSystem = getFlexUISupportedSystem;
 exports.getSystemUI5Version = getSystemUI5Version;
+exports.getBaseAppInbounds = getBaseAppInbounds;
 const axios_extension_1 = require("@sap-ux/axios-extension");
+const helper_1 = require("../base/helper");
 const FILTER = {
     'scheme': 'http://www.sap.com/adt/categories/ui_flex',
     'term': 'dta_folder'
@@ -40,4 +42,19 @@ async function getSystemUI5Version(provider) {
     const service = await provider.getAdtService(axios_extension_1.UI5RtVersionService);
     return service?.getUI5Version();
 }
+/**
+ * Retrieves the list of tile inbounds of the application.
+ *
+ * @param {string} appId - The ID of the application for which to retrieve inbounds.
+ * @param {AbapServiceProvider} provider - Instance of the ABAP provider.
+ * @returns {Promise<ManifestNamespace.Inbound>} list of tile inbounds of the application.
+ */
+async function getBaseAppInbounds(appId, provider) {
+    const lrepService = provider.getLayeredRepository();
+    const inbounds = (await lrepService.getSystemInfo(undefined, undefined, appId)).inbounds;
+    if (!inbounds?.length) {
+        return undefined;
+    }
+    return (0, helper_1.filterAndMapInboundsToManifest)(inbounds);
+}
 //# sourceMappingURL=client.js.map

package/dist/base/helper.d.ts

@@ -1,4 +1,6 @@
 import type { Editor } from 'mem-fs-editor';
+import { type ManifestNamespace } from '@sap-ux/project-access';
+import type { Inbound } from '@sap-ux/axios-extension';
 import type { DescriptorVariant, AdpPreviewConfig } from '../types';
 /**
  * Get the app descriptor variant.
@@ -22,11 +24,10 @@ export declare function updateVariant(basePath: string, variant: DescriptorVaria
  * This function determines whether there are changes of type `appdescr_app_changeInbound`
  * or `appdescr_app_addNewInbound` present in the content of the descriptor variant.
  *
- * @param {string} basePath - The base path of the project where the manifest.appdescr_variant is located.
+ * @param {DescriptorVariant} variant - The descriptor variant object to check for FLP configuration changes.
  * @returns {Promise<boolean>} Returns `true` if FLP configuration changes exist, otherwise `false`.
- * @throws {Error} Throws an error if the variant could not be retrieved.
  */
-export declare function flpConfigurationExists(basePath: string): Promise<boolean>;
+export declare function flpConfigurationExists(variant: DescriptorVariant): boolean;
 /**
  * Checks whether TypeScript is supported in the project by verifying the existence of `tsconfig.json`.
  *
@@ -53,4 +54,11 @@ export declare function getWebappFiles(basePath: string): Promise<{
     relativePath: string;
     content: string;
 }[]>;
+/**
+ * Transforms an array of inbound objects from the SystemInfo API format into a ManifestNamespace.Inbound object.
+ *
+ * @param {Inbound[]} inbounds - The array of inbound objects to transform.
+ * @returns {ManifestNamespace.Inbound | undefined} The transformed inbounds or undefined if input is empty.
+ */
+export declare function filterAndMapInboundsToManifest(inbounds: Inbound[]): ManifestNamespace.Inbound | undefined;
 //# sourceMappingURL=helper.d.ts.map

package/dist/base/helper.js

@@ -6,6 +6,7 @@ exports.flpConfigurationExists = flpConfigurationExists;
 exports.isTypescriptSupported = isTypescriptSupported;
 exports.getAdpConfig = getAdpConfig;
 exports.getWebappFiles = getWebappFiles;
+exports.filterAndMapInboundsToManifest = filterAndMapInboundsToManifest;
 const fs_1 = require("fs");
 const path_1 = require("path");
 const project_access_1 = require("@sap-ux/project-access");
@@ -39,18 +40,11 @@ async function updateVariant(basePath, variant, fs) {
  * This function determines whether there are changes of type `appdescr_app_changeInbound`
  * or `appdescr_app_addNewInbound` present in the content of the descriptor variant.
  *
- * @param {string} basePath - The base path of the project where the manifest.appdescr_variant is located.
+ * @param {DescriptorVariant} variant - The descriptor variant object to check for FLP configuration changes.
  * @returns {Promise<boolean>} Returns `true` if FLP configuration changes exist, otherwise `false`.
- * @throws {Error} Throws an error if the variant could not be retrieved.
  */
-async function flpConfigurationExists(basePath) {
-    try {
-        const variant = await getVariant(basePath);
-        return variant.content?.some(({ changeType }) => changeType === 'appdescr_app_changeInbound' || changeType === 'appdescr_app_addNewInbound');
-    }
-    catch (error) {
-        throw new Error(`Failed to check if FLP configuration exists: ${error.message}`);
-    }
+function flpConfigurationExists(variant) {
+    return variant.content?.some(({ changeType }) => changeType === 'appdescr_app_changeInbound' || changeType === 'appdescr_app_addNewInbound');
 }
 /**
  * Checks whether TypeScript is supported in the project by verifying the existence of `tsconfig.json`.
@@ -114,4 +108,27 @@ async function getWebappFiles(basePath) {
     getFilesRecursivelySync(dir);
     return files;
 }
+/**
+ * Transforms an array of inbound objects from the SystemInfo API format into a ManifestNamespace.Inbound object.
+ *
+ * @param {Inbound[]} inbounds - The array of inbound objects to transform.
+ * @returns {ManifestNamespace.Inbound | undefined} The transformed inbounds or undefined if input is empty.
+ */
+function filterAndMapInboundsToManifest(inbounds) {
+    if (!inbounds || inbounds.length === 0) {
+        return undefined;
+    }
+    return inbounds.reduce((acc, inbound) => {
+        // Skip if hideLauncher is not false
+        if (!inbound?.content || inbound.content.hideLauncher !== false) {
+            return acc;
+        }
+        const { semanticObject, action } = inbound.content;
+        if (semanticObject && action) {
+            const key = `${semanticObject}-${action}`;
+            acc[key] = inbound.content;
+        }
+        return acc;
+    }, {});
+}
 //# sourceMappingURL=helper.js.map

package/dist/types.d.ts

@@ -182,12 +182,12 @@ export interface NewInboundNavigation {
     title: string;
     /** Optional: Subtitle associated with the inbound navigation. */
     subTitle?: string;
+    /** Icon associated with the inbound navigation. */
+    icon?: string;
 }
 export interface InternalInboundNavigation extends NewInboundNavigation {
     /** Identifier for the inbound navigation. */
     inboundId: string;
-    /** Flag indicating if the new inbound navigation should be added. */
-    addInboundId?: boolean;
 }
 export type FlpConfig = ChangeInboundNavigation | NewInboundNavigation;
 export interface Language {
@@ -664,6 +664,8 @@ export interface AddInboundModel {
     title: string;
     /** Optional: Subtitle associated with the inbound navigation data. */
     subTitle?: string;
+    /** Optional: Icon associated with the inbound navigation data. */
+    icon?: string;
     signature: AddInboundSignitureModel;
 }
 export interface AddInboundSignitureModel {

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

@@ -1,6 +1,6 @@
 import { type Editor } from 'mem-fs-editor';
 import { type NewI18nEntry } from '@sap-ux/i18n';
-import type { InternalInboundNavigation } from '../types';
+import type { InternalInboundNavigation, DescriptorVariantContent } from '../types';
 /**
  * Generates and writes the inbound configuration to the manifest.appdescr_variant file.
  *
@@ -28,4 +28,11 @@ export declare function getFlpI18nKeys(config: InternalInboundNavigation, appId:
  * @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>;
+/**
+ * Removes elements with changeType 'appdescr_app_addNewInbound', 'appdescr_app_removeAllInboundsExceptOne' and 'appdescr_app_changeInbound' from the given array.
+ *
+ * @param content The array of manifest change objects.
+ * @returns A new array with the specified elements removed.
+ */
+export declare function removeInboundChangeTypes(content: DescriptorVariantContent[]): DescriptorVariantContent[];
 //# sourceMappingURL=inbound-navigation.d.ts.map

package/dist/writer/inbound-navigation.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateInboundConfig = generateInboundConfig;
 exports.getFlpI18nKeys = getFlpI18nKeys;
 exports.updateI18n = updateI18n;
+exports.removeInboundChangeTypes = removeInboundChangeTypes;
 const path_1 = __importDefault(require("path"));
 const mem_fs_1 = require("mem-fs");
 const mem_fs_editor_1 = require("mem-fs-editor");
@@ -25,8 +26,8 @@ async function generateInboundConfig(basePath, config, 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.addInboundId = true;
         config.inboundId = `${variant.id}.InboundID`;
     }
     (0, options_1.enhanceManifestChangeContentWithFlpConfig)(config, variant.id, variant.content);
@@ -44,9 +45,17 @@ async function generateInboundConfig(basePath, config, fs) {
 function getFlpI18nKeys(config, appId) {
     const newEntries = [];
     const baseKey = `${appId}_sap.app.crossNavigation.inbounds.${config.inboundId}`;
-    newEntries.push({ key: `${baseKey}.title`, value: config.title });
+    newEntries.push({
+        key: `${baseKey}.title`,
+        value: config.title,
+        annotation: { textType: i18n_1.SapShortTextType.TableTitle, note: 'Fiori Launchpad Tile Title' }
+    });
     if (config?.subTitle) {
-        newEntries.push({ key: `${baseKey}.subTitle`, value: config.subTitle });
+        newEntries.push({
+            key: `${baseKey}.subTitle`,
+            value: config.subTitle,
+            annotation: { textType: i18n_1.SapShortTextType.TableTitle, note: 'Fiori Launchpad Tile Subtitle' }
+        });
     }
     return newEntries;
 }
@@ -62,6 +71,18 @@ function getFlpI18nKeys(config, appId) {
 async function updateI18n(basePath, appId, config, fs) {
     const newEntries = getFlpI18nKeys(config, appId);
     const i18nPath = path_1.default.join(basePath, 'webapp', 'i18n', 'i18n.properties');
-    await (0, i18n_1.createPropertiesI18nEntries)(i18nPath, newEntries, basePath, fs);
+    const keysToRemove = [`${appId}_sap.app.crossNavigation.inbounds`];
+    await (0, i18n_1.removeAndCreateI18nEntries)(i18nPath, newEntries, keysToRemove, basePath, fs);
+}
+/**
+ * Removes elements with changeType 'appdescr_app_addNewInbound', 'appdescr_app_removeAllInboundsExceptOne' and 'appdescr_app_changeInbound' from the given array.
+ *
+ * @param content The array of manifest change objects.
+ * @returns A new array with the specified elements removed.
+ */
+function removeInboundChangeTypes(content) {
+    return content.filter((item) => item.changeType !== 'appdescr_app_addNewInbound' &&
+        item.changeType !== 'appdescr_app_changeInbound' &&
+        item.changeType !== 'appdescr_app_removeAllInboundsExceptOne');
 }
 //# sourceMappingURL=inbound-navigation.js.map

package/dist/writer/index.js

@@ -37,7 +37,6 @@ function setDefaults(config) {
     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.addInboundId = true;
         configWithDefaults.flp.inboundId = `${configWithDefaults.app.id}.InboundID`;
     }
     if (configWithDefaults.customConfig?.adp.environment === 'C' && configWithDefaults.flp) {

package/dist/writer/options.js

@@ -7,7 +7,6 @@ exports.enhanceUI5YamlWithTranspileMiddleware = enhanceUI5YamlWithTranspileMiddl
 exports.hasDeployConfig = hasDeployConfig;
 exports.enhanceUI5DeployYaml = enhanceUI5DeployYaml;
 exports.enhanceManifestChangeContentWithFlpConfig = enhanceManifestChangeContentWithFlpConfig;
-const common_1 = require("../common");
 const VSCODE_URL = 'https://REQUIRED_FOR_VSCODE.example';
 /**
  * Generate the configuration for the middlewares required for the ui5.yaml.
@@ -234,47 +233,6 @@ function getAdpCloudCustomTasks(config) {
         }
     ];
 }
-/**
- * Get a Inbound change content with provided inboundId.
- *
- * @param flpConfiguration FLP cloud project configuration
- * @param appId application id
- * @returns Inbound change content.
- */
-function getInboundChangeContentWithExistingInboundId(flpConfiguration, appId) {
-    const inboundContent = {
-        inboundId: flpConfiguration.inboundId,
-        entityPropertyChange: [
-            {
-                propertyPath: 'title',
-                operation: 'UPSERT',
-                propertyValue: `{{${appId}_sap.app.crossNavigation.inbounds.${flpConfiguration.inboundId}.title}}`
-            }
-        ]
-    };
-    if (flpConfiguration.subTitle) {
-        inboundContent.entityPropertyChange.push({
-            propertyPath: 'subTitle',
-            operation: 'UPSERT',
-            propertyValue: `{{${appId}_sap.app.crossNavigation.inbounds.${flpConfiguration.inboundId}.subTitle}}`
-        });
-    }
-    inboundContent.entityPropertyChange.push({
-        propertyPath: 'signature/parameters/sap-appvar-id',
-        operation: 'UPSERT',
-        propertyValue: {
-            required: true,
-            filter: {
-                value: appId,
-                format: 'plain'
-            },
-            launcherValue: {
-                value: appId
-            }
-        }
-    });
-    return inboundContent;
-}
 /**
  * Get a Inbound change content without provided inboundId.
  *
@@ -283,14 +241,13 @@ function getInboundChangeContentWithExistingInboundId(flpConfiguration, appId) {
  * @returns Inbound change content.
  */
 function getInboundChangeContentWithNewInboundID(flpConfiguration, appId) {
-    const parameters = flpConfiguration?.additionalParameters
-        ? (0, common_1.parseParameters)(flpConfiguration?.additionalParameters)
-        : {};
+    const parameters = flpConfiguration?.additionalParameters ? JSON.parse(flpConfiguration.additionalParameters) : {};
     const content = {
         inbound: {
             [flpConfiguration.inboundId]: {
                 action: flpConfiguration.action,
                 semanticObject: flpConfiguration.semanticObject,
+                icon: flpConfiguration.icon,
                 title: `{{${appId}_sap.app.crossNavigation.inbounds.${flpConfiguration.inboundId}.title}}`,
                 signature: {
                     additionalParameters: 'allowed',
@@ -322,12 +279,10 @@ function getInboundChangeContentWithNewInboundID(flpConfiguration, appId) {
  * @param manifestChangeContent Application variant change content
  */
 function enhanceManifestChangeContentWithFlpConfig(flpConfiguration, appId, manifestChangeContent = []) {
-    const inboundChangeContent = flpConfiguration.addInboundId
-        ? getInboundChangeContentWithNewInboundID(flpConfiguration, appId)
-        : getInboundChangeContentWithExistingInboundId(flpConfiguration, appId);
+    const inboundChangeContent = getInboundChangeContentWithNewInboundID(flpConfiguration, appId);
     if (inboundChangeContent) {
         const addInboundChange = {
-            changeType: flpConfiguration.addInboundId ? 'appdescr_app_addNewInbound' : 'appdescr_app_changeInbound',
+            changeType: 'appdescr_app_addNewInbound',
             content: inboundChangeContent,
             texts: {
                 'i18n': 'i18n/i18n.properties'

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.14.28",
+  "version": "0.14.30",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -23,6 +23,7 @@
     "!dist/**/*.map"
   ],
   "dependencies": {
+    "@sap-devx/yeoman-ui-types": "1.16.9",
     "adm-zip": "0.5.10",
     "ejs": "3.1.10",
     "i18next": "23.11.2",
@@ -32,18 +33,18 @@
     "prompts": "2.4.2",
     "sanitize-filename": "1.6.3",
     "uuid": "10.0.0",
-    "@sap-ux/axios-extension": "1.22.2",
+    "@sap-ux/axios-extension": "1.22.3",
     "@sap-ux/btp-utils": "1.1.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-input-validator": "0.6.3",
-    "@sap-ux/system-access": "0.6.7",
+    "@sap-ux/project-access": "1.30.3",
+    "@sap-ux/project-input-validator": "0.6.4",
+    "@sap-ux/system-access": "0.6.8",
     "@sap-ux/ui5-config": "0.28.2",
     "@sap-ux/ui5-info": "0.12.0",
-    "@sap-ux/odata-service-writer": "0.27.5",
+    "@sap-ux/odata-service-writer": "0.27.6",
     "@sap-ux/nodejs-utils": "0.2.1",
-    "@sap-ux/i18n": "0.3.0",
+    "@sap-ux/i18n": "0.3.1",
     "@sap-ux/store": "1.1.0"
   },
   "devDependencies": {