@sap-ux/preview-middleware 0.25.14 → 0.25.17

package/dist/base/config.js

@@ -144,8 +144,10 @@ function sanitizeConfig(config, logger) {
         delete config.rta; //NOSONAR
     }
     if (config.editors?.rta && config.adp === undefined) {
+        const scenario = config.editors.rta.options?.scenario;
+        const developerModeSupported = scenario === 'FE_FROM_SCRATCH' || scenario === 'ADAPTATION_PROJECT';
         config.editors.rta.endpoints = config.editors.rta.endpoints.map((editor) => {
-            if (editor.developerMode) {
+            if (editor.developerMode && !developerModeSupported) {
                 logger.error('developerMode is ONLY supported for SAP UI5 adaptation projects.');
                 logger.warn(`developerMode for ${editor.path} disabled`);
                 editor.developerMode = false;

package/dist/client/flp/init.js

@@ -132,7 +132,7 @@ sap.ui.define(["sap/base/Log", "open/ux/preview/client/thirdparty/@sap-ux-privat
    * @param container the UShell container
    */
   async function resetAppState(container) {
-    const urlParams = new URLSearchParams(window.location.hash);
+    const urlParams = new URLSearchParams(globalThis.location.hash);
     const appStateValue = urlParams.get('sap-iapp-state') ?? urlParams.get('/?sap-iapp-state');
     if (appStateValue) {
       const appStateService = await container.getServiceAsync('AppState');
@@ -260,7 +260,7 @@ sap.ui.define(["sap/base/Log", "open/ux/preview/client/thirdparty/@sap-ux-privat
     enhancedHomePage,
     enableCardGenerator
   }) {
-    const urlParams = new URLSearchParams(window.location.search);
+    const urlParams = new URLSearchParams(globalThis.location.search);
     const container = sap?.ushell?.Container ?? (await __ui5_require_async('sap/ushell/Container')).default;
     let scenario = '';
     const ui5VersionInfo = await getUi5Version();
@@ -271,6 +271,10 @@ sap.ui.define(["sap/base/Log", "open/ux/preview/client/thirdparty/@sap-ux-privat
       container.attachRendererCreatedEvent(async function () {
         const lifecycleService = await container.getServiceAsync('AppLifeCycle');
         lifecycleService.attachAppLoaded(event => {
+          // Prevent starting RTA when the FLP home component (#Shell-home) fires attachAppLoaded before the user navigates to the actual app.
+          if (!globalThis.location.hash || globalThis.location.hash.startsWith('#Shell-home')) {
+            return;
+          }
           const view = event.getParameter('componentInstance');
           const pluginScript = flexSettings.pluginScript ?? '';
           const libs = [];
@@ -352,7 +356,7 @@ sap.ui.define(["sap/base/Log", "open/ux/preview/client/thirdparty/@sap-ux-privat
     renderer.placeAt('content');
   }
 
-  // eslint-disable-next-line @sap-ux/fiori-tools/sap-no-dom-access,@sap-ux/fiori-tools/sap-browser-api-warning
+  // eslint-disable-next-line @sap-ux/fiori-tools/sap-no-dom-access,@sap-ux/fiori-tools/sap-browser-api-warning, @sap-ux/fiori-tools/sap-no-global-variable
   const bootstrapConfig = document.getElementById('sap-ui-bootstrap');
   if (bootstrapConfig) {
     init({
@@ -392,9 +396,7 @@ sap.ui.define(["sap/base/Log", "open/ux/preview/client/thirdparty/@sap-ux-privat
           type: MessageBarType.warning
         });
       }
-
-      // eslint-disable-next-line @sap-ux/fiori-tools/sap-no-location-reload
-      window.location.reload();
+      globalThis.location.reload();
     }
   }
   var __exports = {

package/dist/client/flp/init.ts

@@ -167,7 +167,7 @@ function registerModules(dataFromAppIndex: AppIndexData) {
  * @param container the UShell container
  */
 export async function resetAppState(container: typeof sap.ushell.Container): Promise<void> {
-    const urlParams = new URLSearchParams(window.location.hash);
+    const urlParams = new URLSearchParams(globalThis.location.hash);
     const appStateValue = urlParams.get('sap-iapp-state') ?? urlParams.get('/?sap-iapp-state');
     if (appStateValue) {
         const appStateService = await container.getServiceAsync<AppState>('AppState');
@@ -301,7 +301,7 @@ export async function init({
     enhancedHomePage?: boolean | null;
     enableCardGenerator?: boolean;
 }): Promise<void> {
-    const urlParams = new URLSearchParams(window.location.search);
+    const urlParams = new URLSearchParams(globalThis.location.search);
     const container =
         sap?.ushell?.Container ??
         ((await import('sap/ushell/Container')).default as unknown as typeof sap.ushell.Container);
@@ -314,6 +314,10 @@ export async function init({
         container.attachRendererCreatedEvent(async function () {
             const lifecycleService = await container.getServiceAsync<AppLifeCycle>('AppLifeCycle');
             lifecycleService.attachAppLoaded((event) => {
+                // Prevent starting RTA when the FLP home component (#Shell-home) fires attachAppLoaded before the user navigates to the actual app.
+                if (!globalThis.location.hash || globalThis.location.hash.startsWith('#Shell-home')) {
+                    return;
+                }
                 const view = event.getParameter('componentInstance');
                 const pluginScript = flexSettings.pluginScript ?? '';
 
@@ -401,7 +405,7 @@ export async function init({
     renderer.placeAt('content');
 }
 
-// eslint-disable-next-line @sap-ux/fiori-tools/sap-no-dom-access,@sap-ux/fiori-tools/sap-browser-api-warning
+// eslint-disable-next-line @sap-ux/fiori-tools/sap-no-dom-access,@sap-ux/fiori-tools/sap-browser-api-warning, @sap-ux/fiori-tools/sap-no-global-variable
 const bootstrapConfig = document.getElementById('sap-ui-bootstrap');
 if (bootstrapConfig) {
     init({
@@ -435,7 +439,6 @@ export async function handleHigherLayerChanges(error: unknown, ui5VersionInfo: U
             });
         }
 
-        // eslint-disable-next-line @sap-ux/fiori-tools/sap-no-location-reload
-        window.location.reload();
+        globalThis.location.reload();
     }
 }

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.25.14",
+  "version": "0.25.17",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -27,14 +27,14 @@
     "mem-fs-editor": "9.4.0",
     "qrcode": "1.5.4",
     "@sap/bas-sdk": "3.13.3",
-    "@sap-ux/adp-tooling": "0.18.109",
-    "@sap-ux/btp-utils": "1.1.12",
+    "@sap-ux/adp-tooling": "0.18.110",
     "@sap-ux/control-property-editor-sources": "npm:@sap-ux/control-property-editor@0.7.23",
     "@sap-ux/feature-toggle": "0.3.8",
     "@sap-ux/logger": "0.8.4",
     "@sap-ux/project-access": "1.35.18",
     "@sap-ux/system-access": "0.7.4",
-    "@sap-ux/i18n": "0.3.10"
+    "@sap-ux/i18n": "0.3.10",
+    "@sap-ux/btp-utils": "1.1.12"
   },
   "devDependencies": {
     "@sap-ux-private/playwright": "0.2.14",
@@ -53,9 +53,9 @@
     "nock": "14.0.11",
     "npm-run-all2": "8.0.4",
     "supertest": "7.2.2",
-    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.25.14",
-    "@sap-ux/axios-extension": "1.25.28",
     "@sap-ux/store": "1.5.12",
+    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.25.17",
+    "@sap-ux/axios-extension": "1.25.28",
     "@sap-ux/ui5-info": "0.13.17"
   },
   "peerDependencies": {