@sap-ux/preview-middleware 0.17.44 → 0.17.46

package/dist/base/flp.d.ts

@@ -1,6 +1,6 @@
 import type { ReaderCollection } from '@ui5/fs';
 import type { Editor as MemFsEditor } from 'mem-fs-editor';
-import type { Router } from 'express';
+import type { Request, Router } from 'express';
 import type { Logger, ToolsLogger } from '@sap-ux/logger';
 import type { MiddlewareUtils } from '@ui5/server';
 import { type Manifest } from '@sap-ux/project-access';
@@ -13,6 +13,14 @@ import { type TemplateConfig } from './config';
 export type EnhancedRouter = Router & {
     getAppPages?: () => string[];
 };
+/**
+ * Enhanced request object that contains additional properties from cds-plugin-ui5.
+ */
+export type EnhancedRequest = Request & {
+    'ui5-patched-router'?: {
+        baseUrl?: string;
+    };
+};
 type OnChangeRequestHandler = (type: OperationType, change: CommonChangeProperties, fs: MemFsEditor, logger: Logger) => Promise<void>;
 /**
  * Class handling preview of a sandbox FLP.

package/dist/base/flp.js

@@ -219,12 +219,13 @@ class FlpSandbox {
     async editorGetHandler(req, res, rta, previewUrl, editor) {
         if (!req.query['fiori-tools-rta-mode']) {
             // Redirect to the same URL but add the necessary parameter
+            const url = 'ui5-patched-router' in req ? (0, path_1.join)(req['ui5-patched-router']?.baseUrl ?? '', previewUrl) : previewUrl;
             const params = structuredClone(req.query);
             params['sap-ui-xx-viewCache'] = 'false';
             params['fiori-tools-rta-mode'] = 'true';
             params['sap-ui-rta-skip-flex-validation'] = 'true';
             params['sap-ui-xx-condense-changes'] = 'true';
-            res.redirect(302, `${previewUrl}?${new URLSearchParams(params)}`);
+            res.redirect(302, `${url}?${new URLSearchParams(params)}`);
             return;
         }
         const html = (await this.generateSandboxForEditor(req, rta, editor)).replace('</body>', `</body>\n<!-- livereload disabled for editor </body>-->`);
@@ -267,10 +268,13 @@ class FlpSandbox {
     async flpGetHandler(req, res, next) {
         // connect API (karma test runner) has no request query property
         if ('query' in req && 'redirect' in res && !req.query['sap-ui-xx-viewCache']) {
+            const url = 'ui5-patched-router' in req
+                ? (0, path_1.join)(req['ui5-patched-router']?.baseUrl ?? '', this.flpConfig.path)
+                : this.flpConfig.path;
             // Redirect to the same URL but add the necessary parameter
             const params = structuredClone(req.query);
             params['sap-ui-xx-viewCache'] = 'false';
-            res.redirect(302, `${this.flpConfig.path}?${new URLSearchParams(params)}`);
+            res.redirect(302, `${url}?${new URLSearchParams(params)}`);
             return;
         }
         await this.setApplicationDependencies();

package/dist/base/index.d.ts

@@ -1,3 +1,3 @@
 export { FlpSandbox, initAdp } from './flp';
-export { generatePreviewFiles, getPreviewPaths } from './config';
+export { generatePreviewFiles, getPreviewPaths, sanitizeRtaConfig } from './config';
 //# sourceMappingURL=index.d.ts.map

package/dist/base/index.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPreviewPaths = exports.generatePreviewFiles = exports.initAdp = exports.FlpSandbox = void 0;
+exports.sanitizeRtaConfig = exports.getPreviewPaths = exports.generatePreviewFiles = exports.initAdp = exports.FlpSandbox = void 0;
 var flp_1 = require("./flp");
 Object.defineProperty(exports, "FlpSandbox", { enumerable: true, get: function () { return flp_1.FlpSandbox; } });
 Object.defineProperty(exports, "initAdp", { enumerable: true, get: function () { return flp_1.initAdp; } });
 var config_1 = require("./config");
 Object.defineProperty(exports, "generatePreviewFiles", { enumerable: true, get: function () { return config_1.generatePreviewFiles; } });
 Object.defineProperty(exports, "getPreviewPaths", { enumerable: true, get: function () { return config_1.getPreviewPaths; } });
+Object.defineProperty(exports, "sanitizeRtaConfig", { enumerable: true, get: function () { return config_1.sanitizeRtaConfig; } });
 //# sourceMappingURL=index.js.map

package/dist/client/adp/quick-actions/fe-v2/create-table-action.js

@@ -77,12 +77,19 @@ sap.ui.define(["sap/ui/dt/OverlayRegistry", "../../../utils/core", "../../dialog
     getHeaderToolbar(table) {
       let headerToolbar;
       if (isA(SMART_TABLE_TYPE, table)) {
-        headerToolbar = table.getAggregation('items').find(item => {
+        for (const item of table.getAggregation('items')) {
           if (item.getAggregation('headerToolbar')) {
-            return true;
+            headerToolbar = item.getAggregation('headerToolbar');
+            break;
           }
-          return isA('sap.m.OverflowToolbar', item);
-        });
+          if (isA('sap.m.OverflowToolbar', item)) {
+            headerToolbar = item;
+            break;
+          }
+        }
+        if (!headerToolbar) {
+          headerToolbar = table.getToolbar();
+        }
       } else if (isA(M_TABLE_TYPE, table)) {
         headerToolbar = table.getAggregation('headerToolbar');
       }

package/dist/client/adp/quick-actions/fe-v2/create-table-action.ts

@@ -83,12 +83,19 @@ export class AddTableActionQuickAction extends TableQuickActionDefinitionBase im
     getHeaderToolbar(table: UI5Element): ManagedObject | ManagedObject[] | OverflowToolbar | null | undefined {
         let headerToolbar;
         if (isA<SmartTable>(SMART_TABLE_TYPE, table)) {
-            headerToolbar = (table.getAggregation('items') as ManagedObject[]).find((item) => {
+            for (const item of table.getAggregation('items') as ManagedObject[]) {
                 if (item.getAggregation('headerToolbar')) {
-                    return true;
+                    headerToolbar = item.getAggregation('headerToolbar');
+                    break;
                 }
-                return isA<OverflowToolbar>('sap.m.OverflowToolbar', item);
-            });
+                if (isA<OverflowToolbar>('sap.m.OverflowToolbar', item)) {
+                    headerToolbar = item;
+                    break;
+                }
+            }
+            if (!headerToolbar) {
+                headerToolbar = table.getToolbar();
+            }
         } else if (isA<Table>(M_TABLE_TYPE, table)) {
             headerToolbar = table.getAggregation('headerToolbar');
         }

package/dist/index.d.ts

@@ -1,4 +1,4 @@
 export * from './ui5/middleware';
-export { FlpSandbox, initAdp, generatePreviewFiles, getPreviewPaths } from './base';
+export { FlpSandbox, initAdp, generatePreviewFiles, getPreviewPaths, sanitizeRtaConfig } from './base';
 export { FlpConfig, RtaConfig, TestConfig, MiddlewareConfig, DefaultFlpPath, DefaultIntent, TestConfigDefaults } from './types';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -14,11 +14,12 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPreviewPaths = exports.generatePreviewFiles = exports.initAdp = exports.FlpSandbox = void 0;
+exports.sanitizeRtaConfig = exports.getPreviewPaths = exports.generatePreviewFiles = exports.initAdp = exports.FlpSandbox = void 0;
 __exportStar(require("./ui5/middleware"), exports);
 var base_1 = require("./base");
 Object.defineProperty(exports, "FlpSandbox", { enumerable: true, get: function () { return base_1.FlpSandbox; } });
 Object.defineProperty(exports, "initAdp", { enumerable: true, get: function () { return base_1.initAdp; } });
 Object.defineProperty(exports, "generatePreviewFiles", { enumerable: true, get: function () { return base_1.generatePreviewFiles; } });
 Object.defineProperty(exports, "getPreviewPaths", { enumerable: true, get: function () { return base_1.getPreviewPaths; } });
+Object.defineProperty(exports, "sanitizeRtaConfig", { enumerable: true, get: function () { return base_1.sanitizeRtaConfig; } });
 //# sourceMappingURL=index.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.17.44",
+  "version": "0.17.46",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -48,11 +48,11 @@
     "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.67",
+    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.11.68",
     "@sap-ux/axios-extension": "1.18.6",
     "@sap-ux/store": "1.0.0",
-    "@sap-ux/i18n": "0.2.1",
-    "@sap-ux/ui5-info": "0.8.3"
+    "@sap-ux/ui5-info": "0.8.3",
+    "@sap-ux/i18n": "0.2.1"
   },
   "peerDependencies": {
     "express": "4"