@sap-ux/preview-middleware 0.23.67 → 0.23.70

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/client/adp/controllers/AddSubpage.controller.js

@@ -35,7 +35,7 @@ sap.ui.define(["sap/ui/model/json/JSONModel", "../../i18n", "../command-executor
     setup: async function _setup(dialog) {
       this.dialog = dialog;
       this.setEscapeHandler();
-      await this.buildDialogData();
+      this.buildDialogData();
       const resourceModel = await getResourceModel('open.ux.preview.client');
       this.dialog.setModel(resourceModel, 'i18n');
       this.dialog.setModel(this.model);
@@ -118,7 +118,7 @@ sap.ui.define(["sap/ui/model/json/JSONModel", "../../i18n", "../command-executor
     /**
      * Builds data that is used in the dialog
      */
-    buildDialogData: async function _buildDialogData() {
+    buildDialogData: function _buildDialogData() {
       this.getControlMetadata(); // is called to fill this.runtimeControl
 
       const pageTypeOptions = [{
@@ -139,7 +139,6 @@ sap.ui.define(["sap/ui/model/json/JSONModel", "../../i18n", "../command-executor
       });
       this.model.setProperty('/navigationOptions', navigationOptions);
       this.model.setProperty('/selectedNavigation', navigationOptions[0]);
-      return Promise.resolve();
     }
   });
   return AddSubpage;

package/dist/client/adp/controllers/AddSubpage.controller.ts

@@ -94,7 +94,7 @@ export default class AddSubpage extends BaseDialog<AddSubpageModel> {
 
         this.setEscapeHandler();
 
-        await this.buildDialogData();
+        this.buildDialogData();
         const resourceModel = await getResourceModel('open.ux.preview.client');
 
         this.dialog.setModel(resourceModel, 'i18n');
@@ -196,7 +196,7 @@ export default class AddSubpage extends BaseDialog<AddSubpageModel> {
     /**
      * Builds data that is used in the dialog
      */
-    async buildDialogData(): Promise<void> {
+    buildDialogData(): void {
         this.getControlMetadata(); // is called to fill this.runtimeControl
 
         const pageTypeOptions: { key: string; value: string }[] = [
@@ -215,7 +215,5 @@ export default class AddSubpage extends BaseDialog<AddSubpageModel> {
         });
         this.model.setProperty('/navigationOptions', navigationOptions);
         this.model.setProperty('/selectedNavigation', navigationOptions[0]);
-
-        return Promise.resolve();
     }
 }

package/dist/client/adp/quick-actions/add-new-subpage-quick-action-base.js

@@ -53,16 +53,16 @@ sap.ui.define(["sap/ui/core/Component", "sap/ui/dt/OverlayRegistry", "../../cpe/
       this.pageType = this.context.view.getViewName().split('.view.')[0];
       const metaModel = this.getODataMetaModel();
       if (!metaModel || !control) {
-        return Promise.resolve();
+        return;
       }
       const modifiedControl = getControlById(control.controlId);
       if (!modifiedControl) {
-        return Promise.resolve();
+        return;
       }
       const component = Component.getOwnerComponentFor(modifiedControl);
       const entitySetName = await this.getEntitySetNameFromPageComponent(component, metaModel);
       if (!entitySetName) {
-        return Promise.resolve();
+        return;
       }
       this.entitySet = entitySetName;
       this.navProperties = [];
@@ -72,7 +72,6 @@ sap.ui.define(["sap/ui/core/Component", "sap/ui/dt/OverlayRegistry", "../../cpe/
         await this.prepareNavigationData(metaModel);
       }
       this.control = modifiedControl;
-      return Promise.resolve();
     }
     async execute() {
       const overlay = OverlayRegistry.getOverlay(this.control);

package/dist/client/adp/quick-actions/add-new-subpage-quick-action-base.ts

@@ -95,18 +95,18 @@ export abstract class AddNewSubpageBase<ODataMetaModelType>
 
         const metaModel = this.getODataMetaModel();
         if (!metaModel || !control) {
-            return Promise.resolve();
+            return;
         }
 
         const modifiedControl = getControlById<ObjectPageLayout>(control.controlId);
         if (!modifiedControl) {
-            return Promise.resolve();
+            return;
         }
 
         const component = Component.getOwnerComponentFor(modifiedControl);
         const entitySetName = await this.getEntitySetNameFromPageComponent(component, metaModel);
         if (!entitySetName) {
-            return Promise.resolve();
+            return;
         }
         this.entitySet = entitySetName;
 
@@ -117,8 +117,6 @@ export abstract class AddNewSubpageBase<ODataMetaModelType>
             await this.prepareNavigationData(metaModel);
         }
         this.control = modifiedControl;
-
-        return Promise.resolve();
     }
 
     async execute(): Promise<FlexCommand[]> {

package/dist/client/adp/quick-actions/fe-v2/add-new-subpage.js

@@ -64,11 +64,10 @@ sap.ui.define(["../../../utils/fe-v2", "../add-new-subpage-quick-action-base", "
         const targetEntitySet = entityContainer.entitySet.find(item => item.entityType === associationEnd.type);
         await this.addNavigationOptionIfAvailable(metaModel, targetEntitySet?.name, navProp.name);
       }
-      return Promise.resolve();
     }
     async initialize() {
       if (!(await areManifestChangesSupported(this.context.manifest))) {
-        return Promise.resolve();
+        return;
       }
       this.appComponent = getV2AppComponent(this.context.view);
       return super.initialize();

package/dist/client/adp/quick-actions/fe-v2/add-new-subpage.ts

@@ -75,12 +75,11 @@ export class AddNewSubpage extends AddNewSubpageBase<ODataMetaModelV2> {
             const targetEntitySet = entityContainer.entitySet.find((item) => item.entityType === associationEnd.type);
             await this.addNavigationOptionIfAvailable(metaModel, targetEntitySet?.name, navProp.name);
         }
-        return Promise.resolve();
     }
 
     async initialize(): Promise<void> {
         if (!(await areManifestChangesSupported(this.context.manifest))) {
-            return Promise.resolve();
+            return;
         }
         this.appComponent = getV2AppComponent(this.context.view);
         return super.initialize();

package/dist/client/cpe/init.js

@@ -73,7 +73,7 @@ sap.ui.define(["sap/base/Log", "open/ux/preview/client/thirdparty/@sap-ux-privat
         return service.init(CommunicationService.sendAction, subscribe)?.catch(error => {
           Log.error('Service Initialization Failed: ', getError(error));
         });
-      });
+      }).filter(p => p !== undefined);
       Promise.all(allPromises).then(() => {
         CommunicationService.sendAction(appLoaded());
       })

package/dist/client/cpe/init.ts

@@ -95,7 +95,7 @@ export default function init(
             return service.init(CommunicationService.sendAction, subscribe)?.catch((error) => {
                 Log.error('Service Initialization Failed: ', getError(error));
             });
-        });
+        }).filter((p): p is Promise<void> => p !== undefined);
         Promise.all(allPromises)
             .then(() => {
                 CommunicationService.sendAction(appLoaded());

package/dist/client/cpe/quick-actions/quick-action-service.js

@@ -148,7 +148,7 @@ sap.ui.define(["sap/base/Log", "open/ux/preview/client/thirdparty/@sap-ux-privat
       if (payload.kind === NESTED_QUICK_ACTION_KIND && actionInstance.kind === NESTED_QUICK_ACTION_KIND) {
         return actionInstance.execute(payload.path);
       }
-      return Promise.resolve([]);
+      return [];
     }
   }
   var __exports = {

package/dist/client/cpe/quick-actions/quick-action-service.ts

@@ -172,6 +172,6 @@ export class QuickActionService implements Service {
         if (payload.kind === NESTED_QUICK_ACTION_KIND && actionInstance.kind === NESTED_QUICK_ACTION_KIND) {
             return actionInstance.execute(payload.path);
         }
-        return Promise.resolve([]);
+        return [];
     }
 }

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.67",
+  "version": "0.23.70",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -27,13 +27,13 @@
     "mem-fs-editor": "9.4.0",
     "qrcode": "1.5.4",
     "@sap/bas-sdk": "3.12.0",
-    "@sap-ux/adp-tooling": "0.18.15",
+    "@sap-ux/adp-tooling": "0.18.18",
     "@sap-ux/btp-utils": "1.1.5",
-    "@sap-ux/control-property-editor-sources": "npm:@sap-ux/control-property-editor@0.7.2",
+    "@sap-ux/control-property-editor-sources": "npm:@sap-ux/control-property-editor@0.7.3",
     "@sap-ux/feature-toggle": "0.3.4",
     "@sap-ux/logger": "0.7.1",
-    "@sap-ux/project-access": "1.32.12",
-    "@sap-ux/system-access": "0.6.30",
+    "@sap-ux/project-access": "1.32.14",
+    "@sap-ux/system-access": "0.6.31",
     "@sap-ux/i18n": "0.3.5"
   },
   "devDependencies": {
@@ -53,10 +53,10 @@
     "nock": "13.4.0",
     "npm-run-all2": "6.2.0",
     "supertest": "7.1.4",
-    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.18.3",
-    "@sap-ux/axios-extension": "1.24.4",
-    "@sap-ux/ui5-info": "0.13.3",
-    "@sap-ux/store": "1.3.3"
+    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.18.4",
+    "@sap-ux/axios-extension": "1.24.5",
+    "@sap-ux/store": "1.3.4",
+    "@sap-ux/ui5-info": "0.13.3"
   },
   "peerDependencies": {
     "express": "4"