@sap-ux/preview-middleware 0.7.4 → 0.7.5

package/dist/base/flp.js

@@ -117,7 +117,6 @@ class FlpSandbox {
             if (this.rta) {
                 (_k = (_l = this.rta).options) !== null && _k !== void 0 ? _k : (_l.options = {});
                 this.rta.options.baseId = componentId !== null && componentId !== void 0 ? componentId : manifest['sap.app'].id;
-                this.rta.options.generator = 'changeUtils: SAPFioriTools-propertyEditor';
                 this.addEditorRoutes(this.rta);
             }
             this.addRoutesForAdditionalApps();
@@ -153,9 +152,13 @@ class FlpSandbox {
                 }
                 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), { developerMode: editor.developerMode === true, pluginScript: editor.pluginScript });
+                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);
                 }

package/dist/client/flp/WorkspaceConnector.js

@@ -4,11 +4,25 @@ sap.ui.define(["sap/base/util/merge", "sap/ui/fl/write/api/connectors/ObjectStor
   "use strict";
 
   const path = '/preview/api/changes';
+  function getFlexSettings() {
+    let result;
+    const bootstrapConfig = document.getElementById('sap-ui-bootstrap');
+    const flexSetting = bootstrapConfig?.getAttribute('data-open-ux-preview-flex-settings');
+    if (flexSetting) {
+      result = JSON.parse(flexSetting);
+    }
+    return result;
+  }
   const connector = merge({}, ObjectStorageConnector, {
     layers: [Layer.VENDOR, Layer.CUSTOMER_BASE],
     storage: {
       _itemsStoredAsObjects: true,
       setItem: function (_key, change) {
+        const settings = getFlexSettings();
+        if (settings) {
+          change.support ??= {};
+          change.support.generator = settings.generator;
+        }
         return fetch(path, {
           method: 'POST',
           body: JSON.stringify(change, null, 2),
@@ -50,12 +64,9 @@ sap.ui.define(["sap/base/util/merge", "sap/ui/fl/write/api/connectors/ObjectStor
       const ui5Version = await VersionInfo.load();
       const [majorVersion, minorVersion] = ui5Version.version.split('.').map(v => parseInt(v, 10));
       features.isVariantAdaptationEnabled = majorVersion >= 1 && minorVersion >= 90;
-      const bootstrapConfig = document.getElementById('sap-ui-bootstrap');
-      if (bootstrapConfig) {
-        const settings = bootstrapConfig.getAttribute('data-open-ux-preview-flex-settings');
-        if (settings && JSON.parse(settings).developerMode) {
-          features.isVariantAdaptationEnabled = false;
-        }
+      const settings = getFlexSettings();
+      if (settings?.developerMode) {
+        features.isVariantAdaptationEnabled = false;
       }
       return features;
     }

package/dist/client/flp/WorkspaceConnector.ts

@@ -3,13 +3,37 @@ import ObjectStorageConnector from 'sap/ui/fl/write/api/connectors/ObjectStorage
 import Layer from 'sap/ui/fl/Layer';
 import VersionInfo from 'sap/ui/VersionInfo';
 
-const path = '/preview/api/changes'; 
+const path = '/preview/api/changes';
+interface Change {
+    support?: {
+        generator?: string;
+    };
+}
+
+function getFlexSettings(): {
+    generator?: string;
+    developerMode?: boolean;
+} | undefined {
+    let result;
+    const bootstrapConfig = document.getElementById('sap-ui-bootstrap');
+    const flexSetting = bootstrapConfig?.getAttribute('data-open-ux-preview-flex-settings');
+    if (flexSetting) {
+        result = JSON.parse(flexSetting);
+    }
+    return result;
+}
 
 const connector = merge({}, ObjectStorageConnector, {
     layers: [Layer.VENDOR, Layer.CUSTOMER_BASE],
     storage: {
         _itemsStoredAsObjects: true,
-        setItem: function (_key: string, change: unknown) {
+        setItem: function (_key: string, change: Change) {
+            const settings = getFlexSettings();
+            if (settings) {
+                change.support ??= {};
+                change.support.generator = settings.generator;
+            }
+
             return fetch(path, {
                 method: 'POST',
                 body: JSON.stringify(change, null, 2),
@@ -49,14 +73,10 @@ const connector = merge({}, ObjectStorageConnector, {
 
         const ui5Version = (await VersionInfo.load()) as { version: string };
         const [majorVersion, minorVersion] = ui5Version.version.split('.').map((v: string) => parseInt(v, 10));
-        features.isVariantAdaptationEnabled = majorVersion >= 1 && minorVersion >= 90;  
-
-        const bootstrapConfig = document.getElementById('sap-ui-bootstrap');
-        if (bootstrapConfig) {
-            const settings = bootstrapConfig.getAttribute('data-open-ux-preview-flex-settings');
-            if (settings && JSON.parse(settings).developerMode) {
-                features.isVariantAdaptationEnabled = false;
-            }
+        features.isVariantAdaptationEnabled = majorVersion >= 1 && minorVersion >= 90;
+        const settings = getFlexSettings();
+        if (settings?.developerMode) {
+            features.isVariantAdaptationEnabled = false;
         }
 
         return features;

package/dist/types/index.d.ts

@@ -25,13 +25,13 @@ export interface RtaConfig {
         [key: string]: unknown;
         baseId?: string;
         projectId?: string;
-        generator?: string;
         scenario?: string;
     };
     editors: {
         path: string;
         developerMode?: boolean;
         pluginScript?: string;
+        generator?: string;
     }[];
 }
 /**

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.4",
+  "version": "0.7.5",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -25,7 +25,7 @@
     "ejs": "3.1.9",
     "@sap-ux/logger": "0.3.8",
     "@sap-ux/adp-tooling": "0.4.0",
-    "@sap-ux/control-property-editor-sources": "npm:@sap-ux/control-property-editor@0.2.2"
+    "@sap-ux/control-property-editor-sources": "npm:@sap-ux/control-property-editor@0.2.3"
   },
   "devDependencies": {
     "@types/ejs": "3.1.2",
@@ -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.0",
+    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.4.1",
     "@sap-ux/project-access": "1.13.6",
     "@sap-ux/store": "0.3.14"
   },