@sap-ux/preview-middleware 0.23.134 → 0.23.136

package/dist/client/adp/quick-actions/fe-v4/create-table-custom-column-config-change.ts

@@ -0,0 +1,178 @@
+import type FlexCommand from 'sap/ui/rta/command/FlexCommand';
+import OverlayRegistry from 'sap/ui/dt/OverlayRegistry';
+
+import { QuickActionContext, NestedQuickActionDefinition } from '../../../cpe/quick-actions/quick-action-definition';
+import { DialogFactory, DialogNames } from '../../dialog-factory';
+import { SMART_TABLE_TYPE, GRID_TABLE_TYPE, MDC_TABLE_TYPE, TREE_TABLE_TYPE } from '../control-types';
+import { TableQuickActionDefinitionBase } from '../table-quick-action-base';
+
+import { DIALOG_ENABLEMENT_VALIDATOR } from '../dialog-enablement-validator';
+import Table from 'sap/ui/mdc/Table';
+import { getV4AppComponent, isMacroTable } from '../../../utils/fe-v4';
+import { getLineItemAnnotation, getPropertyPath } from './utils';
+import { getUi5Version, isLowerThanMinimalUi5Version } from '../../../utils/version';
+import { isA } from '../../../utils/core';
+import UI5Element from 'sap/ui/core/Element';
+
+interface ViewDataType {
+    stableId: string;
+}
+export const CREATE_TABLE_CUSTOM_COLUMN = 'create-table-custom-column';
+const regexForAnnotationPath =
+    /controlConfiguration\/(?:entity\/)?@com\.sap\.vocabularies\.UI\.v1\.LineItem(?:#[^/]+)?\/columns\//;
+
+export const CONTROL_TYPES = [SMART_TABLE_TYPE, MDC_TABLE_TYPE, TREE_TABLE_TYPE, GRID_TABLE_TYPE];
+
+export class AddTableCustomColumnQuickAction
+    extends TableQuickActionDefinitionBase
+    implements NestedQuickActionDefinition
+{
+    protected pageId: string | undefined;
+    constructor(context: QuickActionContext) {
+        super(
+            CREATE_TABLE_CUSTOM_COLUMN,
+            CONTROL_TYPES,
+            'QUICK_ACTION_ADD_CUSTOM_TABLE_COLUMN',
+            context,
+            {
+                validateTableColumns: true
+            },
+            [DIALOG_ENABLEMENT_VALIDATOR]
+        );
+    }
+    async initialize(): Promise<void> {
+        this.pageId = (this.context.view.getViewData() as ViewDataType)?.stableId.split('::').pop() as string;
+        const version = await getUi5Version();
+        if (isLowerThanMinimalUi5Version(version, { major: 1, minor: 120 })) {
+            return;
+        }
+        await super.initialize();
+    }
+
+    async execute(path: string): Promise<FlexCommand[]> {
+        const { table } = this.tableMap[path];
+        if (!table) {
+            return [];
+        }
+        if (table) {
+            const overlay = OverlayRegistry.getOverlay(table) || [];
+            const propertyPath = `${getPropertyPath(table, 'columns')}`;
+            const anchor = findAnchor(table);
+            await DialogFactory.createDialog(
+                overlay,
+                this.context.rta,
+                DialogNames.ADD_CUSTOM_FRAGMENT,
+                undefined,
+                {
+                    title: 'QUICK_ACTION_ADD_CUSTOM_TABLE_COLUMN',
+                    type: 'tableColumn',
+                    appDescriptor: {
+                        appComponent: getV4AppComponent(this.context.view)!,
+                        appType: 'fe-v4',
+                        pageId: this.pageId!,
+                        projectId: this.context.flexSettings.projectId,
+                        anchor
+                    },
+                    validateId: (columnId) => {
+                        const customColumnInPending = [
+                            ...this.context.changeService.getAllPendingConfigPropertyPath()
+                        ].filter((path) => regexForAnnotationPath.test(path));
+                        const idInPendingChanges = customColumnInPending.includes(`${propertyPath}${columnId}`);
+                        if (idInPendingChanges) {
+                            return false;
+                        }
+                        if (
+                            isA(MDC_TABLE_TYPE, table) &&
+                            (table as Table)
+                                .getColumns()
+                                .every((col) => !col.getId().endsWith(`CustomColumn::${columnId}`))
+                        ) {
+                            return true;
+                        }
+                        return false;
+                    },
+                    propertyPath
+                },
+                { actionName: this.type, telemetryEventIdentifier: this.getTelemetryIdentifier() }
+            );
+        }
+        return [];
+    }
+}
+function findAnchor(table: UI5Element): string {
+    const macroTable = table.getParent();
+    let anchor: string = '';
+    if (isMacroTable(macroTable)) {
+        let metaPath = '';
+        if (macroTable.metaPath.includes('LineItem')) {
+            metaPath = macroTable.metaPath;
+        } else {
+            const segments = macroTable.metaPath.split('/');
+            segments.pop();
+            const path = segments.join('/');
+            metaPath = `${path}/${getLineItemAnnotation(macroTable)}`;
+        }
+        if (!metaPath) {
+            return '';
+        }
+        const columns = macroTable.getModel()?.getMetaModel()?.getObject(metaPath);
+        const filteredColumns = columns.filter(
+            (col: { $Type: string; Inline?: boolean; SemanticObject?: string; Action?: string }) =>
+                [
+                    'com.sap.vocabularies.UI.v1.DataField',
+                    'com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation',
+                    'com.sap.vocabularies.UI.v1.DataFieldForAnnotation'
+                ].includes(col.$Type) ||
+                ('com.sap.vocabularies.UI.v1.DataFieldForAction' === col.$Type && col.Inline)
+        ) as {
+            $Type: string;
+            Inline?: boolean;
+            Value: { $Path: string };
+            Action: string;
+            SemanticObject?: string;
+            Target?: { $AnnotationPath: string };
+        }[];
+        const lastColumn = filteredColumns.at(-1);
+        if (!lastColumn) {
+            return '';
+        }
+        anchor = buildColumnAnchor(lastColumn);
+    }
+    return anchor;
+}
+
+/**
+ * Builds anchor string for different column types
+ * @param column - The column object from metadata
+ * @returns The anchor string for the column
+ */
+function buildColumnAnchor(column: {
+    $Type: string;
+    Value?: { $Path: string };
+    Action?: string;
+    SemanticObject?: string;
+    Target?: { $AnnotationPath: string };
+}): string {
+    if (column.$Type === 'com.sap.vocabularies.UI.v1.DataFieldForAction') {
+        return `DataFieldForAction::${column.Action}`;
+    }
+    
+    if (column.$Type === 'com.sap.vocabularies.UI.v1.DataField') {
+        return `DataField::${column.Value?.$Path}`;
+    }
+    
+    if (column.$Type === 'com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation') {
+        return `DataFieldForIntentBasedNavigation::${column.SemanticObject}::${column.Action}`;
+    }
+    
+    if (column.$Type === 'com.sap.vocabularies.UI.v1.DataFieldForAnnotation') {
+        const annotationPath = column.Target?.$AnnotationPath;
+        if (!annotationPath) {
+            return '';
+        }
+        const annotation = annotationPath.split('.').pop();
+        return `DataFieldForAnnotation::${annotation?.split('#').join('::')}`;
+    }
+    
+    return '';
+}

package/dist/client/adp/quick-actions/fe-v4/op-add-custom-section.js

@@ -55,7 +55,8 @@ sap.ui.define(["../../../utils/fe-v4", "../simple-quick-action-base", "../common
       await DialogFactory.createDialog(overlay, this.context.rta, DialogNames.ADD_CUSTOM_FRAGMENT, undefined, {
         propertyPath: 'content/body/sections/',
         title: 'QUICK_ACTION_OP_ADD_CUSTOM_SECTION',
-        appDescriptor: this.currentPageDescriptor
+        appDescriptor: this.currentPageDescriptor,
+        type: 'section'
       }, {
         actionName: this.type,
         telemetryEventIdentifier: this.getTelemetryIdentifier()

package/dist/client/adp/quick-actions/fe-v4/op-add-custom-section.ts

@@ -81,7 +81,8 @@ export class AddCustomSectionQuickAction
             {
                 propertyPath: 'content/body/sections/',
                 title: 'QUICK_ACTION_OP_ADD_CUSTOM_SECTION',
-                appDescriptor: this.currentPageDescriptor
+                appDescriptor: this.currentPageDescriptor,
+                type: 'section'
             },
             { actionName: this.type, telemetryEventIdentifier: this.getTelemetryIdentifier() }
         );

package/dist/client/adp/quick-actions/fe-v4/registry.js

@@ -1,6 +1,6 @@
 "use strict";
 
-sap.ui.define(["../../../cpe/quick-actions/registry", "../common/add-controller-to-page", "./lr-toggle-clear-filter-bar", "./change-table-columns", "../common/op-add-header-field", "./op-add-custom-section", "./create-table-custom-column", "./create-page-action", "./lr-enable-table-filtering", "./lr-enable-semantic-date-range-filter-bar", "./op-enable-empty-row-mode", "../common/add-new-annotation-file", "./enable-variant-management", "../fe-v4/add-new-subpage", "../fe-v4/change-table-actions", "./create-table-action-config-change"], function (_____cpe_quick_actions_registry, ___common_add_controller_to_page, ___lr_toggle_clear_filter_bar, ___change_table_columns, ___common_op_add_header_field, ___op_add_custom_section, ___create_table_custom_column, ___create_page_action, ___lr_enable_table_filtering, ___lr_enable_semantic_date_range_filter_bar, ___op_enable_empty_row_mode, ___common_add_new_annotation_file, ___enable_variant_management, ___fe_v4_add_new_subpage, ___fe_v4_change_table_actions, ___create_table_action_config_change) {
+sap.ui.define(["../../../cpe/quick-actions/registry", "../common/add-controller-to-page", "./lr-toggle-clear-filter-bar", "./change-table-columns", "../common/op-add-header-field", "./op-add-custom-section", "./create-page-action", "./lr-enable-table-filtering", "./lr-enable-semantic-date-range-filter-bar", "./op-enable-empty-row-mode", "../common/add-new-annotation-file", "./enable-variant-management", "../fe-v4/add-new-subpage", "../fe-v4/change-table-actions", "./create-table-action-config-change", "./create-table-custom-column-config-change"], function (_____cpe_quick_actions_registry, ___common_add_controller_to_page, ___lr_toggle_clear_filter_bar, ___change_table_columns, ___common_op_add_header_field, ___op_add_custom_section, ___create_page_action, ___lr_enable_table_filtering, ___lr_enable_semantic_date_range_filter_bar, ___op_enable_empty_row_mode, ___common_add_new_annotation_file, ___enable_variant_management, ___fe_v4_add_new_subpage, ___fe_v4_change_table_actions, ___create_table_action_config_change, ___create_table_custom_column_config_change) {
   "use strict";
 
   const QuickActionDefinitionRegistry = _____cpe_quick_actions_registry["QuickActionDefinitionRegistry"];
@@ -9,7 +9,6 @@ sap.ui.define(["../../../cpe/quick-actions/registry", "../common/add-controller-
   const ChangeTableColumnsQuickAction = ___change_table_columns["ChangeTableColumnsQuickAction"];
   const AddHeaderFieldQuickAction = ___common_op_add_header_field["AddHeaderFieldQuickAction"];
   const AddCustomSectionQuickAction = ___op_add_custom_section["AddCustomSectionQuickAction"];
-  const AddTableCustomColumnQuickAction = ___create_table_custom_column["AddTableCustomColumnQuickAction"];
   const AddPageActionQuickAction = ___create_page_action["AddPageActionQuickAction"];
   const EnableTableFilteringQuickAction = ___lr_enable_table_filtering["EnableTableFilteringQuickAction"];
   const ToggleSemanticDateRangeFilterBar = ___lr_enable_semantic_date_range_filter_bar["ToggleSemanticDateRangeFilterBar"];
@@ -19,6 +18,7 @@ sap.ui.define(["../../../cpe/quick-actions/registry", "../common/add-controller-
   const AddNewSubpage = ___fe_v4_add_new_subpage["AddNewSubpage"];
   const ChangeTableActionsQuickAction = ___fe_v4_change_table_actions["ChangeTableActionsQuickAction"];
   const AddTableActionQuickAction = ___create_table_action_config_change["AddTableActionQuickAction"];
+  const AddTableCustomColumnQuickAction = ___create_table_custom_column_config_change["AddTableCustomColumnQuickAction"];
   const LIST_REPORT_TYPE = 'sap.fe.templates.ListReport.ListReport';
   const OBJECT_PAGE_TYPE = 'sap.fe.templates.ObjectPage.ObjectPage';
 

package/dist/client/adp/quick-actions/fe-v4/registry.ts

@@ -9,7 +9,6 @@ import { ToggleClearFilterBarQuickAction } from './lr-toggle-clear-filter-bar';
 import { ChangeTableColumnsQuickAction } from './change-table-columns';
 import { AddHeaderFieldQuickAction } from '../common/op-add-header-field';
 import { AddCustomSectionQuickAction } from './op-add-custom-section';
-import { AddTableCustomColumnQuickAction } from './create-table-custom-column';
 import { AddPageActionQuickAction } from './create-page-action';
 import { EnableTableFilteringQuickAction } from './lr-enable-table-filtering';
 import { ToggleSemanticDateRangeFilterBar } from './lr-enable-semantic-date-range-filter-bar';
@@ -19,6 +18,7 @@ import { EnableVariantManagementQuickAction } from './enable-variant-management'
 import { AddNewSubpage } from '../fe-v4/add-new-subpage';
 import { ChangeTableActionsQuickAction } from '../fe-v4/change-table-actions';
 import { AddTableActionQuickAction } from './create-table-action-config-change';
+import { AddTableCustomColumnQuickAction } from './create-table-custom-column-config-change';
 
 type PageName = 'listReport' | 'objectPage';
 

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

@@ -4,10 +4,10 @@ sap.ui.define(["../../../utils/core", "sap/ui/rta/command/CommandFactory", "../.
   "use strict";
 
   const getControlById = _____utils_core["getControlById"];
-  const isA = _____utils_core["isA"];
   const getV4AppComponent = _____utils_fe_v4["getV4AppComponent"];
   const getPageName = _____utils_fe_v4["getPageName"];
   const getReference = _____utils_fe_v4["getReference"];
+  const isMacroTable = _____utils_fe_v4["isMacroTable"];
   async function executeToggleAction(context, isButtonEnabled, controlType, propertyPath) {
     const controls = context.controlIndex[controlType] ?? [];
     const control = controls[0];
@@ -65,6 +65,7 @@ sap.ui.define(["../../../utils/core", "sap/ui/rta/command/CommandFactory", "../.
     parts.push(PATTERN_SUFFIX);
     return parts.join('');
   }
+
   /**
    * Get LineItem annotation - tries to use design-time helper if available, falls back to local implementation.
    *
@@ -89,18 +90,17 @@ sap.ui.define(["../../../utils/core", "sap/ui/rta/command/CommandFactory", "../.
    * @param table - table control
    * @returns string
    */
-
-  function getActionsPropertyPath(table) {
+  function getPropertyPath(table, property = 'actions') {
     const macroTable = table.getParent();
     const configPath = '';
-    if (macroTable && (isA('sap.fe.macros.Table', macroTable) || isA('sap.fe.macros.table.TableAPI', macroTable))) {
+    if (isMacroTable(macroTable)) {
       const lineItemAnnotation = getLineItemAnnotation(macroTable);
       const navigationPath = macroTable.metaPath.split(macroTable.getProperty('contextPath'))[1];
       if (!lineItemAnnotation) {
         throw new Error('Line item annotation could not be determined for the table.');
       }
       if (navigationPath) {
-        return configPath.concat('controlConfiguration/', navigationPath.split('@')[0], lineItemAnnotation, '/actions/');
+        return configPath.concat('controlConfiguration/', navigationPath.split('@')[0], lineItemAnnotation, `/${property}/`);
       } else {
         let contextString = macroTable.metaPath;
         const firstSlash = contextString.indexOf('/');
@@ -111,7 +111,7 @@ sap.ui.define(["../../../utils/core", "sap/ui/rta/command/CommandFactory", "../.
         if (secondSlash >= 0) {
           contextString = contextString.substring(0, secondSlash);
         }
-        return configPath.concat('controlConfiguration/', '/', contextString, '/', lineItemAnnotation, '/actions/');
+        return configPath.concat('controlConfiguration/', '/', contextString, '/', lineItemAnnotation, `/${property}/`);
       }
     }
     return undefined;
@@ -123,22 +123,25 @@ sap.ui.define(["../../../utils/core", "sap/ui/rta/command/CommandFactory", "../.
    * @param table - The table control
    * @returns The line item annotation used to define the table
    */
-  function getLineItemAnnotationForTable(table) {
-    const presentation = table.getModel()?.getMetaModel()?.getObject(table.metaPath);
+  function getLineItemAnnotationForTable(macroTable) {
     let lineItemAnnotation = '';
-    // default line item annotation
-    if (!presentation.Visualizations && !presentation.PresentationVariant) {
-      lineItemAnnotation = table.metaPath.split('/').pop();
-    } else if (presentation.Visualizations) {
-      lineItemAnnotation = presentation.Visualizations[0].$AnnotationPath;
-    } else if (presentation.PresentationVariant) {
-      if (presentation.PresentationVariant.Visualizations) {
-        lineItemAnnotation = presentation.PresentationVariant.Visualizations[0].$AnnotationPath;
-      } else {
-        const contextPath = table.metaPath.startsWith('/') ? table.metaPath.split('@')[0] : table.contextPath;
-        const pathForLineItems = contextPath + presentation.PresentationVariant.$Path;
-        const presentationVariantType = table.getModel()?.getMetaModel()?.getObject(pathForLineItems);
-        lineItemAnnotation = presentationVariantType.Visualizations[0].$AnnotationPath;
+    if (isMacroTable(macroTable)) {
+      const presentation = macroTable.getModel()?.getMetaModel()?.getObject(macroTable.metaPath);
+
+      // default line item annotation
+      if (!presentation.Visualizations && !presentation.PresentationVariant) {
+        lineItemAnnotation = macroTable.metaPath.split('/').pop();
+      } else if (presentation.Visualizations) {
+        lineItemAnnotation = presentation.Visualizations[0].$AnnotationPath;
+      } else if (presentation.PresentationVariant) {
+        if (presentation.PresentationVariant.Visualizations) {
+          lineItemAnnotation = presentation.PresentationVariant.Visualizations[0].$AnnotationPath;
+        } else {
+          const contextPath = macroTable.metaPath.startsWith('/') ? macroTable.metaPath.split('@')[0] : macroTable.contextPath;
+          const pathForLineItems = contextPath + presentation.PresentationVariant.$Path;
+          const presentationVariantType = macroTable.getModel()?.getMetaModel()?.getObject(pathForLineItems);
+          lineItemAnnotation = presentationVariantType.Visualizations[0].$AnnotationPath;
+        }
       }
     }
     return lineItemAnnotation;
@@ -148,7 +151,8 @@ sap.ui.define(["../../../utils/core", "sap/ui/rta/command/CommandFactory", "../.
   };
   __exports.executeToggleAction = executeToggleAction;
   __exports.generateRoutePattern = generateRoutePattern;
-  __exports.getActionsPropertyPath = getActionsPropertyPath;
+  __exports.getLineItemAnnotation = getLineItemAnnotation;
+  __exports.getPropertyPath = getPropertyPath;
   return __exports;
 });
 //# sourceMappingURL=utils.js.map

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

@@ -1,9 +1,8 @@
-import { getControlById, isA } from '../../../utils/core';
+import { getControlById } from '../../../utils/core';
 import type FlexCommand from 'sap/ui/rta/command/FlexCommand';
 import type { QuickActionContext } from '../../../cpe/quick-actions/quick-action-definition';
 import CommandFactory from 'sap/ui/rta/command/CommandFactory';
-import { getV4AppComponent, getPageName, getReference } from '../../../utils/fe-v4';
-import TableAPI from 'sap/fe/macros/table/TableAPI';
+import { getV4AppComponent, getPageName, getReference, isMacroTable } from '../../../utils/fe-v4';
 import UI5Element from 'sap/ui/core/Element';
 
 export async function executeToggleAction(
@@ -79,18 +78,13 @@ export function generateRoutePattern(sourceRoutePattern: string, navProperty: st
     return parts.join('');
 }
 
-export type MacroTable = TableAPI & {
-    metaPath: string;
-    contextPath: string;
-};
-
 /**
  * Get LineItem annotation - tries to use design-time helper if available, falls back to local implementation.
  *
  * @param table - table control
  * @returns LineItem annotation string
  */
-function getLineItemAnnotation(table: MacroTable): string | undefined {
+export function getLineItemAnnotation(table: UI5Element): string | undefined {
     try {
         const helper = sap.ui.require('sap/fe/macros/table/designtime/Table.designtime.helper');
         if (helper && typeof helper.getLineItemAnnotation === 'function') {
@@ -108,15 +102,10 @@ function getLineItemAnnotation(table: MacroTable): string | undefined {
  * @param table - table control
  * @returns string
  */
-
-export function getActionsPropertyPath(table: UI5Element): string | undefined {
+export function getPropertyPath(table: UI5Element, property: 'actions' | 'columns' = 'actions'): string | undefined {
     const macroTable = table.getParent();
     const configPath = '';
-    if (
-        macroTable &&
-        (isA<MacroTable>('sap.fe.macros.Table', macroTable) ||
-            isA<MacroTable>('sap.fe.macros.table.TableAPI', macroTable))
-    ) {
+    if (isMacroTable(macroTable)) {
         const lineItemAnnotation = getLineItemAnnotation(macroTable);
 
         const navigationPath = macroTable.metaPath.split(macroTable.getProperty('contextPath'))[1];
@@ -128,7 +117,7 @@ export function getActionsPropertyPath(table: UI5Element): string | undefined {
                 'controlConfiguration/',
                 navigationPath.split('@')[0],
                 lineItemAnnotation,
-                '/actions/'
+                `/${property}/`
             );
         } else {
             let contextString = macroTable.metaPath;
@@ -140,7 +129,14 @@ export function getActionsPropertyPath(table: UI5Element): string | undefined {
             if (secondSlash >= 0) {
                 contextString = contextString.substring(0, secondSlash);
             }
-            return configPath.concat('controlConfiguration/', '/', contextString, '/', lineItemAnnotation, '/actions/');
+            return configPath.concat(
+                'controlConfiguration/',
+                '/',
+                contextString,
+                '/',
+                lineItemAnnotation,
+                `/${property}/`
+            );
         }
     }
     return undefined;
@@ -152,23 +148,27 @@ export function getActionsPropertyPath(table: UI5Element): string | undefined {
  * @param table - The table control
  * @returns The line item annotation used to define the table
  */
-function getLineItemAnnotationForTable(table: MacroTable): string | undefined {
-    const presentation = table.getModel()?.getMetaModel()?.getObject(table.metaPath);
-
+function getLineItemAnnotationForTable(macroTable: UI5Element): string | undefined {
     let lineItemAnnotation: string | undefined = '';
-    // default line item annotation
-    if (!presentation.Visualizations && !presentation.PresentationVariant) {
-        lineItemAnnotation = table.metaPath.split('/').pop();
-    } else if (presentation.Visualizations) {
-        lineItemAnnotation = presentation.Visualizations[0].$AnnotationPath;
-    } else if (presentation.PresentationVariant) {
-        if (presentation.PresentationVariant.Visualizations) {
-            lineItemAnnotation = presentation.PresentationVariant.Visualizations[0].$AnnotationPath;
-        } else {
-            const contextPath = table.metaPath.startsWith('/') ? table.metaPath.split('@')[0] : table.contextPath;
-            const pathForLineItems = contextPath + presentation.PresentationVariant.$Path;
-            const presentationVariantType = table.getModel()?.getMetaModel()?.getObject(pathForLineItems);
-            lineItemAnnotation = presentationVariantType.Visualizations[0].$AnnotationPath;
+    if (isMacroTable(macroTable)) {
+        const presentation = macroTable.getModel()?.getMetaModel()?.getObject(macroTable.metaPath);
+
+        // default line item annotation
+        if (!presentation.Visualizations && !presentation.PresentationVariant) {
+            lineItemAnnotation = macroTable.metaPath.split('/').pop();
+        } else if (presentation.Visualizations) {
+            lineItemAnnotation = presentation.Visualizations[0].$AnnotationPath;
+        } else if (presentation.PresentationVariant) {
+            if (presentation.PresentationVariant.Visualizations) {
+                lineItemAnnotation = presentation.PresentationVariant.Visualizations[0].$AnnotationPath;
+            } else {
+                const contextPath = macroTable.metaPath.startsWith('/')
+                    ? macroTable.metaPath.split('@')[0]
+                    : macroTable.contextPath;
+                const pathForLineItems = contextPath + presentation.PresentationVariant.$Path;
+                const presentationVariantType = macroTable.getModel()?.getMetaModel()?.getObject(pathForLineItems);
+                lineItemAnnotation = presentationVariantType.Visualizations[0].$AnnotationPath;
+            }
         }
     }
     return lineItemAnnotation;

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

@@ -1,6 +1,6 @@
 "use strict";
 
-sap.ui.define(["open/ux/preview/client/thirdparty/@sap-ux-private/control-property-editor-common", "sap/ui/dt/OverlayUtil", "../../cpe/quick-actions/utils", "../../utils/core", "../../utils/version", "./quick-action-base", "./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) {
+sap.ui.define(["open/ux/preview/client/thirdparty/@sap-ux-private/control-property-editor-common", "sap/ui/dt/OverlayUtil", "../../cpe/quick-actions/utils", "../../utils/core", "../../utils/version", "./quick-action-base", "./control-types", "./fe-v2/utils", "../../utils/fe-v4"], 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, ____utils_fe_v4) {
   "use strict";
 
   const NESTED_QUICK_ACTION_KIND = ___sap_ux_private_control_property_editor_common["NESTED_QUICK_ACTION_KIND"];
@@ -19,6 +19,7 @@ sap.ui.define(["open/ux/preview/client/thirdparty/@sap-ux-private/control-proper
   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 isMacroTable = ____utils_fe_v4["isMacroTable"];
   const SMART_TABLE_ACTION_ID = 'CTX_COMP_VARIANT_CONTENT';
   const M_TABLE_ACTION_ID = 'CTX_ADD_ELEMENTS_AS_CHILD';
   const SETTINGS_ID = 'CTX_SETTINGS';
@@ -89,6 +90,34 @@ sap.ui.define(["open/ux/preview/client/thirdparty/@sap-ux-private/control-proper
       }
     }
 
+    /**
+     * Builds a map of custom tab keys to their associated table building blocks.
+     *
+     * @param iconTabBarFilterMap - A map of icon tab bar filter keys to their labels.
+     * @returns A map where each key is a combination of contextPath and metaPath, and the value is the corresponding custom tab key.
+     */
+    getCustomViewTableBuildingBlocksMap(iconTabBarFilterMap) {
+      const customTabTableBuildingBlockMap = {};
+      const customTabs = Object.keys(iconTabBarFilterMap).filter(key => /^fe::CustomTab::\d+$/.test(key));
+      for (const key of customTabs) {
+        const items = this.iconTabBar?.getItems() ?? [];
+        const filterItem = items.find(item => isA('sap.m.IconTabFilter', item) && item.getKey() === key);
+        if (filterItem && isA('sap.m.IconTabFilter', filterItem)) {
+          filterItem.getContent().forEach(content => {
+            if (isMacroTable(content)) {
+              const {
+                metaPath,
+                contextPath
+              } = content;
+              const path = metaPath.startsWith(contextPath) ? metaPath : `${contextPath}${metaPath}`;
+              customTabTableBuildingBlockMap[path] = key;
+            }
+          });
+        }
+      }
+      return customTabTableBuildingBlockMap;
+    }
+
     /**
      * Initializes action object instance
      */
@@ -102,16 +131,17 @@ sap.ui.define(["open/ux/preview/client/thirdparty/@sap-ux-private/control-proper
         this.isApplicable = false;
         return;
       }
-      const iconTabBarfilterMap = this.buildIconTabBarFilterMap();
+      const iconTabBarFilterMap = this.buildIconTabBarFilterMap();
+      const customViewTableBuildingBlockMap = this.getCustomViewTableBuildingBlocksMap(iconTabBarFilterMap);
       for (const table of getRelevantControlFromActivePage(this.context.controlIndex, this.context.view, this.controlTypes)) {
-        const tabKey = Object.keys(iconTabBarfilterMap).find(key => table.getId().endsWith(key));
+        const tabKey = Object.keys(iconTabBarFilterMap).find(key => table.getId().endsWith(key));
         const section = getParentContainer(table, 'sap.uxap.ObjectPageSection');
         if (section) {
           await this.collectChildrenInSection(section, table);
         } else if (this.iconTabBar && tabKey) {
-          const label = `'${iconTabBarfilterMap[tabKey]}' table`;
+          const label = `'${iconTabBarFilterMap[tabKey]}' table`;
           const tableMapKey = this.children.length.toString();
-          const child = this.createChild(label, table, tableMapKey);
+          const child = this.createChild(label, table, tableMapKey, customViewTableBuildingBlockMap);
           this.children.push(child);
           this.tableMap[tableMapKey] = {
             table,
@@ -292,13 +322,27 @@ sap.ui.define(["open/ux/preview/client/thirdparty/@sap-ux-private/control-proper
         children: this.children
       };
     }
-    createChild(label, table, path) {
+    createChild(label, table, path, customViewTableBuildingBlockMap) {
       const child = {
         path,
         label,
         enabled: true,
         children: []
       };
+      const parent = table.getParent();
+      const macroTable = isMacroTable(parent) ? parent : undefined;
+      if (this.options.validateTableColumns && macroTable) {
+        const {
+          metaPath,
+          contextPath
+        } = macroTable;
+        const finalPath = metaPath.startsWith(contextPath) ? metaPath : `${contextPath}${metaPath}`;
+        if (customViewTableBuildingBlockMap?.[finalPath]) {
+          child.enabled = false;
+          child.tooltip = this.context.resourceBundle.getText('CUSTOM_COLUMNS_NOT_SUPPORTED');
+          return child;
+        }
+      }
       if (this.options.validatePageVariantManagement) {
         const variantEnabledV2 = isVariantManagementEnabledOPPage(this.context, table);
         if (variantEnabledV2 === false) {