npm - @sap-ux/preview-middleware - Versions diffs - 0.17.14 → 0.17.16 - Mend

@sap-ux/preview-middleware 0.17.14 → 0.17.16

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/dist/base/flp.js CHANGED Viewed

@@ -238,8 +238,8 @@ class FlpSandbox {
         this.router.use(config_1.PREVIEW_URL.client.path, (0, express_1.static)(config_1.PREVIEW_URL.client.local));
         // add route for the sandbox html
         this.router.get(this.config.path, (async (req, res, next) => {
-            // karma (connect API) has no request query property
-            if (req.query && !req.query['sap-ui-xx-viewCache']) {
+            // connect API (karma test runner) has no request query property
+            if ('query' in req && 'redirect' in res && !req.query['sap-ui-xx-viewCache']) {
                 // Redirect to the same URL but add the necessary parameter
                 const params = structuredClone(req.query);
                 params['sap-ui-xx-viewCache'] = 'false';
@@ -255,7 +255,11 @@ class FlpSandbox {
                 next();
             }
             else {
-                const ui5Version = await this.getUi5Version(req.protocol, req.headers.host, req['ui5-patched-router']?.baseUrl);
+                const ui5Version = await this.getUi5Version(
+                //use protocol from request header referer as fallback for connect API (karma test runner)
+                'protocol' in req
+                    ? req.protocol
+                    : req.headers.referer?.substring(0, req.headers.referer.indexOf(':')) ?? 'http', req.headers.host, 'ui5-patched-router' in req ? req['ui5-patched-router']?.baseUrl : undefined);
                 const html = (0, ejs_1.render)(this.getSandboxTemplate(ui5Version.major), this.templateConfig);
                 this.sendResponse(res, 'text/html', 200, html);
             }
@@ -424,7 +428,7 @@ class FlpSandbox {
         const initTemplate = (0, fs_1.readFileSync)((0, path_1.join)(__dirname, '../../templates/test/testsuite.qunit.js'), 'utf-8');
         const config = (0, test_1.mergeTestConfigDefaults)(testsuiteConfig);
         this.logger.debug(`Add route for ${config.path}`);
-        this.router.get(config.path, (async (_req, res) => {
+        this.router.get(config.path, (async (_req, res, _next) => {
             this.logger.debug(`Serving test route: ${config.path}`);
             const templateConfig = {
                 basePath: this.templateConfig.basePath,

package/dist/client/adp/quick-actions/common/add-new-annotation-file.js CHANGED Viewed

@@ -37,8 +37,8 @@ sap.ui.define([
             const version = await getUi5Version();
             if (isLowerThanMinimalUi5Version(version, {
                     major: 1,
-                    minor: 132,
-                    patch: 0
+                    minor: 108,
+                    patch: 27
                 })) {
                 this.isApplicable = false;
                 return;
@@ -90,7 +90,7 @@ sap.ui.define([
                     const annotationFileNameWithoutExtension = `annotation_${ timestamp }`;
                     const annotationFileName = `${ annotationFileNameWithoutExtension }.xml`;
                     const annotationNameSpace = this.context.flexSettings.layer === 'CUSTOMER_BASE' ? `customer.annotation.${ annotationFileNameWithoutExtension }` : `annotation.${ annotationFileNameWithoutExtension }`;
-                    const content = {
+                    const parameters = {
                         dataSourceId: dataSourceId,
                         annotations: [annotationNameSpace],
                         annotationsInsertPosition: 'END',
@@ -105,11 +105,10 @@ sap.ui.define([
                         changeType: 'appdescr_app_addAnnotationsToOData',
                         generator: this.context.flexSettings.generator,
                         reference: this.context.flexSettings.projectId,
-                        fileName: `id_${ timestamp }_addAnnotationsToOData`,
-                        content: content,
+                        parameters,
                         serviceUrl: dataSource.serviceUrl
                     };
-                    const command = await CommandFactory.getCommandFor(this.context.view, 'annotation', modifiedValue, null, this.context.flexSettings);
+                    const command = await CommandFactory.getCommandFor(this.context.view, 'appDescriptor', modifiedValue, null, this.context.flexSettings);
                     return [command];
                 }
             }

package/dist/client/adp/quick-actions/common/add-new-annotation-file.ts CHANGED Viewed

@@ -40,7 +40,7 @@ export class AddNewAnnotationFile
     async initialize(): Promise<void> {
         const version = await getUi5Version();
-        if (isLowerThanMinimalUi5Version(version, { major: 1, minor: 132, patch: 0 })) {
+        if (isLowerThanMinimalUi5Version(version, { major: 1, minor: 108, patch: 27 })) {
             this.isApplicable = false;
             return;
         }
@@ -104,7 +104,7 @@ export class AddNewAnnotationFile
                     this.context.flexSettings.layer === 'CUSTOMER_BASE'
                         ? `customer.annotation.${annotationFileNameWithoutExtension}`
                         : `annotation.${annotationFileNameWithoutExtension}`;
-                const content = {
+                const parameters = {
                     dataSourceId: dataSourceId,
                     annotations: [annotationNameSpace],
                     annotationsInsertPosition: 'END',
@@ -119,13 +119,12 @@ export class AddNewAnnotationFile
                     changeType: 'appdescr_app_addAnnotationsToOData',
                     generator: this.context.flexSettings.generator,
                     reference: this.context.flexSettings.projectId,
-                    fileName: `id_${timestamp}_addAnnotationsToOData`,
-                    content: content,
+                    parameters,
                     serviceUrl: dataSource.serviceUrl
                 };
                 const command = await CommandFactory.getCommandFor<FlexCommand>(
                     this.context.view,
-                    'annotation',
+                    'appDescriptor',
                     modifiedValue,
                     null,
                     this.context.flexSettings

package/package.json CHANGED Viewed

@@ -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.14",
+  "version": "0.17.16",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -29,10 +29,12 @@
     "@sap-ux/feature-toggle": "0.2.3",
     "@sap-ux/btp-utils": "1.0.0",
     "@sap-ux/adp-tooling": "0.12.121",
-    "@sap-ux/control-property-editor-sources": "npm:@sap-ux/control-property-editor@0.5.33",
+    "@sap-ux/control-property-editor-sources": "npm:@sap-ux/control-property-editor@0.5.34",
     "@sap-ux/project-access": "1.29.4"
   },
   "devDependencies": {
+    "connect": "^3.7.0",
+    "@types/connect": "^3.4.38",
     "@types/ejs": "3.1.2",
     "@types/express": "4.17.21",
     "@types/prompts": "2.4.4",
@@ -46,7 +48,7 @@
     "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.56",
+    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.11.57",
     "@sap-ux/axios-extension": "1.18.4",
     "@sap-ux/store": "1.0.0",
     "@sap-ux/ui5-info": "0.8.3",