@adaptabletools/adaptable-cjs 18.0.0-canary.26 → 18.0.0-canary.28

package/src/Strategy/BulkUpdateModule.d.ts

@@ -6,7 +6,7 @@ import { AccessLevel, AdaptableApi } from '../types';
 export declare class BulkUpdateModule extends AdaptableModuleBase implements IBulkUpdateModule {
     constructor(api: AdaptableApi);
     getViewAccessLevel(): AccessLevel;
-    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
+    createContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     checkCorrectCellSelection(): BulkUpdateValidationResult;
     buildPreviewValues(bulkUpdateValue: any): PreviewInfo;
 }

package/src/Strategy/BulkUpdateModule.js

@@ -15,7 +15,7 @@ class BulkUpdateModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     getViewAccessLevel() {
         return 'Full';
     }
-    addContextMenuItems(menuContext) {
+    createContextMenuItems(menuContext) {
         let menuItemShowPopup = undefined;
         if (!menuContext.isRowGroupColumn && this.isModuleEditable()) {
             if (menuContext.adaptableColumn &&
@@ -26,7 +26,8 @@ class BulkUpdateModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 let popUpParams = {
                     source: 'ContextMenu',
                 };
-                menuItemShowPopup = this.createMainMenuItemShowPopup({ Name: 'bulk-update-apply',
+                menuItemShowPopup = this.createMainMenuItemShowPopup({
+                    Name: 'bulk-update-apply',
                     Label: 'Apply Bulk Update',
                     ComponentName: this.moduleInfo.Popup,
                     Icon: this.moduleInfo.Glyph,

package/src/Strategy/CalculatedColumnModule.d.ts

@@ -16,8 +16,8 @@ export declare class CalculatedColumnModule extends AdaptableModuleBase implemen
     getExplicitlyReferencedColumnIds(calculatedColumn: CalculatedColumn): string[];
     getReferencedNamedQueryNames(calculatedColumn: CalculatedColumn): string[];
     private isCalculatedColumn;
-    addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
-    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
+    createColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
+    createContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     createEditCalculatedColumnMenuItem(column: AdaptableColumn): AdaptableMenuItem[];
     getTeamSharingAction(): TeamSharingImportInfo<CalculatedColumn>;
     toView(calculateColumn: CalculatedColumn): {

package/src/Strategy/CalculatedColumnModule.js

@@ -38,12 +38,12 @@ class CalculatedColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 .getCalculatedColumns()
                 .find((cc) => cc.ColumnId == column.columnId)));
     }
-    addColumnMenuItems(column) {
+    createColumnMenuItems(column) {
         if (this.isModuleEditable() && this.isCalculatedColumn(column)) {
             return this.createEditCalculatedColumnMenuItem(column);
         }
     }
-    addContextMenuItems(menuContext) {
+    createContextMenuItems(menuContext) {
         if (!this.isModuleAvailable()) {
             return;
         }

package/src/Strategy/CellSummaryModule.d.ts

@@ -11,8 +11,8 @@ export declare class CellSummaryModule extends AdaptableModuleBase implements IC
     cachedCellSummary: WeakMap<SelectedCellInfo<any>, CellSummmary>;
     constructor(api: AdaptableApi);
     getViewAccessLevel(): AccessLevel;
-    addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
-    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
+    createColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
+    createContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     private createCellSummaryMenuItem;
     createCellSummary(selectedCellInfo: SelectedCellInfo): CellSummmary;
     private getWeightedAverageCellSummary;

package/src/Strategy/CellSummaryModule.js

@@ -17,7 +17,7 @@ class CellSummaryModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     getViewAccessLevel() {
         return 'Full';
     }
-    addColumnMenuItems(column) {
+    createColumnMenuItems(column) {
         if (!this.isModuleAvailable()) {
             return;
         }
@@ -28,7 +28,7 @@ class CellSummaryModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             }),
         ];
     }
-    addContextMenuItems(menuContext) {
+    createContextMenuItems(menuContext) {
         if (!this.isModuleAvailable()) {
             return;
         }

package/src/Strategy/ColumnFilterModule.d.ts

@@ -13,8 +13,8 @@ export declare class ColumnFilterModule extends AdaptableModuleBase implements I
     getExplicitlyReferencedColumnIds(columnFilter: ColumnFilter): string[];
     hasNamedQueryReferences(): boolean;
     onAdaptableReady(): void;
-    addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
-    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
+    createColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
+    createContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     private getExistingColumnFilter;
     getTeamSharingAction(): TeamSharingImportInfo<ColumnFilter>;
     toViewCompact(filter: ColumnFilter): AdaptableObjectCompactView;

package/src/Strategy/ColumnFilterModule.js

@@ -4,7 +4,6 @@ exports.ColumnFilterModule = void 0;
 const tslib_1 = require("tslib");
 const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
 const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
-const ArrayExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/ArrayExtensions"));
 const LayoutRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/LayoutRedux"));
 const SystemRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/SystemRedux"));
 const FilterStatusBarSubPanelPopover_1 = require("../View/Filter/FilterStatusBarSubPanelPopover");
@@ -43,8 +42,8 @@ class ColumnFilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             }
         });
     }
-    addColumnMenuItems(column) {
-        let filterSubMenuItems = [];
+    createColumnMenuItems(column) {
+        let columnFilterMenuItems = [];
         if (column &&
             column.filterable &&
             this.api.optionsApi.getColumnFilterOptions().useAdaptableColumnFiltering) {
@@ -52,35 +51,22 @@ class ColumnFilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 const isFilterVisible = this.api.columnFilterApi.isQuickFilterVisible();
                 if (this.isModuleEditable() &&
                     this.api.optionsApi.getColumnFilterOptions().useAdaptableColumnFiltering) {
-                    filterSubMenuItems.push(this.createMenuItemReduxAction(isFilterVisible ? 'column-filter-bar-hide' : 'column-filter-bar-show', isFilterVisible ? 'Hide Filter Bar' : 'Show Filter Bar', isFilterVisible ? 'unchecked' : 'check', isFilterVisible
+                    columnFilterMenuItems.push(this.createMenuItemReduxAction(isFilterVisible ? 'column-filter-bar-hide' : 'column-filter-bar-show', isFilterVisible ? 'Hide Filter Bar' : 'Show Filter Bar', isFilterVisible ? 'filter-off' : 'filter', isFilterVisible
                         ? SystemRedux.SystemQuickFilterBarHide()
                         : SystemRedux.SystemQuickFilterBarShow()));
                 }
             }
             const existingColumnFilter = this.getExistingColumnFilter(column);
             if (existingColumnFilter) {
-                filterSubMenuItems.push(this.createMenuItemReduxAction('column-filter-clear', 'Clear Filter', 'close', LayoutRedux.LayoutColumnFilterClear(existingColumnFilter)));
-                filterSubMenuItems.push(this.createMenuItemReduxAction(existingColumnFilter.IsSuspended ? 'column-filter-unsuspend' : 'column-filter-suspend', existingColumnFilter.IsSuspended ? 'Unsuspend Filter' : 'Suspend Filter', existingColumnFilter.IsSuspended ? 'resume' : 'pause', existingColumnFilter.IsSuspended
+                columnFilterMenuItems.push(this.createMenuItemReduxAction('column-filter-clear', 'Clear Filter', 'close', LayoutRedux.LayoutColumnFilterClear(existingColumnFilter)));
+                columnFilterMenuItems.push(this.createMenuItemReduxAction(existingColumnFilter.IsSuspended ? 'column-filter-unsuspend' : 'column-filter-suspend', existingColumnFilter.IsSuspended ? 'Unsuspend Filter' : 'Suspend Filter', existingColumnFilter.IsSuspended ? 'resume' : 'pause', existingColumnFilter.IsSuspended
                     ? LayoutRedux.LayoutColumnFilterUnSuspend(existingColumnFilter)
                     : LayoutRedux.LayoutColumnFilterSuspend(existingColumnFilter)));
             }
-            if (ArrayExtensions_1.default.IsNotNullOrEmpty(filterSubMenuItems)) {
-                return [
-                    {
-                        name: 'column-filter-parent',
-                        label: this.moduleInfo.FriendlyName,
-                        isVisible: true,
-                        module: this.moduleInfo.ModuleName,
-                        icon: {
-                            name: this.moduleInfo.Glyph,
-                        },
-                        subItems: filterSubMenuItems,
-                    },
-                ];
-            }
+            return columnFilterMenuItems;
         }
     }
-    addContextMenuItems(menuContext) {
+    createContextMenuItems(menuContext) {
         if (!menuContext.isRowGroupColumn && this.isModuleAvailable()) {
             if (menuContext.adaptableColumn &&
                 menuContext.adaptableColumn.filterable &&
@@ -102,28 +88,17 @@ class ColumnFilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     ];
                 }
                 else {
-                    let filterSubMenuItems = [];
-                    filterSubMenuItems.push(this.createMenuItemReduxAction('column-filter-clear', 'Clear Filter', 'close', LayoutRedux.LayoutColumnFilterClear(existingColumnFilter)));
-                    filterSubMenuItems.push(this.createMenuItemClickFunction(existingColumnFilter.IsSuspended
-                        ? 'column-filter-unsuspend'
-                        : 'column-filter-suspend', existingColumnFilter.IsSuspended ? 'Unsuspend Filter' : 'Suspend Filter', existingColumnFilter.IsSuspended ? 'resume' : 'pause', existingColumnFilter.IsSuspended
-                        ? () => {
-                            this.api.columnFilterApi.unSuspendColumnFilter(existingColumnFilter);
-                        }
-                        : () => {
-                            this.api.columnFilterApi.suspendColumnFilter(existingColumnFilter);
-                        }));
                     return [
-                        {
-                            name: 'column-filter-parent',
-                            label: this.moduleInfo.FriendlyName,
-                            isVisible: true,
-                            module: this.moduleInfo.ModuleName,
-                            icon: {
-                                name: this.moduleInfo.Glyph,
-                            },
-                            subItems: filterSubMenuItems,
-                        },
+                        this.createMenuItemReduxAction('column-filter-clear', 'Clear Filter', 'close', LayoutRedux.LayoutColumnFilterClear(existingColumnFilter)),
+                        this.createMenuItemClickFunction(existingColumnFilter.IsSuspended
+                            ? 'column-filter-unsuspend'
+                            : 'column-filter-suspend', existingColumnFilter.IsSuspended ? 'Unsuspend Filter' : 'Suspend Filter', existingColumnFilter.IsSuspended ? 'resume' : 'pause', existingColumnFilter.IsSuspended
+                            ? () => {
+                                this.api.columnFilterApi.unSuspendColumnFilter(existingColumnFilter);
+                            }
+                            : () => {
+                                this.api.columnFilterApi.suspendColumnFilter(existingColumnFilter);
+                            }),
                     ];
                 }
             }

package/src/Strategy/ColumnInfoModule.d.ts

@@ -6,6 +6,6 @@ import { AdaptableColumn, AdaptableMenuItem, ContextMenuContext } from '../types
 export declare class ColumnInfoModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
     getViewAccessLevel(): AccessLevel;
-    addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
-    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
+    createColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
+    createContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
 }

package/src/Strategy/ColumnInfoModule.js

@@ -11,7 +11,7 @@ class ColumnInfoModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     getViewAccessLevel() {
         return 'Full';
     }
-    addColumnMenuItems(column) {
+    createColumnMenuItems(column) {
         if (this.isModuleAvailable()) {
             const columnPopUpParams = {
                 source: 'ColumnMenu',
@@ -22,13 +22,13 @@ class ColumnInfoModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     Name: 'column-info-show',
                     Label: 'Column Info',
                     ComponentName: this.moduleInfo.Popup,
-                    Icon: this.moduleInfo.Glyph,
+                    Icon: 'info',
                     PopupParams: columnPopUpParams,
                 }),
             ];
         }
     }
-    addContextMenuItems(menuContext) {
+    createContextMenuItems(menuContext) {
         if (this.isModuleAvailable()) {
             const columnPopUpParams = {
                 source: 'ColumnMenu',
@@ -39,7 +39,7 @@ class ColumnInfoModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     Name: 'column-info-show',
                     Label: 'Column Info',
                     ComponentName: this.moduleInfo.Popup,
-                    Icon: this.moduleInfo.Glyph,
+                    Icon: 'info',
                     PopupParams: columnPopUpParams,
                 }),
             ];

package/src/Strategy/CommentModule.d.ts

@@ -7,6 +7,5 @@ export declare class CommentModule extends AdaptableModuleBase implements IModul
     onAdaptableReady(): void;
     isModuleAvailable(): boolean;
     private loadComments;
-    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
-    private getAddRemoveCommentsMenuItems;
+    createContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
 }

package/src/Strategy/CommentModule.js

@@ -28,49 +28,48 @@ class CommentModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             .getCommentOptions()) === null || _a === void 0 ? void 0 : _a.loadCommentThreads) === null || _b === void 0 ? void 0 : _b.call(_a, (0, ObjectFactory_1.createBaseContext)(this.api)));
         this.api.commentApi.setGridComments(commentThreads);
     }
-    addContextMenuItems(menuContext) {
-        var _a, _b;
+    createContextMenuItems(menuContext) {
+        var _a, _b, _c, _d, _e;
         if (!this.isModuleAvailable()) {
-            return undefined;
+            return;
         }
-        const items = [];
-        const isCellCommentable = (_b = (_a = this.api.optionsApi) === null || _a === void 0 ? void 0 : _a.getCommentOptions()) === null || _b === void 0 ? void 0 : _b.isCellCommentable;
-        if (!isCellCommentable ||
-            isCellCommentable(Object.assign({ gridCell: menuContext.gridCell }, (0, ObjectFactory_1.createBaseContext)(this.api)))) {
-            items.push(...this.getAddRemoveCommentsMenuItems(menuContext));
+        if (!this.api.commentApi.internalApi.areCommentsSupported()) {
+            return;
         }
-        return items;
-    }
-    getAddRemoveCommentsMenuItems(menuContext) {
-        var _a;
         const items = [];
-        if (!this.api.commentApi.internalApi.areCommentsAvailable()) {
-            return items;
+        const isCellCommentable = typeof ((_b = (_a = this.api.optionsApi) === null || _a === void 0 ? void 0 : _a.getCommentOptions()) === null || _b === void 0 ? void 0 : _b.isCellCommentable) === 'function'
+            ? (_d = (_c = this.api.optionsApi) === null || _c === void 0 ? void 0 : _c.getCommentOptions()) === null || _d === void 0 ? void 0 : _d.isCellCommentable(Object.assign({ gridCell: menuContext.gridCell }, (0, ObjectFactory_1.createBaseContext)(this.api)))
+            : true;
+        if (!isCellCommentable) {
+            return;
         }
         const cellAddress = {
             PrimaryKeyValue: menuContext.primaryKeyValue,
             ColumnId: menuContext.adaptableColumn.columnId,
         };
-        const cellComments = (_a = this.api.commentApi.getCommentThread(cellAddress)) === null || _a === void 0 ? void 0 : _a.Comments;
+        const cellComments = (_e = this.api.commentApi.getCommentThread(cellAddress)) === null || _e === void 0 ? void 0 : _e.Comments;
         if (cellComments) {
-            items.push(this.createMenuItemClickFunction('comment-remove', 'Remove Comment', this.moduleInfo.Glyph, () => {
-                this.api.commentApi.deleteCommentThread(cellAddress);
-            }));
+            return [
+                this.createMenuItemClickFunction('comment-remove', 'Remove Comment', this.moduleInfo.Glyph, () => {
+                    this.api.commentApi.deleteCommentThread(cellAddress);
+                }),
+            ];
         }
         else {
-            items.push(this.createMenuItemClickFunction('comment-add', 'Add Comment', this.moduleInfo.Glyph, () => {
-                // add an empty one
-                this.api.commentApi.addCommentThread(Object.assign(Object.assign({}, cellAddress), { Comments: [] }));
-                requestAnimationFrame(() => {
-                    this.api.internalApi.getCellPopupService().showPopup({
-                        PrimaryKeyValue: menuContext.primaryKeyValue,
-                        ColumnId: menuContext.adaptableColumn.columnId,
-                    }, true);
-                    this.api.internalApi.getCellPopupService().editFocusedEntity('Comment');
-                });
-            }));
+            return [
+                this.createMenuItemClickFunction('comment-add', 'Add Comment', this.moduleInfo.Glyph, () => {
+                    // add an empty one
+                    this.api.commentApi.addCommentThread(Object.assign(Object.assign({}, cellAddress), { Comments: [] }));
+                    requestAnimationFrame(() => {
+                        this.api.internalApi.getCellPopupService().showPopup({
+                            PrimaryKeyValue: menuContext.primaryKeyValue,
+                            ColumnId: menuContext.adaptableColumn.columnId,
+                        }, true);
+                        this.api.internalApi.getCellPopupService().editFocusedEntity('Comment');
+                    });
+                }),
+            ];
         }
-        return items;
     }
 }
 exports.CommentModule = CommentModule;

package/src/Strategy/CustomSortModule.d.ts

@@ -15,7 +15,7 @@ export declare class CustomSortModule extends AdaptableModuleBase implements IMo
     }): AdaptableObject[];
     getExplicitlyReferencedColumnIds(customSort: CustomSort): string[];
     hasNamedQueryReferences(): boolean;
-    addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
+    createColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
     getTeamSharingAction(): TeamSharingImportInfo<CustomSort>;
     toView(customSort: CustomSort): AdaptableObjectView;
     toViewAll(): AdaptableObjectView[];

package/src/Strategy/CustomSortModule.js

@@ -22,7 +22,7 @@ class CustomSortModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     hasNamedQueryReferences() {
         return false;
     }
-    addColumnMenuItems(column) {
+    createColumnMenuItems(column) {
         if (column && this.isModuleEditable() && column.sortable) {
             let customSort = this.api.customSortApi
                 .getCustomSorts()

package/src/Strategy/DashboardModule.d.ts

@@ -5,7 +5,7 @@ import { AdaptableApi } from '../Api/AdaptableApi';
 export declare class DashboardModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
     onAdaptableReady(): void;
-    addColumnMenuItems(): AdaptableMenuItem[] | undefined;
-    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
+    createColumnMenuItems(): AdaptableMenuItem[] | undefined;
+    createContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     private buildMenuItems;
 }

package/src/Strategy/DashboardModule.js

@@ -21,10 +21,10 @@ class DashboardModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             this.api.dashboardApi.internalApi.fireDashboardChangedEvent('ADAPTABLE_READY', null, this.api.dashboardApi.getDashboardState());
         }, 20);
     }
-    addColumnMenuItems() {
+    createColumnMenuItems() {
         return this.buildMenuItems();
     }
-    addContextMenuItems(menuContext) {
+    createContextMenuItems(menuContext) {
         return this.buildMenuItems();
     }
     buildMenuItems() {
@@ -51,18 +51,7 @@ class DashboardModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             else {
                 menuItems.push(this.createMenuItemReduxAction('dashboard-hide', 'Hide', 'visibility-off-bold', DashboardRedux.DashboardSetIsHidden(true)));
             }
-            return [
-                {
-                    name: 'dashboard-parent',
-                    label: this.moduleInfo.FriendlyName,
-                    isVisible: true,
-                    module: this.moduleInfo.ModuleName,
-                    icon: {
-                        name: 'dashboard',
-                    },
-                    subItems: menuItems,
-                },
-            ];
+            return menuItems;
         }
     }
 }

package/src/Strategy/DataImportModule.d.ts

@@ -4,8 +4,8 @@ import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { IModule } from './Interface/IModule';
 export declare class DataImportModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
-    addModuleMenuItem(source: 'ModuleMenu' | 'ModuleButton'): AdaptableMenuItem | undefined;
-    addContextMenuItems(): AdaptableMenuItem[] | undefined;
-    addColumnMenuItems(): AdaptableMenuItem[] | undefined;
+    createModuleMenuItem(source: 'ModuleMenu' | 'ModuleButton'): AdaptableMenuItem | undefined;
+    createContextMenuItems(): AdaptableMenuItem[] | undefined;
+    createColumnMenuItems(): AdaptableMenuItem[] | undefined;
     private createDataImportMenuItem;
 }

package/src/Strategy/DataImportModule.js

@@ -8,18 +8,18 @@ class DataImportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.DataImportModuleId, ModuleConstants.DataImportFriendyName, 'import', 'DataImportPopup', 'Import Data', api);
     }
-    addModuleMenuItem(source) {
+    createModuleMenuItem(source) {
         if (this.isModuleAvailable()) {
             return this.createDataImportMenuItem(source);
         }
     }
-    addContextMenuItems() {
+    createContextMenuItems() {
         if (this.isModuleAvailable()) {
             return [this.createDataImportMenuItem('ContextMenu')];
         }
         return undefined;
     }
-    addColumnMenuItems() {
+    createColumnMenuItems() {
         if (this.isModuleAvailable()) {
             return [this.createDataImportMenuItem('ColumnMenu')];
         }

package/src/Strategy/ExportModule.d.ts

@@ -12,9 +12,8 @@ export declare class ExportModule extends AdaptableModuleBase implements IExport
     getModuleAdaptableObjects(): AdaptableObject[];
     getExplicitlyReferencedColumnIds(report: Report): string[];
     getReferencedNamedQueryNames(report: Report): string[];
-    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
+    createContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     private buildReportMenuItems;
-    private buildExportMenuItem;
     private getMenuName;
     export(report: Report, exportDestination: ExportDestination | string): Promise<void>;
     private preProcessExport;

package/src/Strategy/ExportModule.js

@@ -44,14 +44,12 @@ class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         }
         return this.api.namedQueryApi.internalApi.getReferencedNamedQueryNames(report.Query.BooleanExpression);
     }
-    addContextMenuItems(menuContext) {
+    createContextMenuItems(menuContext) {
         const canExport = !menuContext.isRowGroupColumn && this.isModuleAvailable();
         if (!canExport) {
             return;
         }
         let returnMenuItems = [];
-        let selectedCellmenuItems = [];
-        let selectedRowmenuItems = [];
         const canExportCells = menuContext.selectedCellInfo &&
             ArrayExtensions_1.default.IsNotNullOrEmpty(menuContext.selectedCellInfo.columns) &&
             ArrayExtensions_1.default.IsNotNullOrEmpty(menuContext.selectedCellInfo.gridCells);
@@ -62,63 +60,36 @@ class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             menuContext.isSelectedRow;
         if (canExportCells) {
             const selectedCellReport = this.api.exportApi.getReportByName(GeneralConstants_1.SELECTED_CELLS_REPORT);
-            selectedCellmenuItems = this.buildReportMenuItems(selectedCellReport);
+            returnMenuItems.push(...this.buildReportMenuItems(selectedCellReport, 'cells'));
         }
         if (canExportRows) {
             const selectedRowReport = this.api.exportApi.getReportByName(GeneralConstants_1.SELECTED_ROWS_REPORT);
-            selectedRowmenuItems = this.buildReportMenuItems(selectedRowReport);
-        }
-        // if only selected cells then just do one level
-        if (canExportCells && !canExportRows) {
-            returnMenuItems.push(this.buildExportMenuItem('Export Selected Cells', selectedCellmenuItems));
-            // if only selected Rows then just do one level
-        }
-        else if (canExportRows && !canExportCells) {
-            returnMenuItems.push(this.buildExportMenuItem('Export Selected Rows', selectedRowmenuItems));
-        }
-        // if both selected Cells and Rows then add a new level
-        else if (canExportRows && canExportCells) {
-            const exportSelectedCellsMenuItem = this.buildExportMenuItem('Cells', selectedCellmenuItems);
-            const exportSelectedRowsMenuItem = this.buildExportMenuItem('Rows', selectedRowmenuItems);
-            returnMenuItems.push(this.buildExportMenuItem('Export Selected', [
-                exportSelectedCellsMenuItem,
-                exportSelectedRowsMenuItem,
-            ]));
+            returnMenuItems.push(...this.buildReportMenuItems(selectedRowReport, 'rows'));
         }
         return returnMenuItems;
     }
-    buildReportMenuItems(report) {
+    buildReportMenuItems(report, selectionType) {
         const menuItems = [];
         for (const destination of this.api.exportApi.getAvailableExportDestinations()) {
-            menuItems.push(this.createMenuItemClickFunction(this.getMenuName(destination), destination, this.moduleInfo.Glyph, () => this.export(report, destination)));
+            menuItems.push(this.createMenuItemClickFunction(this.getMenuName(destination, selectionType), destination, this.moduleInfo.Glyph, () => this.export(report, destination)));
         }
         for (const customDestination of this.api.exportApi.getCustomDestinations()) {
-            menuItems.push(this.createMenuItemClickFunction('export-custom-destination', customDestination.name, this.moduleInfo.Glyph, () => this.export(report, customDestination.name)));
+            menuItems.push(this.createMenuItemClickFunction(`export-${selectionType}-custom-destination`, customDestination.name, this.moduleInfo.Glyph, () => this.export(report, customDestination.name)));
         }
         return menuItems;
     }
-    buildExportMenuItem(label, subItems) {
-        return {
-            name: 'export-parent',
-            label: label,
-            module: this.moduleInfo.ModuleName,
-            isVisible: true,
-            icon: { name: this.moduleInfo.Glyph },
-            subItems: subItems,
-        };
-    }
-    getMenuName(exportDestination) {
+    getMenuName(exportDestination, selectionType) {
         switch (exportDestination) {
             case Enums_1.ExportDestination.CSV:
-                return 'export-csv';
+                return `export-${selectionType}-csv`;
             case Enums_1.ExportDestination.Clipboard:
-                return 'export-clipboard';
+                return `export-${selectionType}-clipboard`;
             case Enums_1.ExportDestination.Excel:
-                return 'export-excel';
+                return `export-${selectionType}-excel`;
             case Enums_1.ExportDestination.JSON:
-                return 'export-json';
+                return `export-${selectionType}-json`;
             case Enums_1.ExportDestination.Table:
-                return 'export-table';
+                return `export-${selectionType}-table`;
         }
     }
     async export(report, exportDestination) {

package/src/Strategy/Fdc3Module.d.ts

@@ -4,7 +4,7 @@ import { AdaptableApi } from '../Api/AdaptableApi';
 import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
 export declare class Fdc3Module extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
-    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
+    createContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     private buildRaiseIntentMenuItem;
     private buildBroadcastMenuItem;
     private getFdc3Api;

package/src/Strategy/Fdc3Module.js

@@ -8,7 +8,7 @@ class Fdc3Module extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.Fdc3ModuleId, ModuleConstants.Fdc3FriendlyName, 'fdc3', null, 'The FDC3 Module - handles the FDC3 integration', api);
     }
-    addContextMenuItems(menuContext) {
+    createContextMenuItems(menuContext) {
         if (!this.isModuleAvailable()) {
             return;
         }
@@ -29,19 +29,6 @@ class Fdc3Module extends AdaptableModuleBase_1.AdaptableModuleBase {
                 contextMenuItems.push(this.buildBroadcastMenuItem(broadcastConfig, currentRowNode));
             });
             contextMenuItems.sort((a, b) => a.label.localeCompare(b.label));
-            if (contextMenuItems.length > 1) {
-                const groupMenuItem = {
-                    name: 'fdc3-parent',
-                    module: this.moduleInfo.ModuleName,
-                    label: 'FDC3',
-                    icon: {
-                        name: 'fdc3',
-                    },
-                    isVisible: true,
-                    subItems: contextMenuItems,
-                };
-                return [groupMenuItem];
-            }
             return contextMenuItems;
         }
     }

package/src/Strategy/FlashingCellModule.d.ts

@@ -15,8 +15,8 @@ export declare class FlashingCellModule extends AdaptableModuleBase implements I
     }): AdaptableObject[];
     getExplicitlyReferencedColumnIds(alertDefinition: FlashingCellDefinition): string[];
     getReferencedNamedQueryNames(alertDefinition: FlashingCellDefinition): string[];
-    addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
-    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
+    createColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
+    createContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     protected handleCellDataChanged(cellDataChangedInfo: CellDataChangedInfo): void;
     private showFlashingCellsForDefinitions;
     private isFlashingTargetOnlyAggChange;

package/src/Strategy/FlashingCellModule.js

@@ -64,7 +64,7 @@ class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         }
         return this.api.namedQueryApi.internalApi.getReferencedNamedQueryNames(queryExpression);
     }
-    addColumnMenuItems(column) {
+    createColumnMenuItems(column) {
         if (column && this.isModuleEditable()) {
             if (!this.api.columnApi.isCalculatedColumn(column.columnId)) {
                 const flashingCellDefinitions = this.api.flashingCellApi.getFlashingCellDefinitions();
@@ -89,7 +89,7 @@ class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             }
         }
     }
-    addContextMenuItems(menuContext) {
+    createContextMenuItems(menuContext) {
         const items = [];
         if (!menuContext.isRowGroupColumn && this.isModuleAvailable()) {
             if (menuContext.adaptableColumn && menuContext.rowNode) {

package/src/Strategy/FormatColumnModule.d.ts

@@ -13,7 +13,7 @@ export declare class FormatColumnModule extends AdaptableModuleBase implements I
     }): AdaptableObject[];
     getExplicitlyReferencedColumnIds(formatColumn: FormatColumn): string[];
     getReferencedNamedQueryNames(formatColumn: FormatColumn): string[];
-    addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
+    createColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
     getTeamSharingAction(): TeamSharingImportInfo<FormatColumn>;
     toView(formatColumn: FormatColumn): AdaptableObjectView;
     toViewAll(): AdaptableObjectView[];