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

package/src/Strategy/GridInfoModule.js

@@ -11,7 +11,7 @@ class GridInfoModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     getViewAccessLevel() {
         return 'Full';
     }
-    addColumnMenuItems(column) {
+    createColumnMenuItems(column) {
         if (this.isModuleAvailable()) {
             return [
                 this.createMainMenuItemShowPopup({
@@ -23,7 +23,7 @@ class GridInfoModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             ];
         }
     }
-    addContextMenuItems(menuContext) {
+    createContextMenuItems(menuContext) {
         if (this.isModuleAvailable()) {
             return [
                 this.createMainMenuItemShowPopup({

package/src/Strategy/Interface/IModule.d.ts

@@ -141,9 +141,9 @@ export interface AdaptableModuleView {
 export interface IModule {
     moduleInfo: ModuleInfo;
     AccessLevel: AccessLevel;
-    addModuleMenuItem(source: 'ModuleMenu' | 'ModuleButton'): AdaptableMenuItem | undefined;
-    addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
-    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
+    createModuleMenuItem(source: 'ModuleMenu' | 'ModuleButton'): AdaptableMenuItem | undefined;
+    createColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
+    createContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     setModuleEntitlement(): void;
     isModuleAvailable(): boolean;
     isModuleEditable(): boolean;

package/src/Strategy/LayoutModule.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import { AdaptableModuleBase } from './AdaptableModuleBase';
-import { LayoutState, Layout } from '../PredefinedConfig/LayoutState';
+import { Layout, LayoutState } from '../PredefinedConfig/LayoutState';
 import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
 import { TeamSharingImportInfo } from '../PredefinedConfig/TeamSharingState';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
@@ -13,13 +13,13 @@ export declare class LayoutModule extends AdaptableModuleBase implements IModule
     protected LayoutState: LayoutState;
     constructor(api: AdaptableApi);
     onAdaptableReady(): void;
-    rowSummariesSubscribtions(): void;
+    rowSummariesSubscriptions(): void;
     getModuleAdaptableObjects(): AdaptableObject[];
     getExplicitlyReferencedColumnIds(layout: Layout): string[];
     getTeamSharingReferences(adaptableObject: AdaptableObject): TeamSharingReferences;
     hasNamedQueryReferences(): boolean;
-    addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
-    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
+    createColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
+    createContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     private createViewPivotItemsMenuItem;
     getTeamSharingAction(): TeamSharingImportInfo<Layout>;
     toViewAll(): {

package/src/Strategy/LayoutModule.js

@@ -40,9 +40,9 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         requestAnimationFrame(() => {
             this.api.layoutApi.internalApi.fireLayoutChangedEvent('ADAPTABLE_READY', null, this.api.layoutApi.getLayoutState());
         });
-        this.rowSummariesSubscribtions();
+        this.rowSummariesSubscriptions();
     }
-    rowSummariesSubscribtions() {
+    rowSummariesSubscriptions() {
         if (this.api.isDestroyed()) {
             return;
         }
@@ -150,62 +150,50 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     hasNamedQueryReferences() {
         return true;
     }
-    addColumnMenuItems(column) {
+    createColumnMenuItems(column) {
         var _a, _b;
+        if (!this.isModuleEditable()) {
+            return;
+        }
         let returnColumnMenuItems = [];
-        if (this.isModuleEditable()) {
-            const isReadOnlyLayout = this.api.layoutApi.isCurrentLayoutReadOnly();
-            if (!isReadOnlyLayout) {
-                returnColumnMenuItems.push(this.createMenuItemShowPopup('layout-edit', 'Edit Layout', this.moduleInfo.Popup, this.moduleInfo.Glyph, {
-                    action: 'Edit',
-                    source: 'ColumnMenu',
-                    value: this.api.layoutApi.getCurrentLayout(),
+        const isReadOnlyLayout = this.api.layoutApi.isCurrentLayoutReadOnly();
+        if (!isReadOnlyLayout) {
+            returnColumnMenuItems.push(this.createMenuItemShowPopup('layout-edit', 'Edit Layout', this.moduleInfo.Popup, this.moduleInfo.Glyph, {
+                action: 'Edit',
+                source: 'ColumnMenu',
+                value: this.api.layoutApi.getCurrentLayout(),
+            }));
+            if (column) {
+                returnColumnMenuItems.push(this.createMenuItemClickFunction('layout-column-caption-change', 'Change Caption', 'edit', () => this.api.layoutApi.showChangeColumnCaption(column)));
+            }
+        }
+        if (column) {
+            if (column.hideable) {
+                returnColumnMenuItems.push(this.createMenuItemClickFunction('layout-column-hide', 'Hide Column', 'visibility-off-bold', () => {
+                    this.api.columnApi.hideColumn(column.columnId);
                 }));
             }
-            if (column) {
-                if (!isReadOnlyLayout) {
-                    returnColumnMenuItems.push(this.createMenuItemClickFunction('layout-column-caption-change', 'Change Caption', 'edit', () => this.api.layoutApi.showChangeColumnCaption(column)));
-                }
-                if (column.hideable) {
-                    returnColumnMenuItems.push(this.createMenuItemClickFunction('layout-column-hide', 'Hide Column', 'visibility-off-bold', () => {
-                        this.api.columnApi.hideColumn(column.columnId);
-                    }));
-                }
+            const hasExistingSelection = (_b = (_a = this.api.gridApi.getSelectedCellInfo()) === null || _a === void 0 ? void 0 : _a.gridCells) === null || _b === void 0 ? void 0 : _b.length;
+            if (hasExistingSelection) {
+                returnColumnMenuItems.push(this.createMenuItemClickFunction('layout-column-select-preserve', 'Column (Preserve Selection)', 'column-add', () => {
+                    this.api.columnApi.addColumnToSelection(column.columnId);
+                }));
+                returnColumnMenuItems.push(this.createMenuItemClickFunction('layout-column-select-reset', 'Column (Reset Selection)', 'columns', () => {
+                    this.api.columnApi.selectColumn(column.columnId);
+                }));
             }
-            let selectMenuItems = [];
-            if (column) {
-                const hasExistingSelection = (_b = (_a = this.api.gridApi.getSelectedCellInfo()) === null || _a === void 0 ? void 0 : _a.gridCells) === null || _b === void 0 ? void 0 : _b.length;
-                if (hasExistingSelection) {
-                    selectMenuItems.push(this.createMenuItemClickFunction('layout-column-select-preserve', 'Column (Preserve Selection)', 'column-add', () => {
-                        this.api.columnApi.addColumnToSelection(column.columnId);
-                    }));
-                    selectMenuItems.push(this.createMenuItemClickFunction('layout-column-select-reset', 'Column (Reset Selection)', 'columns', () => {
-                        this.api.columnApi.selectColumn(column.columnId);
-                    }));
-                }
-                else {
-                    selectMenuItems.push(this.createMenuItemClickFunction('layout-column-select', 'Column', 'columns', () => {
-                        this.api.columnApi.selectColumn(column.columnId);
-                    }));
-                }
+            else {
+                returnColumnMenuItems.push(this.createMenuItemClickFunction('layout-column-select', 'Column', 'columns', () => {
+                    this.api.columnApi.selectColumn(column.columnId);
+                }));
             }
-            selectMenuItems.push(this.createMenuItemClickFunction('layout-select-all', 'Whole Grid', this.moduleInfo.Glyph, () => {
-                this.api.gridApi.selectAll();
-            }));
-            returnColumnMenuItems.push({
-                name: 'layout-select-parent',
-                label: 'Select',
-                isVisible: true,
-                module: this.moduleInfo.ModuleName,
-                icon: {
-                    name: 'tab-unselected',
-                },
-                subItems: selectMenuItems,
-            });
         }
+        returnColumnMenuItems.push(this.createMenuItemClickFunction('layout-select-all', 'Whole Grid', this.moduleInfo.Glyph, () => {
+            this.api.gridApi.selectAll();
+        }));
         return returnColumnMenuItems;
     }
-    addContextMenuItems(menuContext) {
+    createContextMenuItems(menuContext) {
         let returnColumnMenuItems = [];
         if (this.isModuleEditable() && !this.api.layoutApi.isCurrentLayoutReadOnly()) {
             returnColumnMenuItems.push(this.createMenuItemShowPopup('layout-edit', 'Edit Layout', this.moduleInfo.Popup, this.moduleInfo.Glyph, {
@@ -217,36 +205,23 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             ArrayExtensions_1.default.IsNotNullOrEmpty(menuContext.selectedCellInfo.columns)) ||
             (menuContext.selectedRowInfo &&
                 ArrayExtensions_1.default.IsNotNullOrEmpty(menuContext.selectedRowInfo.gridRows))) {
-            let clickFunction = () => {
+            returnColumnMenuItems.push(this.createMenuItemClickFunction('layout-clear-selection', 'Clear Selected Cells', 'undo', () => {
                 this.api.gridApi.deselectAll();
-            };
-            returnColumnMenuItems.push(this.createMenuItemClickFunction('layout-clear-selection', 'Clear Selected Cells', 'undo', clickFunction));
-            if (this.isModuleAvailable()) {
-                let gridMenuItems = [];
-                let autoSizeFunction = () => {
-                    this.api.columnApi.autosizeAllColumns();
-                };
-                gridMenuItems.push(this.createMenuItemClickFunction('layout-auto-size', 'Auto Size', 'arrow-expand', autoSizeFunction));
-                let clickFunction = () => {
-                    this.api.gridApi.selectAll();
-                };
-                gridMenuItems.push(this.createMenuItemClickFunction('layout-select-all', 'Select', 'tab-unselected', clickFunction));
-                returnColumnMenuItems.push({
-                    name: 'layout-grid-parent',
-                    label: 'Grid',
-                    module: this.moduleInfo.ModuleName,
-                    isVisible: true,
-                    icon: { name: 'align-justify' },
-                    subItems: gridMenuItems,
-                });
-            }
+            }));
         }
+        returnColumnMenuItems.push(this.createMenuItemClickFunction('layout-select-all', 'Select', 'tab-unselected', () => {
+            this.api.gridApi.selectAll();
+        }));
+        returnColumnMenuItems.push(this.createMenuItemClickFunction('layout-auto-size', 'Auto Size', 'arrow-expand', () => {
+            this.api.columnApi.autosizeAllColumns();
+        }));
         const viewPivotItemsMenuItem = this.createViewPivotItemsMenuItem(menuContext);
         if (viewPivotItemsMenuItem) {
             returnColumnMenuItems.push(viewPivotItemsMenuItem);
         }
         return returnColumnMenuItems;
     }
+    // TODO next time this method is touched, it should be extracted in an internal Api
     createViewPivotItemsMenuItem(menuContext) {
         // current group => menuContext.rowNode.field;
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;

package/src/Strategy/NoteModule.d.ts

@@ -6,6 +6,5 @@ export declare class NoteModule extends AdaptableModuleBase implements IModule {
     private adaptable;
     constructor(api: AdaptableApi);
     isModuleAvailable(): boolean;
-    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
-    private getAddRemoveNoteMenuItems;
+    createContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
 }

package/src/Strategy/NoteModule.js

@@ -14,49 +14,47 @@ class NoteModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         // Note module doesn't support autogenerated primary keys
         return super.isModuleAvailable() && !this.api.optionsApi.getAutogeneratePrimaryKey();
     }
-    addContextMenuItems(menuContext) {
-        var _a, _b;
+    createContextMenuItems(menuContext) {
+        var _a, _b, _c;
         if (!this.isModuleAvailable()) {
-            return undefined;
+            return;
+        }
+        if (!this.api.noteApi.internalApi.areNotesSupported()) {
+            return;
         }
         const isReadOnly = this.adaptable.api.entitlementApi.getEntitlementAccessLevelForModule(this.moduleInfo.ModuleName) === 'ReadOnly';
         if (isReadOnly) {
             return undefined;
         }
-        const items = [];
-        const isCellNotable = (_b = (_a = this.adaptable.api.optionsApi) === null || _a === void 0 ? void 0 : _a.getNoteOptions()) === null || _b === void 0 ? void 0 : _b.isCellNotable;
-        if (!isCellNotable ||
-            isCellNotable(Object.assign({ gridCell: menuContext.gridCell }, (0, ObjectFactory_1.createBaseContext)(this.api))))
-            items.push(...this.getAddRemoveNoteMenuItems(menuContext));
-        return items;
-    }
-    getAddRemoveNoteMenuItems(menuContext) {
-        var _a;
-        const items = [];
-        if (!this.api.noteApi.internalApi.areNotesAvailable()) {
-            return items;
+        const isCellNotable = typeof ((_b = (_a = this.adaptable.api.optionsApi) === null || _a === void 0 ? void 0 : _a.getNoteOptions()) === null || _b === void 0 ? void 0 : _b.isCellNotable) === 'function'
+            ? this.adaptable.api.optionsApi.getNoteOptions().isCellNotable(Object.assign({ gridCell: menuContext.gridCell }, (0, ObjectFactory_1.createBaseContext)(this.api)))
+            : true;
+        if (!isCellNotable) {
+            return;
         }
-        // does not have note
-        const [note] = (_a = this.adaptable.api.noteApi.getNotesForCell({
+        const [note] = (_c = this.adaptable.api.noteApi.getNotesForCell({
             PrimaryKeyValue: menuContext.primaryKeyValue,
             ColumnId: menuContext.adaptableColumn.columnId,
-        })) !== null && _a !== void 0 ? _a : [];
+        })) !== null && _c !== void 0 ? _c : [];
         if (note) {
-            items.push(this.createMenuItemClickFunction('note-remove', 'Remove Note', this.moduleInfo.Glyph, () => {
-                this.api.noteApi.deleteNote(note);
-            }));
+            return [
+                this.createMenuItemClickFunction('note-remove', 'Remove Note', this.moduleInfo.Glyph, () => {
+                    this.api.noteApi.deleteNote(note);
+                }),
+            ];
         }
         else {
-            items.push(this.createMenuItemClickFunction('note-add', 'Add Note', this.moduleInfo.Glyph, () => {
-                // add an empty one
-                this.api.noteApi.addNote('', menuContext.primaryKeyValue, menuContext.adaptableColumn.columnId);
-                this.api.internalApi.getCellPopupService().showPopup({
-                    PrimaryKeyValue: menuContext.primaryKeyValue,
-                    ColumnId: menuContext.adaptableColumn.columnId,
-                }, true);
-            }));
+            return [
+                this.createMenuItemClickFunction('note-add', 'Add Note', this.moduleInfo.Glyph, () => {
+                    // add an empty one
+                    this.api.noteApi.addNote('', menuContext.primaryKeyValue, menuContext.adaptableColumn.columnId);
+                    this.api.internalApi.getCellPopupService().showPopup({
+                        PrimaryKeyValue: menuContext.primaryKeyValue,
+                        ColumnId: menuContext.adaptableColumn.columnId,
+                    }, true);
+                }),
+            ];
         }
-        return items;
     }
 }
 exports.NoteModule = NoteModule;

package/src/Strategy/PlusMinusModule.d.ts

@@ -19,7 +19,7 @@ export declare class PlusMinusModule extends AdaptableModuleBase implements IPlu
     getReferencedNamedQueryNames(plusMinusNudge: PlusMinusNudge): string[];
     onAdaptableReady(): void;
     checkListenToKeyDown(): void;
-    addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
+    createColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
     private handleKeyDown;
     applyPlusMinus(plusMinusNudges: PlusMinusNudge[], cellsToUpdate: GridCell[], direction: 'up' | 'down'): boolean;
     isPlusMinusNudgeApplied(plusMinusNudge: PlusMinusNudge, gridCell: GridCell): boolean;

package/src/Strategy/PlusMinusModule.js

@@ -56,7 +56,7 @@ class PlusMinusModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         }
         this.shouldHandleKeyDown = newShouldHandleKeyDown;
     }
-    addColumnMenuItems(column) {
+    createColumnMenuItems(column) {
         if (column && this.isModuleEditable() && column.dataType == 'Number') {
             let popupParam = {
                 column: column,

package/src/Strategy/SettingsPanelModule.d.ts

@@ -5,7 +5,7 @@ import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { IModule } from './Interface/IModule';
 export declare class SettingsPanelModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
-    addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
-    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
-    addModuleMenuItem(source: 'ModuleMenu' | 'ModuleButton'): AdaptableMenuItem | undefined;
+    createColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
+    createContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
+    createModuleMenuItem(source: 'ModuleMenu' | 'ModuleButton'): AdaptableMenuItem | undefined;
 }

package/src/Strategy/SettingsPanelModule.js

@@ -10,18 +10,18 @@ class SettingsPanelModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         const friendlyName = api.optionsApi.getSettingsPanelOptions().title;
         super(ModuleConstants.SettingsPanelModuleId, friendlyName, 'settings', null, 'Manage all Adaptable Settings', api);
     }
-    addColumnMenuItems(column) {
+    createColumnMenuItems(column) {
         return [
             // To do : get the icon and name from settings in case they have changed?
             this.createMenuItemReduxAction('settings-panel-open', 'Open ' + this.moduleInfo.FriendlyName, this.moduleInfo.Glyph, PopupRedux.PopupShowScreen()),
         ];
     }
-    addContextMenuItems(menuContext) {
+    createContextMenuItems(menuContext) {
         return [
             this.createMenuItemReduxAction('settings-panel-open', 'Open ' + this.moduleInfo.FriendlyName, this.moduleInfo.Glyph, PopupRedux.PopupShowScreen()),
         ];
     }
-    addModuleMenuItem(source) {
+    createModuleMenuItem(source) {
         if (this.isModuleAvailable()) {
             return this.createMenuItemReduxAction('settings-panel-open', 'Open ' + this.moduleInfo.FriendlyName, this.moduleInfo.Glyph, PopupRedux.PopupShowScreen());
         }

package/src/Strategy/SmartEditModule.d.ts

@@ -10,7 +10,7 @@ import { SmartEditOperation } from '../AdaptableOptions/EditOptions';
 export declare class SmartEditModule extends AdaptableModuleBase implements ISmartEditModule {
     constructor(api: AdaptableApi);
     getViewAccessLevel(): AccessLevel;
-    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
+    createContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     ApplySmartEdit(cellUpdateRequests: CellUpdateRequest[]): void;
     CheckCorrectCellSelection(): IModuleActionReturn<boolean>;
     BuildPreviewValues(smartEditValue: number, smartEditOperation: SmartEditOperation): PreviewInfo;

package/src/Strategy/SmartEditModule.js

@@ -15,7 +15,7 @@ class SmartEditModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     getViewAccessLevel() {
         return 'Full';
     }
-    addContextMenuItems(menuContext) {
+    createContextMenuItems(menuContext) {
         // not sure if this is right but logic is that
         // if the context cell is one of a selection taht can have smart edit applied
         // then open the smart edit screen
@@ -31,7 +31,8 @@ class SmartEditModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 let popUpParams = {
                     source: 'ContextMenu',
                 };
-                menuItemShowPopup = this.createMainMenuItemShowPopup({ Name: 'smart-edit-apply',
+                menuItemShowPopup = this.createMainMenuItemShowPopup({
+                    Name: 'smart-edit-apply',
                     Label: 'Apply Smart Edit',
                     ComponentName: this.moduleInfo.Popup,
                     Icon: this.moduleInfo.Glyph,

package/src/Strategy/StyledColumnModule.d.ts

@@ -14,7 +14,7 @@ export declare class StyledColumnModule extends AdaptableModuleBase implements I
     }): AdaptableObject[];
     getExplicitlyReferencedColumnIds(formatColumn: FormatColumn): string[];
     hasNamedQueryReferences(): boolean;
-    addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
+    createColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
     private getGlyphForStyledColumn;
     getTeamSharingAction(): TeamSharingImportInfo<StyledColumn>;
     toView(styledColumn: StyledColumn): AdaptableObjectView;

package/src/Strategy/StyledColumnModule.js

@@ -29,7 +29,7 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     hasNamedQueryReferences() {
         return false;
     }
-    addColumnMenuItems(column) {
+    createColumnMenuItems(column) {
         let returnColumnMenuItems = [];
         // Need a Column and an editable Module
         if (column && this.isModuleEditable()) {
@@ -120,14 +120,15 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                                     } }), config: {
                                     defaultCurrentSectionName: 'Style',
                                 } }));
-                            returnColumnMenuItems.push({
-                                name: 'styled-column-parent',
-                                label: 'Create Styled Column',
-                                module: this.moduleInfo.ModuleName,
-                                isVisible: true,
-                                icon: { name: this.moduleInfo.Glyph },
-                                subItems: [newGrandientButton, newPrecentBarButton, newBadgeButton],
-                            });
+                            // returnColumnMenuItems.push({
+                            //   name: 'styled-column-parent',
+                            //   label: 'Create Styled Column',
+                            //   module: this.moduleInfo.ModuleName,
+                            //   isVisible: true,
+                            //   icon: { name: this.moduleInfo.Glyph },
+                            //   subItems: [newGrandientButton, newPrecentBarButton, newBadgeButton],
+                            // });
+                            returnColumnMenuItems.push(...[newGrandientButton, newPrecentBarButton, newBadgeButton]);
                             break;
                         case 'String':
                             returnColumnMenuItems.push(newBadgeButton);

package/src/Strategy/SystemStatusModule.d.ts

@@ -5,7 +5,7 @@ import { AdaptableModuleView, IModule } from './Interface/IModule';
 import { AdaptableApi } from '../Api/AdaptableApi';
 export declare class SystemStatusModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
-    addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
-    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
+    createColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
+    createContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     getViewProperties(): AdaptableModuleView;
 }

package/src/Strategy/SystemStatusModule.js

@@ -9,20 +9,21 @@ class SystemStatusModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.SystemStatusModuleId, ModuleConstants.SystemStatusFriendlyName, 'traffic-lights', 'SystemStatusPopup', 'Provide messages about the Status of your application', api);
     }
-    addColumnMenuItems(column) {
+    createColumnMenuItems(column) {
         if (this.isModuleAvailable()) {
             return [
                 this.createMenuItemShowPopup('system-status-show', 'Show System Status', this.moduleInfo.Popup, this.moduleInfo.Glyph),
             ];
         }
     }
-    addContextMenuItems(menuContext) {
+    createContextMenuItems(menuContext) {
         if (this.isModuleAvailable()) {
             let popUpParams = {
                 source: 'ContextMenu',
             };
             return [
-                this.createMainMenuItemShowPopup({ Name: 'system-status-show',
+                this.createMainMenuItemShowPopup({
+                    Name: 'system-status-show',
                     Label: 'Show System Status',
                     ComponentName: this.moduleInfo.Popup,
                     Icon: this.moduleInfo.Glyph,

package/src/Utilities/Services/ModuleService.js

@@ -14,13 +14,13 @@ class ModuleService {
         const settingsPanelMenuItems = [];
         const buttonMenuItems = [];
         this.getModuleCollection().forEach((module) => {
-            const settingsPanelMenuItem = module.addModuleMenuItem('ModuleMenu');
+            const settingsPanelMenuItem = module.createModuleMenuItem('ModuleMenu');
             if (Helper_1.default.objectExists(settingsPanelMenuItem)) {
                 if (settingsPanelMenuItems.findIndex((m) => m.module == settingsPanelMenuItem.module) == -1) {
                     settingsPanelMenuItems.push(settingsPanelMenuItem);
                 }
             }
-            const buttonMenuItem = module.addModuleMenuItem('ModuleButton');
+            const buttonMenuItem = module.createModuleMenuItem('ModuleButton');
             if (Helper_1.default.objectExists(buttonMenuItem)) {
                 if (buttonMenuItems.findIndex((m) => m.module == buttonMenuItem.module) == -1) {
                     buttonMenuItems.push(buttonMenuItem);

package/src/agGrid/AgGridColumnAdapter.js

@@ -574,7 +574,7 @@ class AgGridColumnAdapter {
         if (!this.adaptableApi.internalApi.getModuleService().isModuleAvailable('Note')) {
             return;
         }
-        if (!this.adaptableApi.noteApi.internalApi.areNotesAvailable()) {
+        if (!this.adaptableApi.noteApi.internalApi.areNotesSupported()) {
             return;
         }
         const cellPosition = {
@@ -591,7 +591,7 @@ class AgGridColumnAdapter {
         if (!this.adaptableApi.internalApi.getModuleService().isModuleAvailable('Comment')) {
             return;
         }
-        if (!this.adaptableApi.commentApi.internalApi.areCommentsAvailable()) {
+        if (!this.adaptableApi.commentApi.internalApi.areCommentsSupported()) {
             return;
         }
         const position = {

package/src/agGrid/AgGridMenuAdapter.d.ts

@@ -1,7 +1,7 @@
 import { AdaptableAgGrid } from './AdaptableAgGrid';
-import { Column, GetContextMenuItems, GetContextMenuItemsParams, GetMainMenuItems, GetMainMenuItemsParams, MenuItemDef } from '@ag-grid-community/core';
+import { GetContextMenuItems, GetContextMenuItemsParams, GetMainMenuItems, GetMainMenuItemsParams, MenuItemDef } from '@ag-grid-community/core';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
-import { AdaptableMenuItem, ColumnMenuContext } from '../PredefinedConfig/Common/Menu';
+import { AdaptableMenuItem } from '../PredefinedConfig/Common/Menu';
 export declare class AgGridMenuAdapter {
     private adaptableInstance;
     constructor(adaptableInstance: AdaptableAgGrid);
@@ -9,20 +9,30 @@ export declare class AgGridMenuAdapter {
     private get adaptableApi();
     destroy(): void;
     buildColumnMenu(params: GetMainMenuItemsParams, originalGetMainMenuItems: GetMainMenuItems): (string | MenuItemDef)[];
-    buildStructuredAdaptableColumnItems(menuContext: ColumnMenuContext): {
-        adaptableMenuItems: AdaptableMenuItem[];
-        structuredAdaptableMenuItems: AdaptableMenuItem[];
-    };
     buildContextMenu(params: GetContextMenuItemsParams, originalGetContextMenuItems: GetContextMenuItems): (string | MenuItemDef)[];
-    createColumnMenuContextObject(adaptableColumn: AdaptableColumn, agGridColumn: Column): ColumnMenuContext;
+    private createColumnMenuContextObject;
     private createAdaptableContextMenuItems;
     private createContextMenuContextObject;
     private mapAdaptableMenuItemToAgGridMenuDefinition;
     private mapCustomMenuItemToAgGridMenuDefinition;
     private mapUserMenuItemToAgGridMenuDefinition;
-    private buildGroupedModuleItems;
+    private buildContextMenuDefaultStructure;
+    /**
+     * Default strategy for menu items: return as is if there is only one item, otherwise group them under a parent item
+     */
+    private getModuleSpecificStructure;
+    private getExportContextMenuStructure;
+    private getLayoutContextMenuStructure;
+    private buildMenuGroupParent;
+    private buildColumnMenuDefaultStructure;
+    private getLayoutColumnMenuStructure;
+    private getStyledColumnColumnMenuStructure;
     private mapAdaptableMenuItemToSystemMenuItems;
     private createAdaptableColumnMenuItems;
     private mapAdaptableIconToAgGridIcon;
+    /**
+     * The output of this function is used to build the column header menu if the AG Grid Menu Module is NOT present
+     * This is controlled by the AdaptableAgGrid.embedColumnMenu property
+     */
     buildStandaloneColumnHeader(adaptableColumn: AdaptableColumn): AdaptableMenuItem[];
 }