@sap-ux/preview-middleware 0.20.16 → 0.20.19

package/dist/base/flp.d.ts

@@ -39,6 +39,7 @@ export declare class FlpSandbox {
     private readonly utils;
     private readonly project;
     private readonly cardGenerator?;
+    private projectType;
     /**
      * Constructor setting defaults and keeping reference to workspace resources.
      *
@@ -72,12 +73,15 @@ export declare class FlpSandbox {
      */
     private getDeveloperModeConfig;
     /**
-     * Overrides the custom connector to a non-existing dummy value.
-     * This is needed for UI5 versions 1.71 and below.
+     * Deletes the Fiori Tools local connector (WorkspaceConnector) in case of a not supported UI5 versions.
+     * As an alternative the Fiori Tools fake connector (FakeLrepConnector) will be used as defined in preview-middleware-client/src/flp/initConnectors.ts.
+     * Also deletes the ABAP connector in case of a CAP project.
      *
+     * @param ui5VersionMajor - the major version of UI5
+     * @param ui5VersionMinor - the minor version of UI5
      * @private
      */
-    private overrideCustomConnector;
+    private checkDeleteConnectors;
     /**
      * Generates the FLP sandbox for an editor.
      *

package/dist/base/flp.js

@@ -69,6 +69,7 @@ class FlpSandbox {
     utils;
     project;
     cardGenerator;
+    projectType;
     /**
      * Constructor setting defaults and keeping reference to workspace resources.
      *
@@ -105,6 +106,7 @@ class FlpSandbox {
      * @param adp optional reference to the ADP tooling
      */
     async init(manifest, componentId, resources = {}, adp) {
+        this.projectType = await (0, project_access_1.getProjectType)(await (0, project_access_1.findProjectRoot)(process.cwd(), true, true));
         this.createFlexHandler();
         this.flpConfig.libs ??= await this.hasLocateReuseLibsScript();
         const id = manifest['sap.app']?.id ?? '';
@@ -118,11 +120,10 @@ class FlpSandbox {
             intent: this.flpConfig.intent
         }, this.logger);
         this.addStandardRoutes();
-        const cardGeneratorPath = this.cardGenerator?.path;
-        if (cardGeneratorPath) {
-            if (!cardGeneratorPath.startsWith('/')) {
-                this.cardGenerator.path = `/${cardGeneratorPath}`;
-            }
+        if (this.cardGenerator?.path) {
+            this.cardGenerator.path = this.cardGenerator.path.startsWith('/')
+                ? this.cardGenerator.path
+                : `/${this.cardGenerator.path}`;
             await this.addCardGeneratorMiddlewareRoute();
             await this.addStoreCardManifestRoute();
             await this.addStoreI18nKeysRoute();
@@ -176,14 +177,29 @@ class FlpSandbox {
         }
     }
     /**
-     * Overrides the custom connector to a non-existing dummy value.
-     * This is needed for UI5 versions 1.71 and below.
+     * Deletes the Fiori Tools local connector (WorkspaceConnector) in case of a not supported UI5 versions.
+     * As an alternative the Fiori Tools fake connector (FakeLrepConnector) will be used as defined in preview-middleware-client/src/flp/initConnectors.ts.
+     * Also deletes the ABAP connector in case of a CAP project.
      *
+     * @param ui5VersionMajor - the major version of UI5
+     * @param ui5VersionMinor - the minor version of UI5
      * @private
      */
-    overrideCustomConnector() {
-        (this.templateConfig.ui5.flex?.[1]).applyConnector = 'FioriToolsNonexistentConnector';
-        (this.templateConfig.ui5.flex?.[1]).writeConnector = 'FioriToolsNonexistentConnector';
+    checkDeleteConnectors(ui5VersionMajor, ui5VersionMinor) {
+        if (ui5VersionMajor === 1 && ui5VersionMinor < 78) {
+            this.templateConfig.ui5.flex?.splice(1, 1);
+            this.logger.debug(`The Fiori Tools local connector (WorkspaceConnector) is not being used because the current UI5 version does not support it. The Fiori Tools fake connector (FakeLrepConnector) will be used instead.`);
+        }
+        else {
+            this.logger.debug(`The Fiori Tools local connector (WorkspaceConnector) is being used.`);
+        }
+        if (this.projectType === 'CAPJava' || this.projectType === 'CAPNodejs') {
+            this.templateConfig.ui5.flex?.splice(0, 1);
+            this.logger.debug(`The ABAP connector is not being used because the current project type is '${this.projectType}'.`);
+        }
+        else {
+            this.logger.debug(`The ABAP connector is being used.`);
+        }
     }
     /**
      * Generates the FLP sandbox for an editor.
@@ -214,9 +230,7 @@ class FlpSandbox {
         };
         config.features = feature_toggle_1.FeatureToggleAccess.getAllFeatureToggles();
         const ui5Version = await this.getUi5Version(req.protocol, req.headers.host, req['ui5-patched-router']?.baseUrl);
-        if (ui5Version.major === 1 && ui5Version.minor <= 71) {
-            this.overrideCustomConnector();
-        }
+        this.checkDeleteConnectors(ui5Version.major, ui5Version.minor);
         if (editor.developerMode === true) {
             config.ui5.bootstrapOptions = serializeUi5Configuration(this.getDeveloperModeConfig(ui5Version.major));
         }
@@ -353,6 +367,7 @@ class FlpSandbox {
             '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);
+            this.checkDeleteConnectors(ui5Version.major, ui5Version.minor);
             const html = (0, ejs_1.render)(this.getSandboxTemplate(ui5Version), this.templateConfig);
             this.sendResponse(res, 'text/html', 200, html);
         }
@@ -415,7 +430,8 @@ class FlpSandbox {
         }
         const [major, minor, patch] = version.split('.').map((versionPart) => parseInt(versionPart, 10));
         const label = version.split(/-(.*)/s)?.[1];
-        if ((major < 2 && minor < 123) || major >= 2 || label?.includes('legacy-free')) {
+        if (this.flpConfig.enhancedHomePage &&
+            ((major < 2 && minor < 123) || major >= 2 || label?.includes('legacy-free'))) {
             this.flpConfig.enhancedHomePage = this.templateConfig.enhancedHomePage = false;
             this.logger.warn(`Feature enhancedHomePage disabled: UI5 version ${version} not supported.`);
         }

package/dist/client/flp/initConnectors.js

@@ -8,8 +8,8 @@ sap.ui.define(["../utils/version"], function (___utils_version) {
   /**
    * Initializes UI5 connectors based on the current UI5 version.
    *
-   * For UI5 versions below 1.72, this function dynamically requires and executes a FakeLrepConnector.
-   * For UI5 versions 1.72 and above, it defines a local connector that reuses the WorkspaceConnector.
+   * For UI5 versions below 1.78, this function dynamically requires and executes a FakeLrepConnector.
+   * For UI5 versions 1.78 and above, a local connector that reuses the WorkspaceConnector is being defined in preview-middleware/src/base/config.ts.
    * This setup allows for flexibility in using different connectors based on the UI5 version.
    *
    * @example
@@ -18,7 +18,7 @@ sap.ui.define(["../utils/version"], function (___utils_version) {
   async function initConnectors() {
     if (isLowerThanMinimalUi5Version(await getUi5Version(), {
       major: 1,
-      minor: 72
+      minor: 78
     })) {
       sap.ui.require(['open/ux/preview/client/flp/enableFakeConnector'], function (enableFakeConnector) {
         enableFakeConnector();

package/dist/client/flp/initConnectors.ts

@@ -3,15 +3,15 @@ import { getUi5Version, isLowerThanMinimalUi5Version } from '../utils/version';
 /**
  * Initializes UI5 connectors based on the current UI5 version.
  *
- * For UI5 versions below 1.72, this function dynamically requires and executes a FakeLrepConnector.
- * For UI5 versions 1.72 and above, it defines a local connector that reuses the WorkspaceConnector.
+ * For UI5 versions below 1.78, this function dynamically requires and executes a FakeLrepConnector.
+ * For UI5 versions 1.78 and above, a local connector that reuses the WorkspaceConnector is being defined in preview-middleware/src/base/config.ts.
  * This setup allows for flexibility in using different connectors based on the UI5 version.
  *
  * @example
  * intiConnectors(); // Simply call the function without any arguments.
  */
 export default async function initConnectors(): Promise<void> {
-    if (isLowerThanMinimalUi5Version(await getUi5Version(), { major: 1, minor: 72 })) {
+    if (isLowerThanMinimalUi5Version(await getUi5Version(), { major: 1, minor: 78 })) {
         sap.ui.require(['open/ux/preview/client/flp/enableFakeConnector'], function (enableFakeConnector: () => void) {
             enableFakeConnector();
         });

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.20.16",
+  "version": "0.20.19",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -25,13 +25,13 @@
     "ejs": "3.1.10",
     "mem-fs": "2.1.0",
     "mem-fs-editor": "9.4.0",
-    "@sap-ux/adp-tooling": "0.14.10",
+    "@sap-ux/adp-tooling": "0.14.12",
     "@sap-ux/btp-utils": "1.1.0",
     "@sap-ux/control-property-editor-sources": "npm:@sap-ux/control-property-editor@0.6.6",
     "@sap-ux/feature-toggle": "0.3.0",
     "@sap-ux/logger": "0.7.0",
     "@sap-ux/project-access": "1.30.2",
-    "@sap-ux/system-access": "0.6.1"
+    "@sap-ux/system-access": "0.6.2"
   },
   "devDependencies": {
     "@sap-ux-private/playwright": "0.2.0",
@@ -49,8 +49,8 @@
     "nock": "13.4.0",
     "npm-run-all2": "6.2.0",
     "supertest": "6.3.3",
-    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.14.4",
-    "@sap-ux/axios-extension": "1.21.1",
+    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.14.5",
+    "@sap-ux/axios-extension": "1.21.2",
     "@sap-ux/i18n": "0.3.0",
     "@sap-ux/store": "1.1.0",
     "@sap-ux/ui5-info": "0.11.0"