@sap-ux/preview-middleware 0.16.34 → 0.16.36

package/dist/client/adp/controllers/BaseDialog.controller.js

@@ -61,7 +61,7 @@ sap.ui.define(["sap/ui/core/library", "sap/ui/core/mvc/Controller", "sap/m/Messa
     checkForExistingChange: function _checkForExistingChange(fragmentName) {
       const allCommands = this.rta.getCommandStack().getCommands();
       return allCommands.some(command => {
-        if (command?.getProperty('name') === 'composite') {
+        if (typeof command.getCommands === 'function') {
           const addXmlCommand = command.getCommands().find(c => c?.getProperty('name') === 'addXMLAtExtensionPoint');
           return addXmlCommand && matchesFragmentName(addXmlCommand, fragmentName);
         } else {

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

@@ -126,7 +126,7 @@ export default abstract class BaseDialog<T extends BaseDialogModel = BaseDialogM
         const allCommands = this.rta.getCommandStack().getCommands();
 
         return allCommands.some((command: FlexCommand) => {
-            if (command?.getProperty('name') === 'composite') {
+            if (typeof command.getCommands === 'function') {
                 const addXmlCommand = command
                     .getCommands()
                     .find((c: FlexCommand) => c?.getProperty('name') === 'addXMLAtExtensionPoint');

package/dist/client/adp/init.js

@@ -4,10 +4,10 @@ sap.ui.define([
     '../cpe/init',
     './init-dialogs',
     'open/ux/preview/client/thirdparty/@sap-ux-private/control-property-editor-common',
-    'sap/ui/VersionInfo',
     './ui5-version-utils',
-    '../cpe/error-utils'
-], function (log, __init, ___init_dialogs, ___sap_ux_private_control_property_editor_common, VersionInfo, ___ui5_version_utils, ___cpe_error_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) {
     'use strict';
     function _interopRequireDefault(obj) {
         return obj && obj.__esModule && typeof obj.default !== 'undefined' ? obj.default : obj;
@@ -32,8 +32,9 @@ sap.ui.define([
     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'];
     var __exports = async function (rta) {
-        const version = (await VersionInfo.load({ library: 'sap.ui.core' }))?.version;
+        const version = await getUi5Version();
         const versionParts = version.split('.');
         const minor = parseInt(versionParts[1], 10);
         const flexSettings = rta.getFlexSettings();

package/dist/client/adp/init.ts

@@ -8,16 +8,14 @@ import {
     startPostMessageCommunication,
     enableTelemetry
 } from '@sap-ux-private/control-property-editor-common';
-
 import { ActionHandler } from '../cpe/types';
-import VersionInfo from 'sap/ui/VersionInfo';
 import { getUI5VersionValidationMessage } from './ui5-version-utils';
 import UI5Element from 'sap/ui/dt/Element';
 import { getError } from '../cpe/error-utils';
-import type {SingleVersionInfo} from '../../types/global';
+import { getUi5Version } from '../utils/version';
 
 export default async function (rta: RuntimeAuthoring) {
-    const version = (await VersionInfo.load({library:'sap.ui.core'}) as SingleVersionInfo)?.version;
+    const version = await getUi5Version();
     const versionParts = version.split('.');
     const minor = parseInt(versionParts[1], 10);
     const flexSettings = rta.getFlexSettings();

package/dist/client/adp/utils.js

@@ -36,6 +36,9 @@ sap.ui.define(["sap/m/MessageToast"], function (MessageToast) {
    *                    the specified fragment name; otherwise, returns false.
    */
   function matchesFragmentName(command, fragmentName) {
+    if (typeof command.getPreparedChange !== 'function') {
+      return false;
+    }
     const change = command.getPreparedChange().getDefinition();
     return change.content?.fragmentPath?.includes(`${fragmentName}.fragment.xml`) || false;
   }

package/dist/client/adp/utils.ts

@@ -45,6 +45,9 @@ export function createDeferred<T>(): Deferred<T> {
  *                    the specified fragment name; otherwise, returns false.
  */
 export function matchesFragmentName(command: FlexCommand, fragmentName: string): boolean {
+    if (typeof command.getPreparedChange !== 'function') {
+        return false;
+    }
     const change = command.getPreparedChange().getDefinition() as unknown as FragmentChange;
     return change.content?.fragmentPath?.includes(`${fragmentName}.fragment.xml`) || false;
 }

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

@@ -1,8 +1,8 @@
 'use strict';
 sap.ui.define([
     'open/ux/preview/client/thirdparty/@sap-ux-private/control-property-editor-common',
-    'sap/ui/VersionInfo'
-], function (___sap_ux_private_control_property_editor_common, VersionInfo) {
+    '../utils/version'
+], function (___sap_ux_private_control_property_editor_common, ___utils_version) {
     'use strict';
     function __ui5_require_async(path) {
         return new Promise(function (resolve, reject) {
@@ -18,9 +18,10 @@ sap.ui.define([
         });
     }
     const storageFileChanged = ___sap_ux_private_control_property_editor_common['storageFileChanged'];
+    const getUi5Version = ___utils_version['getUi5Version'];
     class WorkspaceConnectorService {
         async init(sendAction) {
-            const version = (await VersionInfo.load({ library: 'sap.ui.core' }))?.version;
+            const version = await getUi5Version();
             const versionParts = version.split('.');
             const minor = parseInt(versionParts[1], 10);
             if (minor > 72) {

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

@@ -1,7 +1,6 @@
 import { ExternalAction, storageFileChanged } from '@sap-ux-private/control-property-editor-common';
 import { ActionSenderFunction } from './types';
-import VersionInfo from 'sap/ui/VersionInfo';
-import type {SingleVersionInfo} from '../../types/global';
+import { getUi5Version } from '../utils/version';
 
 /**
  * A Class of WorkspaceConnectorService
@@ -13,7 +12,7 @@ export class WorkspaceConnectorService {
      * @param sendAction action sender function
      */
     public async init(sendAction: ActionSenderFunction): Promise<void> {
-        const version = (await VersionInfo.load({library:'sap.ui.core'}) as SingleVersionInfo)?.version;
+        const version = await getUi5Version();
         const versionParts = version.split('.');
         const minor = parseInt(versionParts[1], 10);
         if (minor > 72) {

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

@@ -1,10 +1,11 @@
 "use strict";
 
-sap.ui.define(["./utils", "sap/ui/VersionInfo"], function (___utils, VersionInfo) {
+sap.ui.define(["./utils", "../../utils/version"], function (___utils, ____utils_version) {
   "use strict";
 
   const isEditable = ___utils["isEditable"];
   const isReuseComponent = ___utils["isReuseComponent"];
+  const getUi5Version = ____utils_version["getUi5Version"];
   /**
    * Retrieves additional data for a given control ID.
    *
@@ -75,9 +76,7 @@ sap.ui.define(["./utils", "sap/ui/VersionInfo"], function (___utils, VersionInfo
   async function transformNodes(input, scenario, reuseComponentsIds) {
     const stack = [...input];
     const items = [];
-    const version = (await VersionInfo.load({
-      library: 'sap.ui.core'
-    }))?.version;
+    const version = await getUi5Version();
     const versionParts = version.split('.');
     const minor = parseInt(versionParts[1], 10);
     while (stack.length) {

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

@@ -2,8 +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 VersionInfo from 'sap/ui/VersionInfo';
-import type {SingleVersionInfo} from '../../../types/global';
+import { getUi5Version } from '../../utils/version';
 
 interface AdditionalData {
     text?: string;
@@ -88,7 +87,7 @@ export async function transformNodes(
 ): Promise<OutlineNode[]> {
     const stack = [...input];
     const items: OutlineNode[] = [];
-    const version = (await VersionInfo.load({library:'sap.ui.core'}) as SingleVersionInfo)?.version;
+    const version = await getUi5Version();
     const versionParts = version.split('.');
     const minor = parseInt(versionParts[1], 10);
     while (stack.length) {

package/dist/client/flp/WorkspaceConnector.js

@@ -1,10 +1,11 @@
 "use strict";
 
-sap.ui.define(["sap/base/util/merge", "sap/ui/fl/write/api/connectors/ObjectStorageConnector", "sap/ui/fl/Layer", "sap/ui/VersionInfo", "./common"], function (merge, ObjectStorageConnector, Layer, VersionInfo, ___common) {
+sap.ui.define(["sap/base/util/merge", "sap/ui/fl/write/api/connectors/ObjectStorageConnector", "sap/ui/fl/Layer", "./common", "../utils/version"], function (merge, ObjectStorageConnector, Layer, ___common, ___utils_version) {
   "use strict";
 
   const CHANGES_API_PATH = ___common["CHANGES_API_PATH"];
   const getFlexSettings = ___common["getFlexSettings"];
+  const getUi5Version = ___utils_version["getUi5Version"];
   const connector = merge({}, ObjectStorageConnector, {
     layers: [Layer.VENDOR, Layer.CUSTOMER_BASE],
     storage: {
@@ -68,9 +69,7 @@ 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 VersionInfo.load({
-        library: 'sap.ui.core'
-      }))?.version;
+      const version = await getUi5Version();
       const [majorVersion, minorVersion] = version.split('.').map(v => parseInt(v, 10));
       features.isVariantAdaptationEnabled = majorVersion >= 1 && minorVersion >= 90;
       const settings = getFlexSettings();

package/dist/client/flp/WorkspaceConnector.ts

@@ -1,9 +1,8 @@
 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 VersionInfo from 'sap/ui/VersionInfo';
-import type {SingleVersionInfo} from '../../types/global';
 import { CHANGES_API_PATH, FlexChange, getFlexSettings } from './common';
+import { getUi5Version } from '../utils/version';
 
 const connector = merge({}, ObjectStorageConnector, {
     layers: [Layer.VENDOR, Layer.CUSTOMER_BASE],
@@ -69,8 +68,7 @@ const connector = merge({}, ObjectStorageConnector, {
     } as typeof ObjectStorageConnector.storage,
     loadFeatures: async function () {
         const features = await ObjectStorageConnector.loadFeatures();
-
-        const version = (await VersionInfo.load({library:'sap.ui.core'}) as SingleVersionInfo)?.version;
+        const version = await getUi5Version();
         const [majorVersion, minorVersion] = version.split('.').map((v: string) => parseInt(v, 10));
         features.isVariantAdaptationEnabled = majorVersion >= 1 && minorVersion >= 90;
         const settings = getFlexSettings();

package/dist/client/flp/init.js

@@ -5,10 +5,10 @@ sap.ui.define([
     'sap/ui/core/IconPool',
     'sap/base/i18n/ResourceBundle',
     '../adp/api-handler',
-    'sap/ui/VersionInfo',
     '../cpe/error-utils',
-    './initConnectors'
-], function (Log, ___sap_ux_private_control_property_editor_common, IconPool, ResourceBundle, ___adp_api_handler, VersionInfo, ___cpe_error_utils, __initConnectors) {
+    './initConnectors',
+    '../utils/version'
+], function (Log, ___sap_ux_private_control_property_editor_common, IconPool, ResourceBundle, ___adp_api_handler, ___cpe_error_utils, __initConnectors, ___utils_version) {
     'use strict';
     function _interopRequireDefault(obj) {
         return obj && obj.__esModule && typeof obj.default !== 'undefined' ? obj.default : obj;
@@ -17,6 +17,7 @@ sap.ui.define([
     const getManifestAppdescr = ___adp_api_handler['getManifestAppdescr'];
     const getError = ___cpe_error_utils['getError'];
     const initConnectors = _interopRequireDefault(__initConnectors);
+    const getUi5Version = ___utils_version['getUi5Version'];
     const UI5_LIBS = [
         'sap.apf',
         'sap.base',
@@ -88,7 +89,7 @@ sap.ui.define([
     function registerModules(dataFromAppIndex) {
         Object.keys(dataFromAppIndex).forEach(function (moduleDefinitionKey) {
             const moduleDefinition = dataFromAppIndex[moduleDefinitionKey];
-            if (moduleDefinition && moduleDefinition.dependencies) {
+            if (moduleDefinition?.dependencies) {
                 moduleDefinition.dependencies.forEach(function (dependency) {
                     if (dependency.url && dependency.url.length > 0 && dependency.type === 'UI5LIB') {
                         Log.info('Registering Library ' + dependency.componentId + ' from server ' + dependency.url);
@@ -159,7 +160,7 @@ 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 VersionInfo.load({ library: 'sap.ui.core' }))?.version;
+        const version = await getUi5Version();
         if (flex) {
             const flexSettings = JSON.parse(flex);
             scenario = flexSettings.scenario;

package/dist/client/flp/init.ts

@@ -7,10 +7,9 @@ import IconPool from 'sap/ui/core/IconPool';
 import ResourceBundle from 'sap/base/i18n/ResourceBundle';
 import AppState from 'sap/ushell/services/AppState';
 import { getManifestAppdescr } from '../adp/api-handler';
-import VersionInfo from 'sap/ui/VersionInfo';
 import { getError } from '../cpe/error-utils';
 import initConnectors from './initConnectors';
-import type {SingleVersionInfo} from '../../types/global';
+import { getUi5Version } from '../utils/version';
 
 /**
  * SAPUI5 delivered namespaces from https://ui5.sap.com/#/api/sap
@@ -142,7 +141,7 @@ async function getManifestLibs(appUrls: string[]): Promise<string> {
 function registerModules(dataFromAppIndex: AppIndexData) {
     Object.keys(dataFromAppIndex).forEach(function (moduleDefinitionKey) {
         const moduleDefinition = dataFromAppIndex[moduleDefinitionKey];
-        if (moduleDefinition && moduleDefinition.dependencies) {
+        if (moduleDefinition?.dependencies) {
             moduleDefinition.dependencies.forEach(function (dependency) {
                 if (dependency.url && dependency.url.length > 0 && dependency.type === 'UI5LIB') {
                     Log.info('Registering Library ' + dependency.componentId + ' from server ' + dependency.url);
@@ -270,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 VersionInfo.load({library:'sap.ui.core'}) as SingleVersionInfo)?.version;
+    const version = await getUi5Version();
     // Register RTA if configured
     if (flex) {
         const flexSettings = JSON.parse(flex) as FlexSettings;

package/dist/client/utils/version.js

@@ -0,0 +1,25 @@
+"use strict";
+
+sap.ui.define(["sap/ui/VersionInfo", "sap/base/Log"], function (VersionInfo, Log) {
+  "use strict";
+
+  /**
+   * Retrieve the UI5 version from sap.ui.core library
+   */
+  async function getUi5Version() {
+    let version = (await VersionInfo.load({
+      library: 'sap.ui.core'
+    }))?.version;
+    if (!version) {
+      Log.error('Could not get UI5 version of application. Using 1.121.0 as fallback.');
+      version = '1.121.0';
+    }
+    return version;
+  }
+  var __exports = {
+    __esModule: true
+  };
+  __exports.getUi5Version = getUi5Version;
+  return __exports;
+});
+//# sourceMappingURL=version.js.map

package/dist/client/utils/version.ts

@@ -0,0 +1,15 @@
+import type { SingleVersionInfo } from '../../types/global';
+import VersionInfo from 'sap/ui/VersionInfo';
+import Log from 'sap/base/Log';
+
+/**
+ * Retrieve the UI5 version from sap.ui.core library
+ */
+export async function getUi5Version() {
+    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;
+}

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.34",
+  "version": "0.16.36",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -25,11 +25,11 @@
     "ejs": "3.1.10",
     "mem-fs": "2.1.0",
     "mem-fs-editor": "9.4.0",
-    "@sap-ux/logger": "0.6.0",
     "@sap-ux/btp-utils": "0.15.0",
-    "@sap-ux/adp-tooling": "0.12.24",
-    "@sap-ux/control-property-editor-sources": "npm:@sap-ux/control-property-editor@0.4.27",
-    "@sap-ux/project-access": "1.26.3"
+    "@sap-ux/logger": "0.6.0",
+    "@sap-ux/adp-tooling": "0.12.25",
+    "@sap-ux/project-access": "1.26.3",
+    "@sap-ux/control-property-editor-sources": "npm:@sap-ux/control-property-editor@0.4.27"
   },
   "devDependencies": {
     "@types/ejs": "3.1.2",
@@ -45,11 +45,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.10.5",
+    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.10.7",
     "@sap-ux/axios-extension": "1.16.2",
     "@sap-ux/store": "0.7.0",
-    "@sap-ux/ui5-info": "0.7.0",
-    "@sap-ux/i18n": "0.1.0"
+    "@sap-ux/i18n": "0.1.0",
+    "@sap-ux/ui5-info": "0.7.0"
   },
   "peerDependencies": {
     "express": "4"