@sap-ux/preview-middleware 0.23.68 → 0.23.71

package/dist/base/config.js

@@ -209,8 +209,9 @@ async function addApp(templateConfig, manifest, app, logger) {
     const appName = getAppName(manifest, app.intent);
     templateConfig.ui5.resources[id] = app.target;
     templateConfig.apps[appName] = {
-        title: (await getI18nTextFromProperty(app.local, manifest['sap.app']?.title, logger)) ?? id,
-        description: (await getI18nTextFromProperty(app.local, manifest['sap.app']?.description, logger)) ?? '',
+        title: (await getI18nTextFromProperty(app.local, manifest['sap.app']?.title, manifest['sap.app']?.id, logger)) ??
+            id,
+        description: (await getI18nTextFromProperty(app.local, manifest['sap.app']?.description, manifest['sap.app']?.id, logger)) ?? '',
         additionalInformation: `SAPUI5.Component=${app.componentId ?? id}`,
         applicationType: 'URL',
         url: app.target
@@ -236,18 +237,21 @@ function getAppName(manifest, intent) {
  *
  * @param projectRoot absolute path to the project root
  * @param propertyValue value of the property
+ * @param appId application id
  * @param logger logger instance
  * @returns i18n text of the property
  */
-async function getI18nTextFromProperty(projectRoot, propertyValue, logger) {
+async function getI18nTextFromProperty(projectRoot, propertyValue, appId, logger) {
     const propertyI18nKey = (0, i18n_1.extractDoubleCurlyBracketsKey)(propertyValue ?? '');
     if (!projectRoot || !propertyI18nKey) {
         return propertyValue;
     }
-    const projectAccess = await (0, project_access_1.createProjectAccess)(projectRoot);
-    const applicationIds = projectAccess.getApplicationIds();
+    const absolutePath = (0, node_path_1.resolve)(process.cwd(), projectRoot);
     try {
-        const bundle = (await projectAccess.getApplication(applicationIds[0]).getI18nBundles())['sap.app'];
+        const projectAccess = await (0, project_access_1.createProjectAccess)(absolutePath);
+        const appPath = await projectAccess.getApplicationIdByManifestAppId(appId ?? '');
+        const applicationAccess = projectAccess.getApplication(appPath ?? '');
+        const bundle = (await applicationAccess.getI18nBundles())['sap.app'];
         return bundle[propertyI18nKey]?.[0]?.value?.value ?? propertyI18nKey;
     }
     catch (e) {

package/dist/base/flp.js

@@ -105,7 +105,8 @@ class FlpSandbox {
      * @param adp optional reference to the ADP tooling
      */
     async init(manifest, componentId, resources = {}, adp) {
-        this.projectType = await (0, project_access_1.getProjectType)(await (0, project_access_1.findProjectRoot)(process.cwd(), true, true));
+        const projectRoot = await (0, project_access_1.findProjectRoot)(process.cwd(), false, true);
+        this.projectType = await (0, project_access_1.getProjectType)(projectRoot);
         this.createFlexHandler();
         this.flpConfig.libs ??= await this.hasLocateReuseLibsScript();
         const id = manifest['sap.app']?.id ?? '';
@@ -156,22 +157,22 @@ class FlpSandbox {
             return new Map([
                 // Run application in design time mode
                 // Adds bindingString to BindingInfo objects. Required to create and read PropertyBinding changes
-                ['xx-designMode', 'true'],
+                ['data-sap-ui-xx-designMode', 'true'],
                 // In design mode, the controller code will not be executed by default, which is not desired in our case, so we suppress the deactivation
-                ['xx-suppressDeactivationOfControllerCode', 'true'],
+                ['data-sap-ui-xx-suppressDeactivationOfControllerCode', 'true'],
                 // Make sure that XML preprocessing results are correctly invalidated
-                ['xx-viewCache', 'false']
+                ['data-sap-ui-xx-viewCache', 'false']
             ]);
         }
         else {
             return new Map([
                 // Run application in design time mode
                 // Adds bindingString to BindingInfo objects. Required to create and read PropertyBinding changes
-                ['xx-design-mode', 'true'],
+                ['data-sap-ui-xx-design-mode', 'true'],
                 // In design mode, the controller code will not be executed by default, which is not desired in our case, so we suppress the deactivation
-                ['xx-suppress-deactivation-of-controller-code', 'true'],
+                ['data-sap-ui-xx-suppress-deactivation-of-controller-code', 'true'],
                 // Make sure that XML preprocessing results are correctly invalidated
-                ['xx-view-cache', 'false']
+                ['data-sap-ui-xx-view-cache', 'false']
             ]);
         }
     }
@@ -936,28 +937,13 @@ class FlpSandbox {
 }
 exports.FlpSandbox = FlpSandbox;
 /**
- * Creates an attribute string that can be added to an HTML element.
- *
- * @param attributes map with attributes and their values
- * @param indent indentation that's inserted before each attribute
- * @param prefix value that should be added at the start of to all attribute names
- * @returns attribute string
- */
-function serializeDataAttributes(attributes, indent = '', prefix = 'data') {
-    return [...attributes.entries()]
-        .map(([name, value]) => {
-        return `${indent}${prefix}-${name}="${value}"`;
-    })
-        .join('\n');
-}
-/**
- * Creates an attribute string that can be added to bootstrap script in a HTML file.
+ * Creates an attribute string that can be added to the UI5 bootstrap script of an HTML file.
  *
  * @param config ui5 configuration options
  * @returns attribute string
  */
 function serializeUi5Configuration(config) {
-    return '\n' + serializeDataAttributes(config, '        ', 'data-sap-ui');
+    return '\n' + [...config.entries()].map(([name, value]) => `        ${name}="${value}"`).join('\n');
 }
 /**
  * Configure RTA (Runtime Adaptation) for the FLP sandbox.

package/dist/types/index.d.ts

@@ -12,6 +12,9 @@ export interface Intent {
  */
 export interface App {
     target: string;
+    /**
+     * Either a local path to a folder containing the application or the componentId of a remote app
+     */
     local?: string;
     /**
      * Optional component id if it differs from the manifest (e.g. for adaptation projects)

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%3Apreview-middleware"
   },
-  "version": "0.23.68",
+  "version": "0.23.71",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -27,12 +27,12 @@
     "mem-fs-editor": "9.4.0",
     "qrcode": "1.5.4",
     "@sap/bas-sdk": "3.12.0",
-    "@sap-ux/adp-tooling": "0.18.16",
-    "@sap-ux/btp-utils": "1.1.5",
+    "@sap-ux/adp-tooling": "0.18.19",
     "@sap-ux/control-property-editor-sources": "npm:@sap-ux/control-property-editor@0.7.3",
     "@sap-ux/feature-toggle": "0.3.4",
+    "@sap-ux/project-access": "1.32.14",
+    "@sap-ux/btp-utils": "1.1.5",
     "@sap-ux/logger": "0.7.1",
-    "@sap-ux/project-access": "1.32.12",
     "@sap-ux/system-access": "0.6.31",
     "@sap-ux/i18n": "0.3.5"
   },