@sap-ux/preview-middleware 0.13.0 → 0.13.2

package/dist/base/flp.d.ts

@@ -134,7 +134,16 @@ export declare class FlpSandbox {
      * @param manifest manifest of the additional target app
      * @param app configuration for the preview
      */
-    addApp(manifest: Manifest, app: App): void;
+    addApp(manifest: Manifest, app: App): Promise<void>;
+    /**
+     * Get the i18n text of the given property.
+     *
+     * @param projectRoot absolute path to the project root
+     * @param propertyValue value of the property
+     * @returns i18n text of the property
+     * @private
+     */
+    private getI18nTextFromProperty;
     /**
      * Gets the UI5 libs dependencies from manifest.json.
      *

package/dist/base/flp.js

@@ -15,6 +15,7 @@ const fs_1 = require("fs");
 const path_1 = require("path");
 const express_1 = require("express");
 const flex_1 = require("./flex");
+const project_access_1 = require("@sap-ux/project-access");
 const adp_tooling_1 = require("@sap-ux/adp-tooling");
 const test_1 = require("./test");
 const DEVELOPER_MODE_CONFIG = new Map([
@@ -143,7 +144,7 @@ class FlpSandbox {
                 },
                 locateReuseLibsScript: (_e = this.config.libs) !== null && _e !== void 0 ? _e : (yield this.hasLocateReuseLibsScript())
             };
-            this.addApp(manifest, {
+            yield this.addApp(manifest, {
                 componentId,
                 target: (_f = resources[componentId !== null && componentId !== void 0 ? componentId : id]) !== null && _f !== void 0 ? _f : this.templateConfig.basePath,
                 local: '.',
@@ -159,7 +160,7 @@ class FlpSandbox {
             if (this.test) {
                 this.addTestRoutes(this.test, id);
             }
-            this.addRoutesForAdditionalApps();
+            yield this.addRoutesForAdditionalApps();
             this.logger.info(`Initialized for app ${id}`);
             this.logger.debug(`Configured apps: ${JSON.stringify(this.templateConfig.apps)}`);
         });
@@ -269,29 +270,31 @@ class FlpSandbox {
      */
     addRoutesForAdditionalApps() {
         var _a, _b;
-        for (const app of this.config.apps) {
-            let manifest;
-            if (app.local) {
-                manifest = JSON.parse((0, fs_1.readFileSync)((0, path_1.join)(app.local, 'webapp/manifest.json'), 'utf-8'));
-                this.router.use(app.target, (0, express_1.static)((0, path_1.join)(app.local, 'webapp')));
-                this.logger.info(`Serving additional application at ${app.target} from ${app.local}`);
-            }
-            else if (app.componentId) {
-                manifest = {
-                    'sap.app': {
-                        id: app.componentId,
-                        title: app.intent ? `${app.intent.object}-${app.intent.action}` : app.componentId
-                    }
-                };
-            }
-            if (manifest) {
-                this.addApp(manifest, app);
-                this.logger.info(`Adding additional intent: ${(_a = app.intent) === null || _a === void 0 ? void 0 : _a.object}-${(_b = app.intent) === null || _b === void 0 ? void 0 : _b.action}`);
-            }
-            else {
-                this.logger.info(`Invalid application config for route ${app.target} because neither componentId nor local folder provided.`);
+        return __awaiter(this, void 0, void 0, function* () {
+            for (const app of this.config.apps) {
+                let manifest;
+                if (app.local) {
+                    manifest = JSON.parse((0, fs_1.readFileSync)((0, path_1.join)(app.local, 'webapp/manifest.json'), 'utf-8'));
+                    this.router.use(app.target, (0, express_1.static)((0, path_1.join)(app.local, 'webapp')));
+                    this.logger.info(`Serving additional application at ${app.target} from ${app.local}`);
+                }
+                else if (app.componentId) {
+                    manifest = {
+                        'sap.app': {
+                            id: app.componentId,
+                            title: app.intent ? `${app.intent.object}-${app.intent.action}` : app.componentId
+                        }
+                    };
+                }
+                if (manifest) {
+                    yield this.addApp(manifest, app);
+                    this.logger.info(`Adding additional intent: ${(_a = app.intent) === null || _a === void 0 ? void 0 : _a.object}-${(_b = app.intent) === null || _b === void 0 ? void 0 : _b.action}`);
+                }
+                else {
+                    this.logger.info(`Invalid application config for route ${app.target} because neither componentId nor local folder provided.`);
+                }
             }
-        }
+        });
     }
     /**
      * Retrieves the configuration settings for UI5 flexibility services.
@@ -416,21 +419,56 @@ class FlpSandbox {
      * @param app configuration for the preview
      */
     addApp(manifest, app) {
-        var _a, _b, _c, _d, _e, _f;
-        const id = manifest['sap.app'].id;
-        (_a = app.intent) !== null && _a !== void 0 ? _a : (app.intent = {
-            object: id.replace(/\./g, ''),
-            action: 'preview'
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        return __awaiter(this, void 0, void 0, function* () {
+            const id = manifest['sap.app'].id;
+            (_a = app.intent) !== null && _a !== void 0 ? _a : (app.intent = {
+                object: id.replace(/\./g, ''),
+                action: 'preview'
+            });
+            let title = (_b = manifest['sap.app'].title) !== null && _b !== void 0 ? _b : id;
+            let description = (_c = manifest['sap.app'].description) !== null && _c !== void 0 ? _c : '';
+            if (app.local) {
+                title = (_d = (yield this.getI18nTextFromProperty(app.local, manifest['sap.app'].title))) !== null && _d !== void 0 ? _d : id;
+                description = (_e = (yield this.getI18nTextFromProperty(app.local, manifest['sap.app'].description))) !== null && _e !== void 0 ? _e : '';
+            }
+            this.templateConfig.ui5.resources[id] = app.target;
+            this.templateConfig.apps[`${(_f = app.intent) === null || _f === void 0 ? void 0 : _f.object}-${(_g = app.intent) === null || _g === void 0 ? void 0 : _g.action}`] = {
+                title: title,
+                description: description,
+                additionalInformation: `SAPUI5.Component=${(_h = app.componentId) !== null && _h !== void 0 ? _h : id}`,
+                applicationType: 'URL',
+                url: app.target,
+                applicationDependencies: { manifest: true }
+            };
+        });
+    }
+    /**
+     * Get the i18n text of the given property.
+     *
+     * @param projectRoot absolute path to the project root
+     * @param propertyValue value of the property
+     * @returns i18n text of the property
+     * @private
+     */
+    getI18nTextFromProperty(projectRoot, propertyValue) {
+        var _a, _b, _c, _d;
+        return __awaiter(this, void 0, void 0, function* () {
+            //i18n model format could be {{key}} or {i18n>key}
+            if (!propertyValue || propertyValue.search(/{{\w+}}|{i18n>\w+}/g) === -1) {
+                return propertyValue;
+            }
+            const propertyI18nKey = propertyValue.replace(/i18n>|[{}]/g, '');
+            const projectAccess = yield (0, project_access_1.createProjectAccess)(projectRoot);
+            try {
+                const bundle = (yield projectAccess.getApplication('').getI18nBundles())['sap.app'];
+                return (_d = (_c = (_b = (_a = bundle[propertyI18nKey]) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.value) === null || _c === void 0 ? void 0 : _c.value) !== null && _d !== void 0 ? _d : propertyI18nKey;
+            }
+            catch (e) {
+                this.logger.warn('Failed to load i18n properties bundle');
+            }
+            return propertyI18nKey;
         });
-        this.templateConfig.ui5.resources[id] = app.target;
-        this.templateConfig.apps[`${(_b = app.intent) === null || _b === void 0 ? void 0 : _b.object}-${(_c = app.intent) === null || _c === void 0 ? void 0 : _c.action}`] = {
-            title: (_d = manifest['sap.app'].title) !== null && _d !== void 0 ? _d : id,
-            description: (_e = manifest['sap.app'].description) !== null && _e !== void 0 ? _e : '',
-            additionalInformation: `SAPUI5.Component=${(_f = app.componentId) !== null && _f !== void 0 ? _f : id}`,
-            applicationType: 'URL',
-            url: app.target,
-            applicationDependencies: { manifest: true }
-        };
     }
     /**
      * Gets the UI5 libs dependencies from manifest.json.

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.13.0",
+  "version": "0.13.2",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -25,7 +25,8 @@
     "ejs": "3.1.9",
     "@sap-ux/logger": "0.5.1",
     "@sap-ux/adp-tooling": "0.9.6",
-    "@sap-ux/control-property-editor-sources": "npm:@sap-ux/control-property-editor@0.4.16"
+    "@sap-ux/control-property-editor-sources": "npm:@sap-ux/control-property-editor@0.4.16",
+    "@sap-ux/project-access": "1.19.4"
   },
   "devDependencies": {
     "@types/ejs": "3.1.2",
@@ -40,9 +41,9 @@
     "@sap-ux-private/playwright": "0.0.3",
     "dotenv": "16.3.1",
     "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.9.3",
-    "@sap-ux/project-access": "1.19.2",
+    "@sap-ux/axios-extension": "1.11.4",
     "@sap-ux/store": "0.5.0",
-    "@sap-ux/axios-extension": "1.11.4"
+    "@sap-ux/i18n": "0.0.5"
   },
   "peerDependencies": {
     "express": "4"