@sap-ux/preview-middleware 0.17.42 → 0.17.44

package/dist/client/adp/controllers/AddFragment.controller.js

@@ -126,6 +126,10 @@ sap.ui.define([
             this.model.setProperty('/selectedIndex', indexArray.length - 1);
             this.model.setProperty('/targetAggregation', controlAggregation);
             this.model.setProperty('/index', indexArray);
+            const defaultIndex = Number(this.options.defaultAggregationArrayIndex);
+            if (defaultIndex >= 0) {
+                this.model.setProperty('/selectedIndex', indexArray.length - 1 > 0 ? defaultIndex : 0);
+            }
         },
         createFragmentChange: async function _createFragmentChange(fragmentData) {
             const {fragmentName, index, targetAggregation} = fragmentData;

package/dist/client/adp/controllers/AddFragment.controller.ts

@@ -52,6 +52,7 @@ export type AddFragmentModel = JSONModel & {
 export interface AddFragmentOptions {
     title: string;
     aggregation?: string;
+    defaultAggregationArrayIndex?: number;
 }
 
 /**
@@ -203,6 +204,10 @@ export default class AddFragment extends BaseDialog<AddFragmentModel> {
         this.model.setProperty('/selectedIndex', indexArray.length - 1);
         this.model.setProperty('/targetAggregation', controlAggregation);
         this.model.setProperty('/index', indexArray);
+        const defaultIndex = Number(this.options.defaultAggregationArrayIndex);
+        if (defaultIndex >= 0) {
+            this.model.setProperty('/selectedIndex', indexArray.length - 1 > 0 ? defaultIndex : 0);
+        }
     }
 
     /**

package/dist/client/adp/dialog-factory.js

@@ -54,6 +54,9 @@ sap.ui.define(["sap/ui/core/Fragment", "../i18n", "./controllers/AddFragment.con
             ...('aggregation' in options && {
               aggregation: options.aggregation
             }),
+            ...('defaultAggregationArrayIndex' in options && {
+              defaultAggregationArrayIndex: options.defaultAggregationArrayIndex
+            }),
             title: resources.getText(options.title ?? 'ADP_ADD_FRAGMENT_DIALOG_TITLE')
           });
           break;

package/dist/client/adp/dialog-factory.ts

@@ -62,6 +62,9 @@ export class DialogFactory {
             case DialogNames.ADD_FRAGMENT:
                 controller = new AddFragment(`open.ux.preview.client.adp.controllers.${dialogName}`, overlay, rta, {
                     ...('aggregation' in options && { aggregation: options.aggregation }),
+                    ...('defaultAggregationArrayIndex' in options && {
+                        defaultAggregationArrayIndex: options.defaultAggregationArrayIndex
+                    }),
                     title: resources.getText(options.title ?? 'ADP_ADD_FRAGMENT_DIALOG_TITLE')
                 });
                 break;

package/dist/client/adp/quick-actions/common/create-page-action.js

@@ -19,11 +19,11 @@ sap.ui.define(["sap/ui/dt/OverlayRegistry", "../../dialog-factory", "../simple-q
   class AddPageActionQuickAction extends SimpleQuickActionDefinitionBase {
     constructor(context) {
       super(ADD_PAGE_ACTION, CONTROL_TYPES, 'QUICK_ACTION_ADD_CUSTOM_PAGE_ACTION', context, [DIALOG_ENABLEMENT_VALIDATOR]);
+      this.appType = getApplicationType(this.context.rta.getRootControlInstance().getManifest());
     }
     async initialize() {
-      const appType = getApplicationType(this.context.rta.getRootControlInstance().getManifest());
       const version = await getUi5Version();
-      if (appType === 'fe-v4' && isLowerThanMinimalUi5Version(version, {
+      if (this.appType === 'fe-v4' && isLowerThanMinimalUi5Version(version, {
         major: 1,
         minor: 130
       })) {
@@ -36,7 +36,8 @@ sap.ui.define(["sap/ui/dt/OverlayRegistry", "../../dialog-factory", "../simple-q
         const overlay = OverlayRegistry.getOverlay(this.control) || [];
         await DialogFactory.createDialog(overlay, this.context.rta, DialogNames.ADD_FRAGMENT, undefined, {
           aggregation: 'actions',
-          title: 'QUICK_ACTION_ADD_CUSTOM_PAGE_ACTION'
+          title: 'QUICK_ACTION_ADD_CUSTOM_PAGE_ACTION',
+          defaultAggregationArrayIndex: 1
         });
       }
       return [];

package/dist/client/adp/quick-actions/common/create-page-action.ts

@@ -4,7 +4,7 @@ import FlexCommand from 'sap/ui/rta/command/FlexCommand';
 import { DialogFactory, DialogNames } from '../../dialog-factory';
 import { QuickActionContext, SimpleQuickActionDefinition } from '../../../cpe/quick-actions/quick-action-definition';
 import { SimpleQuickActionDefinitionBase } from '../simple-quick-action-base';
-import { getApplicationType } from '../../../utils/application';
+import { ApplicationType, getApplicationType } from '../../../utils/application';
 import { getUi5Version, isLowerThanMinimalUi5Version } from '../../../utils/version';
 import { DIALOG_ENABLEMENT_VALIDATOR } from '../dialog-enablement-validator';
 
@@ -15,16 +15,17 @@ const CONTROL_TYPES = ['sap.f.DynamicPageTitle', 'sap.uxap.ObjectPageHeader', 's
  * Quick Action for adding a custom page action.
  */
 export class AddPageActionQuickAction extends SimpleQuickActionDefinitionBase implements SimpleQuickActionDefinition {
+    private readonly appType: ApplicationType;
     constructor(context: QuickActionContext) {
         super(ADD_PAGE_ACTION, CONTROL_TYPES, 'QUICK_ACTION_ADD_CUSTOM_PAGE_ACTION', context, [
             DIALOG_ENABLEMENT_VALIDATOR
         ]);
+        this.appType = getApplicationType(this.context.rta.getRootControlInstance().getManifest());
     }
 
     async initialize(): Promise<void> {
-        const appType = getApplicationType(this.context.rta.getRootControlInstance().getManifest());
         const version = await getUi5Version();
-        if (appType === 'fe-v4' && isLowerThanMinimalUi5Version(version, { major: 1, minor: 130 })) {
+        if (this.appType === 'fe-v4' && isLowerThanMinimalUi5Version(version, { major: 1, minor: 130 })) {
             return;
         }
         await super.initialize();
@@ -35,7 +36,8 @@ export class AddPageActionQuickAction extends SimpleQuickActionDefinitionBase im
             const overlay = OverlayRegistry.getOverlay(this.control) || [];
             await DialogFactory.createDialog(overlay, this.context.rta, DialogNames.ADD_FRAGMENT, undefined, {
                 aggregation: 'actions',
-                title: 'QUICK_ACTION_ADD_CUSTOM_PAGE_ACTION'
+                title: 'QUICK_ACTION_ADD_CUSTOM_PAGE_ACTION',
+                defaultAggregationArrayIndex: 1
             });
         }
         return [];

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

@@ -19,6 +19,23 @@ sap.ui.define(["sap/ui/dt/OverlayRegistry", "../../../utils/core", "../../dialog
     constructor(context) {
       super(CREATE_TABLE_ACTION, CONTROL_TYPES, 'QUICK_ACTION_ADD_CUSTOM_TABLE_ACTION', context, undefined, [DIALOG_ENABLEMENT_VALIDATOR]);
     }
+    async initialize() {
+      const processChild = (child, mapKey) => {
+        const table = this.tableMap[mapKey]?.table;
+        if (table) {
+          const headerToolbar = this.getHeaderToolbar(table);
+          if (!headerToolbar) {
+            child.enabled = false;
+            child.tooltip = this.context.resourceBundle.getText('NO_TABLE_HEADER_TOOLBAR');
+          }
+        }
+        child.children.forEach((nestedChild, idx) => processChild(nestedChild, `${mapKey}/${idx.toFixed(0)}`));
+      };
+      await super.initialize();
+
+      // disable nested actions based on conditions
+      this.children.forEach((nestedChild, idx) => processChild(nestedChild, `${idx.toFixed(0)}`));
+    }
     async execute(path) {
       const {
         table,
@@ -44,23 +61,33 @@ sap.ui.define(["sap/ui/dt/OverlayRegistry", "../../../utils/core", "../../dialog
       if (this.iconTabBar && iconTabBarFilterKey) {
         this.iconTabBar.setSelectedKey(iconTabBarFilterKey);
       }
-      let headerToolbar;
-      if (isA(SMART_TABLE_TYPE, table)) {
-        headerToolbar = table.getAggregation('items')[0].getAggregation('headerToolbar');
-      } else if (isA(M_TABLE_TYPE, table)) {
-        headerToolbar = table.getAggregation('headerToolbar');
-      }
+      const headerToolbar = this.getHeaderToolbar(table);
 
       // open dialogBox to add, and content is selected ByDefault
       if (headerToolbar) {
         const overlay = OverlayRegistry.getOverlay(headerToolbar) || [];
         await DialogFactory.createDialog(overlay, this.context.rta, DialogNames.ADD_FRAGMENT, undefined, {
           aggregation: 'content',
-          title: 'QUICK_ACTION_ADD_CUSTOM_TABLE_ACTION'
+          title: 'QUICK_ACTION_ADD_CUSTOM_TABLE_ACTION',
+          defaultAggregationArrayIndex: 1
         });
       }
       return [];
     }
+    getHeaderToolbar(table) {
+      let headerToolbar;
+      if (isA(SMART_TABLE_TYPE, table)) {
+        headerToolbar = table.getAggregation('items').find(item => {
+          if (item.getAggregation('headerToolbar')) {
+            return true;
+          }
+          return isA('sap.m.OverflowToolbar', item);
+        });
+      } else if (isA(M_TABLE_TYPE, table)) {
+        headerToolbar = table.getAggregation('headerToolbar');
+      }
+      return headerToolbar;
+    }
   }
   var __exports = {
     __esModule: true

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

@@ -10,6 +10,8 @@ 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';
 
 export const CREATE_TABLE_ACTION = 'create-table-action';
 const SMART_TABLE_TYPE = 'sap.ui.comp.smarttable.SmartTable';
@@ -25,6 +27,25 @@ export class AddTableActionQuickAction extends TableQuickActionDefinitionBase im
         ]);
     }
 
+    async initialize(): Promise<void> {
+        const processChild = (child: NestedQuickActionChild, mapKey: string) => {
+            const table = this.tableMap[mapKey]?.table;
+            if (table) {
+                const headerToolbar = this.getHeaderToolbar(table);
+                if (!headerToolbar) {
+                    child.enabled = false;
+                    child.tooltip = this.context.resourceBundle.getText('NO_TABLE_HEADER_TOOLBAR');
+                }
+            }
+
+            child.children.forEach((nestedChild, idx) => processChild(nestedChild, `${mapKey}/${idx.toFixed(0)}`));
+        };
+
+        await super.initialize();
+
+        // disable nested actions based on conditions
+        this.children.forEach((nestedChild, idx) => processChild(nestedChild, `${idx.toFixed(0)}`));
+    }
     async execute(path: string): Promise<FlexCommand[]> {
         const { table, iconTabBarFilterKey, sectionInfo } = this.tableMap[path];
         if (!table) {
@@ -45,21 +66,32 @@ export class AddTableActionQuickAction extends TableQuickActionDefinitionBase im
             this.iconTabBar.setSelectedKey(iconTabBarFilterKey);
         }
 
-        let headerToolbar;
-        if (isA<SmartTable>(SMART_TABLE_TYPE, table)) {
-            headerToolbar = (table.getAggregation('items') as ManagedObject[])[0].getAggregation('headerToolbar');
-        } else if (isA<Table>(M_TABLE_TYPE, table)) {
-            headerToolbar = table.getAggregation('headerToolbar');
-        }
+        const headerToolbar = this.getHeaderToolbar(table);
 
         // open dialogBox to add, and content is selected ByDefault
         if (headerToolbar) {
             const overlay = OverlayRegistry.getOverlay(headerToolbar as UI5Element) || [];
             await DialogFactory.createDialog(overlay, this.context.rta, DialogNames.ADD_FRAGMENT, undefined, {
                 aggregation: 'content',
-                title: 'QUICK_ACTION_ADD_CUSTOM_TABLE_ACTION'
+                title: 'QUICK_ACTION_ADD_CUSTOM_TABLE_ACTION',
+                defaultAggregationArrayIndex: 1
             });
         }
         return [];
     }
+
+    getHeaderToolbar(table: UI5Element): ManagedObject | ManagedObject[] | OverflowToolbar | null | undefined {
+        let headerToolbar;
+        if (isA<SmartTable>(SMART_TABLE_TYPE, table)) {
+            headerToolbar = (table.getAggregation('items') as ManagedObject[]).find((item) => {
+                if (item.getAggregation('headerToolbar')) {
+                    return true;
+                }
+                return isA<OverflowToolbar>('sap.m.OverflowToolbar', item);
+            });
+        } else if (isA<Table>(M_TABLE_TYPE, table)) {
+            headerToolbar = table.getAggregation('headerToolbar');
+        }
+        return headerToolbar;
+    }
 }

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

@@ -35,6 +35,7 @@ sap.ui.define(["sap/ui/dt/OverlayUtil", "../../../utils/core", "../../dialog-fac
         controlOverlay.setSelected(true);
         await DialogFactory.createDialog(controlOverlay, this.context.rta, DialogNames.ADD_FRAGMENT, undefined, {
           aggregation: 'actions',
+          defaultAggregationArrayIndex: 0,
           title: 'QUICK_ACTION_ADD_CUSTOM_TABLE_ACTION'
         });
       }

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

@@ -35,6 +35,7 @@ export class AddTableActionQuickAction extends TableQuickActionDefinitionBase im
 
             await DialogFactory.createDialog(controlOverlay, this.context.rta, DialogNames.ADD_FRAGMENT, undefined, {
                 aggregation: 'actions',
+                defaultAggregationArrayIndex: 0,
                 title: 'QUICK_ACTION_ADD_CUSTOM_TABLE_ACTION'
             });
         }

package/dist/client/messagebundle.properties

@@ -50,6 +50,7 @@ EMPTY_ROW_MODE_IS_NOT_SUPPORTED=This action is disabled because empty row mode i
 VARIANT_MANAGEMENT_FOR_PAGE_CONTROLS_IS_ALREADY_ENABLED=This option has been disabled because variant management is already enabled for tables and charts
 VARIANT_MANAGEMENT_FOR_TABLE_CONTROLS_IS_ALREADY_ENABLED=This option has been disabled because variant management is already enabled for the ''{0}''
 VARIANT_MANAGEMENT_FOR_CUSTOM_TABLES_NOT_SUPPORTED=Variant management cannot be set for custom table ''{0}''
+NO_TABLE_HEADER_TOOLBAR=This option has been disabled because the table does not have a header toolbar.
 
 ADD_ANNOTATION_FILE=Add Annotation File for ''{0}''
 SHOW_ANNOTATION_FILE=Show Annotation File for ''{0}''

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.42",
+  "version": "0.17.44",
   "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/btp-utils": "1.0.1",
     "@sap-ux/adp-tooling": "0.12.136",
     "@sap-ux/control-property-editor-sources": "npm:@sap-ux/control-property-editor@0.5.37",
+    "@sap-ux/btp-utils": "1.0.1",
     "@sap-ux/project-access": "1.29.8"
   },
   "devDependencies": {
@@ -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.65",
+    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.11.67",
     "@sap-ux/axios-extension": "1.18.6",
     "@sap-ux/store": "1.0.0",
-    "@sap-ux/ui5-info": "0.8.3",
-    "@sap-ux/i18n": "0.2.1"
+    "@sap-ux/i18n": "0.2.1",
+    "@sap-ux/ui5-info": "0.8.3"
   },
   "peerDependencies": {
     "express": "4"