@sap-ux/preview-middleware 0.7.7 → 0.7.9

package/dist/base/flp.d.ts

@@ -69,6 +69,14 @@ export declare class FlpSandbox {
      * @param resources optional additional resource mappings
      */
     init(manifest: Manifest, componentId?: string, resources?: Record<string, string>): Promise<void>;
+    /**
+     * Generates the FLP sandbox for an editor.
+     *
+     * @param rta runtime authoring configuration
+     * @param editor editor configuration
+     * @returns FLP sandbox html
+     */
+    private generateSandboxForEditor;
     /**
      * Add additional routes for configured editors.
      *

package/dist/base/flp.js

@@ -124,6 +124,32 @@ class FlpSandbox {
             this.logger.debug(`Configured apps: ${JSON.stringify(this.templateConfig.apps)}`);
         });
     }
+    /**
+     * Generates the FLP sandbox for an editor.
+     *
+     * @param rta runtime authoring configuration
+     * @param editor editor configuration
+     * @returns FLP sandbox html
+     */
+    generateSandboxForEditor(rta, editor) {
+        var _a;
+        const defaultGenerator = editor.developerMode
+            ? '@sap-ux/control-property-editor'
+            : '@sap-ux/preview-middleware';
+        const config = Object.assign({}, this.templateConfig);
+        /* sap.ui.rta needs to be added to the list of preload libs for variants management and adaptation projects */
+        if (!config.ui5.libs.includes('sap.ui.rta')) {
+            const libs = config.ui5.libs.split(',');
+            libs.push('sap.ui.rta');
+            config.ui5.libs = libs.join(',');
+        }
+        config.flex = Object.assign(Object.assign({ layer: rta.layer }, rta.options), { generator: (_a = editor.generator) !== null && _a !== void 0 ? _a : defaultGenerator, developerMode: editor.developerMode === true, pluginScript: editor.pluginScript });
+        if (editor.developerMode === true) {
+            config.ui5.bootstrapOptions = serializeUi5Configuration(DEVELOPER_MODE_CONFIG);
+        }
+        const template = (0, fs_1.readFileSync)((0, path_1.join)(__dirname, '../../templates/flp/sandbox.html'), 'utf-8');
+        return (0, ejs_1.render)(template, config);
+    }
     /**
      * Add additional routes for configured editors.
      *
@@ -137,35 +163,25 @@ class FlpSandbox {
             if (editor.developerMode) {
                 previewUrl = `${previewUrl}.inner.html`;
                 (_a = editor.pluginScript) !== null && _a !== void 0 ? _a : (editor.pluginScript = 'open/ux/preview/client/cpe/init');
-                this.router.get(editor.path, ((_req, res) => __awaiter(this, void 0, void 0, function* () {
-                    var _b, _c;
+                this.router.get(editor.path, (_req, res) => {
+                    var _a, _b;
                     const template = (0, fs_1.readFileSync)((0, path_1.join)(__dirname, '../../templates/flp/editor.html'), 'utf-8');
                     const html = (0, ejs_1.render)(template, {
                         previewUrl: `${previewUrl}?sap-ui-xx-viewCache=false&fiori-tools-rta-mode=forAdaptation&sap-ui-rta-skip-flex-validation=true&sap-ui-xx-condense-changes=true#${this.config.intent.object}-${this.config.intent.action}`,
-                        telemetry: (_c = (_b = rta.options) === null || _b === void 0 ? void 0 : _b.telemetry) !== null && _c !== void 0 ? _c : false
+                        telemetry: (_b = (_a = rta.options) === null || _a === void 0 ? void 0 : _a.telemetry) !== null && _b !== void 0 ? _b : false
                     });
                     res.status(200).contentType('html').send(html);
-                })));
+                });
                 let path = (0, path_1.dirname)(editor.path);
                 if (!path.endsWith('/')) {
                     path = `${path}/`;
                 }
                 this.router.use(`${path}editor`, (0, express_1.static)(cpe));
             }
-            const defaultGenerator = editor.developerMode
-                ? '@sap-ux/control-property-editor'
-                : '@sap-ux/preview-middleware';
-            this.router.get(previewUrl, ((_req, res) => __awaiter(this, void 0, void 0, function* () {
-                var _d;
-                const config = Object.assign({}, this.templateConfig);
-                config.flex = Object.assign(Object.assign({ layer: rta.layer }, rta.options), { generator: (_d = editor.generator) !== null && _d !== void 0 ? _d : defaultGenerator, developerMode: editor.developerMode === true, pluginScript: editor.pluginScript });
-                if (editor.developerMode === true) {
-                    config.ui5.bootstrapOptions = serializeUi5Configuration(DEVELOPER_MODE_CONFIG);
-                }
-                const template = (0, fs_1.readFileSync)((0, path_1.join)(__dirname, '../../templates/flp/sandbox.html'), 'utf-8');
-                const html = (0, ejs_1.render)(template, config);
+            this.router.get(previewUrl, (_req, res) => {
+                const html = this.generateSandboxForEditor(rta, editor);
                 res.status(200).contentType('html').send(html);
-            })));
+            });
         }
     }
     /**

package/dist/client/flp/init.js

@@ -180,7 +180,7 @@ sap.ui.define(["sap/base/Log", "sap/ui/core/IconPool", "sap/base/i18n/ResourceBu
     // init
     setI18nTitle();
     registerSAPFonts();
-    const renderer = await sap.ushell.Container.createRenderer(true);
+    const renderer = await sap.ushell.Container.createRenderer(undefined, true);
     renderer.placeAt('content');
   }
   const bootstrapConfig = document.getElementById('sap-ui-bootstrap');

package/dist/client/flp/init.ts

@@ -215,7 +215,7 @@ export async function init({ appUrls, flex }: { appUrls?: string | null; flex?:
     // init
     setI18nTitle();
     registerSAPFonts();
-    const renderer = await sap.ushell.Container.createRenderer(true);
+    const renderer = await sap.ushell.Container.createRenderer(undefined, true);
     renderer.placeAt('content');
 }
 

package/dist/types/index.d.ts

@@ -19,6 +19,12 @@ export interface App {
     componentId?: string;
     intent?: Intent;
 }
+export interface Editor {
+    path: string;
+    developerMode?: boolean;
+    pluginScript?: string;
+    generator?: string;
+}
 export interface RtaConfig {
     layer: UI5FlexLayer;
     options?: {
@@ -27,12 +33,7 @@ export interface RtaConfig {
         projectId?: string;
         scenario?: string;
     };
-    editors: {
-        path: string;
-        developerMode?: boolean;
-        pluginScript?: string;
-        generator?: string;
-    }[];
+    editors: Editor[];
 }
 /**
  * FLP preview configuration.

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.7.7",
+  "version": "0.7.9",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -36,7 +36,7 @@
     "npm-run-all": "4.1.5",
     "nock": "13.2.1",
     "supertest": "6.3.3",
-    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.4.1",
+    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.4.2",
     "@sap-ux/project-access": "1.13.7",
     "@sap-ux/store": "0.3.14"
   },