@sap-ux/preview-middleware 0.16.136 → 0.16.139

package/dist/client/utils/version.js

@@ -1,87 +1,87 @@
-"use strict";
-
-sap.ui.define(["sap/ui/VersionInfo", "sap/base/Log"], function (VersionInfo, Log) {
-  "use strict";
-
-  /**
-   * Default minimal supported UI5 version
-   */
-  const minVersionInfo = {
-    major: 1,
-    minor: 71
-  };
-
-  /**
-   * Retrieve the UI5 version from sap.ui.core library
-   *
-   * @returns Ui5VersionInfo
-   */
-  async function getUi5Version() {
-    let version = (await VersionInfo.load({
-      library: 'sap.ui.core'
-    }))?.version;
-    if (!version) {
-      Log.error('Could not get UI5 version of application. Using 1.121.0 as fallback.');
-      version = '1.121.0';
-    }
-    const [major, minor, patch] = version.split('.').map(versionPart => parseInt(versionPart, 10));
-    return {
-      major: major,
-      minor: minor,
-      patch: patch
-    };
-  }
-
-  /**
-   * Checks if the given version is lower than the required minimal version.
-   * @param ui5VersionInfo to check
-   * @param minUi5VersionInfo to check against (default is 1.71)
-   *
-   * @returns boolean
-   */
-  function isLowerThanMinimalUi5Version(ui5VersionInfo) {
-    let minUi5VersionInfo = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : minVersionInfo;
-    if (!isNaN(ui5VersionInfo.major) && !isNaN(ui5VersionInfo.minor)) {
-      if (ui5VersionInfo.major < minUi5VersionInfo.major) {
-        return true;
-      }
-      if (ui5VersionInfo.major === minUi5VersionInfo.major && ui5VersionInfo.minor < minUi5VersionInfo.minor) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  /**
-   * Checks if the given version is equal to the specified version.
-   * @param ui5VersionInfo to check
-   * @param targetUi5VersionInfo to check against (default is 1.71)
-   *
-   * @returns boolean
-   */
-  function isVersionEqualOrHasNewerPatch(ui5VersionInfo) {
-    let targetUi5VersionInfo = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : minVersionInfo;
-    if (!isNaN(ui5VersionInfo.major) && !isNaN(ui5VersionInfo.minor)) {
-      return ui5VersionInfo.major === targetUi5VersionInfo.major && ui5VersionInfo.minor === targetUi5VersionInfo.minor && (ui5VersionInfo?.patch ?? 0) >= (targetUi5VersionInfo?.patch ?? 0);
-    }
-    return false;
-  }
-
-  /**
-   * Get UI5 version validation message.
-   * @param ui5VersionInfo to be mentioned in the message
-   * @returns string with validation message.
-   */
-  function getUI5VersionValidationMessage(ui5VersionInfo) {
-    return `The current SAPUI5 version set for this Adaptation project is ${ui5VersionInfo.major}.${ui5VersionInfo.minor}. The minimum version to use for SAPUI5 Adaptation Project and its SAPUI5 Visual Editor is ${minVersionInfo.major}.${minVersionInfo.minor}`;
-  }
-  var __exports = {
-    __esModule: true
-  };
-  __exports.getUi5Version = getUi5Version;
-  __exports.isLowerThanMinimalUi5Version = isLowerThanMinimalUi5Version;
-  __exports.isVersionEqualOrHasNewerPatch = isVersionEqualOrHasNewerPatch;
-  __exports.getUI5VersionValidationMessage = getUI5VersionValidationMessage;
-  return __exports;
+"use strict";
+
+sap.ui.define(["sap/ui/VersionInfo", "sap/base/Log"], function (VersionInfo, Log) {
+  "use strict";
+
+  /**
+   * Default minimal supported UI5 version
+   */
+  const minVersionInfo = {
+    major: 1,
+    minor: 71
+  };
+
+  /**
+   * Retrieve the UI5 version from sap.ui.core library
+   *
+   * @returns Ui5VersionInfo
+   */
+  async function getUi5Version() {
+    let version = (await VersionInfo.load({
+      library: 'sap.ui.core'
+    }))?.version;
+    if (!version) {
+      Log.error('Could not get UI5 version of application. Using 1.121.0 as fallback.');
+      version = '1.121.0';
+    }
+    const [major, minor, patch] = version.split('.').map(versionPart => parseInt(versionPart, 10));
+    return {
+      major: major,
+      minor: minor,
+      patch: patch
+    };
+  }
+
+  /**
+   * Checks if the given version is lower than the required minimal version.
+   * @param ui5VersionInfo to check
+   * @param minUi5VersionInfo to check against (default is 1.71)
+   *
+   * @returns boolean
+   */
+  function isLowerThanMinimalUi5Version(ui5VersionInfo) {
+    let minUi5VersionInfo = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : minVersionInfo;
+    if (!isNaN(ui5VersionInfo.major) && !isNaN(ui5VersionInfo.minor)) {
+      if (ui5VersionInfo.major < minUi5VersionInfo.major) {
+        return true;
+      }
+      if (ui5VersionInfo.major === minUi5VersionInfo.major && ui5VersionInfo.minor < minUi5VersionInfo.minor) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  /**
+   * Checks if the given version is equal to the specified version.
+   * @param ui5VersionInfo to check
+   * @param targetUi5VersionInfo to check against (default is 1.71)
+   *
+   * @returns boolean
+   */
+  function isVersionEqualOrHasNewerPatch(ui5VersionInfo) {
+    let targetUi5VersionInfo = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : minVersionInfo;
+    if (!isNaN(ui5VersionInfo.major) && !isNaN(ui5VersionInfo.minor)) {
+      return ui5VersionInfo.major === targetUi5VersionInfo.major && ui5VersionInfo.minor === targetUi5VersionInfo.minor && (ui5VersionInfo?.patch ?? 0) >= (targetUi5VersionInfo?.patch ?? 0);
+    }
+    return false;
+  }
+
+  /**
+   * Get UI5 version validation message.
+   * @param ui5VersionInfo to be mentioned in the message
+   * @returns string with validation message.
+   */
+  function getUI5VersionValidationMessage(ui5VersionInfo) {
+    return `The current SAPUI5 version set for this Adaptation project is ${ui5VersionInfo.major}.${ui5VersionInfo.minor}. The minimum version to use for SAPUI5 Adaptation Project and its SAPUI5 Visual Editor is ${minVersionInfo.major}.${minVersionInfo.minor}`;
+  }
+  var __exports = {
+    __esModule: true
+  };
+  __exports.getUi5Version = getUi5Version;
+  __exports.isLowerThanMinimalUi5Version = isLowerThanMinimalUi5Version;
+  __exports.isVersionEqualOrHasNewerPatch = isVersionEqualOrHasNewerPatch;
+  __exports.getUI5VersionValidationMessage = getUI5VersionValidationMessage;
+  return __exports;
 });
 //# sourceMappingURL=version.js.map

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.16.136",
+  "version": "0.16.139",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -26,9 +26,9 @@
     "mem-fs": "2.1.0",
     "mem-fs-editor": "9.4.0",
     "@sap-ux/logger": "0.6.0",
-    "@sap-ux/feature-toggle": "0.2.2",
-    "@sap-ux/btp-utils": "0.17.0",
-    "@sap-ux/adp-tooling": "0.12.87",
+    "@sap-ux/feature-toggle": "0.2.3",
+    "@sap-ux/btp-utils": "0.17.1",
+    "@sap-ux/adp-tooling": "0.12.89",
     "@sap-ux/control-property-editor-sources": "npm:@sap-ux/control-property-editor@0.5.28",
     "@sap-ux/project-access": "1.28.8"
   },
@@ -46,10 +46,10 @@
     "supertest": "6.3.3",
     "@sap-ux-private/playwright": "0.1.0",
     "dotenv": "16.3.1",
-    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.11.39",
-    "@sap-ux/axios-extension": "1.17.4",
+    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.11.40",
     "@sap-ux/store": "0.9.3",
     "@sap-ux/ui5-info": "0.8.3",
+    "@sap-ux/axios-extension": "1.17.6",
     "@sap-ux/i18n": "0.2.0"
   },
   "peerDependencies": {

package/templates/flp/sandbox.html

@@ -44,9 +44,8 @@
         window["data-open-ux-preview-basePath"] = "<%- basePath %>";
     </script>
 
-    <script src="<%- basePath %>/preview/client/flp/bootstrap.js" id="preview-bootstrap"></script>
-    <script id="sap-ushell-bootstrap"></script>
-    <!-- Bootstrap the UI5 core library. 'data-sap-ui-frameOptions="allow"'' is a NON-SECURE setting for test environments -->
+    <script src="<%- basePath %>/test-resources/sap/ushell/bootstrap/sandbox.js" id="sap-ushell-bootstrap"></script>
+    <!-- Bootstrap the UI5 core library. 'data-sap-ui-frameOptions="allow"' is a NON-SECURE setting for test environments -->
     <script id="sap-ui-bootstrap"
         src="<%- basePath %>/resources/sap-ui-core.js"
         data-sap-ui-libs="<%- ui5.libs %>"

package/templates/flp/sandbox2.html

@@ -0,0 +1,87 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<!-- Copyright (c) 2015 SAP AG, All Rights Reserved -->
+
+<head>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Local FLP Sandbox</title>
+
+    <!-- Bootstrap the unified shell in sandbox mode for standalone usage.
+
+         The renderer is specified in the global Unified Shell configuration object "sap-ushell-config".
+
+         The fiori2 renderer will render the shell header allowing, for instance,
+         testing of additional application setting buttons.
+
+         The navigation target resolution service is configured in a way that the empty URL hash is
+         resolved to our own application.
+
+         This example uses relative path references for the SAPUI5 resources and test-resources;
+         it might be necessary to adapt them depending on the target runtime platform.
+         The sandbox platform is restricted to development or demo use cases and must NOT be used
+         for productive scenarios.
+    -->
+    <script type="text/javascript">
+        window["sap-ushell-config"] = {
+            defaultRenderer: "fiori2",
+            renderers: {
+                fiori2: {
+                    componentData: {
+                        config: {
+                            search: "hidden",
+                            enableSearch: false
+                        }
+                    }
+                }
+            },
+            applications:  <%- JSON.stringify(apps) %>
+        };
+    </script>
+
+    <script type="text/javascript">
+        window["data-open-ux-preview-basePath"] = "<%- basePath %>";
+    </script>
+
+    <script src="<%- basePath %>/resources/sap/ushell/bootstrap/sandbox2.js" id="sap-ushell-bootstrap"></script>
+    <!-- Bootstrap the UI5 core library. 'data-sap-ui-frameOptions="allow"' is a NON-SECURE setting for test environments -->
+    <script id="sap-ui-bootstrap"
+        src="<%- basePath %>/resources/sap-ui-core.js"
+        data-sap-ui-libs="<%- ui5.libs %>"
+        data-sap-ui-async="true"
+        data-sap-ui-theme="<%- ui5.theme %>"
+        data-sap-ui-compat-version="edge"
+        data-sap-ui-language="en"
+        data-sap-ui-flexibility-services='<%- JSON.stringify(ui5.flex) %>'
+        data-sap-ui-resource-roots='<%- JSON.stringify(ui5.resources) %>'
+        data-sap-ui-frame-options="allow"
+        data-sap-ui-xx-component-preload="off"<%- ui5.bootstrapOptions %>
+        data-sap-ui-on-init="module:open/ux/preview/client/flp/init"<% if (locals.init) { %>
+        data-open-ux-preview-customInit='<%- init %>'<% } if (locals.flex) { %>
+        data-open-ux-preview-features='<%- JSON.stringify(features) %>'
+        data-open-ux-preview-flex-settings='<%- JSON.stringify(flex) %>'<% } if (locals.locateReuseLibsScript) { %>
+        data-open-ux-preview-libs-manifests='<%- JSON.stringify(Object.values(apps).map(app => app.url)) %>'<% } %>>
+    </script>
+
+<% if (locals.flex && flex?.developerMode) { %>
+        <!-- Hides Rta native toolbar  -->
+    <style>
+        #shell-header, .sapUiRtaToolbar {
+            visibility: hidden;
+            height: 1px;
+        }
+        .sapUshellShellCanvas {
+            top: 0 !important;
+        }
+        .sapUiRtaMode .sapUiShellBackgroundImage.sapUiGlobalBackgroundImageForce.sapUshellShellBG {
+            background-color: transparent !important;
+        }
+    </style><% } %>
+</head>
+
+<!-- UI Content -->
+<body class="sapUiBody" id="content">
+</body>
+
+</html>

package/dist/client/flp/bootstrap.js

@@ -1,77 +0,0 @@
-/* eslint-disable @typescript-eslint/no-unsafe-assignment,
-                  @typescript-eslint/no-unsafe-member-access,
-                  @typescript-eslint/no-unsafe-argument,
-                  no-console */
-
-/**
- * Calculates the script content for accessing the right sap/ushell/bootstrap sandbox.
- * @param fnCallback {Function} The callback function to be executed after the bootstrap is loaded.
- */
-async function ushellBootstrap(fnCallback) {
-    const basePath = window['data-open-ux-preview-basePath'] ?? '';
-
-    let src = `${basePath}/test-resources/sap/ushell/bootstrap/sandbox.js`;
-    try {
-        const response = await fetch(`${basePath}/resources/sap-ui-version.json`);
-        const json = await response.json();
-        const version = json?.libraries?.find((lib) => lib.name === 'sap.ui.core')?.version ?? '1.121.0';
-        const [major, minor] = version.split('.');
-        const majorUi5Version = parseInt(major, 10);
-        const minorUi5Version = parseInt(minor, 10);
-        if (majorUi5Version >= 2) {
-            src = `${basePath}/resources/sap/ushell/bootstrap/sandbox2.js`;
-        }
-
-        if (majorUi5Version === 1 && minorUi5Version < 72) {
-            removeAsyncHintsRequests();
-        }
-    } catch (error) {
-        console.warn('Failed to fetch sap-ui-version.json. Assuming it is a 1.x version.');
-    }
-
-    // eslint-disable-next-line fiori-custom/sap-no-dom-access,fiori-custom/sap-browser-api-warning
-    const shellBootstrap = document.getElementById('sap-ushell-bootstrap');
-    if (shellBootstrap) {
-        shellBootstrap.onload = () => {
-            window['sap-ui-config']['xx-bootTask'](fnCallback);
-        };
-        shellBootstrap.setAttribute('src', src);
-    }
-}
-
-/**
- * For UI5 version 1.71 and below, we need to remove the asyncHints.requests
- * to load the changes in an Adaptation project.
- * This logic needs to be executed here to have a reliable check for
- * UI5 version and remove the asyncHints.requests before the sandbox is loaded.
- * The sandbox shell modifies the `window['sap-ushell-config']`.
- */
-function removeAsyncHintsRequests() {
-    const obj = window['sap-ushell-config']['applications'];
-
-    if (!obj || typeof obj !== 'object') return;
-
-    const stack = [obj];
-
-    while (stack.length > 0) {
-        const current = stack.pop();
-
-        if (current.asyncHints) {
-            if (current.asyncHints.requests) {
-                current.asyncHints.requests = [];
-            }
-            return;
-        }
-
-        for (const key in current) {
-            if (typeof current[key] === 'object' && current[key] !== null) {
-                stack.push(current[key]);
-            }
-        }
-    }
-}
-
-// eslint-disable-next-line fiori-custom/sap-no-global-define
-window['sap-ui-config'] = {
-    'xx-bootTask': ushellBootstrap
-};