@sap-ux/preview-middleware 0.17.33 → 0.17.34

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

@@ -60,6 +60,14 @@ sap.ui.define([
             this.options = options;
             this.enablementValidators = enablementValidators;
         }
+        async addSettingsActionId(table, tableMapKey) {
+            if (this.options.includeServiceAction) {
+                const actions = await this.context.actionService.get(table.getId());
+                const actionsIds = await getActionId(table);
+                const changeColumnAction = actionsIds.find(actionId => actions.findIndex(action => action.id === actionId) > -1);
+                this.tableMap[tableMapKey].changeColumnActionId = changeColumnAction;
+            }
+        }
         async initialize() {
             const version = await getUi5Version();
             if (isLowerThanMinimalUi5Version(version, {
@@ -74,26 +82,20 @@ sap.ui.define([
                 const tabKey = Object.keys(iconTabBarfilterMap).find(key => table.getId().endsWith(key));
                 const section = getParentContainer(table, 'sap.uxap.ObjectPageSection');
                 if (section) {
-                    this.collectChildrenInSection(section, table);
+                    await this.collectChildrenInSection(section, table);
                 } else if (this.iconTabBar && tabKey) {
                     const label = `'${ iconTabBarfilterMap[tabKey] }' table`;
                     const child = this.createChild(label, table);
                     this.children.push(child);
-                    this.tableMap[`${ this.children.length - 1 }`] = {
+                    const tableMapKey = `${ this.children.length - 1 }`;
+                    this.tableMap[tableMapKey] = {
                         table,
                         iconTabBarFilterKey: tabKey,
                         tableUpdateEventAttachedOnce: false
                     };
+                    await this.addSettingsActionId(table, tableMapKey);
                 } else {
-                    this.processTable(table);
-                }
-                if (this.options.includeServiceAction) {
-                    const actions = await this.context.actionService.get(table.getId());
-                    const actionsIds = await getActionId(table);
-                    const changeColumnAction = actionsIds.find(actionId => actions.findIndex(action => action.id === actionId) > -1);
-                    Object.keys(this.tableMap).forEach(key => {
-                        this.tableMap[key].changeColumnActionId = changeColumnAction;
-                    });
+                    await this.processTable(table);
                 }
             }
             if (this.children.length > 0) {
@@ -147,13 +149,13 @@ sap.ui.define([
             }
             return iconTabBarFilterMap;
         }
-        collectChildrenInSection(section, table) {
+        async collectChildrenInSection(section, table) {
             const layout = getParentContainer(table, 'sap.uxap.ObjectPageLayout');
             const subSections = section.getSubSections();
             const subSection = getParentContainer(table, 'sap.uxap.ObjectPageSubSection');
             if (subSection) {
                 if (subSections?.length === 1) {
-                    this.processTable(table, {
+                    await this.processTable(table, {
                         section,
                         subSection: subSections[0],
                         layout
@@ -183,10 +185,11 @@ sap.ui.define([
                         },
                         tableUpdateEventAttachedOnce: false
                     };
+                    await this.addSettingsActionId(table, tableMapIndex);
                 }
             }
         }
-        processTable(table, sectionInfo) {
+        async processTable(table, sectionInfo) {
             if ([
                     SMART_TABLE_TYPE,
                     M_TABLE_TYPE,
@@ -199,11 +202,13 @@ sap.ui.define([
                 const child = this.createChild(label, table);
                 this.children.push(child);
             }
-            this.tableMap[`${ this.children.length - 1 }`] = {
+            const tableMapKey = `${ this.children.length - 1 }`;
+            this.tableMap[tableMapKey] = {
                 table,
                 sectionInfo: sectionInfo,
                 tableUpdateEventAttachedOnce: false
             };
+            await this.addSettingsActionId(table, tableMapKey);
         }
         selectOverlay(table) {
             const controlOverlay = OverlayUtil.getClosestOverlayFor(table);

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

@@ -91,6 +91,23 @@ export abstract class TableQuickActionDefinitionBase extends QuickActionDefiniti
         super(type, NESTED_QUICK_ACTION_KIND, defaultTextKey, context, enablementValidators);
     }
 
+    /**
+     * Adds action id to the table map entry, if the service actions are needed.
+     * @param table - table element
+     * @param tableMapKey - map key
+     */
+    protected async addSettingsActionId(table: UI5Element, tableMapKey: string): Promise<void> {
+        if (this.options.includeServiceAction) {
+            const actions = await this.context.actionService.get(table.getId());
+            const actionsIds = await getActionId(table);
+
+            const changeColumnAction = actionsIds.find(
+                (actionId) => actions.findIndex((action) => action.id === actionId) > -1
+            );
+            this.tableMap[tableMapKey].changeColumnActionId = changeColumnAction;
+        }
+    }
+
     /**
      * Initializes action object instance
      */
@@ -110,32 +127,20 @@ export abstract class TableQuickActionDefinitionBase extends QuickActionDefiniti
             const tabKey = Object.keys(iconTabBarfilterMap).find((key) => table.getId().endsWith(key));
             const section = getParentContainer<ObjectPageSection>(table, 'sap.uxap.ObjectPageSection');
             if (section) {
-                this.collectChildrenInSection(section, table);
+                await this.collectChildrenInSection(section, table);
             } else if (this.iconTabBar && tabKey) {
                 const label = `'${iconTabBarfilterMap[tabKey]}' table`;
                 const child = this.createChild(label, table);
                 this.children.push(child);
-                this.tableMap[`${this.children.length - 1}`] = {
+                const tableMapKey = `${this.children.length - 1}`;
+                this.tableMap[tableMapKey] = {
                     table,
                     iconTabBarFilterKey: tabKey,
                     tableUpdateEventAttachedOnce: false
                 };
+                await this.addSettingsActionId(table, tableMapKey);
             } else {
-                this.processTable(table);
-            }
-
-            // add action id to the table map, if the service actions are needed.
-            if (this.options.includeServiceAction) {
-                const actions = await this.context.actionService.get(table.getId());
-                const actionsIds = await getActionId(table);
-
-                const changeColumnAction = actionsIds.find(
-                    (actionId) => actions.findIndex((action) => action.id === actionId) > -1
-                );
-                Object.keys(this.tableMap).forEach((key) => {
-                    // Update the changeColumnActionId for each entry
-                    this.tableMap[key].changeColumnActionId = changeColumnAction;
-                });
+                await this.processTable(table);
             }
         }
         if (this.children.length > 0) {
@@ -219,13 +224,13 @@ export abstract class TableQuickActionDefinitionBase extends QuickActionDefiniti
      * @param section - object page section
      * @param table - table element
      */
-    private collectChildrenInSection(section: ObjectPageSection, table: UI5Element): void {
+    private async collectChildrenInSection(section: ObjectPageSection, table: UI5Element): Promise<void> {
         const layout = getParentContainer<ObjectPageLayout>(table, 'sap.uxap.ObjectPageLayout');
         const subSections = section.getSubSections();
         const subSection = getParentContainer<ObjectPageSubSection>(table, 'sap.uxap.ObjectPageSubSection');
         if (subSection) {
             if (subSections?.length === 1) {
-                this.processTable(table, { section, subSection: subSections[0], layout });
+                await this.processTable(table, { section, subSection: subSections[0], layout });
             } else if (subSections.length > 1) {
                 const existingChildIdx = this.children.findIndex(
                     (val) => val.label === `'${section.getTitle()}' section`
@@ -253,6 +258,7 @@ export abstract class TableQuickActionDefinitionBase extends QuickActionDefiniti
                     sectionInfo: { section, subSection, layout },
                     tableUpdateEventAttachedOnce: false
                 };
+                await this.addSettingsActionId(table, tableMapIndex);
             }
         }
     }
@@ -262,10 +268,10 @@ export abstract class TableQuickActionDefinitionBase extends QuickActionDefiniti
      * @param table - table element
      * @param sectionInfo - section info object
      */
-    private processTable(
+    private async processTable(
         table: UI5Element,
         sectionInfo?: { section: ObjectPageSection; subSection: ObjectPageSubSection; layout?: ObjectPageLayout }
-    ): void {
+    ): Promise<void> {
         if (
             [
                 SMART_TABLE_TYPE,
@@ -281,11 +287,13 @@ export abstract class TableQuickActionDefinitionBase extends QuickActionDefiniti
             this.children.push(child);
         }
 
-        this.tableMap[`${this.children.length - 1}`] = {
+        const tableMapKey = `${this.children.length - 1}`;
+        this.tableMap[tableMapKey] = {
             table,
             sectionInfo: sectionInfo,
             tableUpdateEventAttachedOnce: false
         };
+        await this.addSettingsActionId(table, tableMapKey);
     }
 
     /**

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.17.33",
+  "version": "0.17.34",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -48,11 +48,11 @@
     "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.62",
     "@sap-ux/axios-extension": "1.18.5",
-    "@sap-ux/store": "1.0.0",
+    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.11.63",
     "@sap-ux/ui5-info": "0.8.3",
-    "@sap-ux/i18n": "0.2.1"
+    "@sap-ux/i18n": "0.2.1",
+    "@sap-ux/store": "1.0.0"
   },
   "peerDependencies": {
     "express": "4"