@adaptabletools/adaptable-cjs 18.0.0-canary.3 → 18.0.0-canary.31

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");
@@ -32,70 +31,7 @@ class ColumnFilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     hasNamedQueryReferences() {
         return false;
     }
-    updateOldConfig() {
-        // Note: have updated Dashboard and Status bar but NOT Tool Panels
-        // Update Module Buttons
-        let updateModuleButtons = false;
-        let moduleButtons = this.api.dashboardApi.getModuleButtons();
-        if (!moduleButtons.includes('ColumnFilter')) {
-            moduleButtons = moduleButtons.map((moduleButton) => {
-                if (moduleButton == 'Filter') {
-                    updateModuleButtons = true;
-                    return 'ColumnFilter';
-                }
-                return moduleButton;
-            });
-        }
-        if (updateModuleButtons) {
-            this.api.dashboardApi.setModuleButtons(moduleButtons);
-        }
-        // Update Toolbars
-        let updateTabs = false;
-        const tabs = this.api.dashboardApi.getTabs().map((tab) => {
-            if (tab.Toolbars.includes('Filter') && !tab.Toolbars.includes('ColumnFilter')) {
-                updateTabs = true;
-                return Object.assign(Object.assign({}, tab), { 
-                    // replace with 'GridFilter'
-                    Toolbars: tab.Toolbars.map((t) => (t == 'Filter' ? 'ColumnFilter' : t)) });
-            }
-            return tab;
-        });
-        if (updateTabs) {
-            this.api.dashboardApi.setTabs(tabs);
-        }
-        // - move pinned toolbars
-        let updatePinnedToolbars = false;
-        let pinnedToolbars = this.api.dashboardApi.getPinnedToolbars();
-        if (pinnedToolbars && !(pinnedToolbars === null || pinnedToolbars === void 0 ? void 0 : pinnedToolbars.includes('ColumnFilter'))) {
-            pinnedToolbars = pinnedToolbars.map((pinnedToolbar) => {
-                if (pinnedToolbar == 'Filter') {
-                    updatePinnedToolbars = true;
-                    return 'ColumnFilter';
-                }
-                return pinnedToolbar;
-            });
-        }
-        if (updatePinnedToolbars) {
-            this.api.dashboardApi.setPinnedToolbars(pinnedToolbars);
-        }
-        // Update Status Bar
-        let updateStatusBars = false;
-        const statusBars = this.api.statusBarApi
-            .getAdaptableStatusBars()
-            .map((panel) => {
-            return Object.assign(Object.assign({}, panel), { StatusBarPanels: panel.StatusBarPanels.map((panel) => {
-                    if (panel === 'Filter') {
-                        updateStatusBars = true;
-                        return 'ColumnFilter';
-                    }
-                    return panel;
-                }) });
-        });
-        if (updateStatusBars) {
-            this.api.statusBarApi.setStatusBarPanels(statusBars);
-        }
-    }
-    handleAdaptableReady() {
+    onAdaptableReady() {
         if (this.api.optionsApi.getColumnFilterOptions().quickFilterOptions.showQuickFilter == false) {
             this.api.columnFilterApi.hideQuickFilterBar();
         }
@@ -106,7 +42,31 @@ class ColumnFilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             }
         });
     }
-    addContextMenuItems(menuContext) {
+    createColumnMenuItems(column) {
+        let columnFilterMenuItems = [];
+        if (column &&
+            column.filterable &&
+            this.api.optionsApi.getColumnFilterOptions().useAdaptableColumnFiltering) {
+            if (this.api.gridApi.isQuickFilterAvailable()) {
+                const isFilterVisible = this.api.columnFilterApi.isQuickFilterVisible();
+                if (this.isModuleEditable() &&
+                    this.api.optionsApi.getColumnFilterOptions().useAdaptableColumnFiltering) {
+                    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) {
+                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)));
+            }
+            return columnFilterMenuItems;
+        }
+    }
+    createContextMenuItems(menuContext) {
         if (!menuContext.isRowGroupColumn && this.isModuleAvailable()) {
             if (menuContext.adaptableColumn &&
                 menuContext.adaptableColumn.filterable &&
@@ -124,70 +84,26 @@ class ColumnFilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                             this.api.columnFilterApi.internalApi.createEqualityColumnFilterForCell(menuContext.selectedCellInfo.gridCells[0]);
                         };
                     return [
-                        this.createColumnMenuItemClickFunction(isMultiple ? 'Filter on Cell Values' : 'Filter on Cell Value', this.moduleInfo.Glyph, clickFunction),
+                        this.createMenuItemClickFunction('column-filter-on-cell-value', isMultiple ? 'Filter on Cell Values' : 'Filter on Cell Value', this.moduleInfo.Glyph, clickFunction),
                     ];
                 }
                 else {
-                    let filterSubMenuItems = [];
-                    filterSubMenuItems.push(this.createColumnMenuItemReduxAction('Clear Filter', 'close', LayoutRedux.LayoutColumnFilterClear(existingColumnFilter)));
-                    filterSubMenuItems.push(this.createColumnMenuItemClickFunction(existingColumnFilter.IsSuspended ? 'Unsuspend Filter' : 'Suspend Filter', existingColumnFilter.IsSuspended ? 'resume' : 'pause', existingColumnFilter.IsSuspended
-                        ? () => {
-                            this.api.columnFilterApi.unSuspendColumnFilter(existingColumnFilter);
-                        }
-                        : () => {
-                            this.api.columnFilterApi.suspendColumnFilter(existingColumnFilter);
-                        }));
                     return [
-                        {
-                            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);
+                            }),
                     ];
                 }
             }
         }
     }
-    addColumnMenuItems(column) {
-        let filterSubMenuItems = [];
-        if (column &&
-            column.filterable &&
-            this.api.optionsApi.getColumnFilterOptions().useAdaptableColumnFiltering) {
-            if (this.api.gridApi.isQuickFilterAvailable()) {
-                const isFilterVisible = this.api.columnFilterApi.isQuickFilterVisible();
-                if (this.isModuleEditable() &&
-                    this.api.optionsApi.getColumnFilterOptions().useAdaptableColumnFiltering) {
-                    filterSubMenuItems.push(this.createColumnMenuItemReduxAction(isFilterVisible ? 'Hide Filter Bar' : 'Show Filter Bar', isFilterVisible ? 'unchecked' : 'check', isFilterVisible
-                        ? SystemRedux.SystemQuickFilterBarHide()
-                        : SystemRedux.SystemQuickFilterBarShow()));
-                }
-            }
-            const existingColumnFilter = this.getExistingColumnFilter(column);
-            if (existingColumnFilter) {
-                filterSubMenuItems.push(this.createColumnMenuItemReduxAction('Clear Filter', 'close', LayoutRedux.LayoutColumnFilterClear(existingColumnFilter)));
-                filterSubMenuItems.push(this.createColumnMenuItemReduxAction(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 [
-                    {
-                        label: this.moduleInfo.FriendlyName,
-                        isVisible: true,
-                        module: this.moduleInfo.ModuleName,
-                        icon: {
-                            name: this.moduleInfo.Glyph,
-                        },
-                        subItems: filterSubMenuItems,
-                    },
-                ];
-            }
-        }
-    }
     getExistingColumnFilter(column) {
         return this.api.columnFilterApi.getColumnFilters().find((x) => x.ColumnId == column.columnId);
     }

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',
@@ -19,15 +19,16 @@ class ColumnInfoModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             };
             return [
                 this.createMainMenuItemShowPopup({
+                    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',
@@ -35,9 +36,10 @@ class ColumnInfoModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             };
             return [
                 this.createMainMenuItemShowPopup({
+                    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

@@ -0,0 +1,11 @@
+import { AdaptableApi } from '../Api/AdaptableApi';
+import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
+import { AdaptableModuleBase } from './AdaptableModuleBase';
+import { IModule } from './Interface/IModule';
+export declare class CommentModule extends AdaptableModuleBase implements IModule {
+    constructor(api: AdaptableApi);
+    onAdaptableReady(): void;
+    isModuleAvailable(): boolean;
+    private loadComments;
+    createContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
+}

package/src/Strategy/CommentModule.js

@@ -0,0 +1,75 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CommentModule = void 0;
+const tslib_1 = require("tslib");
+const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
+const ObjectFactory_1 = require("../Utilities/ObjectFactory");
+const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
+class CommentModule extends AdaptableModuleBase_1.AdaptableModuleBase {
+    constructor(api) {
+        super(ModuleConstants.CommentModuleId, ModuleConstants.CommentFriendlyName, 'comments', 'CommentsPopup', 'comments', api);
+    }
+    onAdaptableReady() {
+        this.loadComments();
+    }
+    isModuleAvailable() {
+        const options = this.api.optionsApi.getCommentOptions();
+        if (!options || !options.persistCommentThreads || !options.loadCommentThreads) {
+            return false;
+        }
+        if (this.api.optionsApi.getAutogeneratePrimaryKey()) {
+            return false;
+        }
+        return super.isModuleAvailable();
+    }
+    async loadComments() {
+        var _a, _b;
+        const commentThreads = await ((_b = (_a = this.api.optionsApi
+            .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);
+    }
+    createContextMenuItems(menuContext) {
+        var _a, _b, _c, _d, _e;
+        if (!this.isModuleAvailable()) {
+            return;
+        }
+        if (!this.api.commentApi.internalApi.areCommentsSupported()) {
+            return;
+        }
+        const 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 = (_e = this.api.commentApi.getCommentThread(cellAddress)) === null || _e === void 0 ? void 0 : _e.Comments;
+        if (cellComments) {
+            return [
+                this.createMenuItemClickFunction('comment-remove', 'Remove Comment', this.moduleInfo.Glyph, () => {
+                    this.api.commentApi.deleteCommentThread(cellAddress);
+                }),
+            ];
+        }
+        else {
+            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');
+                    });
+                }),
+            ];
+        }
+    }
+}
+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,14 +22,14 @@ 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()
                 .find((x) => x.ColumnId == column.columnId);
             let label = customSort ? 'Edit ' : 'Create ';
             // dont show a menu item if there is a custom sort that uses a comparer function
-            const columnSortComparer = this.api.customSortApi.internalApi.getCustomSortComparer(column);
+            const columnSortComparer = this.api.customSortApi.internalApi.getCustomSortComparer(column.columnId);
             if (columnSortComparer) {
                 return undefined;
             }
@@ -38,8 +38,9 @@ class CustomSortModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 action: customSort ? 'Edit' : 'New',
                 source: 'ColumnMenu',
             };
+            let name = customSort ? 'custom-sort-edit' : 'custom-sort-add';
             return [
-                this.createColumnMenuItemShowPopup(label + 'Custom Sort', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam),
+                this.createMenuItemShowPopup(name, label + 'Custom Sort', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam),
             ];
         }
     }

package/src/Strategy/DashboardModule.d.ts

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

package/src/Strategy/DashboardModule.js

@@ -9,14 +9,7 @@ class DashboardModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.DashboardModuleId, ModuleConstants.DashboardFriendlyName, 'dashboard', 'DashboardPopup', 'The Dashboard - usually placed above the Grid - is designed to provide quick access to commonly required AdapTable functionalty', api);
     }
-    updateOldConfig() {
-        let dashboardState = this.api.dashboardApi.getDashboardState();
-        if (dashboardState.VisibleButtons) {
-            this.api.logWarn(`Updating Obsolete VisibleButtons Config for DashboardState: [${dashboardState.VisibleButtons}]`);
-            this.api.dashboardApi.setModuleButtons(dashboardState.VisibleButtons);
-        }
-    }
-    handleAdaptableReady() {
+    onAdaptableReady() {
         // we used to create a default tab here but we no longer do // this.api.internalApi.setDefaultDashboardTab();
         // this handler reacts to the 'AdaptableReady' event,
         // but so do all the other possible handlers of the 'DashboardChanged' event
@@ -28,47 +21,37 @@ 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() {
         if (this.isModuleAvailable()) {
             let menuItems = [];
             if (this.isModuleEditable()) {
-                menuItems.push(this.createColumnMenuItemClickFunction('Configure', 'settings', () => this.api.dashboardApi.openDashboardSettingsPanel()));
+                menuItems.push(this.createMenuItemClickFunction('dashboard-configure', 'Configure', 'settings', () => this.api.dashboardApi.openDashboardSettingsPanel()));
             }
             if (this.api.dashboardApi.getDashboardState().IsCollapsed) {
-                menuItems.push(this.createColumnMenuItemReduxAction('Expand', 'expand', DashboardRedux.DashboardSetIsCollapsed(false)));
+                menuItems.push(this.createMenuItemReduxAction('dashboard-expand', 'Expand', 'expand', DashboardRedux.DashboardSetIsCollapsed(false)));
             }
             else {
-                menuItems.push(this.createColumnMenuItemReduxAction('Collapse', 'collapse', DashboardRedux.DashboardSetIsCollapsed(true)));
+                menuItems.push(this.createMenuItemReduxAction('dashboard-collapse', 'Collapse', 'collapse', DashboardRedux.DashboardSetIsCollapsed(true)));
             }
             if (this.api.dashboardApi.getDashboardState().IsFloating) {
-                menuItems.push(this.createColumnMenuItemReduxAction('Dock', 'dock', DashboardRedux.DashboardSetIsFloating(false)));
+                menuItems.push(this.createMenuItemReduxAction('dashboard-dock', 'Dock', 'dock', DashboardRedux.DashboardSetIsFloating(false)));
             }
             else if (this.api.optionsApi.getDashboardOptions().canFloat) {
-                menuItems.push(this.createColumnMenuItemReduxAction('Float', 'dock', DashboardRedux.DashboardSetIsFloating(true)));
+                menuItems.push(this.createMenuItemReduxAction('dashboard-float', 'Float', 'dock', DashboardRedux.DashboardSetIsFloating(true)));
             }
             if (this.api.dashboardApi.getDashboardState().IsHidden) {
-                menuItems.push(this.createColumnMenuItemReduxAction('Show', 'visibility-on-bold', DashboardRedux.DashboardSetIsHidden(false)));
+                menuItems.push(this.createMenuItemReduxAction('dashboard-show', 'Show', 'visibility-on-bold', DashboardRedux.DashboardSetIsHidden(false)));
             }
             else {
-                menuItems.push(this.createColumnMenuItemReduxAction('Hide', 'visibility-off-bold', DashboardRedux.DashboardSetIsHidden(true)));
+                menuItems.push(this.createMenuItemReduxAction('dashboard-hide', 'Hide', 'visibility-off-bold', DashboardRedux.DashboardSetIsHidden(true)));
             }
-            return [
-                {
-                    label: this.moduleInfo.FriendlyName,
-                    isVisible: true,
-                    module: this.moduleInfo.ModuleName,
-                    icon: {
-                        name: 'dashboard',
-                    },
-                    subItems: menuItems,
-                },
-            ];
+            return menuItems;
         }
     }
 }

package/src/Strategy/DataChangeHistoryModule.d.ts

@@ -3,6 +3,7 @@ import { AdaptableModuleView, IModule } from './Interface/IModule';
 import { AdaptableApi } from '../Api/AdaptableApi';
 export declare class DataChangeHistoryModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
+    onAdaptableReady(): void;
     isModuleAvailable(): boolean;
     getPopupMaxWidth(): number;
     hasNamedQueryReferences(): boolean;

package/src/Strategy/DataChangeHistoryModule.js

@@ -10,6 +10,8 @@ const core_1 = require("ag-grid-community");
 class DataChangeHistoryModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.DataChangeHistoryModuleId, ModuleConstants.DataChangeHistoryFriendlyName, 'target', 'DataChangeHistoryPopup', 'Provides an overview of all previous changes, giving the possibility to undo specific changes', api);
+    }
+    onAdaptableReady() {
         this.api.internalApi
             .getDataService()
             .on('CellDataChanged', (cellDataChangedInfo) => {
@@ -24,7 +26,7 @@ class DataChangeHistoryModule extends AdaptableModuleBase_1.AdaptableModuleBase
         const isAdaptableModuleAvailable = super.isModuleAvailable();
         const isAgGridModuleAvailable = this.api.internalApi
             .getAdaptableInstance()
-            .isAgGridModulePresent(core_1.ModuleNames.ClientSideRowModelModule);
+            .agGridAdapter.isModulePresent(core_1.ModuleNames.ClientSideRowModelModule);
         if (isAdaptableModuleAvailable && !isAgGridModuleAvailable) {
             this.api.logWarn(`Data Change History is NOT available due to missing required AG Grid module: ${core_1.ModuleNames.ClientSideRowModelModule}`);
         }

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;
-    private getOpenPopupMenuItem;
+    createModuleMenuItem(source: 'ModuleMenu' | 'ModuleButton'): AdaptableMenuItem | undefined;
+    createContextMenuItems(): AdaptableMenuItem[] | undefined;
+    createColumnMenuItems(): AdaptableMenuItem[] | undefined;
+    private createDataImportMenuItem;
 }

package/src/Strategy/DataImportModule.js

@@ -8,29 +8,29 @@ 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.getOpenPopupMenuItem(source);
+            return this.createDataImportMenuItem(source);
         }
     }
-    addContextMenuItems() {
+    createContextMenuItems() {
         if (this.isModuleAvailable()) {
-            return [this.getOpenPopupMenuItem('ContextMenu')];
+            return [this.createDataImportMenuItem('ContextMenu')];
         }
         return undefined;
     }
-    addColumnMenuItems() {
+    createColumnMenuItems() {
         if (this.isModuleAvailable()) {
-            return [this.getOpenPopupMenuItem('ColumnMenu')];
+            return [this.createDataImportMenuItem('ColumnMenu')];
         }
     }
-    getOpenPopupMenuItem(source) {
+    createDataImportMenuItem(source) {
         const moduleParams = {
             action: 'New',
             source: source,
             maxWidth: this.getPopupMaxWidth(),
         };
-        return this.createColumnMenuItemShowPopup('Import Data', this.moduleInfo.Popup, this.moduleInfo.Glyph, moduleParams);
+        return this.createMenuItemShowPopup('data-import', 'Import Data', this.moduleInfo.Popup, this.moduleInfo.Glyph, moduleParams);
     }
 }
 exports.DataImportModule = DataImportModule;

package/src/Strategy/DataSetModule.d.ts

@@ -5,7 +5,7 @@ import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
 import { DataSet } from '../AdaptableOptions/DataSetOptions';
 export declare class DataSetModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
-    handleAdaptableReady(): void;
+    onAdaptableReady(): void;
     getModuleAdaptableObjects(): AdaptableObject[];
     hasNamedQueryReferences(): boolean;
     toView(dataSet: DataSet): AdaptableObjectView;

package/src/Strategy/DataSetModule.js

@@ -12,7 +12,7 @@ class DataSetModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.DataSetModuleId, ModuleConstants.DataSetFriendlyName, 'data-set', 'DataSetPopup', 'Update the entire data source in AdapTable using pre-populated data sets', api);
     }
-    handleAdaptableReady() {
+    onAdaptableReady() {
         this.api.dataSetApi.getDataSets().forEach((ds) => {
             if (!ds.Uuid) {
                 ds.Uuid = (0, Uuid_1.createUuid)();

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;
     export(report: Report, exportDestination: ExportDestination | string): Promise<void>;
     private preProcessExport;
     private isCustomDestination;