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

package/src/Strategy/FormatColumnModule.js

@@ -10,7 +10,6 @@ import { getFormatColumnStyleViewItems } from './Utilities/FormatColumn/getForma
 import { getObjectTagsViewItems } from './Utilities/getObjectTagsViewItems';
 import { getRuleViewItems } from './Utilities/getRuleViewItems';
 import { MoveFormatColumn } from '../View/FormatColumn/MoveFormatColumn';
-import ArrayExtensions from '../Utilities/Extensions/ArrayExtensions';
 export class FormatColumnModule extends AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.FormatColumnModuleId, ModuleConstants.FormatColumnFriendlyName, 'color-palette', 'FormatColumnPopup', 'Create a column style, display format or cell alignment', api);
@@ -37,56 +36,38 @@ export class FormatColumnModule extends AdaptableModuleBase {
         }
         return this.api.namedQueryApi.internalApi.getReferencedNamedQueryNames(queryExpression);
     }
-    addColumnMenuItems(column) {
+    createColumnMenuItems(column) {
+        if (!column || !this.isModuleEditable() || column.isSparkline) {
+            return;
+        }
         let returnColumnMenuItems = [];
-        if (column && this.isModuleEditable() && !column.isSparkline) {
-            let createPopupParam = {
+        let createPopupParam = {
+            column: column,
+            action: 'New',
+            source: 'ColumnMenu',
+        };
+        const createFormatColumnMenuItem = this.createMenuItemShowPopup('format-column-add', 'Create', this.moduleInfo.Popup, 'plus', createPopupParam);
+        returnColumnMenuItems.push(this.createMenuItemShowPopup('format-column-add', 'Create Format Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, createPopupParam));
+        const formatColumnsForColumn = this.api.formatColumnApi.getFormatColumnsForColumnId(column.columnId);
+        if (formatColumnsForColumn.length === 1) {
+            let editPopupParam = {
                 column: column,
-                action: 'New',
+                action: 'Edit',
+                value: formatColumnsForColumn[0],
                 source: 'ColumnMenu',
             };
-            const createFormatColumnMenuItem = this.createMenuItemShowPopup('format-column-add', 'Create', this.moduleInfo.Popup, 'plus', createPopupParam);
-            const formatColumnsForColumn = this.api.formatColumnApi.getFormatColumnsForColumnId(column.columnId);
-            //  .filter((fc) => this.api.scopeApi.isSingleColumnScope(fc.Scope));
-            // if no formats then just show Create
-            if (ArrayExtensions.IsNullOrEmpty(formatColumnsForColumn)) {
-                returnColumnMenuItems.push(this.createMenuItemShowPopup('format-column-add', 'Create Format Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, createPopupParam));
-                // if 1 format then show a Create and an Edit
-            }
-            else if (formatColumnsForColumn.length == 1) {
-                let editPopupParam = {
-                    column: column,
-                    action: 'Edit',
-                    value: formatColumnsForColumn[0],
-                    source: 'ColumnMenu',
-                };
-                const editFormatColumnMenuItem = this.createMenuItemShowPopup('format-column-edit', 'Edit', this.moduleInfo.Popup, 'edit', editPopupParam);
-                returnColumnMenuItems.push({
-                    name: 'format-column-parent',
-                    label: 'Format Column',
-                    module: this.moduleInfo.ModuleName,
-                    isVisible: true,
-                    icon: { name: this.moduleInfo.Glyph },
-                    subItems: [createFormatColumnMenuItem, editFormatColumnMenuItem],
-                });
-                // if more than one then display a Create and a Show
-                // we should probably do the Show better - perhaps use Column Info in some way?
-                // or to filter the format columns ?
-            }
-            else {
-                const moduleInfo = this.api.internalApi
-                    .getModuleService()
-                    .getModuleInfoByModule('FormatColumn');
-                const editFormatColumnMenuItem = this.createMenuItemReduxAction('format-column-edit', 'Show Current', this.moduleInfo.Glyph, PopupRedux.PopupShowScreen('FormatColumn', moduleInfo.Popup));
-                returnColumnMenuItems.push({
-                    name: 'format-column-parent',
-                    label: 'Format Column',
-                    module: this.moduleInfo.ModuleName,
-                    isVisible: true,
-                    icon: { name: this.moduleInfo.Glyph },
-                    subItems: [createFormatColumnMenuItem, editFormatColumnMenuItem],
-                });
-            }
+            const editFormatColumnMenuItem = this.createMenuItemShowPopup('format-column-edit', 'Edit', this.moduleInfo.Popup, 'edit', editPopupParam);
+            returnColumnMenuItems.push(editFormatColumnMenuItem);
+        }
+        else if (formatColumnsForColumn.length > 1) {
+            // if more than one then display a Create and a Show
+            // we should probably do the Show better - perhaps use Column Info in some way?
+            // or to filter the format columns ?
+            const moduleInfo = this.api.internalApi
+                .getModuleService()
+                .getModuleInfoByModule('FormatColumn');
+            const editFormatColumnMenuItem = this.createMenuItemReduxAction('format-column-edit', 'Show Current', this.moduleInfo.Glyph, PopupRedux.PopupShowScreen('FormatColumn', moduleInfo.Popup));
+            returnColumnMenuItems.push(editFormatColumnMenuItem);
         }
         return returnColumnMenuItems;
     }

package/src/Strategy/FreeTextColumnModule.d.ts

@@ -12,7 +12,7 @@ export declare class FreeTextColumnModule extends AdaptableModuleBase implements
     isModuleAvailable(): boolean;
     getModuleAdaptableObjects(): FreeTextColumn[];
     hasNamedQueryReferences(): boolean;
-    addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
+    createColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
     getTeamSharingAction(): TeamSharingImportInfo<FreeTextColumn>;
     toView(freeTextColumn: FreeTextColumn): AdaptableObjectView;
     toViewAll(): AdaptableObjectView[];

package/src/Strategy/FreeTextColumnModule.js

@@ -17,7 +17,7 @@ export class FreeTextColumnModule extends AdaptableModuleBase {
     hasNamedQueryReferences() {
         return false;
     }
-    addColumnMenuItems(column) {
+    createColumnMenuItems(column) {
         if (column && this.isModuleEditable()) {
             if (this.api.freeTextColumnApi
                 .getFreeTextColumns()

package/src/Strategy/GridInfoModule.d.ts

@@ -7,6 +7,6 @@ import { AccessLevel } from '../PredefinedConfig/Common/Entitlement';
 export declare class GridInfoModule 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/GridInfoModule.js

@@ -2,12 +2,12 @@ import { AdaptableModuleBase } from './AdaptableModuleBase';
 import * as ModuleConstants from '../Utilities/Constants/ModuleConstants';
 export class GridInfoModule extends AdaptableModuleBase {
     constructor(api) {
-        super(ModuleConstants.GridInfoModuleId, ModuleConstants.GridInfoFriendlyName, 'align-justify', 'GridInfoPopup', 'Display information about the Grid, the Options selected and all columns', api);
+        super(ModuleConstants.GridInfoModuleId, ModuleConstants.GridInfoFriendlyName, 'grid-info', 'GridInfoPopup', 'Display information about the Grid, the Options selected and all columns', api);
     }
     getViewAccessLevel() {
         return 'Full';
     }
-    addColumnMenuItems(column) {
+    createColumnMenuItems(column) {
         if (this.isModuleAvailable()) {
             return [
                 this.createMainMenuItemShowPopup({
@@ -19,7 +19,7 @@ export class GridInfoModule extends 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

@@ -36,9 +36,9 @@ export class LayoutModule extends 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;
         }
@@ -146,65 +146,53 @@ export class LayoutModule extends 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, 'edit-table', {
+                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', 'Select Column (Preserve Selection)', 'select-fwd', () => {
+                    this.api.columnApi.addColumnToSelection(column.columnId);
+                }));
+                returnColumnMenuItems.push(this.createMenuItemClickFunction('layout-column-select-reset', 'Select Column (Reset Selection)', 'tab-unselected', () => {
+                    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', 'Select Column', 'tab-unselected', () => {
+                    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-grid-select', 'Select Grid', 'select-all', () => {
+            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, {
+            returnColumnMenuItems.push(this.createMenuItemShowPopup('layout-edit', 'Edit Layout', this.moduleInfo.Popup, 'edit-table', {
                 action: 'Edit',
                 source: 'ColumnMenu',
             }));
@@ -213,36 +201,23 @@ export class LayoutModule extends AdaptableModuleBase {
             ArrayExtensions.IsNotNullOrEmpty(menuContext.selectedCellInfo.columns)) ||
             (menuContext.selectedRowInfo &&
                 ArrayExtensions.IsNotNullOrEmpty(menuContext.selectedRowInfo.gridRows))) {
-            let clickFunction = () => {
+            returnColumnMenuItems.push(this.createMenuItemClickFunction('layout-clear-selection', 'Clear Selected Cells', 'select-off', () => {
                 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 Grid', 'select-all', () => {
+            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

@@ -10,48 +10,46 @@ export class NoteModule extends 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 }, 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 }, 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;
     }
 }

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

@@ -52,7 +52,7 @@ export class PlusMinusModule extends 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

@@ -6,18 +6,18 @@ export class SettingsPanelModule extends 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

@@ -11,7 +11,7 @@ export class SmartEditModule extends 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
@@ -27,7 +27,8 @@ export class SmartEditModule extends 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

@@ -25,7 +25,7 @@ export class StyledColumnModule extends AdaptableModuleBase {
     hasNamedQueryReferences() {
         return false;
     }
-    addColumnMenuItems(column) {
+    createColumnMenuItems(column) {
         let returnColumnMenuItems = [];
         // Need a Column and an editable Module
         if (column && this.isModuleEditable()) {
@@ -80,7 +80,8 @@ export class StyledColumnModule extends AdaptableModuleBase {
                             },
                         };
                         const icon = this.getGlyphForStyledColumn(styledColumn);
-                        const label = `Edit ${this.getTypeLabel(styledColumn)} Style`;
+                        const typeLabel = this.getTypeLabel(styledColumn);
+                        const label = `Edit ${typeLabel}`;
                         const name = this.getTypeName(styledColumn);
                         returnColumnMenuItems.push(this.createMenuItemShowPopup(name, label, this.moduleInfo.Popup, icon, popupParam));
                     }
@@ -93,7 +94,7 @@ export class StyledColumnModule extends AdaptableModuleBase {
                         value: newStyledColumn,
                         config: {},
                     };
-                    const badgeLabel = column.dataType === 'Number' ? 'Badge' : 'Create Badge Style';
+                    const badgeLabel = 'Create Badge Style';
                     const newBadgeButton = this.createMenuItemShowPopup('styled-column-badge-add', badgeLabel, this.moduleInfo.Popup, 'badge', Object.assign(Object.assign({}, popupParam), { value: Object.assign(Object.assign({}, newStyledColumn), { BadgeStyle: {
                                 Badges: [ObjectFactory.CreateDefaultStyledColumnBadge()],
                             } }), config: {
@@ -106,24 +107,25 @@ export class StyledColumnModule extends AdaptableModuleBase {
                             const emptyRanges = this.api.scopeApi.createCellColorRangesForScope({
                                 ColumnIds: [column.columnId],
                             });
-                            const newGrandientButton = this.createMenuItemShowPopup('styled-column-gradient-add', 'Gradient', this.moduleInfo.Popup, 'gradient', Object.assign(Object.assign({}, popupParam), { value: Object.assign(Object.assign({}, newStyledColumn), { GradientStyle: {
+                            const newGrandientButton = this.createMenuItemShowPopup('styled-column-gradient-add', 'Create Gradient Column', this.moduleInfo.Popup, 'gradient', Object.assign(Object.assign({}, popupParam), { value: Object.assign(Object.assign({}, newStyledColumn), { GradientStyle: {
                                         CellRanges: emptyRanges,
                                     } }), config: {
                                     defaultCurrentSectionName: 'Style',
                                 } }));
-                            const newPrecentBarButton = this.createMenuItemShowPopup('styled-column-percent-bar-add', 'Percent Bar', this.moduleInfo.Popup, 'percent', Object.assign(Object.assign({}, popupParam), { value: Object.assign(Object.assign({}, newStyledColumn), { PercentBarStyle: {
+                            const newPercentBarButton = this.createMenuItemShowPopup('styled-column-percent-bar-add', 'Create Percent Bar', this.moduleInfo.Popup, 'percent', Object.assign(Object.assign({}, popupParam), { value: Object.assign(Object.assign({}, newStyledColumn), { PercentBarStyle: {
                                         CellRanges: emptyRanges,
                                     } }), 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, newPercentBarButton, newBadgeButton],
+                            // });
+                            returnColumnMenuItems.push(...[newGrandientButton, newPercentBarButton, newBadgeButton]);
                             break;
                         case 'String':
                             returnColumnMenuItems.push(newBadgeButton);
@@ -222,7 +224,7 @@ export class StyledColumnModule extends AdaptableModuleBase {
     getTypeLabel(styledColumn) {
         let type = null;
         if (styledColumn.GradientStyle) {
-            type = 'Gradient';
+            type = 'Gradient Column';
         }
         else if (styledColumn.PercentBarStyle) {
             type = 'Percent Bar';
@@ -231,7 +233,7 @@ export class StyledColumnModule extends AdaptableModuleBase {
             type = 'Spark Line';
         }
         else if (styledColumn.BadgeStyle) {
-            type = 'Badge';
+            type = 'Badge Style';
         }
         return type;
     }

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;
 }