@sap-ux/preview-middleware 0.16.125 → 0.16.127

package/dist/client/adp/quick-actions/fe-v4/lr-enable-semantic-date-range-filter-bar.js

@@ -9,7 +9,8 @@ sap.ui.define(["../../../cpe/feature-service", "../../../cpe/quick-actions/utils
   const executeToggleAction = ___utils["executeToggleAction"];
   const SimpleQuickActionDefinitionBase = ___simple_quick_action_base["SimpleQuickActionDefinitionBase"];
   const ENABLE_SEMANTIC_DATE_RANGE = 'enable-semantic-date-range';
-  const PROPERTY_PATH = 'controlConfiguration/@com.sap.vocabularies.UI.v1.SelectionFields/useSemanticDateRange';
+  const PROPERTY_NAME = 'useSemanticDateRange';
+  const PROPERTY_PATH = `controlConfiguration/@com.sap.vocabularies.UI.v1.SelectionFields/${PROPERTY_NAME}`;
   const CONTROL_TYPE = 'sap.fe.macros.controls.FilterBar';
   const boolMap = {
     'true': true,
@@ -34,7 +35,8 @@ sap.ui.define(["../../../cpe/feature-service", "../../../cpe/quick-actions/utils
         const filterBar = getControlById(control.controlId);
         if (isActionApplicable && filterBar) {
           this.control = filterBar;
-          this.isUseDateRangeTypeEnabled = boolMap[this.control.data('useSemanticDateRange')];
+          const value = this.context.changeService.getConfigurationPropertyValue(control.controlId, PROPERTY_NAME);
+          this.isUseDateRangeTypeEnabled = value === undefined ? boolMap[this.control.data('useSemanticDateRange')] : value;
         }
       }
     }

package/dist/client/adp/quick-actions/fe-v4/lr-enable-semantic-date-range-filter-bar.ts

@@ -9,7 +9,8 @@ import { executeToggleAction } from './utils';
 import { SimpleQuickActionDefinitionBase } from '../simple-quick-action-base';
 
 export const ENABLE_SEMANTIC_DATE_RANGE = 'enable-semantic-date-range';
-const PROPERTY_PATH = 'controlConfiguration/@com.sap.vocabularies.UI.v1.SelectionFields/useSemanticDateRange';
+const PROPERTY_NAME = 'useSemanticDateRange';
+const PROPERTY_PATH = `controlConfiguration/@com.sap.vocabularies.UI.v1.SelectionFields/${PROPERTY_NAME}`;
 const CONTROL_TYPE = 'sap.fe.macros.controls.FilterBar';
 const boolMap: { [key: string]: boolean } = {
     'true': true,
@@ -38,7 +39,12 @@ export class ToggleSemanticDateRangeFilterBar
             const filterBar = getControlById<FilterBar>(control.controlId);
             if (isActionApplicable && filterBar) {
                 this.control = filterBar;
-                this.isUseDateRangeTypeEnabled = boolMap[this.control.data('useSemanticDateRange')];
+                const value = this.context.changeService.getConfigurationPropertyValue(
+                    control.controlId,
+                    PROPERTY_NAME
+                );
+                this.isUseDateRangeTypeEnabled =
+                    value === undefined ? boolMap[this.control.data('useSemanticDateRange')] : (value as boolean);
             }
         }
     }

package/dist/client/adp/quick-actions/fe-v4/lr-toggle-clear-filter-bar.js

@@ -8,7 +8,8 @@ sap.ui.define(["../../../cpe/quick-actions/utils", "../../../utils/core", "./uti
   const executeToggleAction = ___utils["executeToggleAction"];
   const SimpleQuickActionDefinitionBase = ___simple_quick_action_base["SimpleQuickActionDefinitionBase"];
   const ENABLE_CLEAR_FILTER_BAR_TYPE = 'enable-clear-filter-bar';
-  const PROPERTY_PATH = 'controlConfiguration/@com.sap.vocabularies.UI.v1.SelectionFields/showClearButton';
+  const PROPERTY_NAME = 'showClearButton';
+  const PROPERTY_PATH = `controlConfiguration/@com.sap.vocabularies.UI.v1.SelectionFields/${PROPERTY_NAME}`;
   const CONTROL_TYPE = 'sap.fe.macros.controls.FilterBar';
 
   /**
@@ -27,7 +28,8 @@ sap.ui.define(["../../../cpe/quick-actions/utils", "../../../utils/core", "./uti
         const filterBar = getControlById(control.controlId);
         if (isActionApplicable && filterBar) {
           this.control = filterBar;
-          this.isClearButtonEnabled = filterBar.getShowClearButton();
+          const value = this.context.changeService.getConfigurationPropertyValue(control.controlId, PROPERTY_NAME);
+          this.isClearButtonEnabled = value === undefined ? filterBar.getShowClearButton() : value;
         }
       }
     }

package/dist/client/adp/quick-actions/fe-v4/lr-toggle-clear-filter-bar.ts

@@ -8,7 +8,8 @@ import { executeToggleAction } from './utils';
 import { SimpleQuickActionDefinitionBase } from '../simple-quick-action-base';
 
 export const ENABLE_CLEAR_FILTER_BAR_TYPE = 'enable-clear-filter-bar';
-const PROPERTY_PATH = 'controlConfiguration/@com.sap.vocabularies.UI.v1.SelectionFields/showClearButton';
+const PROPERTY_NAME = 'showClearButton';
+const PROPERTY_PATH = `controlConfiguration/@com.sap.vocabularies.UI.v1.SelectionFields/${PROPERTY_NAME}`;
 const CONTROL_TYPE = 'sap.fe.macros.controls.FilterBar';
 
 /**
@@ -31,7 +32,11 @@ export class ToggleClearFilterBarQuickAction
             const filterBar = getControlById<FilterBar>(control.controlId);
             if (isActionApplicable && filterBar) {
                 this.control = filterBar;
-                this.isClearButtonEnabled = filterBar.getShowClearButton();
+                const value = this.context.changeService.getConfigurationPropertyValue(
+                    control.controlId,
+                    PROPERTY_NAME
+                );
+                this.isClearButtonEnabled = value === undefined ? filterBar.getShowClearButton() : (value as boolean);
             }
         }
     }

package/dist/client/cpe/init.js

@@ -42,7 +42,7 @@ sap.ui.define([
         const selectionService = new SelectionService(rta, changesService);
         const connectorService = new WorkspaceConnectorService();
         const outlineService = new OutlineService(rta, changesService);
-        const quickActionService = new QuickActionService(rta, outlineService, registries);
+        const quickActionService = new QuickActionService(rta, outlineService, registries, changesService);
         const services = [
             connectorService,
             selectionService,
@@ -53,12 +53,16 @@ sap.ui.define([
         ];
         try {
             loadDefaultLibraries();
-            for (const service of services) {
-                service.init(CommunicationService.sendAction, subscribe)?.catch(reason => Log.error('Service Initialization Failed: ', getError(reason)));
-            }
+            const allPromises = services.map(service => {
+                return service.init(CommunicationService.sendAction, subscribe)?.catch(error => {
+                    Log.error('Service Initialization Failed: ', getError(error));
+                });
+            });
+            Promise.all(allPromises).then(() => {
+                CommunicationService.sendAction(appLoaded());
+            }).catch(Log.error);
             const icons = getIcons();
             CommunicationService.sendAction(iconsLoaded(icons));
-            CommunicationService.sendAction(appLoaded());
         } catch (error) {
             Log.error('Error during initialization of Control Property Editor', getError(error));
         }

package/dist/client/cpe/init.ts

@@ -43,7 +43,7 @@ export default function init(
 
     const connectorService = new WorkspaceConnectorService();
     const outlineService = new OutlineService(rta, changesService);
-    const quickActionService = new QuickActionService(rta, outlineService, registries);
+    const quickActionService = new QuickActionService(rta, outlineService, registries, changesService);
     const services: Service[] = [
         connectorService,
         selectionService,
@@ -52,22 +52,25 @@ export default function init(
         rtaService,
         quickActionService
     ];
-
     try {
         loadDefaultLibraries();
-
-        for (const service of services) {
-            service
-                .init(CommunicationService.sendAction, subscribe)
-                ?.catch((reason) => Log.error('Service Initialization Failed: ', getError(reason)));
-        }
-
+        const allPromises = services.map((service) => {
+            return service.init(CommunicationService.sendAction, subscribe)?.catch((error) => {
+                Log.error('Service Initialization Failed: ', getError(error));
+            });
+        });
+        Promise.all(allPromises)
+            .then(() => {
+                CommunicationService.sendAction(appLoaded());
+            })
+            // eslint-disable-next-line @typescript-eslint/unbound-method
+            .catch(Log.error);
         const icons = getIcons();
-
         CommunicationService.sendAction(iconsLoaded(icons));
-        CommunicationService.sendAction(appLoaded());
     } catch (error) {
         Log.error('Error during initialization of Control Property Editor', getError(error));
     }
+
+    //  * This is returned immediately to avoid promise deadlock, preventing services from waiting indefinitely.
     return Promise.resolve();
 }

package/dist/client/cpe/quick-actions/quick-action-definition.ts

@@ -13,6 +13,7 @@ import type {
 
 import type { TextBundle } from '../../i18n';
 import type { ControlTreeIndex } from '../types';
+import { ChangeService } from '../changes';
 
 export interface QuickActionActivationContext {
     controlIndex: ControlTreeIndex;
@@ -38,6 +39,7 @@ export interface QuickActionContext {
     rta: RuntimeAuthoring;
     flexSettings: FlexSettings;
     manifest: Manifest;
+    changeService: ChangeService;
 }
 
 export type QuickActionActivationData = {

package/dist/client/cpe/quick-actions/quick-action-service.js

@@ -15,10 +15,11 @@ sap.ui.define([
         sendAction = () => {
         };
         actions = [];
-        constructor(rta, outlineService, registries) {
+        constructor(rta, outlineService, registries, changeService) {
             this.rta = rta;
             this.outlineService = outlineService;
             this.registries = registries;
+            this.changeService = changeService;
         }
         async init(sendAction, subscribe) {
             this.sendAction = sendAction;
@@ -40,8 +41,12 @@ sap.ui.define([
                 }
             });
             this.outlineService.onOutlineChange(async event => {
+                this.controlTreeIndex = event.detail.controlIndex;
                 await this.reloadQuickActions(event.detail.controlIndex);
             });
+            this.changeService.onStackChange(async () => {
+                await this.reloadQuickActions(this.controlTreeIndex);
+            });
         }
         async reloadQuickActions(controlIndex) {
             const context = {
@@ -62,7 +67,8 @@ sap.ui.define([
                         key,
                         rta: this.rta,
                         flexSettings: this.rta.getFlexSettings(),
-                        resourceBundle: this.texts
+                        resourceBundle: this.texts,
+                        changeService: this.changeService
                     };
                     for (const Definition of definitions) {
                         try {

package/dist/client/cpe/quick-actions/quick-action-service.ts

@@ -19,6 +19,7 @@ import { QuickActionActivationContext, QuickActionContext, QuickActionDefinition
 import { QuickActionDefinitionRegistry } from './registry';
 import { OutlineService } from '../outline/service';
 import { getTextBundle, TextBundle } from '../../i18n';
+import { ChangeService } from '../changes';
 
 /**
  * Service providing Quick Actions.
@@ -26,13 +27,14 @@ import { getTextBundle, TextBundle } from '../../i18n';
 export class QuickActionService implements Service {
     private sendAction: ActionSenderFunction = () => {};
     private actions: QuickActionDefinition[] = [];
+    private controlTreeIndex: ControlTreeIndex;
 
     private actionService: ActionService;
     private texts: TextBundle;
 
     /**
      * Qucik action service constructor.zrf
-     * 
+     *
      * @param rta - RTA object.
      * @param outlineService - Outline service instance.
      * @param registries - Quick action registries.
@@ -40,7 +42,8 @@ export class QuickActionService implements Service {
     constructor(
         private readonly rta: RuntimeAuthoring,
         private readonly outlineService: OutlineService,
-        private readonly registries: QuickActionDefinitionRegistry<string>[]
+        private readonly registries: QuickActionDefinitionRegistry<string>[],
+        private readonly changeService: ChangeService
     ) {}
 
     /**
@@ -75,13 +78,18 @@ export class QuickActionService implements Service {
         });
 
         this.outlineService.onOutlineChange(async (event) => {
+            this.controlTreeIndex = event.detail.controlIndex;
             await this.reloadQuickActions(event.detail.controlIndex);
         });
+
+        this.changeService.onStackChange(async () => {
+            await this.reloadQuickActions(this.controlTreeIndex);
+        });
     }
 
     /**
      * Prepares a list of currently applicable Quick Actions and sends them to the UI.
-     * 
+     *
      * @param controlIndex - Control tree index.
      */
     public async reloadQuickActions(controlIndex: ControlTreeIndex): Promise<void> {
@@ -104,7 +112,8 @@ export class QuickActionService implements Service {
                     key,
                     rta: this.rta,
                     flexSettings: this.rta.getFlexSettings(),
-                    resourceBundle: this.texts
+                    resourceBundle: this.texts,
+                    changeService: this.changeService
                 };
                 for (const Definition of definitions) {
                     try {

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

@@ -13,33 +13,37 @@ sap.ui.define(['open/ux/preview/client/thirdparty/@sap-ux-private/control-proper
         constructor(rta) {
             this.rta = rta;
         }
-        init(sendAction, subscribe) {
-            sendAction(applicationModeChanged(this.rta.getMode()));
-            subscribe(async action => {
-                if (setAppMode.match(action)) {
-                    this.rta.setMode(action.payload);
-                }
-                if (undo.match(action)) {
-                    this.rta.undo();
-                }
-                if (redo.match(action)) {
-                    this.rta.redo();
-                }
-                if (reloadApplication.match(action)) {
-                    if (action.payload.save === true) {
+        async init(sendAction, subscribe) {
+            return new Promise(resolve => {
+                sendAction(applicationModeChanged(this.rta.getMode()));
+                subscribe(async action => {
+                    if (setAppMode.match(action)) {
+                        this.rta.setMode(action.payload);
+                    }
+                    if (undo.match(action)) {
+                        this.rta.undo();
+                    }
+                    if (redo.match(action)) {
+                        this.rta.redo();
+                    }
+                    if (reloadApplication.match(action)) {
+                        if (action.payload.save === true) {
+                            await this.save();
+                        }
+                        await this.rta.stop(false, true);
+                    }
+                    if (save.match(action)) {
                         await this.save();
                     }
-                    await this.rta.stop(false, true);
-                }
-                if (save.match(action)) {
-                    await this.save();
-                }
-                return Promise.resolve();
-            });
-            this.rta.attachStop(() => {
-                location.reload();
+                });
+                this.rta.attachStop(() => {
+                    location.reload();
+                });
+                this.rta.attachStart(() => {
+                    resolve();
+                });
+                this.rta.attachModeChanged(modeAndStackChangeHandler(sendAction, this.rta));
             });
-            this.rta.attachModeChanged(modeAndStackChangeHandler(sendAction, this.rta));
         }
         save() {
             if (this.rta.save) {

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

@@ -28,36 +28,40 @@ export class RtaService {
      * @param sendAction action sender function
      * @param subscribe subscriber function
      */
-    public init(sendAction: ActionSenderFunction, subscribe: SubscribeFunction): void {
-        sendAction(applicationModeChanged(this.rta.getMode()));
-        subscribe(async (action): Promise<void> => {
-            if (setAppMode.match(action)) {
-                this.rta.setMode(action.payload);
-            }
-            if (undo.match(action)) {
-                this.rta.undo();
-            }
-            if (redo.match(action)) {
-                this.rta.redo();
-            }
-            if (reloadApplication.match(action)) {
-                if (action.payload.save === true) {
-                    await this.save();
+    public async init(sendAction: ActionSenderFunction, subscribe: SubscribeFunction): Promise<void> {
+        return new Promise((resolve) => {
+            sendAction(applicationModeChanged(this.rta.getMode()));
+            subscribe(async (action): Promise<void> => {
+                if (setAppMode.match(action)) {
+                    this.rta.setMode(action.payload);
+                }
+                if (undo.match(action)) {
+                    this.rta.undo();
+                }
+                if (redo.match(action)) {
+                    this.rta.redo();
+                }
+                if (reloadApplication.match(action)) {
+                    if (action.payload.save === true) {
+                        await this.save();
+                    }
+                    await this.rta.stop(false, true);
                 }
-                await this.rta.stop(false, true);
-            }
 
-            if (save.match(action)) {
-                await this.save();
-            }
-            return Promise.resolve();
-        });
+                if (save.match(action)) {
+                    await this.save();
+                }
+            });
 
-        this.rta.attachStop(() => {
-            // eslint-disable-next-line fiori-custom/sap-no-location-reload
-            location.reload();
+            this.rta.attachStop(() => {
+                // eslint-disable-next-line fiori-custom/sap-no-location-reload
+                location.reload();
+            });
+            this.rta.attachStart(() => {
+                resolve();
+            });
+            this.rta.attachModeChanged(modeAndStackChangeHandler(sendAction, this.rta));
         });
-        this.rta.attachModeChanged(modeAndStackChangeHandler(sendAction, this.rta));
     }
 
     private save(): Promise<void> {

package/dist/client/cpe/selection.js

@@ -22,6 +22,7 @@ sap.ui.define([
     const getRuntimeControl = ___utils['getRuntimeControl'];
     const getDocumentation = ___documentation['getDocumentation'];
     const getComponent = ___utils_core['getComponent'];
+    const getControlById = ___utils_core['getControlById'];
     const getError = ___utils_error['getError'];
     function propertyChangeId(controlId, propertyName) {
         return [
@@ -73,7 +74,7 @@ sap.ui.define([
                     this.applyControlPropertyChange(action.payload.controlId, action.payload.propertyName);
                 } else if (selectControl.match(action)) {
                     const id = action.payload;
-                    const control = sap.ui.getCore().byId(id);
+                    const control = getControlById(id);
                     if (!control) {
                         const component = getComponent(id);
                         if (component) {
@@ -127,6 +128,7 @@ sap.ui.define([
                     const overlayControl = sap.ui.getCore().byId(selection[0].getId());
                     if (overlayControl) {
                         const runtimeControl = getRuntimeControl(overlayControl);
+                        this.currentSelection = runtimeControl;
                         const controlName = runtimeControl.getMetadata().getName();
                         this.handlePropertyChanges(runtimeControl, sendAction);
                         try {

package/dist/client/cpe/selection.ts

@@ -21,10 +21,9 @@ import Log from 'sap/base/Log';
 import { getDocumentation } from './documentation';
 import OverlayRegistry from 'sap/ui/dt/OverlayRegistry';
 import OverlayUtil from 'sap/ui/dt/OverlayUtil';
-import { getComponent } from '../utils/core';
+import { getComponent, getControlById } from '../utils/core';
 import { getError } from '../utils/error';
 import { ChangeService } from './changes';
-import UI5Element from 'sap/ui/core/Element';
 
 export interface PropertyChangeParams {
     name: string;
@@ -95,7 +94,7 @@ async function addDocumentationForProperties(control: ManagedObject, controlData
 export class SelectionService implements Service {
     private appliedChangeCache = new Map<string, number>();
     private activeChangeHandlers = new Set<() => void>();
-    private currentSelection: UI5Element;
+    private currentSelection: ManagedObject;
     /**
      *
      * @param rta - rta object.
@@ -120,7 +119,7 @@ export class SelectionService implements Service {
                 this.applyControlPropertyChange(action.payload.controlId, action.payload.propertyName);
             } else if (selectControl.match(action)) {
                 const id = action.payload;
-                const control = sap.ui.getCore().byId(id);
+                const control = getControlById(id);
                 if (!control) {
                     const component = getComponent(id);
                     if (component) {
@@ -201,6 +200,7 @@ export class SelectionService implements Service {
                 const overlayControl = sap.ui.getCore().byId(selection[0].getId()) as ElementOverlay;
                 if (overlayControl) {
                     const runtimeControl = getRuntimeControl(overlayControl);
+                    this.currentSelection = runtimeControl;
                     const controlName = runtimeControl.getMetadata().getName();
                     this.handlePropertyChanges(runtimeControl, sendAction);
                     try {

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.125",
+  "version": "0.16.127",
   "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/feature-toggle": "0.2.2",
-    "@sap-ux/adp-tooling": "0.12.81",
     "@sap-ux/btp-utils": "0.17.0",
-    "@sap-ux/control-property-editor-sources": "npm:@sap-ux/control-property-editor@0.5.26",
+    "@sap-ux/adp-tooling": "0.12.82",
+    "@sap-ux/control-property-editor-sources": "npm:@sap-ux/control-property-editor@0.5.27",
     "@sap-ux/project-access": "1.28.7"
   },
   "devDependencies": {
@@ -46,10 +46,10 @@
     "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.11.34",
+    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.11.35",
     "@sap-ux/axios-extension": "1.17.4",
-    "@sap-ux/ui5-info": "0.8.3",
     "@sap-ux/store": "0.9.3",
+    "@sap-ux/ui5-info": "0.8.3",
     "@sap-ux/i18n": "0.2.0"
   },
   "peerDependencies": {