@sap-ux/preview-middleware 0.13.36 → 0.13.38

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

@@ -27,6 +27,7 @@ sap.ui.define(["sap/ui/core/Fragment", "sap/ui/fl/Utils", "./controllers/AddFrag
       id: 'ADD_FRAGMENT',
       text: 'Add: Fragment',
       handler: async overlays => await handler(overlays[0], rta, DialogNames.ADD_FRAGMENT),
+      enabled: isFragmentCommandEnabled,
       icon: 'sap-icon://attachment-html'
     });
     contextMenu.addMenuItem({
@@ -44,13 +45,26 @@ sap.ui.define(["sap/ui/core/Fragment", "sap/ui/fl/Utils", "./controllers/AddFrag
    * @param overlays Control overlays
    * @param syncViewsIds Runtime Authoring
    *
-   * @returns boolean 
+   * @returns boolean
    */
   const isControllerExtensionEnabled = (overlays, syncViewsIds) => {
     const clickedControlId = FlUtils.getViewForControl(overlays[0].getElement()).getId();
     return overlays.length <= 1 && !syncViewsIds.includes(clickedControlId);
   };
 
+  /**
+   * 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.
+   * @returns {boolean} True if the fragment command is enabled, false otherwise.
+   */
+  const isFragmentCommandEnabled = overlays => {
+    if (overlays.length === 0) return false;
+    const control = overlays[0].getElement();
+    const hasStableId = FlUtils.checkControlId(control);
+    return hasStableId && overlays.length <= 1;
+  };
+
   /**
    * Handler for new context menu entry
    *
@@ -86,6 +100,7 @@ sap.ui.define(["sap/ui/core/Fragment", "sap/ui/fl/Utils", "./controllers/AddFrag
   __exports.DialogNames = DialogNames;
   __exports.initDialogs = initDialogs;
   __exports.isControllerExtensionEnabled = isControllerExtensionEnabled;
+  __exports.isFragmentCommandEnabled = isFragmentCommandEnabled;
   __exports.handler = handler;
   return __exports;
 });

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

@@ -11,7 +11,8 @@ import type RuntimeAuthoring from 'sap/ui/rta/RuntimeAuthoring';
 /** sap.ui.fl */
 import FlUtils from 'sap/ui/fl/Utils';
 
-import ElementOverlay from 'sap/ui/dt/ElementOverlay';
+/** sap.ui.dt */
+import type ElementOverlay from 'sap/ui/dt/ElementOverlay';
 
 import AddFragment from './controllers/AddFragment.controller';
 import ControllerExtension from './controllers/ControllerExtension.controller';
@@ -39,6 +40,7 @@ export const initDialogs = (rta: RuntimeAuthoring, syncViewsIds: string[]): void
         id: 'ADD_FRAGMENT',
         text: 'Add: Fragment',
         handler: async (overlays: UI5Element[]) => await handler(overlays[0], rta, DialogNames.ADD_FRAGMENT),
+        enabled: isFragmentCommandEnabled,
         icon: 'sap-icon://attachment-html'
     });
 
@@ -57,7 +59,7 @@ export const initDialogs = (rta: RuntimeAuthoring, syncViewsIds: string[]): void
  * @param overlays Control overlays
  * @param syncViewsIds Runtime Authoring
  *
- * @returns boolean 
+ * @returns boolean
  */
 export const isControllerExtensionEnabled = (overlays: ElementOverlay[], syncViewsIds: string[]): boolean => {
     const clickedControlId = FlUtils.getViewForControl(overlays[0].getElement()).getId();
@@ -65,6 +67,21 @@ export const isControllerExtensionEnabled = (overlays: ElementOverlay[], syncVie
     return overlays.length <= 1 && !syncViewsIds.includes(clickedControlId);
 };
 
+/**
+ * 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.
+ * @returns {boolean} True if the fragment command is enabled, false otherwise.
+ */
+export const isFragmentCommandEnabled = (overlays: ElementOverlay[]): boolean => {
+    if (overlays.length === 0) return false;
+
+    const control = overlays[0].getElement();
+    const hasStableId = FlUtils.checkControlId(control);
+
+    return hasStableId && overlays.length <= 1;
+};
+
 /**
  * Handler for new context menu entry
  *

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/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.36",
+  "version": "0.13.38",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -26,10 +26,10 @@
     "mem-fs": "2.1.0",
     "mem-fs-editor": "9.4.0",
     "@sap-ux/logger": "0.5.1",
-    "@sap-ux/btp-utils": "0.14.4",
     "@sap-ux/adp-tooling": "0.10.5",
     "@sap-ux/control-property-editor-sources": "npm:@sap-ux/control-property-editor@0.4.20",
-    "@sap-ux/project-access": "1.20.0"
+    "@sap-ux/project-access": "1.20.0",
+    "@sap-ux/btp-utils": "0.14.4"
   },
   "devDependencies": {
     "@types/ejs": "3.1.2",
@@ -45,7 +45,7 @@
     "supertest": "6.3.3",
     "@sap-ux-private/playwright": "0.0.3",
     "dotenv": "16.3.1",
-    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.9.9",
+    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.9.11",
     "@sap-ux/axios-extension": "1.12.3",
     "@sap-ux/store": "0.5.0",
     "@sap-ux/i18n": "0.0.6"