@sap-ux/preview-middleware 0.23.8 → 0.23.9

package/dist/client/adp/quick-actions/fe-v2/change-table-columns.js

@@ -1,21 +1,21 @@
 "use strict";
 
-sap.ui.define(["../../../utils/core", "../table-quick-action-base", "../dialog-enablement-validator"], function (_____utils_core, ___table_quick_action_base, ___dialog_enablement_validator) {
+sap.ui.define(["../../../utils/core", "../table-quick-action-base", "../dialog-enablement-validator", "../control-types"], function (_____utils_core, ___table_quick_action_base, ___dialog_enablement_validator, ___control_types) {
   "use strict";
 
   const getControlById = _____utils_core["getControlById"];
   const isA = _____utils_core["isA"];
   const TableQuickActionDefinitionBase = ___table_quick_action_base["TableQuickActionDefinitionBase"];
   const DIALOG_ENABLEMENT_VALIDATOR = ___dialog_enablement_validator["DIALOG_ENABLEMENT_VALIDATOR"];
+  const M_TABLE_TYPE = ___control_types["M_TABLE_TYPE"];
+  const SMART_TABLE_TYPE = ___control_types["SMART_TABLE_TYPE"];
   const CHANGE_TABLE_COLUMNS = 'change-table-columns';
-  const SMART_TABLE_TYPE = 'sap.ui.comp.smarttable.SmartTable';
-  const M_TABLE_TYPE = 'sap.m.Table';
-  // maintain order if action id
-  const CONTROL_TYPES = [SMART_TABLE_TYPE, M_TABLE_TYPE, 'sap.ui.table.TreeTable', 'sap.ui.table.Table'];
+  const CONTROL_TYPES = [SMART_TABLE_TYPE];
   class ChangeTableColumnsQuickAction extends TableQuickActionDefinitionBase {
     constructor(context) {
       super(CHANGE_TABLE_COLUMNS, CONTROL_TYPES, 'V2_QUICK_ACTION_CHANGE_TABLE_COLUMNS', context, {
-        includeServiceAction: true
+        includeServiceAction: true,
+        validatePageVariantManagement: true
       }, [DIALOG_ENABLEMENT_VALIDATOR]);
     }
     async execute(path) {

package/dist/client/adp/quick-actions/fe-v2/change-table-columns.ts

@@ -7,12 +7,10 @@ import { QuickActionContext, NestedQuickActionDefinition } from '../../../cpe/qu
 import { getControlById, isA } from '../../../utils/core';
 import { TableQuickActionDefinitionBase } from '../table-quick-action-base';
 import { DIALOG_ENABLEMENT_VALIDATOR } from '../dialog-enablement-validator';
+import { M_TABLE_TYPE, SMART_TABLE_TYPE } from '../control-types';
 
 export const CHANGE_TABLE_COLUMNS = 'change-table-columns';
-const SMART_TABLE_TYPE = 'sap.ui.comp.smarttable.SmartTable';
-const M_TABLE_TYPE = 'sap.m.Table';
-// maintain order if action id
-const CONTROL_TYPES = [SMART_TABLE_TYPE, M_TABLE_TYPE, 'sap.ui.table.TreeTable', 'sap.ui.table.Table'];
+const CONTROL_TYPES = [SMART_TABLE_TYPE];
 
 export class ChangeTableColumnsQuickAction
     extends TableQuickActionDefinitionBase
@@ -25,7 +23,8 @@ export class ChangeTableColumnsQuickAction
             'V2_QUICK_ACTION_CHANGE_TABLE_COLUMNS',
             context,
             {
-                includeServiceAction: true
+                includeServiceAction: true,
+                validatePageVariantManagement: true
             },
             [DIALOG_ENABLEMENT_VALIDATOR]
         );

package/dist/client/adp/quick-actions/fe-v2/create-table-action.js

@@ -1,6 +1,6 @@
 "use strict";
 
-sap.ui.define(["sap/ui/dt/OverlayRegistry", "../../../utils/core", "../../dialog-factory", "../table-quick-action-base", "../dialog-enablement-validator"], function (OverlayRegistry, _____utils_core, ____dialog_factory, ___table_quick_action_base, ___dialog_enablement_validator) {
+sap.ui.define(["sap/ui/dt/OverlayRegistry", "../../../utils/core", "../../dialog-factory", "../table-quick-action-base", "../dialog-enablement-validator", "../control-types"], function (OverlayRegistry, _____utils_core, ____dialog_factory, ___table_quick_action_base, ___dialog_enablement_validator, ___control_types) {
   "use strict";
 
   const getControlById = _____utils_core["getControlById"];
@@ -9,12 +9,14 @@ sap.ui.define(["sap/ui/dt/OverlayRegistry", "../../../utils/core", "../../dialog
   const DialogNames = ____dialog_factory["DialogNames"];
   const TableQuickActionDefinitionBase = ___table_quick_action_base["TableQuickActionDefinitionBase"];
   const DIALOG_ENABLEMENT_VALIDATOR = ___dialog_enablement_validator["DIALOG_ENABLEMENT_VALIDATOR"];
+  const GRID_TABLE_TYPE = ___control_types["GRID_TABLE_TYPE"];
+  const M_TABLE_TYPE = ___control_types["M_TABLE_TYPE"];
+  const SMART_TABLE_TYPE = ___control_types["SMART_TABLE_TYPE"];
+  const TREE_TABLE_TYPE = ___control_types["TREE_TABLE_TYPE"];
   const CREATE_TABLE_ACTION = 'create-table-action';
-  const SMART_TABLE_TYPE = 'sap.ui.comp.smarttable.SmartTable';
-  const M_TABLE_TYPE = 'sap.m.Table';
   // maintain order if action id
 
-  const CONTROL_TYPES = [SMART_TABLE_TYPE, M_TABLE_TYPE, 'sap.ui.table.TreeTable', 'sap.ui.table.Table'];
+  const CONTROL_TYPES = [SMART_TABLE_TYPE, M_TABLE_TYPE, TREE_TABLE_TYPE, GRID_TABLE_TYPE];
   class AddTableActionQuickAction extends TableQuickActionDefinitionBase {
     constructor(context) {
       super(CREATE_TABLE_ACTION, CONTROL_TYPES, 'QUICK_ACTION_ADD_CUSTOM_TABLE_ACTION', context, undefined, [DIALOG_ENABLEMENT_VALIDATOR]);

package/dist/client/adp/quick-actions/fe-v2/create-table-action.ts

@@ -5,23 +5,19 @@ import OverlayRegistry from 'sap/ui/dt/OverlayRegistry';
 import ManagedObject from 'sap/ui/base/ManagedObject';
 import UI5Element from 'sap/ui/core/Element';
 
-import {
-    QuickActionContext,
-    NestedQuickActionDefinition
-} from '../../../cpe/quick-actions/quick-action-definition';
+import { QuickActionContext, NestedQuickActionDefinition } from '../../../cpe/quick-actions/quick-action-definition';
 import { getControlById, isA } from '../../../utils/core';
 import { DialogFactory, DialogNames } from '../../dialog-factory';
 import { TableQuickActionDefinitionBase } from '../table-quick-action-base';
 import { DIALOG_ENABLEMENT_VALIDATOR } from '../dialog-enablement-validator';
 import type OverflowToolbar from 'sap/m/OverflowToolbar';
 import { NestedQuickActionChild } from '@sap-ux-private/control-property-editor-common';
+import { GRID_TABLE_TYPE, M_TABLE_TYPE, SMART_TABLE_TYPE, TREE_TABLE_TYPE } from '../control-types';
 
 export const CREATE_TABLE_ACTION = 'create-table-action';
-const SMART_TABLE_TYPE = 'sap.ui.comp.smarttable.SmartTable';
-const M_TABLE_TYPE = 'sap.m.Table';
 // maintain order if action id
 
-const CONTROL_TYPES = [SMART_TABLE_TYPE, M_TABLE_TYPE, 'sap.ui.table.TreeTable', 'sap.ui.table.Table'];
+const CONTROL_TYPES = [SMART_TABLE_TYPE, M_TABLE_TYPE, TREE_TABLE_TYPE, GRID_TABLE_TYPE];
 
 export class AddTableActionQuickAction extends TableQuickActionDefinitionBase implements NestedQuickActionDefinition {
     constructor(context: QuickActionContext) {

package/dist/client/adp/quick-actions/fe-v2/utils.js

@@ -106,6 +106,25 @@ sap.ui.define(["sap/ui/rta/command/CommandFactory", "../../../utils/version", "s
     });
     return isAboveOrEqualMinimalVersion || isSupportedPatchVersion;
   }
+  function isVariantManagementEnabledOPPage(context, control) {
+    const ownerComponent = Component.getOwnerComponentFor(control);
+    if (ownerComponent?.isA('sap.suite.ui.generic.template.ObjectPage.Component')) {
+      const id = control.getId();
+      if (typeof id !== 'string') {
+        throw new Error('Could not retrieve configuration property because control id is not valid!');
+      }
+      if (!control.isA('sap.ui.comp.smarttable.SmartTable')) {
+        // variant management is only supported by SmartTable
+        return false;
+      }
+      let value = context.changeService.getConfigurationPropertyValue(id, 'variantManagement');
+      if (value === undefined) {
+        value = !!control.getVariantManagement();
+      }
+      return value;
+    }
+    return undefined;
+  }
   var __exports = {
     __esModule: true
   };
@@ -113,6 +132,7 @@ sap.ui.define(["sap/ui/rta/command/CommandFactory", "../../../utils/version", "s
   __exports.prepareManifestChange = prepareManifestChange;
   __exports.isManifestArrayStructured = isManifestArrayStructured;
   __exports.areManifestChangesSupported = areManifestChangesSupported;
+  __exports.isVariantManagementEnabledOPPage = isVariantManagementEnabledOPPage;
   return __exports;
 });
 //# sourceMappingURL=utils.js.map

package/dist/client/adp/quick-actions/fe-v2/utils.ts

@@ -9,6 +9,7 @@ import Component from 'sap/ui/core/Component';
 import type AppComponent from 'sap/suite/ui/generic/template/lib/AppComponent';
 import type ManagedObject from 'sap/ui/base/ManagedObject';
 import type TemplateComponent from 'sap/suite/ui/generic/template/lib/TemplateComponent';
+import SmartTableExtended from 'sap/ui/comp/smarttable';
 
 /**
  * Gets app component of a v2 project.
@@ -109,3 +110,25 @@ export async function areManifestChangesSupported(manifest: Manifest): Promise<b
     return isAboveOrEqualMinimalVersion || isSupportedPatchVersion;
 }
 
+export function isVariantManagementEnabledOPPage(
+    context: QuickActionContext,
+    control: UI5Element
+): boolean | undefined {
+    const ownerComponent = Component.getOwnerComponentFor(control);
+    if (ownerComponent?.isA('sap.suite.ui.generic.template.ObjectPage.Component')) {
+        const id = control.getId();
+        if (typeof id !== 'string') {
+            throw new Error('Could not retrieve configuration property because control id is not valid!');
+        }
+        if (!control.isA<SmartTableExtended>('sap.ui.comp.smarttable.SmartTable')) {
+            // variant management is only supported by SmartTable
+            return false;
+        }
+        let value = context.changeService.getConfigurationPropertyValue(id, 'variantManagement');
+        if (value === undefined) {
+            value = !!control.getVariantManagement();
+        }
+        return value as boolean;
+    }
+    return undefined;
+}

package/dist/client/adp/quick-actions/fe-v4/change-table-columns.js

@@ -23,16 +23,29 @@ sap.ui.define(["sap/ui/dt/OverlayUtil", "sap/ui/fl/apply/api/FlexRuntimeInfoAPI"
         const hasVariantManagement = FlexRuntimeInfoAPI.hasVariantManagement({
           element: smartTable
         });
+        const path = this.children.length.toString();
+        const tableHeader = smartTable.getHeader() || 'Unnamed';
+        const tableLabel = `'${tableHeader}' table`;
         if (!hasVariantManagement) {
+          this.children.push({
+            path,
+            label: tableLabel,
+            enabled: false,
+            tooltip: this.context.resourceBundle.getText('TABLE_ACTION_DISABLED_VARIANT_MANAGEMENT_NOT_AVAILABLE'),
+            children: []
+          });
+          this.tableMap[path] = {
+            table: smartTable,
+            tableUpdateEventAttachedOnce: false
+          };
           continue;
         }
         const actions = await this.context.actionService.get(smartTable.getId());
         const changeColumnAction = actions.find(action => action.id === ACTION_ID);
         if (changeColumnAction) {
-          const path = this.children.length.toString();
           this.children.push({
             path,
-            label: `'${smartTable.getHeader()}' table`,
+            label: tableLabel,
             enabled: true,
             children: []
           });

package/dist/client/adp/quick-actions/fe-v4/change-table-columns.ts

@@ -32,17 +32,33 @@ export class ChangeTableColumnsQuickAction
             this.controlTypes
         )) {
             const hasVariantManagement = FlexRuntimeInfoAPI.hasVariantManagement({ element: smartTable });
+            const path = this.children.length.toString();
+            const tableHeader = (smartTable as Table).getHeader() || 'Unnamed';
+            const tableLabel = `'${tableHeader}' table`;
+
             if (!hasVariantManagement) {
+                this.children.push({
+                    path,
+                    label: tableLabel,
+                    enabled: false,
+                    tooltip: this.context.resourceBundle.getText(
+                        'TABLE_ACTION_DISABLED_VARIANT_MANAGEMENT_NOT_AVAILABLE'
+                    ),
+                    children: []
+                });
+                this.tableMap[path] = {
+                    table: smartTable,
+                    tableUpdateEventAttachedOnce: false
+                };
                 continue;
             }
 
             const actions = await this.context.actionService.get(smartTable.getId());
             const changeColumnAction = actions.find((action) => action.id === ACTION_ID);
             if (changeColumnAction) {
-                const path = this.children.length.toString();
                 this.children.push({
                     path,
-                    label: `'${(smartTable as Table).getHeader()}' table`,
+                    label: tableLabel,
                     enabled: true,
                     children: []
                 });

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

@@ -6,8 +6,9 @@ sap.ui.define([
     '../../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, ___quick_action_base, ___control_types) {
+    './control-types',
+    './fe-v2/utils'
+], function (___sap_ux_private_control_property_editor_common, OverlayUtil, ____cpe_quick_actions_utils, ____utils_core, ____utils_version, ___quick_action_base, ___control_types, ___fe_v2_utils) {
     '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'];
@@ -24,6 +25,7 @@ sap.ui.define([
     const MDC_TABLE_TYPE = ___control_types['MDC_TABLE_TYPE'];
     const SMART_TABLE_TYPE = ___control_types['SMART_TABLE_TYPE'];
     const TREE_TABLE_TYPE = ___control_types['TREE_TABLE_TYPE'];
+    const isVariantManagementEnabledOPPage = ___fe_v2_utils['isVariantManagementEnabledOPPage'];
     const SMART_TABLE_ACTION_ID = 'CTX_COMP_VARIANT_CONTENT';
     const M_TABLE_ACTION_ID = 'CTX_ADD_ELEMENTS_AS_CHILD';
     const SETTINGS_ID = 'CTX_SETTINGS';
@@ -249,14 +251,22 @@ sap.ui.define([
                 enabled: true,
                 children: []
             };
+            if (this.options.validatePageVariantManagement) {
+                const variantEnabledV2 = isVariantManagementEnabledOPPage(this.context, table);
+                if (variantEnabledV2 === false) {
+                    child.enabled = false;
+                    child.tooltip = this.context.resourceBundle.getText('TABLE_ACTION_DISABLED_VARIANT_MANAGEMENT_NOT_AVAILABLE');
+                    return child;
+                }
+            }
             if (!this.options.areTableRowsRequired) {
                 return child;
             }
             const innerTable = this.getInternalTable(table);
-            const tableRows = innerTable?.getAggregation('items') || [];
-            if (isA(M_TABLE_TYPE, innerTable) && !tableRows.length) {
+            const tableRows = innerTable?.getAggregation('items') ?? [];
+            if (isA(M_TABLE_TYPE, innerTable) && Array.isArray(tableRows) && tableRows.length === 0) {
                 child.enabled = false;
-                child.tooltip = this.context.resourceBundle.getText('TABLE_CUSTOM_COLUMN_ACTION_NOT_AVAILABLE');
+                child.tooltip = this.context.resourceBundle.getText('TABLE_ACTION_DISABLED_ROWS_NOT_AVAILABLE');
             }
             return child;
         }

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

@@ -25,6 +25,7 @@ import {
     SMART_TABLE_TYPE,
     TREE_TABLE_TYPE
 } from './control-types';
+import { isVariantManagementEnabledOPPage } from './fe-v2/utils';
 
 const SMART_TABLE_ACTION_ID = 'CTX_COMP_VARIANT_CONTENT';
 const M_TABLE_ACTION_ID = 'CTX_ADD_ELEMENTS_AS_CHILD';
@@ -57,6 +58,7 @@ async function getRearrangeToolbarContentActionId(): Promise<string> {
 export type TableQuickActionsOptions = {
     includeServiceAction?: boolean;
     areTableRowsRequired?: boolean;
+    validatePageVariantManagement?: boolean;
 };
 
 /**
@@ -346,14 +348,24 @@ export abstract class TableQuickActionDefinitionBase extends QuickActionDefiniti
             enabled: true,
             children: []
         };
+        if (this.options.validatePageVariantManagement) {
+            const variantEnabledV2 = isVariantManagementEnabledOPPage(this.context, table);
+            if (variantEnabledV2 === false) {
+                child.enabled = false;
+                child.tooltip = this.context.resourceBundle.getText(
+                    'TABLE_ACTION_DISABLED_VARIANT_MANAGEMENT_NOT_AVAILABLE'
+                );
+                return child;
+            }
+        }
         if (!this.options.areTableRowsRequired) {
             return child;
         }
         const innerTable = this.getInternalTable(table);
-        const tableRows = (innerTable?.getAggregation('items') as ManagedObject[]) || [];
-        if (isA(M_TABLE_TYPE, innerTable) && !tableRows.length) {
+        const tableRows = innerTable?.getAggregation('items') ?? [];
+        if (isA(M_TABLE_TYPE, innerTable) && Array.isArray(tableRows) && tableRows.length === 0) {
             child.enabled = false;
-            child.tooltip = this.context.resourceBundle.getText('TABLE_CUSTOM_COLUMN_ACTION_NOT_AVAILABLE');
+            child.tooltip = this.context.resourceBundle.getText('TABLE_ACTION_DISABLED_ROWS_NOT_AVAILABLE');
         }
         return child;
     }

package/dist/client/messagebundle.properties

@@ -82,7 +82,8 @@ TABLE_ROWS_NEEDED_TO_CREATE_CUSTOM_COLUMN=At least one table row is required to
 HIGHER_LAYER_CHANGES_TITLE = Higher Layer Changes Detected
 HIGHER_LAYER_CHANGES_INFO_MESSAGE=The preview of the project was reloaded due to detected changes in higher layer than the one used in your project.
 
-TABLE_CUSTOM_COLUMN_ACTION_NOT_AVAILABLE=This action has been disabled because the table rows are not available. Please load the table data and try again
+TABLE_ACTION_DISABLED_ROWS_NOT_AVAILABLE=This action has been disabled because the table rows are not available. Please load the table data and try again.
+TABLE_ACTION_DISABLED_VARIANT_MANAGEMENT_NOT_AVAILABLE=This action has been disabled because variant management is disabled. Enable variant management and try again.
 TABLE_FILTERING_CHANGE_HAS_ALREADY_BEEN_MADE=This option is disabled because table filtering for page variants is already enabled
 EMPTY_ROW_MODE_IS_ALREADY_ENABLED=This option has been disabled because empty row mode is already enabled for this table
 EMPTY_ROW_MODE_IS_NOT_SUPPORTED=This action is disabled because empty row mode is not supported for analytical and tree tables

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.23.8",
+  "version": "0.23.9",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -50,7 +50,7 @@
     "nock": "13.4.0",
     "npm-run-all2": "6.2.0",
     "supertest": "7.1.4",
-    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.17.0",
+    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.17.1",
     "@sap-ux/axios-extension": "1.22.7",
     "@sap-ux/store": "1.1.4",
     "@sap-ux/ui5-info": "0.12.2"