@sap-ux/preview-middleware 0.17.43 → 0.17.45

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/controllers/AddFragment.controller.js

@@ -126,6 +126,10 @@ sap.ui.define([
             this.model.setProperty('/selectedIndex', indexArray.length - 1);
             this.model.setProperty('/targetAggregation', controlAggregation);
             this.model.setProperty('/index', indexArray);
+            const defaultIndex = Number(this.options.defaultAggregationArrayIndex);
+            if (defaultIndex >= 0) {
+                this.model.setProperty('/selectedIndex', indexArray.length - 1 > 0 ? defaultIndex : 0);
+            }
         },
         createFragmentChange: async function _createFragmentChange(fragmentData) {
             const {fragmentName, index, targetAggregation} = fragmentData;

package/dist/client/adp/controllers/AddFragment.controller.ts

@@ -52,6 +52,7 @@ export type AddFragmentModel = JSONModel & {
 export interface AddFragmentOptions {
     title: string;
     aggregation?: string;
+    defaultAggregationArrayIndex?: number;
 }
 
 /**
@@ -203,6 +204,10 @@ export default class AddFragment extends BaseDialog<AddFragmentModel> {
         this.model.setProperty('/selectedIndex', indexArray.length - 1);
         this.model.setProperty('/targetAggregation', controlAggregation);
         this.model.setProperty('/index', indexArray);
+        const defaultIndex = Number(this.options.defaultAggregationArrayIndex);
+        if (defaultIndex >= 0) {
+            this.model.setProperty('/selectedIndex', indexArray.length - 1 > 0 ? defaultIndex : 0);
+        }
     }
 
     /**

package/dist/client/adp/dialog-factory.js

@@ -54,6 +54,9 @@ sap.ui.define(["sap/ui/core/Fragment", "../i18n", "./controllers/AddFragment.con
             ...('aggregation' in options && {
               aggregation: options.aggregation
             }),
+            ...('defaultAggregationArrayIndex' in options && {
+              defaultAggregationArrayIndex: options.defaultAggregationArrayIndex
+            }),
             title: resources.getText(options.title ?? 'ADP_ADD_FRAGMENT_DIALOG_TITLE')
           });
           break;

package/dist/client/adp/dialog-factory.ts

@@ -62,6 +62,9 @@ export class DialogFactory {
             case DialogNames.ADD_FRAGMENT:
                 controller = new AddFragment(`open.ux.preview.client.adp.controllers.${dialogName}`, overlay, rta, {
                     ...('aggregation' in options && { aggregation: options.aggregation }),
+                    ...('defaultAggregationArrayIndex' in options && {
+                        defaultAggregationArrayIndex: options.defaultAggregationArrayIndex
+                    }),
                     title: resources.getText(options.title ?? 'ADP_ADD_FRAGMENT_DIALOG_TITLE')
                 });
                 break;

package/dist/client/adp/quick-actions/common/create-page-action.js

@@ -19,11 +19,11 @@ sap.ui.define(["sap/ui/dt/OverlayRegistry", "../../dialog-factory", "../simple-q
   class AddPageActionQuickAction extends SimpleQuickActionDefinitionBase {
     constructor(context) {
       super(ADD_PAGE_ACTION, CONTROL_TYPES, 'QUICK_ACTION_ADD_CUSTOM_PAGE_ACTION', context, [DIALOG_ENABLEMENT_VALIDATOR]);
+      this.appType = getApplicationType(this.context.rta.getRootControlInstance().getManifest());
     }
     async initialize() {
-      const appType = getApplicationType(this.context.rta.getRootControlInstance().getManifest());
       const version = await getUi5Version();
-      if (appType === 'fe-v4' && isLowerThanMinimalUi5Version(version, {
+      if (this.appType === 'fe-v4' && isLowerThanMinimalUi5Version(version, {
         major: 1,
         minor: 130
       })) {
@@ -36,7 +36,8 @@ sap.ui.define(["sap/ui/dt/OverlayRegistry", "../../dialog-factory", "../simple-q
         const overlay = OverlayRegistry.getOverlay(this.control) || [];
         await DialogFactory.createDialog(overlay, this.context.rta, DialogNames.ADD_FRAGMENT, undefined, {
           aggregation: 'actions',
-          title: 'QUICK_ACTION_ADD_CUSTOM_PAGE_ACTION'
+          title: 'QUICK_ACTION_ADD_CUSTOM_PAGE_ACTION',
+          defaultAggregationArrayIndex: 1
         });
       }
       return [];

package/dist/client/adp/quick-actions/common/create-page-action.ts

@@ -4,7 +4,7 @@ import FlexCommand from 'sap/ui/rta/command/FlexCommand';
 import { DialogFactory, DialogNames } from '../../dialog-factory';
 import { QuickActionContext, SimpleQuickActionDefinition } from '../../../cpe/quick-actions/quick-action-definition';
 import { SimpleQuickActionDefinitionBase } from '../simple-quick-action-base';
-import { getApplicationType } from '../../../utils/application';
+import { ApplicationType, getApplicationType } from '../../../utils/application';
 import { getUi5Version, isLowerThanMinimalUi5Version } from '../../../utils/version';
 import { DIALOG_ENABLEMENT_VALIDATOR } from '../dialog-enablement-validator';
 
@@ -15,16 +15,17 @@ const CONTROL_TYPES = ['sap.f.DynamicPageTitle', 'sap.uxap.ObjectPageHeader', 's
  * Quick Action for adding a custom page action.
  */
 export class AddPageActionQuickAction extends SimpleQuickActionDefinitionBase implements SimpleQuickActionDefinition {
+    private readonly appType: ApplicationType;
     constructor(context: QuickActionContext) {
         super(ADD_PAGE_ACTION, CONTROL_TYPES, 'QUICK_ACTION_ADD_CUSTOM_PAGE_ACTION', context, [
             DIALOG_ENABLEMENT_VALIDATOR
         ]);
+        this.appType = getApplicationType(this.context.rta.getRootControlInstance().getManifest());
     }
 
     async initialize(): Promise<void> {
-        const appType = getApplicationType(this.context.rta.getRootControlInstance().getManifest());
         const version = await getUi5Version();
-        if (appType === 'fe-v4' && isLowerThanMinimalUi5Version(version, { major: 1, minor: 130 })) {
+        if (this.appType === 'fe-v4' && isLowerThanMinimalUi5Version(version, { major: 1, minor: 130 })) {
             return;
         }
         await super.initialize();
@@ -35,7 +36,8 @@ export class AddPageActionQuickAction extends SimpleQuickActionDefinitionBase im
             const overlay = OverlayRegistry.getOverlay(this.control) || [];
             await DialogFactory.createDialog(overlay, this.context.rta, DialogNames.ADD_FRAGMENT, undefined, {
                 aggregation: 'actions',
-                title: 'QUICK_ACTION_ADD_CUSTOM_PAGE_ACTION'
+                title: 'QUICK_ACTION_ADD_CUSTOM_PAGE_ACTION',
+                defaultAggregationArrayIndex: 1
             });
         }
         return [];

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

@@ -68,7 +68,8 @@ sap.ui.define(["sap/ui/dt/OverlayRegistry", "../../../utils/core", "../../dialog
         const overlay = OverlayRegistry.getOverlay(headerToolbar) || [];
         await DialogFactory.createDialog(overlay, this.context.rta, DialogNames.ADD_FRAGMENT, undefined, {
           aggregation: 'content',
-          title: 'QUICK_ACTION_ADD_CUSTOM_TABLE_ACTION'
+          title: 'QUICK_ACTION_ADD_CUSTOM_TABLE_ACTION',
+          defaultAggregationArrayIndex: 1
         });
       }
       return [];

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

@@ -73,7 +73,8 @@ export class AddTableActionQuickAction extends TableQuickActionDefinitionBase im
             const overlay = OverlayRegistry.getOverlay(headerToolbar as UI5Element) || [];
             await DialogFactory.createDialog(overlay, this.context.rta, DialogNames.ADD_FRAGMENT, undefined, {
                 aggregation: 'content',
-                title: 'QUICK_ACTION_ADD_CUSTOM_TABLE_ACTION'
+                title: 'QUICK_ACTION_ADD_CUSTOM_TABLE_ACTION',
+                defaultAggregationArrayIndex: 1
             });
         }
         return [];

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

@@ -35,6 +35,7 @@ sap.ui.define(["sap/ui/dt/OverlayUtil", "../../../utils/core", "../../dialog-fac
         controlOverlay.setSelected(true);
         await DialogFactory.createDialog(controlOverlay, this.context.rta, DialogNames.ADD_FRAGMENT, undefined, {
           aggregation: 'actions',
+          defaultAggregationArrayIndex: 0,
           title: 'QUICK_ACTION_ADD_CUSTOM_TABLE_ACTION'
         });
       }

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

@@ -35,6 +35,7 @@ export class AddTableActionQuickAction extends TableQuickActionDefinitionBase im
 
             await DialogFactory.createDialog(controlOverlay, this.context.rta, DialogNames.ADD_FRAGMENT, undefined, {
                 aggregation: 'actions',
+                defaultAggregationArrayIndex: 0,
                 title: 'QUICK_ACTION_ADD_CUSTOM_TABLE_ACTION'
             });
         }

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.43",
+  "version": "0.17.45",
   "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.66",
+    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.11.67",
     "@sap-ux/axios-extension": "1.18.6",
+    "@sap-ux/store": "1.0.0",
     "@sap-ux/ui5-info": "0.8.3",
-    "@sap-ux/i18n": "0.2.1",
-    "@sap-ux/store": "1.0.0"
+    "@sap-ux/i18n": "0.2.1"
   },
   "peerDependencies": {
     "express": "4"