@sap-ux/preview-middleware 0.16.155 → 0.16.156

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

@@ -1,57 +1,58 @@
-"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", "../common/op-add-custom-section", "./create-table-custom-column", "../common/create-page-action", "./create-table-action", "./lr-enable-table-filtering", "./lr-enable-semantic-date-range-filter-bar"], function (_____cpe_quick_actions_registry, ___common_add_controller_to_page, ___lr_toggle_clear_filter_bar, ___change_table_columns, ___common_op_add_header_field, ___common_op_add_custom_section, ___create_table_custom_column, ___common_create_page_action, ___create_table_action, ___lr_enable_table_filtering, ___lr_enable_semantic_date_range_filter_bar) {
-  "use strict";
-
-  const QuickActionDefinitionRegistry = _____cpe_quick_actions_registry["QuickActionDefinitionRegistry"];
-  const AddControllerToPageQuickAction = ___common_add_controller_to_page["AddControllerToPageQuickAction"];
-  const ToggleClearFilterBarQuickAction = ___lr_toggle_clear_filter_bar["ToggleClearFilterBarQuickAction"];
-  const ChangeTableColumnsQuickAction = ___change_table_columns["ChangeTableColumnsQuickAction"];
-  const AddHeaderFieldQuickAction = ___common_op_add_header_field["AddHeaderFieldQuickAction"];
-  const AddCustomSectionQuickAction = ___common_op_add_custom_section["AddCustomSectionQuickAction"];
-  const AddTableCustomColumnQuickAction = ___create_table_custom_column["AddTableCustomColumnQuickAction"];
-  const AddPageActionQuickAction = ___common_create_page_action["AddPageActionQuickAction"];
-  const AddTableActionQuickAction = ___create_table_action["AddTableActionQuickAction"];
-  const EnableTableFilteringQuickAction = ___lr_enable_table_filtering["EnableTableFilteringQuickAction"];
-  const ToggleSemanticDateRangeFilterBar = ___lr_enable_semantic_date_range_filter_bar["ToggleSemanticDateRangeFilterBar"];
-  const LIST_REPORT_TYPE = 'sap.fe.templates.ListReport.ListReport';
-  const OBJECT_PAGE_TYPE = 'sap.fe.templates.ObjectPage.ObjectPage';
-
-  /**
-   * Quick Action provider for SAP Fiori Elements V4 applications.
-   */
-  class FEV4QuickActionRegistry extends QuickActionDefinitionRegistry {
-    PAGE_NAME_MAP = {
-      [LIST_REPORT_TYPE]: 'listReport',
-      [OBJECT_PAGE_TYPE]: 'objectPage'
-    };
-    getDefinitions(context) {
-      const activePages = this.getActivePageContent(context.controlIndex);
-      const definitionGroups = [];
-      for (let index = 0; index < activePages.length; index++) {
-        const {
-          name,
-          view
-        } = activePages[index];
-        if (name === 'listReport') {
-          definitionGroups.push({
-            title: 'LIST REPORT',
-            definitions: [AddControllerToPageQuickAction, AddPageActionQuickAction, ToggleClearFilterBarQuickAction, ToggleSemanticDateRangeFilterBar, ChangeTableColumnsQuickAction, AddTableActionQuickAction, AddTableCustomColumnQuickAction, EnableTableFilteringQuickAction],
-            view,
-            key: name + index
-          });
-        } else if (name === 'objectPage') {
-          definitionGroups.push({
-            title: 'OBJECT PAGE',
-            definitions: [AddControllerToPageQuickAction, AddPageActionQuickAction, AddHeaderFieldQuickAction, AddCustomSectionQuickAction, ChangeTableColumnsQuickAction, AddTableActionQuickAction, AddTableCustomColumnQuickAction],
-            view,
-            key: name + index
-          });
-        }
-      }
-      return definitionGroups;
-    }
-  }
-  return FEV4QuickActionRegistry;
+"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", "../common/op-add-custom-section", "./create-table-custom-column", "../common/create-page-action", "./create-table-action", "./lr-enable-table-filtering", "./lr-enable-semantic-date-range-filter-bar", "./op-enable-empty-row-mode"], function (_____cpe_quick_actions_registry, ___common_add_controller_to_page, ___lr_toggle_clear_filter_bar, ___change_table_columns, ___common_op_add_header_field, ___common_op_add_custom_section, ___create_table_custom_column, ___common_create_page_action, ___create_table_action, ___lr_enable_table_filtering, ___lr_enable_semantic_date_range_filter_bar, ___op_enable_empty_row_mode) {
+  "use strict";
+
+  const QuickActionDefinitionRegistry = _____cpe_quick_actions_registry["QuickActionDefinitionRegistry"];
+  const AddControllerToPageQuickAction = ___common_add_controller_to_page["AddControllerToPageQuickAction"];
+  const ToggleClearFilterBarQuickAction = ___lr_toggle_clear_filter_bar["ToggleClearFilterBarQuickAction"];
+  const ChangeTableColumnsQuickAction = ___change_table_columns["ChangeTableColumnsQuickAction"];
+  const AddHeaderFieldQuickAction = ___common_op_add_header_field["AddHeaderFieldQuickAction"];
+  const AddCustomSectionQuickAction = ___common_op_add_custom_section["AddCustomSectionQuickAction"];
+  const AddTableCustomColumnQuickAction = ___create_table_custom_column["AddTableCustomColumnQuickAction"];
+  const AddPageActionQuickAction = ___common_create_page_action["AddPageActionQuickAction"];
+  const AddTableActionQuickAction = ___create_table_action["AddTableActionQuickAction"];
+  const EnableTableFilteringQuickAction = ___lr_enable_table_filtering["EnableTableFilteringQuickAction"];
+  const ToggleSemanticDateRangeFilterBar = ___lr_enable_semantic_date_range_filter_bar["ToggleSemanticDateRangeFilterBar"];
+  const EnableTableEmptyRowModeQuickAction = ___op_enable_empty_row_mode["EnableTableEmptyRowModeQuickAction"];
+  const LIST_REPORT_TYPE = 'sap.fe.templates.ListReport.ListReport';
+  const OBJECT_PAGE_TYPE = 'sap.fe.templates.ObjectPage.ObjectPage';
+
+  /**
+   * Quick Action provider for SAP Fiori Elements V4 applications.
+   */
+  class FEV4QuickActionRegistry extends QuickActionDefinitionRegistry {
+    PAGE_NAME_MAP = {
+      [LIST_REPORT_TYPE]: 'listReport',
+      [OBJECT_PAGE_TYPE]: 'objectPage'
+    };
+    getDefinitions(context) {
+      const activePages = this.getActivePageContent(context.controlIndex);
+      const definitionGroups = [];
+      for (let index = 0; index < activePages.length; index++) {
+        const {
+          name,
+          view
+        } = activePages[index];
+        if (name === 'listReport') {
+          definitionGroups.push({
+            title: 'LIST REPORT',
+            definitions: [AddControllerToPageQuickAction, AddPageActionQuickAction, ToggleClearFilterBarQuickAction, ToggleSemanticDateRangeFilterBar, ChangeTableColumnsQuickAction, AddTableActionQuickAction, AddTableCustomColumnQuickAction, EnableTableFilteringQuickAction],
+            view,
+            key: name + index
+          });
+        } else if (name === 'objectPage') {
+          definitionGroups.push({
+            title: 'OBJECT PAGE',
+            definitions: [AddControllerToPageQuickAction, AddPageActionQuickAction, AddHeaderFieldQuickAction, AddCustomSectionQuickAction, ChangeTableColumnsQuickAction, AddTableActionQuickAction, AddTableCustomColumnQuickAction, EnableTableEmptyRowModeQuickAction],
+            view,
+            key: name + index
+          });
+        }
+      }
+      return definitionGroups;
+    }
+  }
+  return FEV4QuickActionRegistry;
 });
 //# sourceMappingURL=registry.js.map

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

@@ -14,6 +14,7 @@ import { AddPageActionQuickAction } from '../common/create-page-action';
 import { AddTableActionQuickAction } from './create-table-action';
 import { EnableTableFilteringQuickAction } from './lr-enable-table-filtering';
 import { ToggleSemanticDateRangeFilterBar } from './lr-enable-semantic-date-range-filter-bar';
+import { EnableTableEmptyRowModeQuickAction } from './op-enable-empty-row-mode';
 
 type PageName = 'listReport' | 'objectPage';
 
@@ -60,7 +61,8 @@ export default class FEV4QuickActionRegistry extends QuickActionDefinitionRegist
                         AddCustomSectionQuickAction,
                         ChangeTableColumnsQuickAction,
                         AddTableActionQuickAction,
-                        AddTableCustomColumnQuickAction
+                        AddTableCustomColumnQuickAction,
+                        EnableTableEmptyRowModeQuickAction
                     ],
                     view,
                     key: name + index

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

@@ -8,7 +8,6 @@ sap.ui.define([
     const NESTED_QUICK_ACTION_KIND = ___sap_ux_private_control_property_editor_common['NESTED_QUICK_ACTION_KIND'];
     const getRelevantControlFromActivePage = _____cpe_quick_actions_utils['getRelevantControlFromActivePage'];
     const ACTION_ID = 'CTX_SETTINGS0';
-    const CONTROL_TYPE = 'sap.ui.mdc.Table';
     class TableQuickActionDefinitionBase {
         kind = NESTED_QUICK_ACTION_KIND;
         get id() {
@@ -25,15 +24,16 @@ sap.ui.define([
         isClearButtonEnabled = false;
         children = [];
         tableMap = {};
-        constructor(type, defaultTextKey, context, isSkipVariantManagementCheck) {
+        constructor(type, controlTypes, defaultTextKey, context, isSkipVariantManagementCheck) {
             this.type = type;
+            this.controlTypes = controlTypes;
             this.defaultTextKey = defaultTextKey;
             this.context = context;
             this.isSkipVariantManagementCheck = isSkipVariantManagementCheck;
         }
         async initialize() {
             let index = 0;
-            for (const smartTable of getRelevantControlFromActivePage(this.context.controlIndex, this.context.view, [CONTROL_TYPE])) {
+            for (const smartTable of getRelevantControlFromActivePage(this.context.controlIndex, this.context.view, this.controlTypes)) {
                 if (!this.isSkipVariantManagementCheck) {
                     const hasVariantManagement = FlexRuntimeInfoAPI.hasVariantManagement({ element: smartTable });
                     if (!hasVariantManagement) {

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

@@ -8,7 +8,7 @@ import { QuickActionContext } from '../../../cpe/quick-actions/quick-action-defi
 import { getRelevantControlFromActivePage } from '../../../cpe/quick-actions/utils';
 
 const ACTION_ID = 'CTX_SETTINGS0';
-const CONTROL_TYPE = 'sap.ui.mdc.Table';
+
 export abstract class TableQuickActionDefinitionBase {
     readonly kind = NESTED_QUICK_ACTION_KIND;
     public get id(): string {
@@ -28,6 +28,7 @@ export abstract class TableQuickActionDefinitionBase {
     tableMap: Record<string, number> = {};
     constructor(
         public readonly type: string,
+        protected readonly controlTypes: string[],
         protected readonly defaultTextKey: string,
         protected readonly context: QuickActionContext,
         protected readonly isSkipVariantManagementCheck?: boolean
@@ -35,9 +36,11 @@ export abstract class TableQuickActionDefinitionBase {
 
     async initialize(): Promise<void> {
         let index = 0;
-        for (const smartTable of getRelevantControlFromActivePage(this.context.controlIndex, this.context.view, [
-            CONTROL_TYPE
-        ])) {
+        for (const smartTable of getRelevantControlFromActivePage(
+            this.context.controlIndex,
+            this.context.view,
+            this.controlTypes
+        )) {
             if (!this.isSkipVariantManagementCheck) {
                 const hasVariantManagement = FlexRuntimeInfoAPI.hasVariantManagement({ element: smartTable });
                 if (!hasVariantManagement) {

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

@@ -1,49 +1,49 @@
-"use strict";
-
-sap.ui.define(["../../../utils/core", "sap/ui/rta/command/CommandFactory", "../../../utils/fe-v4"], function (_____utils_core, CommandFactory, _____utils_fe_v4) {
-  "use strict";
-
-  const getControlById = _____utils_core["getControlById"];
-  const getAppComponent = _____utils_fe_v4["getAppComponent"];
-  const getPageName = _____utils_fe_v4["getPageName"];
-  const getReference = _____utils_fe_v4["getReference"];
-  async function executeToggleAction(context, isButtonEnabled, controlType, propertyPath) {
-    const controls = context.controlIndex[controlType] ?? [];
-    const control = controls[0];
-    if (control) {
-      const modifiedControl = getControlById(control.controlId);
-      if (!modifiedControl) {
-        return [];
-      }
-      const {
-        flexSettings
-      } = context;
-      const parent = modifiedControl.getParent();
-      if (!parent) {
-        return [];
-      }
-      const modifiedValue = {
-        reference: getReference(modifiedControl),
-        appComponent: getAppComponent(modifiedControl),
-        changeType: 'appdescr_fe_changePageConfiguration',
-        parameters: {
-          page: getPageName(parent),
-          entityPropertyChange: {
-            propertyPath: propertyPath,
-            propertyValue: !isButtonEnabled,
-            operation: 'UPSERT'
-          }
-        }
-      };
-      const command = await CommandFactory.getCommandFor(modifiedControl, 'appDescriptor', modifiedValue, null, flexSettings);
-      return [command];
-    }
-    return [];
-  }
-  var __exports = {
-    __esModule: true
-  };
-  __exports.executeToggleAction = executeToggleAction;
-  return __exports;
+"use strict";
+
+sap.ui.define(["../../../utils/core", "sap/ui/rta/command/CommandFactory", "../../../utils/fe-v4"], function (_____utils_core, CommandFactory, _____utils_fe_v4) {
+  "use strict";
+
+  const getControlById = _____utils_core["getControlById"];
+  const getAppComponent = _____utils_fe_v4["getAppComponent"];
+  const getPageName = _____utils_fe_v4["getPageName"];
+  const getReference = _____utils_fe_v4["getReference"];
+  async function executeToggleAction(context, isButtonEnabled, controlType, propertyPath) {
+    const controls = context.controlIndex[controlType] ?? [];
+    const control = controls[0];
+    if (control) {
+      const modifiedControl = getControlById(control.controlId);
+      if (!modifiedControl) {
+        return [];
+      }
+      const {
+        flexSettings
+      } = context;
+      const parent = modifiedControl.getParent();
+      if (!parent) {
+        return [];
+      }
+      const modifiedValue = {
+        reference: getReference(modifiedControl),
+        appComponent: getAppComponent(modifiedControl),
+        changeType: 'appdescr_fe_changePageConfiguration',
+        parameters: {
+          page: getPageName(parent),
+          entityPropertyChange: {
+            propertyPath: propertyPath,
+            propertyValue: !isButtonEnabled,
+            operation: 'UPSERT'
+          }
+        }
+      };
+      const command = await CommandFactory.getCommandFor(modifiedControl, 'appDescriptor', modifiedValue, null, flexSettings);
+      return [command];
+    }
+    return [];
+  }
+  var __exports = {
+    __esModule: true
+  };
+  __exports.executeToggleAction = executeToggleAction;
+  return __exports;
 });
 //# sourceMappingURL=utils.js.map

package/dist/client/adp/quick-actions/load.js

@@ -1,46 +1,46 @@
-"use strict";
-
-sap.ui.define([], function () {
-  "use strict";
-
-  function __ui5_require_async(path) {
-    return new Promise(function (resolve, reject) {
-      sap.ui.require([path], function (module) {
-        if (!(module && module.__esModule)) {
-          module = module === null || !(typeof module === "object" && path.endsWith("/library")) ? {
-            default: module
-          } : module;
-          Object.defineProperty(module, "__esModule", {
-            value: true
-          });
-        }
-        resolve(module);
-      }, function (err) {
-        reject(err);
-      });
-    });
-  }
-  /**
-   * Loads the appropriate Quick Action registries for the given application type.
-   *
-   * @param appType - Application type.
-   * @returns Quick Action registries.
-   */
-  async function loadDefinitions(appType) {
-    if (appType === 'fe-v2') {
-      const FEV2QuickActionRegistry = (await __ui5_require_async('open/ux/preview/client/adp/quick-actions/fe-v2/registry')).default;
-      return [new FEV2QuickActionRegistry()];
-    }
-    if (appType === 'fe-v4') {
-      const FEV4QuickActionRegistry = (await __ui5_require_async('open/ux/preview/client/adp/quick-actions/fe-v4/registry')).default;
-      return [new FEV4QuickActionRegistry()];
-    }
-    return [];
-  }
-  var __exports = {
-    __esModule: true
-  };
-  __exports.loadDefinitions = loadDefinitions;
-  return __exports;
+"use strict";
+
+sap.ui.define([], function () {
+  "use strict";
+
+  function __ui5_require_async(path) {
+    return new Promise(function (resolve, reject) {
+      sap.ui.require([path], function (module) {
+        if (!(module && module.__esModule)) {
+          module = module === null || !(typeof module === "object" && path.endsWith("/library")) ? {
+            default: module
+          } : module;
+          Object.defineProperty(module, "__esModule", {
+            value: true
+          });
+        }
+        resolve(module);
+      }, function (err) {
+        reject(err);
+      });
+    });
+  }
+  /**
+   * Loads the appropriate Quick Action registries for the given application type.
+   *
+   * @param appType - Application type.
+   * @returns Quick Action registries.
+   */
+  async function loadDefinitions(appType) {
+    if (appType === 'fe-v2') {
+      const FEV2QuickActionRegistry = (await __ui5_require_async('open/ux/preview/client/adp/quick-actions/fe-v2/registry')).default;
+      return [new FEV2QuickActionRegistry()];
+    }
+    if (appType === 'fe-v4') {
+      const FEV4QuickActionRegistry = (await __ui5_require_async('open/ux/preview/client/adp/quick-actions/fe-v4/registry')).default;
+      return [new FEV4QuickActionRegistry()];
+    }
+    return [];
+  }
+  var __exports = {
+    __esModule: true
+  };
+  __exports.loadDefinitions = loadDefinitions;
+  return __exports;
 });
 //# sourceMappingURL=load.js.map

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

@@ -4,8 +4,9 @@ sap.ui.define([
     'sap/ui/dt/OverlayUtil',
     '../../cpe/quick-actions/utils',
     '../../utils/core',
-    '../../utils/version'
-], function (___sap_ux_private_control_property_editor_common, OverlayUtil, ____cpe_quick_actions_utils, ____utils_core, ____utils_version) {
+    '../../utils/version',
+    './control-types'
+], function (___sap_ux_private_control_property_editor_common, OverlayUtil, ____cpe_quick_actions_utils, ____utils_core, ____utils_version, ___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'];
@@ -15,16 +16,16 @@ sap.ui.define([
     const isManagedObject = ____utils_core['isManagedObject'];
     const getUi5Version = ____utils_version['getUi5Version'];
     const isLowerThanMinimalUi5Version = ____utils_version['isLowerThanMinimalUi5Version'];
+    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'];
+    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 SMART_TABLE_ACTION_ID = 'CTX_COMP_VARIANT_CONTENT';
     const M_TABLE_ACTION_ID = 'CTX_ADD_ELEMENTS_AS_CHILD';
     const SETTINGS_ID = 'CTX_SETTINGS';
     const ICON_TAB_BAR_TYPE = 'sap.m.IconTabBar';
-    const SMART_TABLE_TYPE = 'sap.ui.comp.smarttable.SmartTable';
-    const M_TABLE_TYPE = 'sap.m.Table';
-    const MDC_TABLE_TYPE = 'sap.ui.mdc.Table';
-    const TREE_TABLE_TYPE = 'sap.ui.table.TreeTable';
-    const GRID_TABLE_TYPE = 'sap.ui.table.Table';
-    const ANALYTICAL_TABLE_TYPE = 'sap.ui.table.AnalyticalTable';
     async function getActionId(table) {
         const {major, minor} = await getUi5Version();
         if (isA(SMART_TABLE_TYPE, table)) {
@@ -160,20 +161,20 @@ sap.ui.define([
                         layout
                     });
                 } else if (subSections.length > 1) {
-                    const sectionChild = this.children.find(val => val.label === `${ section.getTitle() } section`);
-                    let tableMapIndex = `${ this.children.length - 1 }`;
+                    const existingChildIdx = this.children.findIndex(val => val.label === `'${ section.getTitle() }' section`);
+                    let tableMapIndex;
                     const label = this.getTableLabel(table);
                     const child = this.createChild(label, table);
-                    if (!sectionChild) {
-                        tableMapIndex = `${ tableMapIndex }/0`;
+                    if (existingChildIdx < 0) {
                         this.children.push({
                             label: `'${ section?.getTitle() }' section`,
                             enabled: true,
                             children: [child]
                         });
+                        tableMapIndex = `${ this.children.length - 1 }/0`;
                     } else {
-                        tableMapIndex = `${ tableMapIndex }/${ sectionChild.children.length - 1 }`;
-                        sectionChild.children.push(child);
+                        this.children[existingChildIdx].children.push(child);
+                        tableMapIndex = `${ existingChildIdx.toFixed(0) }/${ this.children[existingChildIdx].children.length - 1 }`;
                     }
                     this.tableMap[tableMapIndex] = {
                         table,
@@ -192,7 +193,9 @@ sap.ui.define([
                     SMART_TABLE_TYPE,
                     M_TABLE_TYPE,
                     MDC_TABLE_TYPE,
-                    TREE_TABLE_TYPE
+                    TREE_TABLE_TYPE,
+                    GRID_TABLE_TYPE,
+                    ANALYTICAL_TABLE_TYPE
                 ].some(type => isA(type, table))) {
                 const label = this.getTableLabel(table);
                 const child = this.createChild(label, table);
@@ -239,12 +242,6 @@ sap.ui.define([
         }
     }
     var __exports = { __esModule: true };
-    __exports.SMART_TABLE_TYPE = SMART_TABLE_TYPE;
-    __exports.M_TABLE_TYPE = M_TABLE_TYPE;
-    __exports.MDC_TABLE_TYPE = MDC_TABLE_TYPE;
-    __exports.TREE_TABLE_TYPE = TREE_TABLE_TYPE;
-    __exports.GRID_TABLE_TYPE = GRID_TABLE_TYPE;
-    __exports.ANALYTICAL_TABLE_TYPE = ANALYTICAL_TABLE_TYPE;
     __exports.TableQuickActionDefinitionBase = TableQuickActionDefinitionBase;
     return __exports;
 });

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

@@ -15,17 +15,19 @@ 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 {
+    ANALYTICAL_TABLE_TYPE,
+    GRID_TABLE_TYPE,
+    M_TABLE_TYPE,
+    MDC_TABLE_TYPE,
+    SMART_TABLE_TYPE,
+    TREE_TABLE_TYPE
+} from './control-types';
 
 const SMART_TABLE_ACTION_ID = 'CTX_COMP_VARIANT_CONTENT';
 const M_TABLE_ACTION_ID = 'CTX_ADD_ELEMENTS_AS_CHILD';
 const SETTINGS_ID = 'CTX_SETTINGS';
 const ICON_TAB_BAR_TYPE = 'sap.m.IconTabBar';
-export const SMART_TABLE_TYPE = 'sap.ui.comp.smarttable.SmartTable';
-export const M_TABLE_TYPE = 'sap.m.Table';
-export const MDC_TABLE_TYPE = 'sap.ui.mdc.Table';
-export const TREE_TABLE_TYPE = 'sap.ui.table.TreeTable';
-export const GRID_TABLE_TYPE = 'sap.ui.table.Table';
-export const ANALYTICAL_TABLE_TYPE = 'sap.ui.table.AnalyticalTable';
 
 async function getActionId(table: UI5Element): Promise<string[]> {
     const { major, minor } = await getUi5Version();
@@ -229,21 +231,25 @@ export abstract class TableQuickActionDefinitionBase {
             if (subSections?.length === 1) {
                 this.processTable(table, { section, subSection: subSections[0], layout });
             } else if (subSections.length > 1) {
-                const sectionChild = this.children.find((val) => val.label === `${section.getTitle()} section`);
-                let tableMapIndex = `${this.children.length - 1}`;
+                const existingChildIdx = this.children.findIndex(
+                    (val) => val.label === `'${section.getTitle()}' section`
+                );
+                let tableMapIndex;
                 const label = this.getTableLabel(table);
                 const child = this.createChild(label, table);
-                if (!sectionChild) {
-                    tableMapIndex = `${tableMapIndex}/0`;
-
+                if (existingChildIdx < 0) {
                     this.children.push({
                         label: `'${section?.getTitle()}' section`,
                         enabled: true,
                         children: [child]
                     });
+
+                    tableMapIndex = `${this.children.length - 1}/0`;
                 } else {
-                    tableMapIndex = `${tableMapIndex}/${sectionChild.children.length - 1}`;
-                    sectionChild.children.push(child);
+                    this.children[existingChildIdx].children.push(child);
+                    tableMapIndex = `${existingChildIdx.toFixed(0)}/${
+                        this.children[existingChildIdx].children.length - 1
+                    }`;
                 }
 
                 this.tableMap[tableMapIndex] = {
@@ -264,7 +270,16 @@ export abstract class TableQuickActionDefinitionBase {
         table: UI5Element,
         sectionInfo?: { section: ObjectPageSection; subSection: ObjectPageSubSection; layout?: ObjectPageLayout }
     ): void {
-        if ([SMART_TABLE_TYPE, M_TABLE_TYPE, MDC_TABLE_TYPE, TREE_TABLE_TYPE].some((type) => isA(type, table))) {
+        if (
+            [
+                SMART_TABLE_TYPE,
+                M_TABLE_TYPE,
+                MDC_TABLE_TYPE,
+                TREE_TABLE_TYPE,
+                GRID_TABLE_TYPE,
+                ANALYTICAL_TABLE_TYPE
+            ].some((type) => isA(type, table))
+        ) {
             const label = this.getTableLabel(table);
             const child = this.createChild(label, table);
             this.children.push(child);