@sap-ux/preview-middleware 0.16.156 → 0.16.157

package/dist/client/adp/quick-actions/table-quick-action-base.js

@@ -5,8 +5,9 @@ sap.ui.define([
     '../../cpe/quick-actions/utils',
     '../../utils/core',
     '../../utils/version',
+    './quick-action-base',
     './control-types'
-], function (___sap_ux_private_control_property_editor_common, OverlayUtil, ____cpe_quick_actions_utils, ____utils_core, ____utils_version, ___control_types) {
+], function (___sap_ux_private_control_property_editor_common, OverlayUtil, ____cpe_quick_actions_utils, ____utils_core, ____utils_version, ___quick_action_base, ___control_types) {
     'use strict';
     const NESTED_QUICK_ACTION_KIND = ___sap_ux_private_control_property_editor_common['NESTED_QUICK_ACTION_KIND'];
     const getParentContainer = ____cpe_quick_actions_utils['getParentContainer'];
@@ -16,6 +17,7 @@ sap.ui.define([
     const isManagedObject = ____utils_core['isManagedObject'];
     const getUi5Version = ____utils_version['getUi5Version'];
     const isLowerThanMinimalUi5Version = ____utils_version['isLowerThanMinimalUi5Version'];
+    const QuickActionDefinitionBase = ___quick_action_base['QuickActionDefinitionBase'];
     const ANALYTICAL_TABLE_TYPE = ___control_types['ANALYTICAL_TABLE_TYPE'];
     const GRID_TABLE_TYPE = ___control_types['GRID_TABLE_TYPE'];
     const M_TABLE_TYPE = ___control_types['M_TABLE_TYPE'];
@@ -40,15 +42,8 @@ sap.ui.define([
             SETTINGS_ID
         ];
     }
-    class TableQuickActionDefinitionBase {
-        kind = NESTED_QUICK_ACTION_KIND;
-        get id() {
-            return `${ this.context.key }-${ this.type }`;
-        }
+    class TableQuickActionDefinitionBase extends QuickActionDefinitionBase {
         isApplicable = false;
-        get tooltip() {
-            return undefined;
-        }
         children = [];
         tableMap = {};
         get textKey() {
@@ -56,11 +51,14 @@ sap.ui.define([
         }
         constructor(type, controlTypes, defaultTextKey, context) {
             let options = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
+            let enablementValidators = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : [];
+            super(type, NESTED_QUICK_ACTION_KIND, defaultTextKey, context, enablementValidators);
             this.type = type;
             this.controlTypes = controlTypes;
             this.defaultTextKey = defaultTextKey;
             this.context = context;
             this.options = options;
+            this.enablementValidators = enablementValidators;
         }
         async initialize() {
             const version = await getUi5Version();

package/dist/client/adp/quick-actions/table-quick-action-base.ts

@@ -15,6 +15,8 @@ import ObjectPageSection from 'sap/uxap/ObjectPageSection';
 import ObjectPageSubSection from 'sap/uxap/ObjectPageSubSection';
 import ObjectPageLayout from 'sap/uxap/ObjectPageLayout';
 import ManagedObject from 'sap/ui/base/ManagedObject';
+import { EnablementValidator } from './enablement-validator';
+import { QuickActionDefinitionBase } from './quick-action-base';
 import {
     ANALYTICAL_TABLE_TYPE,
     GRID_TABLE_TYPE,
@@ -50,20 +52,11 @@ export type TableQuickActionsOptions = {
 /**
  * Base class for table quick actions.
  */
-export abstract class TableQuickActionDefinitionBase {
-    readonly kind = NESTED_QUICK_ACTION_KIND;
-    public get id(): string {
-        return `${this.context.key}-${this.type}`;
-    }
-
+export abstract class TableQuickActionDefinitionBase extends QuickActionDefinitionBase<
+    typeof NESTED_QUICK_ACTION_KIND
+> {
     public isApplicable = false;
 
-    protected isDisabled: boolean | undefined;
-
-    public get tooltip(): string | undefined {
-        return undefined;
-    }
-
     public children: NestedQuickActionChild[] = [];
     public tableMap: Record<
         string,
@@ -92,8 +85,11 @@ export abstract class TableQuickActionDefinitionBase {
         protected readonly controlTypes: string[],
         protected readonly defaultTextKey: string,
         protected readonly context: QuickActionContext,
-        protected options: TableQuickActionsOptions = {}
-    ) {}
+        protected options: TableQuickActionsOptions = {},
+        protected readonly enablementValidators: EnablementValidator[] = []
+    ) {
+        super(type, NESTED_QUICK_ACTION_KIND, defaultTextKey, context, enablementValidators);
+    }
 
     /**
      * Initializes action object instance

package/dist/client/cpe/changes/service.js

@@ -356,6 +356,34 @@ sap.ui.define([
             }
             return result;
         }
+        prepareV2ConfigurationChange(command, fileName, index, inactiveCommandCount) {
+            const {entityPropertyChange, page} = command.getProperty('parameters');
+            const propertyName = Object.keys(entityPropertyChange.propertyValue)[0];
+            const propertyValue = entityPropertyChange.propertyValue[propertyName];
+            const controlId = this.getCommandSelectorId(command) ?? '';
+            const propertyPathSegments = entityPropertyChange.propertyPath.split('/');
+            const key = getConfigMapControlIdMap(page, propertyPathSegments);
+            const isActive = index >= inactiveCommandCount;
+            const controlIds = this.configPropertyControlIdMap?.get(key) || [controlId];
+            const result = {
+                type: PENDING_CHANGE_TYPE,
+                kind: CONFIGURATION_CHANGE_KIND,
+                controlIds,
+                propertyPath: getCompactV4ConfigPath(propertyPathSegments) || page,
+                propertyName,
+                isActive,
+                value: propertyValue,
+                fileName
+            };
+            for (const id of result.controlIds) {
+                if (!this.pendingConfigChangeMap.get(id)) {
+                    this.pendingConfigChangeMap.set(id, []);
+                }
+                const pendingChanges = this.pendingConfigChangeMap.get(id);
+                pendingChanges?.push(result);
+            }
+            return result;
+        }
         async prepareChangeType(command, inactiveCommandCount, index) {
             const change = command?.getPreparedChange?.();
             const selectorId = typeof change?.getSelector === 'function' ? await this.getControlIdByChange(change) : this.getCommandSelectorId(command);
@@ -389,6 +417,8 @@ sap.ui.define([
             } else if (changeType === 'appdescr_fe_changePageConfiguration') {
                 const value = command.getProperty('parameters').entityPropertyChange.propertyValue;
                 return this.prepareV4ConfigurationChange(command, value, fileName, index, inactiveCommandCount);
+            } else if (changeType === 'appdescr_ui_generic_app_changePageConfiguration') {
+                return this.prepareV2ConfigurationChange(command, fileName, index, inactiveCommandCount);
             } else {
                 let result = {
                     type: PENDING_CHANGE_TYPE,

package/dist/client/cpe/changes/service.ts

@@ -558,6 +558,50 @@ export class ChangeService extends EventTarget {
         return result;
     }
 
+    private prepareV2ConfigurationChange(
+        command: FlexCommand,
+        fileName: string,
+        index: number,
+        inactiveCommandCount: number
+    ): PendingConfigurationChange {
+        const { entityPropertyChange, page } = command.getProperty('parameters') as {
+            entityPropertyChange: {
+                propertyPath: string;
+                propertyValue: Record<string, string>;
+            };
+            page: string;
+        };
+        const propertyName = Object.keys(entityPropertyChange.propertyValue)[0];
+        const propertyValue = entityPropertyChange.propertyValue[propertyName];
+        const controlId = this.getCommandSelectorId(command) ?? '';
+        const propertyPathSegments = entityPropertyChange.propertyPath.split('/');
+
+        const key = getConfigMapControlIdMap(page, propertyPathSegments);
+
+        const isActive = index >= inactiveCommandCount;
+        const controlIds = this.configPropertyControlIdMap?.get(key) || [controlId];
+
+        const result: PendingConfigurationChange = {
+            type: PENDING_CHANGE_TYPE,
+            kind: CONFIGURATION_CHANGE_KIND,
+            controlIds,
+            propertyPath: getCompactV4ConfigPath(propertyPathSegments) || page,
+            propertyName,
+            isActive,
+            value: propertyValue,
+            fileName
+        };
+        for (const id of result.controlIds) {
+            if (!this.pendingConfigChangeMap.get(id)) {
+                this.pendingConfigChangeMap.set(id, []);
+            }
+            const pendingChanges = this.pendingConfigChangeMap.get(id);
+            pendingChanges?.push(result);
+        }
+
+        return result;
+    }
+
     /**
      * Prepares the type of change based on the command and other parameters.
      *
@@ -613,6 +657,8 @@ export class ChangeService extends EventTarget {
                 command.getProperty('parameters') as { entityPropertyChange: { propertyValue: ConfigurationValue } }
             ).entityPropertyChange.propertyValue;
             return this.prepareV4ConfigurationChange(command, value, fileName, index, inactiveCommandCount);
+        } else if (changeType === 'appdescr_ui_generic_app_changePageConfiguration') {
+            return this.prepareV2ConfigurationChange(command, fileName, index, inactiveCommandCount);
         } else {
             let result: PendingChange = {
                 type: PENDING_CHANGE_TYPE,

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

@@ -62,9 +62,13 @@ interface QuickActionDefinitionBase {
      */
     isApplicable: boolean;
     /**
-     * Initializes the action and checks if it should be enabled in current context.
+     * Initializes the action and checks if it should be displayed in current context.
      */
     initialize: () => void | Promise<void>;
+    /**
+     * Runs enablement validators to check if the action should be enabled.
+     */
+    runEnablementValidators: () => void | Promise<void>;
 }
 
 export interface SimpleQuickActionDefinition extends QuickActionDefinitionBase {

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

@@ -2,8 +2,9 @@
 sap.ui.define([
     'sap/base/Log',
     'open/ux/preview/client/thirdparty/@sap-ux-private/control-property-editor-common',
-    '../../i18n'
-], function (Log, ___sap_ux_private_control_property_editor_common, ____i18n) {
+    '../../i18n',
+    '../../adp/dialog-factory'
+], function (Log, ___sap_ux_private_control_property_editor_common, ____i18n, ____adp_dialog_factory) {
     'use strict';
     const executeQuickAction = ___sap_ux_private_control_property_editor_common['executeQuickAction'];
     const quickActionListChanged = ___sap_ux_private_control_property_editor_common['quickActionListChanged'];
@@ -11,6 +12,7 @@ sap.ui.define([
     const NESTED_QUICK_ACTION_KIND = ___sap_ux_private_control_property_editor_common['NESTED_QUICK_ACTION_KIND'];
     const updateQuickAction = ___sap_ux_private_control_property_editor_common['updateQuickAction'];
     const getTextBundle = ____i18n['getTextBundle'];
+    const DialogFactory = ____adp_dialog_factory['DialogFactory'];
     class QuickActionService {
         sendAction = () => {
         };
@@ -47,6 +49,9 @@ sap.ui.define([
             this.changeService.onStackChange(async () => {
                 await this.reloadQuickActions(this.controlTreeIndex);
             });
+            DialogFactory.onOpenDialogStatusChange(async () => {
+                await this.reloadQuickActions(this.controlTreeIndex);
+            });
         }
         async reloadQuickActions(controlIndex) {
             const context = {
@@ -74,7 +79,7 @@ sap.ui.define([
                         try {
                             const instance = new Definition(actionContext);
                             await instance.initialize();
-                            this.addAction(group, instance);
+                            await this.addAction(group, instance);
                         } catch {
                             Log.warning(`Failed to initialize ${ Definition.name } quick action.`);
                         }
@@ -84,8 +89,9 @@ sap.ui.define([
             }
             this.sendAction(quickActionListChanged(groups));
         }
-        addAction(group, instance) {
+        async addAction(group, instance) {
             if (instance.isApplicable) {
+                await instance.runEnablementValidators();
                 const quickAction = instance.getActionObject();
                 group.actions.push(quickAction);
                 this.actions.push(instance);

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

@@ -20,6 +20,7 @@ import { QuickActionDefinitionRegistry } from './registry';
 import { OutlineService } from '../outline/service';
 import { getTextBundle, TextBundle } from '../../i18n';
 import { ChangeService } from '../changes';
+import { DialogFactory } from '../../adp/dialog-factory';
 
 /**
  * Service providing Quick Actions.
@@ -33,7 +34,7 @@ export class QuickActionService implements Service {
     private texts: TextBundle;
 
     /**
-     * Qucik action service constructor.zrf
+     * Quick action service constructor.
      *
      * @param rta - RTA object.
      * @param outlineService - Outline service instance.
@@ -85,6 +86,10 @@ export class QuickActionService implements Service {
         this.changeService.onStackChange(async () => {
             await this.reloadQuickActions(this.controlTreeIndex);
         });
+
+        DialogFactory.onOpenDialogStatusChange(async () => {
+            await this.reloadQuickActions(this.controlTreeIndex);
+        });
     }
 
     /**
@@ -119,7 +124,7 @@ export class QuickActionService implements Service {
                     try {
                         const instance = new Definition(actionContext);
                         await instance.initialize();
-                        this.addAction(group, instance);
+                        await this.addAction(group, instance);
                     } catch {
                         Log.warning(`Failed to initialize ${Definition.name} quick action.`);
                     }
@@ -131,8 +136,9 @@ export class QuickActionService implements Service {
         this.sendAction(quickActionListChanged(groups));
     }
 
-    private addAction(group: QuickActionGroup, instance: QuickActionDefinition): void {
+    private async addAction(group: QuickActionGroup, instance: QuickActionDefinition): Promise<void> {
         if (instance.isApplicable) {
+            await instance.runEnablementValidators();
             const quickAction = instance.getActionObject();
             group.actions.push(quickAction);
             this.actions.push(instance);

package/dist/client/messagebundle.properties

@@ -31,6 +31,7 @@ ADP_ADD_FRAGMENT_WITH_TEMPLATE_NOTIFICATION = Note: The "{0}.fragment.xml" fragm
 ADP_ADD_TWO_FRAGMENTS_WITH_TEMPLATE_NOTIFICATION = Note: The "{0}.fragment.xml" and "{1}.fragment.xml" fragments will be created once you save the changes.
 ADP_SYNC_VIEWS_MESSAGE = Synchronous views are detected for this application. Controller extensions are not supported for such views and will be disabled.
 ADP_REUSE_COMPONENTS_MESSAGE = Reuse components are detected for some views in this application. Controller extensions, adding fragments and manifest changes are not supported for such views and will be disabled.
+ADP_QUICK_ACTION_DIALOG_OPEN_MESSAGE = This action is disabled because a dialog is already open
 
 CPE_CHANGES_VISIBLE_AFTER_SAVE_AND_RELOAD_MESSAGE = Note: The change will be visible after save and reload. 
 

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.156",
+  "version": "0.16.157",
   "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.3",
-    "@sap-ux/adp-tooling": "0.12.101",
-    "@sap-ux/control-property-editor-sources": "npm:@sap-ux/control-property-editor@0.5.29",
     "@sap-ux/btp-utils": "0.17.2",
+    "@sap-ux/control-property-editor-sources": "npm:@sap-ux/control-property-editor@0.5.30",
+    "@sap-ux/adp-tooling": "0.12.101",
     "@sap-ux/project-access": "1.28.10"
   },
   "devDependencies": {
@@ -46,9 +46,9 @@
     "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.44",
-    "@sap-ux/axios-extension": "1.17.8",
+    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.11.45",
     "@sap-ux/store": "1.0.0",
+    "@sap-ux/axios-extension": "1.17.8",
     "@sap-ux/ui5-info": "0.8.3",
     "@sap-ux/i18n": "0.2.0"
   },