@sap-ux/preview-middleware 0.16.49 → 0.16.51

package/dist/client/adp/init-dialogs.js

@@ -21,16 +21,16 @@ sap.ui.define(["sap/ui/core/Fragment", "sap/ui/fl/Utils", "./controllers/AddFrag
    *
    * @param overlays Control overlays
    * @param syncViewsIds Runtime Authoring
-   * @param minorUI5Version minor UI5 version
+   * @param ui5VersionInfo UI5 version information
    *
    * @returns boolean whether menu item is enabled or not
    */
-  const isControllerExtensionEnabled = (overlays, syncViewsIds, minorUI5Version) => {
+  const isControllerExtensionEnabled = (overlays, syncViewsIds, ui5VersionInfo) => {
     if (overlays.length === 0 || overlays.length > 1) {
       return false;
     }
     const clickedControlId = FlUtils.getViewForControl(overlays[0].getElement()).getId();
-    const isClickedControlReuseComponent = isReuseComponent(clickedControlId, minorUI5Version);
+    const isClickedControlReuseComponent = isReuseComponent(clickedControlId, ui5VersionInfo);
     return !syncViewsIds.includes(clickedControlId) && !isClickedControlReuseComponent;
   };
 
@@ -38,15 +38,15 @@ sap.ui.define(["sap/ui/core/Fragment", "sap/ui/fl/Utils", "./controllers/AddFrag
    * Determines whether the fragment command should be enabled based on the provided overlays.
    *
    * @param {ElementOverlay[]} overlays - An array of ElementOverlay objects representing the UI overlays.
-   * @param minorUI5Version minor UI5 version
+   * @param ui5VersionInfo UI5 version information
    * @returns {boolean} True if the fragment command is enabled, false otherwise.
    */
-  const isFragmentCommandEnabled = (overlays, minorUI5Version) => {
+  const isFragmentCommandEnabled = (overlays, ui5VersionInfo) => {
     if (overlays.length === 0 || overlays.length > 1) {
       return false;
     }
     const control = overlays[0].getElement();
-    return hasStableId(control) && !isReuseComponent(control.getId(), minorUI5Version);
+    return hasStableId(control) && !isReuseComponent(control.getId(), ui5VersionInfo);
   };
 
   /**
@@ -107,23 +107,23 @@ sap.ui.define(["sap/ui/core/Fragment", "sap/ui/fl/Utils", "./controllers/AddFrag
    *
    * @param rta Runtime Authoring
    * @param syncViewsIds Ids of all application sync views
-   * @param minorUI5Version minor UI5 version
+   * @param ui5VersionInfo UI5 version information
    */
-  const initDialogs = (rta, syncViewsIds, minorUI5Version) => {
+  const initDialogs = (rta, syncViewsIds, ui5VersionInfo) => {
     const contextMenu = rta.getDefaultPlugins().contextMenu;
     contextMenu.addMenuItem({
       id: 'ADD_FRAGMENT',
       text: getAddFragmentItemText,
       handler: async overlays => await handler(overlays[0], rta, DialogNames.ADD_FRAGMENT),
       icon: 'sap-icon://attachment-html',
-      enabled: overlays => isFragmentCommandEnabled(overlays, minorUI5Version)
+      enabled: overlays => isFragmentCommandEnabled(overlays, ui5VersionInfo)
     });
     contextMenu.addMenuItem({
       id: 'EXTEND_CONTROLLER',
       text: 'Extend With Controller',
       handler: async overlays => await handler(overlays[0], rta, DialogNames.CONTROLLER_EXTENSION),
       icon: 'sap-icon://create-form',
-      enabled: overlays => isControllerExtensionEnabled(overlays, syncViewsIds, minorUI5Version)
+      enabled: overlays => isControllerExtensionEnabled(overlays, syncViewsIds, ui5VersionInfo)
     });
   };
   var __exports = {

package/dist/client/adp/init-dialogs.ts

@@ -20,6 +20,7 @@ import { ExtensionPointData } from './extension-point';
 import ExtensionPoint from './controllers/ExtensionPoint.controller';
 import ManagedObject from 'sap/ui/base/ManagedObject';
 import { isReuseComponent } from '../cpe/outline/utils';
+import { Ui5VersionInfo } from '../utils/version';
 
 export const enum DialogNames {
     ADD_FRAGMENT = 'AddFragment',
@@ -34,21 +35,21 @@ type Controller = AddFragment | ControllerExtension | ExtensionPoint;
  *
  * @param overlays Control overlays
  * @param syncViewsIds Runtime Authoring
- * @param minorUI5Version minor UI5 version
+ * @param ui5VersionInfo UI5 version information
  *
  * @returns boolean whether menu item is enabled or not
  */
 export const isControllerExtensionEnabled = (
     overlays: ElementOverlay[],
     syncViewsIds: string[],
-    minorUI5Version: number
+    ui5VersionInfo: Ui5VersionInfo
 ): boolean => {
     if (overlays.length === 0 || overlays.length > 1) {
         return false;
     }
 
     const clickedControlId = FlUtils.getViewForControl(overlays[0].getElement()).getId();
-    const isClickedControlReuseComponent = isReuseComponent(clickedControlId, minorUI5Version);
+    const isClickedControlReuseComponent = isReuseComponent(clickedControlId, ui5VersionInfo);
 
     return !syncViewsIds.includes(clickedControlId) && !isClickedControlReuseComponent;
 };
@@ -57,17 +58,17 @@ export const isControllerExtensionEnabled = (
  * Determines whether the fragment command should be enabled based on the provided overlays.
  *
  * @param {ElementOverlay[]} overlays - An array of ElementOverlay objects representing the UI overlays.
- * @param minorUI5Version minor UI5 version
+ * @param ui5VersionInfo UI5 version information
  * @returns {boolean} True if the fragment command is enabled, false otherwise.
  */
-export const isFragmentCommandEnabled = (overlays: ElementOverlay[], minorUI5Version: number): boolean => {
+export const isFragmentCommandEnabled = (overlays: ElementOverlay[], ui5VersionInfo: Ui5VersionInfo): boolean => {
     if (overlays.length === 0 || overlays.length > 1) {
         return false;
     }
 
     const control = overlays[0].getElement();
 
-    return hasStableId(control) && !isReuseComponent(control.getId(), minorUI5Version);
+    return hasStableId(control) && !isReuseComponent(control.getId(), ui5VersionInfo);
 };
 
 /**
@@ -143,9 +144,9 @@ export async function handler(
  *
  * @param rta Runtime Authoring
  * @param syncViewsIds Ids of all application sync views
- * @param minorUI5Version minor UI5 version
+ * @param ui5VersionInfo UI5 version information
  */
-export const initDialogs = (rta: RuntimeAuthoring, syncViewsIds: string[], minorUI5Version: number): void => {
+export const initDialogs = (rta: RuntimeAuthoring, syncViewsIds: string[], ui5VersionInfo: Ui5VersionInfo): void => {
     const contextMenu = rta.getDefaultPlugins().contextMenu;
 
     contextMenu.addMenuItem({
@@ -153,7 +154,7 @@ export const initDialogs = (rta: RuntimeAuthoring, syncViewsIds: string[], minor
         text: getAddFragmentItemText,
         handler: async (overlays: UI5Element[]) => await handler(overlays[0], rta, DialogNames.ADD_FRAGMENT),
         icon: 'sap-icon://attachment-html',
-        enabled: (overlays: ElementOverlay[]) => isFragmentCommandEnabled(overlays, minorUI5Version)
+        enabled: (overlays: ElementOverlay[]) => isFragmentCommandEnabled(overlays, ui5VersionInfo)
     });
 
     contextMenu.addMenuItem({
@@ -161,6 +162,6 @@ export const initDialogs = (rta: RuntimeAuthoring, syncViewsIds: string[], minor
         text: 'Extend With Controller',
         handler: async (overlays: UI5Element[]) => await handler(overlays[0], rta, DialogNames.CONTROLLER_EXTENSION),
         icon: 'sap-icon://create-form',
-        enabled: (overlays: ElementOverlay[]) => isControllerExtensionEnabled(overlays, syncViewsIds, minorUI5Version)
+        enabled: (overlays: ElementOverlay[]) => isControllerExtensionEnabled(overlays, syncViewsIds, ui5VersionInfo)
     });
 };

package/dist/client/adp/init.js

@@ -4,10 +4,9 @@ sap.ui.define([
     '../cpe/init',
     './init-dialogs',
     'open/ux/preview/client/thirdparty/@sap-ux-private/control-property-editor-common',
-    './ui5-version-utils',
     '../cpe/error-utils',
     '../utils/version'
-], function (log, __init, ___init_dialogs, ___sap_ux_private_control_property_editor_common, ___ui5_version_utils, ___cpe_error_utils, ___utils_version) {
+], function (log, __init, ___init_dialogs, ___sap_ux_private_control_property_editor_common, ___cpe_error_utils, ___utils_version) {
     'use strict';
     function _interopRequireDefault(obj) {
         return obj && obj.__esModule && typeof obj.default !== 'undefined' ? obj.default : obj;
@@ -30,13 +29,11 @@ sap.ui.define([
     const showMessage = ___sap_ux_private_control_property_editor_common['showMessage'];
     const startPostMessageCommunication = ___sap_ux_private_control_property_editor_common['startPostMessageCommunication'];
     const enableTelemetry = ___sap_ux_private_control_property_editor_common['enableTelemetry'];
-    const getUI5VersionValidationMessage = ___ui5_version_utils['getUI5VersionValidationMessage'];
     const getError = ___cpe_error_utils['getError'];
     const getUi5Version = ___utils_version['getUi5Version'];
+    const getUI5VersionValidationMessage = ___utils_version['getUI5VersionValidationMessage'];
+    const isLowerThanMinimalUi5Version = ___utils_version['isLowerThanMinimalUi5Version'];
     var __exports = async function (rta) {
-        const version = await getUi5Version();
-        const versionParts = version.split('.');
-        const minor = parseInt(versionParts[1], 10);
         const flexSettings = rta.getFlexSettings();
         if (flexSettings.telemetry === true) {
             enableTelemetry();
@@ -54,18 +51,21 @@ sap.ui.define([
                 }
             }
         });
-        const syncViewsIds = await getAllSyncViewsIds(minor);
-        initDialogs(rta, syncViewsIds, minor);
-        if (minor > 77) {
+        const ui5VersionInfo = await getUi5Version();
+        const syncViewsIds = await getAllSyncViewsIds(ui5VersionInfo);
+        initDialogs(rta, syncViewsIds, ui5VersionInfo);
+        if (!isLowerThanMinimalUi5Version(ui5VersionInfo, {
+                major: 1,
+                minor: 78
+            })) {
             const ExtensionPointService = (await __ui5_require_async('open/ux/preview/client/adp/extension-point')).default;
             const extPointService = new ExtensionPointService(rta);
             extPointService.init(subscribe);
         }
         await init(rta);
-        const ui5VersionValidationMsg = getUI5VersionValidationMessage(version);
-        if (ui5VersionValidationMsg) {
+        if (isLowerThanMinimalUi5Version(ui5VersionInfo)) {
             sendAction(showMessage({
-                message: ui5VersionValidationMsg,
+                message: getUI5VersionValidationMessage(ui5VersionInfo),
                 shouldHideIframe: true
             }));
             return;
@@ -78,10 +78,13 @@ sap.ui.define([
         }
         log.debug('ADP init executed.');
     };
-    async function getAllSyncViewsIds(minor) {
+    async function getAllSyncViewsIds(ui5VersionInfo) {
         const syncViewIds = [];
         try {
-            if (minor < 120) {
+            if (isLowerThanMinimalUi5Version(ui5VersionInfo, {
+                    major: 1,
+                    minor: 120
+                })) {
                 const Element = (await __ui5_require_async('sap/ui/core/Element')).default;
                 const elements = Element.registry.filter(() => true);
                 elements.forEach(ui5Element => {

package/dist/client/adp/init.ts

@@ -9,15 +9,16 @@ import {
     enableTelemetry
 } from '@sap-ux-private/control-property-editor-common';
 import { ActionHandler } from '../cpe/types';
-import { getUI5VersionValidationMessage } from './ui5-version-utils';
 import UI5Element from 'sap/ui/dt/Element';
 import { getError } from '../cpe/error-utils';
-import { getUi5Version } from '../utils/version';
+import {
+    getUi5Version,
+    getUI5VersionValidationMessage,
+    isLowerThanMinimalUi5Version,
+    Ui5VersionInfo
+} from '../utils/version';
 
 export default async function (rta: RuntimeAuthoring) {
-    const version = await getUi5Version();
-    const versionParts = version.split('.');
-    const minor = parseInt(versionParts[1], 10);
     const flexSettings = rta.getFlexSettings();
     if (flexSettings.telemetry === true) {
         enableTelemetry();
@@ -44,21 +45,20 @@ export default async function (rta: RuntimeAuthoring) {
         }
     );
 
-    const syncViewsIds = await getAllSyncViewsIds(minor);
-    initDialogs(rta, syncViewsIds, minor);
+    const ui5VersionInfo = await getUi5Version();
+    const syncViewsIds = await getAllSyncViewsIds(ui5VersionInfo);
+    initDialogs(rta, syncViewsIds, ui5VersionInfo);
 
-    if (minor > 77) {
+    if (!isLowerThanMinimalUi5Version(ui5VersionInfo, { major: 1, minor: 78 })) {
         const ExtensionPointService = (await import('open/ux/preview/client/adp/extension-point')).default;
         const extPointService = new ExtensionPointService(rta);
         extPointService.init(subscribe);
     }
 
     await init(rta);
-    const ui5VersionValidationMsg = getUI5VersionValidationMessage(version);
-
-    if (ui5VersionValidationMsg) {
-        sendAction(showMessage({ message: ui5VersionValidationMsg, shouldHideIframe: true }));
 
+    if (isLowerThanMinimalUi5Version(ui5VersionInfo)) {
+        sendAction(showMessage({ message: getUI5VersionValidationMessage(ui5VersionInfo), shouldHideIframe: true }));
         return;
     }
 
@@ -78,14 +78,14 @@ export default async function (rta: RuntimeAuthoring) {
 /**
  * Get Ids for all sync views
  *
- * @param minor UI5 Version
+ * @param ui5VersionInfo UI5 Version Information
  *
  * @returns array of Ids for application sync views
  */
-async function getAllSyncViewsIds(minor: number): Promise<string[]> {
+async function getAllSyncViewsIds(ui5VersionInfo: Ui5VersionInfo): Promise<string[]> {
     const syncViewIds: string[] = [];
     try {
-        if (minor < 120) {
+        if (isLowerThanMinimalUi5Version(ui5VersionInfo, { major: 1, minor: 120 })) {
             const Element = (await import('sap/ui/core/Element')).default;
             const elements = Element.registry.filter(() => true) as UI5Element[];
             elements.forEach((ui5Element) => {

package/dist/client/cpe/connector-service.js

@@ -19,17 +19,18 @@ sap.ui.define([
     }
     const storageFileChanged = ___sap_ux_private_control_property_editor_common['storageFileChanged'];
     const getUi5Version = ___utils_version['getUi5Version'];
+    const isLowerThanMinimalUi5Version = ___utils_version['isLowerThanMinimalUi5Version'];
     class WorkspaceConnectorService {
         async init(sendAction) {
-            const version = await getUi5Version();
-            const versionParts = version.split('.');
-            const minor = parseInt(versionParts[1], 10);
-            if (minor > 72) {
-                const connector = (await __ui5_require_async('open/ux/preview/client/flp/WorkspaceConnector')).default;
-                connector.storage.fileChangeRequestNotifier = notifier(sendAction);
-            } else {
+            if (isLowerThanMinimalUi5Version(await getUi5Version(), {
+                    major: 1,
+                    minor: 73
+                })) {
                 const FakeLrepConnector = (await __ui5_require_async('sap/ui/fl/FakeLrepConnector')).default;
                 FakeLrepConnector.fileChangeRequestNotifier = notifier(sendAction);
+            } else {
+                const connector = (await __ui5_require_async('open/ux/preview/client/flp/WorkspaceConnector')).default;
+                connector.storage.fileChangeRequestNotifier = notifier(sendAction);
             }
         }
     }

package/dist/client/cpe/connector-service.ts

@@ -1,6 +1,6 @@
 import { ExternalAction, storageFileChanged } from '@sap-ux-private/control-property-editor-common';
 import { ActionSenderFunction } from './types';
-import { getUi5Version } from '../utils/version';
+import { getUi5Version, isLowerThanMinimalUi5Version } from '../utils/version';
 
 /**
  * A Class of WorkspaceConnectorService
@@ -12,16 +12,13 @@ export class WorkspaceConnectorService {
      * @param sendAction action sender function
      */
     public async init(sendAction: ActionSenderFunction): Promise<void> {
-        const version = await getUi5Version();
-        const versionParts = version.split('.');
-        const minor = parseInt(versionParts[1], 10);
-        if (minor > 72) {
+        if (isLowerThanMinimalUi5Version(await getUi5Version(), { major: 1, minor: 73 })) {
+            const FakeLrepConnector = (await import('sap/ui/fl/FakeLrepConnector')).default;
+            FakeLrepConnector.fileChangeRequestNotifier = notifier(sendAction);
+        } else {
             const connector = (await import('open/ux/preview/client/flp/WorkspaceConnector')).default;
             // hook the file deletion listener to the UI5 workspace connector
             connector.storage.fileChangeRequestNotifier = notifier(sendAction);
-        } else {
-            const FakeLrepConnector = (await import('sap/ui/fl/FakeLrepConnector')).default;
-            FakeLrepConnector.fileChangeRequestNotifier = notifier(sendAction);
         }
     }
 }

package/dist/client/cpe/outline/nodes.js

@@ -76,9 +76,7 @@ sap.ui.define(["./utils", "../../utils/version"], function (___utils, ____utils_
   async function transformNodes(input, scenario, reuseComponentsIds) {
     const stack = [...input];
     const items = [];
-    const version = await getUi5Version();
-    const versionParts = version.split('.');
-    const minor = parseInt(versionParts[1], 10);
+    const ui5VersionInfo = await getUi5Version();
     while (stack.length) {
       const current = stack.shift();
       const editable = isEditable(current?.id);
@@ -99,7 +97,7 @@ sap.ui.define(["./utils", "../../utils/version"], function (___utils, ____utils_
           visible: current.visible ?? true,
           children: transformedChildren
         };
-        fillReuseComponents(reuseComponentsIds, current, scenario, minor);
+        fillReuseComponents(reuseComponentsIds, current, scenario, ui5VersionInfo);
         items.push(node);
       }
       if (isAdp && isExtPoint) {
@@ -133,10 +131,10 @@ sap.ui.define(["./utils", "../../utils/version"], function (___utils, ____utils_
    * @param reuseComponentsIds ids of reuse components that are filled when outline nodes are transformed
    * @param node view node
    * @param scenario type of project
-   * @param minorUI5Version miner UI5 version
+   * @param ui5VersionInfo UI5 version information
    */
-  function fillReuseComponents(reuseComponentsIds, node, scenario, minorUI5Version) {
-    if (scenario === 'ADAPTATION_PROJECT' && node?.component && isReuseComponent(node.id, minorUI5Version)) {
+  function fillReuseComponents(reuseComponentsIds, node, scenario, ui5VersionInfo) {
+    if (scenario === 'ADAPTATION_PROJECT' && node?.component && isReuseComponent(node.id, ui5VersionInfo)) {
       reuseComponentsIds.add(node.id);
     }
   }

package/dist/client/cpe/outline/nodes.ts

@@ -2,7 +2,7 @@ import type { OutlineNode } from '@sap-ux-private/control-property-editor-common
 import type { OutlineViewNode } from 'sap/ui/rta/command/OutlineService';
 import type { Scenario } from 'sap/ui/fl/Scenario';
 import { isEditable, isReuseComponent } from './utils';
-import { getUi5Version } from '../../utils/version';
+import { getUi5Version, Ui5VersionInfo } from '../../utils/version';
 
 interface AdditionalData {
     text?: string;
@@ -87,9 +87,7 @@ export async function transformNodes(
 ): Promise<OutlineNode[]> {
     const stack = [...input];
     const items: OutlineNode[] = [];
-    const version = await getUi5Version();
-    const versionParts = version.split('.');
-    const minor = parseInt(versionParts[1], 10);
+    const ui5VersionInfo = await getUi5Version();
     while (stack.length) {
         const current = stack.shift();
         const editable = isEditable(current?.id);
@@ -114,7 +112,7 @@ export async function transformNodes(
                 children: transformedChildren
             };
 
-            fillReuseComponents(reuseComponentsIds, current, scenario, minor);
+            fillReuseComponents(reuseComponentsIds, current, scenario, ui5VersionInfo);
 
             items.push(node);
         }
@@ -150,15 +148,15 @@ export async function transformNodes(
  * @param reuseComponentsIds ids of reuse components that are filled when outline nodes are transformed
  * @param node view node
  * @param scenario type of project
- * @param minorUI5Version miner UI5 version
+ * @param ui5VersionInfo UI5 version information
  */
 function fillReuseComponents(
     reuseComponentsIds: Set<string>,
     node: OutlineViewNode,
     scenario: Scenario,
-    minorUI5Version: number
+    ui5VersionInfo: Ui5VersionInfo
 ): void {
-    if (scenario === 'ADAPTATION_PROJECT' && node?.component && isReuseComponent(node.id, minorUI5Version)) {
+    if (scenario === 'ADAPTATION_PROJECT' && node?.component && isReuseComponent(node.id, ui5VersionInfo)) {
         reuseComponentsIds.add(node.id);
     }
 }

package/dist/client/cpe/outline/utils.js

@@ -1,11 +1,12 @@
 "use strict";
 
-sap.ui.define(["../control-data", "../utils", "sap/ui/dt/OverlayUtil", "sap/ui/dt/OverlayRegistry", "../ui5-utils", "sap/ui/core/Component"], function (___control_data, ___utils, OverlayUtil, OverlayRegistry, ___ui5_utils, Component) {
+sap.ui.define(["../control-data", "../utils", "sap/ui/dt/OverlayUtil", "sap/ui/dt/OverlayRegistry", "../ui5-utils", "sap/ui/core/Component", "../../utils/version"], function (___control_data, ___utils, OverlayUtil, OverlayRegistry, ___ui5_utils, Component, ____utils_version) {
   "use strict";
 
   const buildControlData = ___control_data["buildControlData"];
   const getRuntimeControl = ___utils["getRuntimeControl"];
   const getComponent = ___ui5_utils["getComponent"];
+  const isLowerThanMinimalUi5Version = ____utils_version["isLowerThanMinimalUi5Version"];
   const isEditable = function () {
     let id = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
     let editable = false;
@@ -35,11 +36,14 @@ sap.ui.define(["../control-data", "../utils", "sap/ui/dt/OverlayUtil", "sap/ui/d
    * Function that checks if control is reuse component
    *
    * @param controlId id control
-   * @param minorUI5Version minor UI5 version
+   * @param ui5VersionInfo UI5 version information
    * @returns boolean if control is from reused component view
    */
-  const isReuseComponent = (controlId, minorUI5Version) => {
-    if (minorUI5Version <= 114) {
+  const isReuseComponent = (controlId, ui5VersionInfo) => {
+    if (isLowerThanMinimalUi5Version(ui5VersionInfo, {
+      major: 1,
+      minor: 115
+    })) {
       return false;
     }
     const component = Component.getComponentById(controlId);

package/dist/client/cpe/outline/utils.ts

@@ -5,6 +5,7 @@ import OverlayRegistry from 'sap/ui/dt/OverlayRegistry';
 import { getComponent } from '../ui5-utils';
 import Component from 'sap/ui/core/Component';
 import { Manifest } from 'sap/ui/rta/RuntimeAuthoring';
+import { isLowerThanMinimalUi5Version, Ui5VersionInfo } from '../../utils/version';
 
 export const isEditable = (id = ''): boolean => {
     let editable = false;
@@ -34,11 +35,11 @@ export const isEditable = (id = ''): boolean => {
  * Function that checks if control is reuse component
  *
  * @param controlId id control
- * @param minorUI5Version minor UI5 version
+ * @param ui5VersionInfo UI5 version information
  * @returns boolean if control is from reused component view
  */
-export const isReuseComponent = (controlId: string, minorUI5Version: number): boolean => {
-    if(minorUI5Version <= 114) {
+export const isReuseComponent = (controlId: string, ui5VersionInfo: Ui5VersionInfo): boolean => {
+    if (isLowerThanMinimalUi5Version(ui5VersionInfo, { major: 1, minor: 115 })) {
         return false;
     }
 
@@ -48,7 +49,7 @@ export const isReuseComponent = (controlId: string, minorUI5Version: number): bo
     }
 
     const manifest = component.getManifest() as Manifest;
-    if(!manifest) {
+    if (!manifest) {
         return false;
     }
 

package/dist/client/flp/WorkspaceConnector.js

@@ -6,6 +6,7 @@ sap.ui.define(["sap/base/util/merge", "sap/ui/fl/write/api/connectors/ObjectStor
   const CHANGES_API_PATH = ___common["CHANGES_API_PATH"];
   const getFlexSettings = ___common["getFlexSettings"];
   const getUi5Version = ___utils_version["getUi5Version"];
+  const isLowerThanMinimalUi5Version = ___utils_version["isLowerThanMinimalUi5Version"];
   const connector = merge({}, ObjectStorageConnector, {
     layers: [Layer.VENDOR, Layer.CUSTOMER_BASE],
     storage: {
@@ -69,9 +70,10 @@ sap.ui.define(["sap/base/util/merge", "sap/ui/fl/write/api/connectors/ObjectStor
     },
     loadFeatures: async function () {
       const features = await ObjectStorageConnector.loadFeatures();
-      const version = await getUi5Version();
-      const [majorVersion, minorVersion] = version.split('.').map(v => parseInt(v, 10));
-      features.isVariantAdaptationEnabled = majorVersion >= 1 && minorVersion >= 90;
+      features.isVariantAdaptationEnabled = !isLowerThanMinimalUi5Version(await getUi5Version(), {
+        major: 1,
+        minor: 90
+      });
       const settings = getFlexSettings();
       if (settings?.developerMode) {
         features.isVariantAdaptationEnabled = false;

package/dist/client/flp/WorkspaceConnector.ts

@@ -2,7 +2,7 @@ import merge from 'sap/base/util/merge';
 import ObjectStorageConnector from 'sap/ui/fl/write/api/connectors/ObjectStorageConnector';
 import Layer from 'sap/ui/fl/Layer';
 import { CHANGES_API_PATH, FlexChange, getFlexSettings } from './common';
-import { getUi5Version } from '../utils/version';
+import { getUi5Version, isLowerThanMinimalUi5Version } from '../utils/version';
 
 const connector = merge({}, ObjectStorageConnector, {
     layers: [Layer.VENDOR, Layer.CUSTOMER_BASE],
@@ -68,9 +68,10 @@ const connector = merge({}, ObjectStorageConnector, {
     } as typeof ObjectStorageConnector.storage,
     loadFeatures: async function () {
         const features = await ObjectStorageConnector.loadFeatures();
-        const version = await getUi5Version();
-        const [majorVersion, minorVersion] = version.split('.').map((v: string) => parseInt(v, 10));
-        features.isVariantAdaptationEnabled = majorVersion >= 1 && minorVersion >= 90;
+        features.isVariantAdaptationEnabled = !isLowerThanMinimalUi5Version(await getUi5Version(), {
+            major: 1,
+            minor: 90
+        });
         const settings = getFlexSettings();
         if (settings?.developerMode) {
             features.isVariantAdaptationEnabled = false;

package/dist/client/flp/bootstrap.js

@@ -1,6 +1,5 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment,
                   @typescript-eslint/no-unsafe-member-access,
-                  @typescript-eslint/no-unsafe-assignment,
                   @typescript-eslint/no-unsafe-argument,
                   no-console */
 
@@ -15,9 +14,9 @@ async function ushellBootstrap(fnCallback) {
     try {
         const response = await fetch(`${basePath}/resources/sap-ui-version.json`);
         const json = await response.json();
-        const version = json?.libraries?.find((lib) => lib.name === 'sap.ui.core')?.version;
-        const major = version ? parseInt(version.split('.')[0], 10) : 2;
-        if (major >= 2) {
+        const version = json?.libraries?.find((lib) => lib.name === 'sap.ui.core')?.version ?? '1.121.0';
+        const majorUi5Version = parseInt(version.split('.')[0], 10);
+        if (majorUi5Version >= 2) {
             src = `${basePath}/resources/sap/ushell/bootstrap/sandbox2.js`;
         }
     } catch (error) {

package/dist/client/flp/init.js

@@ -18,6 +18,7 @@ sap.ui.define([
     const getError = ___cpe_error_utils['getError'];
     const initConnectors = _interopRequireDefault(__initConnectors);
     const getUi5Version = ___utils_version['getUi5Version'];
+    const isLowerThanMinimalUi5Version = ___utils_version['isLowerThanMinimalUi5Version'];
     const UI5_LIBS = [
         'sap.apf',
         'sap.base',
@@ -160,22 +161,24 @@ sap.ui.define([
         const urlParams = new URLSearchParams(window.location.search);
         const container = sap?.ushell?.Container ?? sap.ui.require('sap/ushell/Container');
         let scenario = '';
-        const version = await getUi5Version();
+        const ui5VersionInfo = await getUi5Version();
         if (flex) {
             const flexSettings = JSON.parse(flex);
             scenario = flexSettings.scenario;
             container.attachRendererCreatedEvent(async function () {
                 const lifecycleService = await container.getServiceAsync('AppLifeCycle');
                 lifecycleService.attachAppLoaded(event => {
-                    const minor = parseInt(version.split('.')[1], 10);
                     const view = event.getParameter('componentInstance');
                     const flexSettings = JSON.parse(flex);
                     const pluginScript = flexSettings.pluginScript ?? '';
                     let libs = [];
-                    if (minor > 71) {
-                        libs.push('sap/ui/rta/api/startAdaptation');
-                    } else {
+                    if (isLowerThanMinimalUi5Version(ui5VersionInfo, {
+                            major: 1,
+                            minor: 72
+                        })) {
                         libs.push('open/ux/preview/client/flp/initRta');
+                    } else {
+                        libs.push('sap/ui/rta/api/startAdaptation');
                     }
                     if (flexSettings.pluginScript) {
                         libs.push(pluginScript);
@@ -205,8 +208,7 @@ sap.ui.define([
         const resourceBundle = await loadI18nResourceBundle(scenario);
         setI18nTitle(resourceBundle);
         registerSAPFonts();
-        const major = version ? parseInt(version.split('.')[0], 10) : 2;
-        const renderer = major < 2 ? await container.createRenderer(undefined, true) : await container.createRendererInternal(undefined, true);
+        const renderer = ui5VersionInfo.major < 2 ? await container.createRenderer(undefined, true) : await container.createRendererInternal(undefined, true);
         renderer.placeAt('content');
     }
     const bootstrapConfig = document.getElementById('sap-ui-bootstrap');

package/dist/client/flp/init.ts

@@ -9,7 +9,7 @@ import AppState from 'sap/ushell/services/AppState';
 import { getManifestAppdescr } from '../adp/api-handler';
 import { getError } from '../cpe/error-utils';
 import initConnectors from './initConnectors';
-import { getUi5Version } from '../utils/version';
+import { getUi5Version, isLowerThanMinimalUi5Version } from '../utils/version';
 
 /**
  * SAPUI5 delivered namespaces from https://ui5.sap.com/#/api/sap
@@ -269,7 +269,7 @@ export async function init({
     const urlParams = new URLSearchParams(window.location.search);
     const container = sap?.ushell?.Container ?? sap.ui.require('sap/ushell/Container');
     let scenario: string = '';
-    const version = await getUi5Version();
+    const ui5VersionInfo = await getUi5Version();
     // Register RTA if configured
     if (flex) {
         const flexSettings = JSON.parse(flex) as FlexSettings;
@@ -277,16 +277,16 @@ export async function init({
         container.attachRendererCreatedEvent(async function () {
             const lifecycleService = await container.getServiceAsync<AppLifeCycle>('AppLifeCycle');
             lifecycleService.attachAppLoaded((event) => {
-                const minor = parseInt(version.split('.')[1], 10);
                 const view = event.getParameter('componentInstance');
                 const flexSettings = JSON.parse(flex) as FlexSettings;
                 const pluginScript = flexSettings.pluginScript ?? '';
 
                 let libs: string[] = [];
-                if (minor > 71) {
-                    libs.push('sap/ui/rta/api/startAdaptation');
-                } else {
+
+                if (isLowerThanMinimalUi5Version(ui5VersionInfo, { major: 1, minor: 72 })) {
                     libs.push('open/ux/preview/client/flp/initRta');
+                } else {
+                    libs.push('sap/ui/rta/api/startAdaptation');
                 }
 
                 if (flexSettings.pluginScript) {
@@ -332,10 +332,9 @@ export async function init({
     const resourceBundle = await loadI18nResourceBundle(scenario as Scenario);
     setI18nTitle(resourceBundle);
     registerSAPFonts();
-    const major = version ? parseInt(version.split('.')[0], 10) : 2;
 
     const renderer =
-        major < 2
+        ui5VersionInfo.major < 2
             ? await container.createRenderer(undefined, true)
             : await container.createRendererInternal(undefined, true);
     renderer.placeAt('content');

package/dist/client/flp/initConnectors.js

@@ -1,8 +1,10 @@
 "use strict";
 
-sap.ui.define(["sap/ui/VersionInfo"], function (VersionInfo) {
+sap.ui.define(["../utils/version"], function (___utils_version) {
   "use strict";
 
+  const getUi5Version = ___utils_version["getUi5Version"];
+  const isLowerThanMinimalUi5Version = ___utils_version["isLowerThanMinimalUi5Version"];
   /**
    * Initializes UI5 connectors based on the current UI5 version.
    *
@@ -14,13 +16,10 @@ sap.ui.define(["sap/ui/VersionInfo"], function (VersionInfo) {
    * intiConnectors(); // Simply call the function without any arguments.
    */
   async function initConnectors() {
-    const version = (await VersionInfo.load({
-      library: 'sap.ui.core'
-    }))?.version;
-    const versionArray = version ? version.split('.') : ['2', '99'];
-    const minor = parseInt(versionArray[1], 10);
-    const major = parseInt(versionArray[0], 10);
-    if (major === 1 && minor < 72) {
+    if (isLowerThanMinimalUi5Version(await getUi5Version(), {
+      major: 1,
+      minor: 72
+    })) {
       sap.ui.require(['open/ux/preview/client/flp/enableFakeConnector'], function (enableFakeConnector) {
         enableFakeConnector();
       });

package/dist/client/flp/initConnectors.ts

@@ -1,5 +1,4 @@
-import VersionInfo from 'sap/ui/VersionInfo';
-import type {SingleVersionInfo} from '../../types/global';
+import { getUi5Version, isLowerThanMinimalUi5Version } from '../utils/version';
 
 /**
  * Initializes UI5 connectors based on the current UI5 version.
@@ -12,12 +11,7 @@ import type {SingleVersionInfo} from '../../types/global';
  * intiConnectors(); // Simply call the function without any arguments.
  */
 export default async function initConnectors(): Promise<void> {
-    const version = (await VersionInfo.load({library:'sap.ui.core'}) as SingleVersionInfo)?.version;
-    const versionArray = version ? version.split('.') : ['2', '99'];
-    const minor = parseInt(versionArray[1], 10);
-    const major = parseInt(versionArray[0], 10);
-
-    if (major === 1 && minor < 72) {
+    if (isLowerThanMinimalUi5Version(await getUi5Version(), { major: 1, minor: 72 })) {
         sap.ui.require(['open/ux/preview/client/flp/enableFakeConnector'], function (enableFakeConnector: () => void) {
             enableFakeConnector();
         });

package/dist/client/utils/version.js

@@ -3,8 +3,18 @@
 sap.ui.define(["sap/ui/VersionInfo", "sap/base/Log"], function (VersionInfo, Log) {
   "use strict";
 
+  /**
+   * Default minimal supported UI5 version
+   */
+  const minVersionInfo = {
+    major: 1,
+    minor: 71
+  };
+
   /**
    * Retrieve the UI5 version from sap.ui.core library
+   *
+   * @returns Ui5VersionInfo
    */
   async function getUi5Version() {
     let version = (await VersionInfo.load({
@@ -14,12 +24,47 @@ sap.ui.define(["sap/ui/VersionInfo", "sap/base/Log"], function (VersionInfo, Log
       Log.error('Could not get UI5 version of application. Using 1.121.0 as fallback.');
       version = '1.121.0';
     }
-    return version;
+    const [major, minor] = version.split('.').map(versionPart => parseInt(versionPart, 10));
+    return {
+      major: major,
+      minor: minor
+    };
+  }
+
+  /**
+   * Checks if the given version is lower than the required minimal version.
+   * @param ui5VersionInfo to check
+   * @param minUi5VersionInfo to check against (default is 1.71)
+   *
+   * @returns boolean
+   */
+  function isLowerThanMinimalUi5Version(ui5VersionInfo) {
+    let minUi5VersionInfo = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : minVersionInfo;
+    if (!isNaN(ui5VersionInfo.major) && !isNaN(ui5VersionInfo.minor)) {
+      if (ui5VersionInfo.major < minUi5VersionInfo.major) {
+        return true;
+      }
+      if (ui5VersionInfo.major === minUi5VersionInfo.major && ui5VersionInfo.minor < minUi5VersionInfo.minor) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  /**
+   * Get UI5 version validation message.
+   * @param ui5VersionInfo to be mentioned in the message
+   * @returns string with validation message.
+   */
+  function getUI5VersionValidationMessage(ui5VersionInfo) {
+    return `The current SAPUI5 version set for this Adaptation project is ${ui5VersionInfo.major}.${ui5VersionInfo.minor}. The minimum version to use for SAPUI5 Adaptation Project and its SAPUI5 Visual Editor is ${minVersionInfo.major}.${minVersionInfo.minor}`;
   }
   var __exports = {
     __esModule: true
   };
   __exports.getUi5Version = getUi5Version;
+  __exports.isLowerThanMinimalUi5Version = isLowerThanMinimalUi5Version;
+  __exports.getUI5VersionValidationMessage = getUI5VersionValidationMessage;
   return __exports;
 });
 //# sourceMappingURL=version.js.map

package/dist/client/utils/version.ts

@@ -1,15 +1,75 @@
-import type { SingleVersionInfo } from '../../types/global';
 import VersionInfo from 'sap/ui/VersionInfo';
 import Log from 'sap/base/Log';
 
+type SingleVersionInfo =
+    | {
+          name: string;
+          version: string;
+      }
+    | undefined;
+
+export type Ui5VersionInfo = {
+    major: number;
+    minor: number;
+};
+
+/**
+ * Default minimal supported UI5 version
+ */
+const minVersionInfo = {
+    major: 1,
+    minor: 71
+} as Readonly<Ui5VersionInfo>;
+
 /**
  * Retrieve the UI5 version from sap.ui.core library
+ *
+ * @returns Ui5VersionInfo
  */
-export async function getUi5Version() {
+export async function getUi5Version(): Promise<Ui5VersionInfo> {
     let version = ((await VersionInfo.load({ library: 'sap.ui.core' })) as SingleVersionInfo)?.version;
     if (!version) {
         Log.error('Could not get UI5 version of application. Using 1.121.0 as fallback.');
         version = '1.121.0';
     }
-    return version;
+    const [major, minor] = version.split('.').map(versionPart => parseInt(versionPart, 10));
+
+    return {
+        major: major,
+        minor: minor
+    } satisfies Ui5VersionInfo;
+}
+
+/**
+ * Checks if the given version is lower than the required minimal version.
+ * @param ui5VersionInfo to check
+ * @param minUi5VersionInfo to check against (default is 1.71)
+ *
+ * @returns boolean
+ */
+export function isLowerThanMinimalUi5Version(
+    ui5VersionInfo: Ui5VersionInfo,
+    minUi5VersionInfo: Ui5VersionInfo = minVersionInfo
+): boolean {
+    if (!isNaN(ui5VersionInfo.major) && !isNaN(ui5VersionInfo.minor)) {
+        if (ui5VersionInfo.major < minUi5VersionInfo.major) {
+            return true;
+        }
+        if (
+            ui5VersionInfo.major === minUi5VersionInfo.major &&
+            ui5VersionInfo.minor < minUi5VersionInfo.minor
+        ) {
+            return true;
+        }
+    }
+    return false;
+}
+
+/**
+ * Get UI5 version validation message.
+ * @param ui5VersionInfo to be mentioned in the message
+ * @returns string with validation message.
+ */
+export function getUI5VersionValidationMessage(ui5VersionInfo: Ui5VersionInfo): string {
+    return `The current SAPUI5 version set for this Adaptation project is ${ui5VersionInfo.major}.${ui5VersionInfo.minor}. The minimum version to use for SAPUI5 Adaptation Project and its SAPUI5 Visual Editor is ${minVersionInfo.major}.${minVersionInfo.minor}`;
 }

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.16.49",
+  "version": "0.16.51",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -27,9 +27,9 @@
     "mem-fs-editor": "9.4.0",
     "@sap-ux/logger": "0.6.0",
     "@sap-ux/btp-utils": "0.15.1",
-    "@sap-ux/adp-tooling": "0.12.37",
+    "@sap-ux/adp-tooling": "0.12.39",
     "@sap-ux/control-property-editor-sources": "npm:@sap-ux/control-property-editor@0.4.27",
-    "@sap-ux/project-access": "1.26.6"
+    "@sap-ux/project-access": "1.26.8"
   },
   "devDependencies": {
     "@types/ejs": "3.1.2",
@@ -45,7 +45,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.10.7",
+    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.10.8",
     "@sap-ux/axios-extension": "1.16.4",
     "@sap-ux/store": "0.9.1",
     "@sap-ux/ui5-info": "0.8.1",

package/dist/client/adp/ui5-version-utils.js

@@ -1,65 +0,0 @@
-"use strict";
-
-sap.ui.define([], function () {
-  "use strict";
-
-  /**
-   * Parses the UI5 version
-   * Returns NaN for snapshot or snapshot-untested
-   * Returns x.xx for snapshot-x.xx
-   *
-   * @param version the UI5 version to parse
-   * @returns The major and the minor version, e.g. 1.86
-   */
-  function parseUI5Version(version) {
-    const versionParts = version.replace(/snapshot-untested|snapshot-|snapshot/, '').split('.');
-    const major = parseInt(versionParts[0], 10);
-    const minor = parseInt(versionParts[1], 10);
-    return {
-      major,
-      minor
-    };
-  }
-
-  /**
-   * Checks if the given version is lower than the required minimal version.
-   * @param version to check
-   * @param minVersion to check
-   *
-   * @returns boolean
-   */
-  function isLowerThanMinimalUi5Version(version, minVersion) {
-    if (version && minVersion) {
-      const minVersionParsed = parseUI5Version(minVersion);
-      const ui5VersionParsed = parseUI5Version(version);
-      if (!isNaN(ui5VersionParsed.major) && !isNaN(ui5VersionParsed.minor)) {
-        if (ui5VersionParsed.major < minVersionParsed.major) {
-          return true;
-        }
-        if (ui5VersionParsed.major === minVersionParsed.major && ui5VersionParsed.minor < minVersionParsed.minor) {
-          return true;
-        }
-      }
-    }
-    return false;
-  }
-
-  /**
-   * Get UI5 version validation message based on conditions.
-   * @param ui5Version to validate
-   * @returns string with validation message or undefined if non condition is met.
-   */
-  function getUI5VersionValidationMessage(ui5Version) {
-    if (isLowerThanMinimalUi5Version(ui5Version, '1.71')) {
-      return `The current SAPUI5 version set for this Adaptation project is ${ui5Version}. The minimum version to use for SAPUI5 Adaptation Project and its SAPUI5 Visual Editor is 1.71`;
-    }
-    return undefined;
-  }
-  var __exports = {
-    __esModule: true
-  };
-  __exports.isLowerThanMinimalUi5Version = isLowerThanMinimalUi5Version;
-  __exports.getUI5VersionValidationMessage = getUI5VersionValidationMessage;
-  return __exports;
-});
-//# sourceMappingURL=ui5-version-utils.js.map

package/dist/client/adp/ui5-version-utils.ts

@@ -1,52 +0,0 @@
-/**
- * Parses the UI5 version
- * Returns NaN for snapshot or snapshot-untested
- * Returns x.xx for snapshot-x.xx
- *
- * @param version the UI5 version to parse
- * @returns The major and the minor version, e.g. 1.86
- */
-function parseUI5Version(version: string): { major: number; minor: number } {
-    const versionParts = version.replace(/snapshot-untested|snapshot-|snapshot/, '').split('.');
-    const major = parseInt(versionParts[0], 10);
-    const minor = parseInt(versionParts[1], 10);
-
-    return { major, minor };
-}
-
-/**
- * Checks if the given version is lower than the required minimal version.
- * @param version to check
- * @param minVersion to check
- *
- * @returns boolean
- */
-export function isLowerThanMinimalUi5Version(version: string, minVersion: string): boolean {
-    if (version && minVersion) {
-        const minVersionParsed = parseUI5Version(minVersion);
-        const ui5VersionParsed = parseUI5Version(version);
-        if (!isNaN(ui5VersionParsed.major) && !isNaN(ui5VersionParsed.minor)) {
-            if (ui5VersionParsed.major < minVersionParsed.major) {
-                return true;
-            }
-            if (ui5VersionParsed.major === minVersionParsed.major && ui5VersionParsed.minor < minVersionParsed.minor) {
-                return true;
-            }
-        }
-    }
-    return false;
-}
-
-/**
- * Get UI5 version validation message based on conditions.
- * @param ui5Version to validate
- * @returns string with validation message or undefined if non condition is met.
- */
-export function getUI5VersionValidationMessage(ui5Version: string): string | undefined {
-    if (isLowerThanMinimalUi5Version(ui5Version, '1.71')) {
-        return `The current SAPUI5 version set for this Adaptation project is ${ui5Version}. The minimum version to use for SAPUI5 Adaptation Project and its SAPUI5 Visual Editor is 1.71`;
-    }
-
-    return undefined;
-}
-