@sap-ux/preview-middleware 0.13.37 → 0.13.39

package/dist/client/adp/init.js

@@ -1,13 +1,12 @@
 'use strict';
 sap.ui.define([
     'sap/base/Log',
-    'sap/ui/core/ElementRegistry',
     '../cpe/init',
     './init-dialogs',
     'open/ux/preview/client/thirdparty/@sap-ux-private/control-property-editor-common',
     'sap/ui/VersionInfo',
     './ui5-version-utils'
-], function (log, UI5ElementRegistry, __init, ___init_dialogs, ___sap_ux_private_control_property_editor_common, VersionInfo, ___ui5_version_utils) {
+], function (log, __init, ___init_dialogs, ___sap_ux_private_control_property_editor_common, VersionInfo, ___ui5_version_utils) {
     'use strict';
     function _interopRequireDefault(obj) {
         return obj && obj.__esModule && typeof obj.default !== 'undefined' ? obj.default : obj;
@@ -52,7 +51,7 @@ sap.ui.define([
                 }
             }
         });
-        const syncViewsIds = getAllSyncViewsIds();
+        const syncViewsIds = await getAllSyncViewsIds(minor);
         initDialogs(rta, syncViewsIds);
         if (minor > 77) {
             const ExtensionPointService = (await __ui5_require_async('open/ux/preview/client/adp/extension-point')).default;
@@ -76,16 +75,34 @@ sap.ui.define([
         }
         log.debug('ADP init executed.');
     };
-    function getAllSyncViewsIds() {
-        const elements = UI5ElementRegistry.all();
+    async function getAllSyncViewsIds(minor) {
         const syncViewIds = [];
-        Object.entries(elements).forEach(_ref => {
-            let [key, ui5Element] = _ref;
-            if (ui5Element?.getMetadata()?.getName()?.includes('XMLView') && ui5Element?.oAsyncState === undefined) {
-                syncViewIds.push(key);
+        try {
+            if (minor < 120) {
+                const Element = (await __ui5_require_async('sap/ui/core/Element')).default;
+                const elements = Element.registry.filter(() => true);
+                elements.forEach(ui5Element => {
+                    if (isSyncView(ui5Element)) {
+                        syncViewIds.push(ui5Element.getId());
+                    }
+                });
+            } else {
+                const ElementRegistry = (await __ui5_require_async('sap/ui/core/ElementRegistry')).default;
+                const elements = ElementRegistry.all();
+                Object.entries(elements).forEach(_ref => {
+                    let [key, ui5Element] = _ref;
+                    if (isSyncView(ui5Element)) {
+                        syncViewIds.push(key);
+                    }
+                });
             }
-        });
+        } catch (error) {
+            log.error('Could not get application sync views', error);
+        }
         return syncViewIds;
     }
+    const isSyncView = element => {
+        return element?.getMetadata()?.getName()?.includes('XMLView') && element?.oAsyncState === undefined;
+    };
     return __exports;
 });

package/dist/client/adp/init.ts

@@ -1,7 +1,5 @@
 import log from 'sap/base/Log';
 import type RuntimeAuthoring from 'sap/ui/rta/RuntimeAuthoring';
-import UI5ElementRegistry from 'sap/ui/core/ElementRegistry';
-
 import init from '../cpe/init';
 import { initDialogs } from './init-dialogs';
 import {
@@ -46,7 +44,7 @@ export default async function (rta: RuntimeAuthoring) {
         }
     );
 
-    const syncViewsIds = getAllSyncViewsIds();
+    const syncViewsIds = await getAllSyncViewsIds(minor);
     initDialogs(rta, syncViewsIds);
 
     if (minor > 77) {
@@ -77,19 +75,45 @@ export default async function (rta: RuntimeAuthoring) {
 }
 
 /**
- *
  * Get Ids for all sync views
+ * 
+ * @param minor UI5 Version
  *
  * @returns array of Ids for application sync views
  */
-function getAllSyncViewsIds(): string[] {
-    const elements = UI5ElementRegistry.all() as Record<string, UI5Element>;
+async function getAllSyncViewsIds(minor: number): Promise<string[]> {
     const syncViewIds: string[] = [];
-    Object.entries(elements).forEach(([key, ui5Element]) => {
-        if (ui5Element?.getMetadata()?.getName()?.includes('XMLView') && ui5Element?.oAsyncState === undefined) {
-            syncViewIds.push(key);
+    try {
+        if (minor < 120) {
+            const Element = (await import('sap/ui/core/Element')).default;
+            const elements = Element.registry.filter(() => true) as UI5Element[];
+            elements.forEach((ui5Element) => {
+                if (isSyncView(ui5Element)) {
+                    syncViewIds.push(ui5Element.getId());
+                }
+            });
+        } else {
+            const ElementRegistry = (await import('sap/ui/core/ElementRegistry')).default;
+            const elements = ElementRegistry.all() as Record<string, UI5Element>;
+            Object.entries(elements).forEach(([key, ui5Element]) => {
+                if (isSyncView(ui5Element)) {
+                    syncViewIds.push(key);
+                }
+            });
         }
-    });
+    } catch (error) {
+        log.error('Could not get application sync views', error);
+    }
 
     return syncViewIds;
 }
+
+/**
+ * Check if element is sync view
+ *
+ * @param element UI5Element
+ * @returns boolean if element is sync view or not
+ */
+const isSyncView = (element: UI5Element): boolean => {
+    return element?.getMetadata()?.getName()?.includes('XMLView') && element?.oAsyncState === undefined;
+};

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

@@ -0,0 +1,45 @@
+'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) {
+    'use strict';
+    function __ui5_require_async(path) {
+        return new Promise(function (resolve, reject) {
+            sap.ui.require([path], function (module) {
+                if (!(module && module.__esModule)) {
+                    module = module === null || !(typeof module === 'object' && path.endsWith('/library')) ? { default: module } : module;
+                    Object.defineProperty(module, '__esModule', { value: true });
+                }
+                resolve(module);
+            }, function (err) {
+                reject(err);
+            });
+        });
+    }
+    const storageFileChanged = ___sap_ux_private_control_property_editor_common['storageFileChanged'];
+    class WorkspaceConnectorService {
+        async init(sendAction) {
+            const {version} = await VersionInfo.load();
+            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 {
+                const FakeLrepConnector = (await __ui5_require_async('sap/ui/fl/FakeLrepConnector')).default;
+                FakeLrepConnector.fileChangeRequestNotifier = notifier(sendAction);
+            }
+        }
+    }
+    function notifier(sendAction) {
+        return (fileName, kind, changeType) => {
+            if (changeType && changeType !== 'appdescr_fe_changePageConfiguration' || kind === 'delete') {
+                sendAction(storageFileChanged(fileName?.replace('sap.ui.fl.', '')));
+            }
+        };
+    }
+    var __exports = { __esModule: true };
+    __exports.WorkspaceConnectorService = WorkspaceConnectorService;
+    return __exports;
+});

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

@@ -0,0 +1,35 @@
+import { ExternalAction, storageFileChanged } from '@sap-ux-private/control-property-editor-common';
+import { ActionSenderFunction } from './types';
+import VersionInfo from 'sap/ui/VersionInfo';
+
+/**
+ * A Class of WorkspaceConnectorService
+ */
+export class WorkspaceConnectorService {
+    /**
+     * Initializes connector service.
+     *
+     * @param sendAction action sender function
+     */
+    public async init(sendAction: ActionSenderFunction): Promise<void> {
+        const { version } = (await VersionInfo.load()) as { version: string };
+        const versionParts = version.split('.');
+        const minor = parseInt(versionParts[1], 10);
+        if (minor > 72) {
+            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);
+        }
+    }
+}
+
+function notifier(sendAction: (action: ExternalAction) => void) {
+    return (fileName: string, kind: 'delete' | 'create', changeType?: string) => {
+        if ((changeType && changeType !== 'appdescr_fe_changePageConfiguration') || kind === 'delete') {
+            sendAction(storageFileChanged(fileName?.replace('sap.ui.fl.', '')));
+        }
+    };
+}

package/dist/client/cpe/init.js

@@ -8,23 +8,19 @@ sap.ui.define([
     'sap/base/Log',
     './logger',
     './ui5-utils',
-    '../flp/WorkspaceConnector'
-], function (___sap_ux_private_control_property_editor_common, ___outline_index, ___selection, ___changes_service, ___documentation, Log, ___logger, ___ui5_utils, __workspaceConnector) {
+    './connector-service'
+], function (___sap_ux_private_control_property_editor_common, ___outline_index, ___selection, ___changes_service, ___documentation, Log, ___logger, ___ui5_utils, ___connector_service) {
     'use strict';
-    function _interopRequireDefault(obj) {
-        return obj && obj.__esModule && typeof obj.default !== 'undefined' ? obj.default : obj;
-    }
     const startPostMessageCommunication = ___sap_ux_private_control_property_editor_common['startPostMessageCommunication'];
     const iconsLoaded = ___sap_ux_private_control_property_editor_common['iconsLoaded'];
     const enableTelemetry = ___sap_ux_private_control_property_editor_common['enableTelemetry'];
-    const storageFileChanged = ___sap_ux_private_control_property_editor_common['storageFileChanged'];
     const initOutline = ___outline_index['initOutline'];
     const SelectionService = ___selection['SelectionService'];
     const ChangeService = ___changes_service['ChangeService'];
     const loadDefaultLibraries = ___documentation['loadDefaultLibraries'];
     const logger = ___logger['logger'];
     const getIcons = ___ui5_utils['getIcons'];
-    const workspaceConnector = _interopRequireDefault(__workspaceConnector);
+    const WorkspaceConnectorService = ___connector_service['WorkspaceConnectorService'];
     function init(rta) {
         Log.info('Initializing Control Property Editor');
         const flexSettings = rta.getFlexSettings();
@@ -37,9 +33,11 @@ sap.ui.define([
         }
         const selectionService = new SelectionService(rta);
         const changesService = new ChangeService({ rta }, selectionService);
+        const connectorService = new WorkspaceConnectorService();
         const services = [
             selectionService,
-            changesService
+            changesService,
+            connectorService
         ];
         try {
             loadDefaultLibraries();
@@ -57,11 +55,6 @@ sap.ui.define([
             }
             initOutline(rta, sendAction).catch(error => Log.error('Error during initialization of Control Property Editor', error));
             const icons = getIcons();
-            workspaceConnector.storage.fileChangeRequestNotifier = (fileName, kind, changeType) => {
-                if (changeType && changeType !== 'appdescr_fe_changePageConfiguration' || kind === 'delete') {
-                    sendAction(storageFileChanged(fileName?.replace('sap.ui.fl.', '')));
-                }
-            };
             sendAction(iconsLoaded(icons));
         } catch (error) {
             Log.error('Error during initialization of Control Property Editor', error);

package/dist/client/cpe/init.ts

@@ -2,8 +2,7 @@ import type { ExternalAction } from '@sap-ux-private/control-property-editor-com
 import {
     startPostMessageCommunication,
     iconsLoaded,
-    enableTelemetry,
-    storageFileChanged
+    enableTelemetry
 } from '@sap-ux-private/control-property-editor-common';
 import type RuntimeAuthoring from 'sap/ui/rta/RuntimeAuthoring';
 
@@ -15,7 +14,7 @@ import { loadDefaultLibraries } from './documentation';
 import Log from 'sap/base/Log';
 import { logger } from './logger';
 import { getIcons } from './ui5-utils';
-import workspaceConnector from '../flp/WorkspaceConnector';
+import { WorkspaceConnectorService } from './connector-service';
 
 export default function init(rta: RuntimeAuthoring): Promise<void> {
     Log.info('Initializing Control Property Editor');
@@ -38,7 +37,9 @@ export default function init(rta: RuntimeAuthoring): Promise<void> {
     const selectionService = new SelectionService(rta);
 
     const changesService = new ChangeService({ rta }, selectionService);
-    const services: Service[] = [selectionService, changesService];
+    const connectorService = new WorkspaceConnectorService();
+
+    const services: Service[] = [selectionService, changesService, connectorService];
     try {
         loadDefaultLibraries();
         const { sendAction } = startPostMessageCommunication<ExternalAction>(
@@ -65,17 +66,6 @@ export default function init(rta: RuntimeAuthoring): Promise<void> {
         );
         const icons = getIcons();
 
-        // hook the file deletion listener to the UI5 workspace connector
-        workspaceConnector.storage.fileChangeRequestNotifier = (
-            fileName: string,
-            kind: 'delete' | 'create',
-            changeType?: string
-        ) => {
-            if ((changeType && changeType !== 'appdescr_fe_changePageConfiguration') || kind === 'delete') {
-                sendAction(storageFileChanged(fileName?.replace('sap.ui.fl.', '')));
-            }
-        };
-
         sendAction(iconsLoaded(icons));
     } catch (error) {
         Log.error('Error during initialization of Control Property Editor', error);

package/dist/client/flp/enableFakeConnector.js

@@ -19,6 +19,13 @@ sap.ui.define(["sap/ui/fl/LrepConnector", "sap/ui/fl/FakeLrepConnector", "./comm
         change.support ??= {};
         change.support.generator = settings.generator;
       }
+      if (typeof FakeLrepConnector.fileChangeRequestNotifier === 'function' && change.fileName) {
+        try {
+          FakeLrepConnector.fileChangeRequestNotifier(change.fileName, 'create', change.changeType);
+        } catch (e) {
+          // exceptions in the listener call are ignored
+        }
+      }
       return fetch(CHANGES_API_PATH, {
         method: 'POST',
         body: JSON.stringify(change, null, 2),

package/dist/client/flp/enableFakeConnector.ts

@@ -37,6 +37,14 @@ export async function create(changes: FlexChange[]): Promise<void> {
                 change.support.generator = settings.generator;
             }
 
+            if (typeof FakeLrepConnector.fileChangeRequestNotifier === 'function' && change.fileName) {
+                try {
+                    FakeLrepConnector.fileChangeRequestNotifier(change.fileName, 'create', change.changeType);
+                } catch (e) {
+                    // exceptions in the listener call are ignored
+                }
+            }
+
             return fetch(CHANGES_API_PATH, {
                 method: 'POST',
                 body: JSON.stringify(change, null, 2),
@@ -88,6 +96,5 @@ export default function (): void {
         loadChanges,
         loadSettings: () => Promise.resolve()
     });
-
     FakeLrepConnector.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.13.37",
+  "version": "0.13.39",
   "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/btp-utils": "0.14.4",
-    "@sap-ux/adp-tooling": "0.10.5",
     "@sap-ux/logger": "0.5.1",
-    "@sap-ux/control-property-editor-sources": "npm:@sap-ux/control-property-editor@0.4.20",
-    "@sap-ux/project-access": "1.20.0"
+    "@sap-ux/adp-tooling": "0.10.5",
+    "@sap-ux/btp-utils": "0.14.4",
+    "@sap-ux/project-access": "1.20.0",
+    "@sap-ux/control-property-editor-sources": "npm:@sap-ux/control-property-editor@0.4.20"
   },
   "devDependencies": {
     "@types/ejs": "3.1.2",
@@ -45,9 +45,10 @@
     "supertest": "6.3.3",
     "@sap-ux-private/playwright": "0.0.3",
     "dotenv": "16.3.1",
-    "@sap-ux/i18n": "0.0.6",
-    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.9.10",
     "@sap-ux/axios-extension": "1.12.3",
+    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.9.12",
+    "@sap-ux/i18n": "0.0.6",
+    "@sap-ux/ui5-info": "0.5.0",
     "@sap-ux/store": "0.5.0"
   },
   "peerDependencies": {