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

package/src/Strategy/LayoutModule.js

@@ -19,42 +19,14 @@ const windowFactory_1 = require("../View/Components/Popups/WindowPopups/windowFa
 const flattenDeep_1 = tslib_1.__importDefault(require("lodash/flattenDeep"));
 const StringExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/StringExtensions"));
 const getGridFilterPreview_1 = require("../View/Layout/Wizard/getGridFilterPreview");
+const RowSummaryService_1 = require("../Utilities/Services/RowSummaryService");
 class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.LayoutModuleId, ModuleConstants.LayoutFriendlyName, 'grid', 'LayoutPopup', 'Named sets of column visibility, order, groupings, aggregation, pivots etc.', api);
-        this.clearUnsuportedFeaturesFromLayout = (layout) => {
-            const layoutSupportedFeatures = this.api.layoutApi.internalApi.getLayoutSupportedFeatures();
-            let needsUpdate = false;
-            const layoutToSave = Object.assign({}, layout);
-            if (!layoutSupportedFeatures.RowGroupedColumns && layout.RowGroupedColumns) {
-                delete layoutToSave.RowGroupedColumns;
-                needsUpdate = true;
-            }
-            if (!layoutSupportedFeatures.AggregationColumns && layout.AggregationColumns) {
-                delete layoutToSave.AggregationColumns;
-                needsUpdate = true;
-            }
-            if (!layoutSupportedFeatures.PivotColumns && layout.PivotColumns) {
-                delete layoutToSave.PivotColumns;
-                delete layoutToSave.EnablePivot;
-                needsUpdate = true;
-            }
-            if (!layoutSupportedFeatures.ColumnFilters && layout.ColumnFilters) {
-                delete layoutToSave.ColumnFilters;
-                needsUpdate = true;
-            }
-            if (!layoutSupportedFeatures.GridFilter && layout.GridFilter) {
-                delete layoutToSave.GridFilter;
-                needsUpdate = true;
-            }
-            if (!layoutSupportedFeatures.ColumnSorts && layout.ColumnSorts) {
-                delete layoutToSave.ColumnSorts;
-                needsUpdate = true;
-            }
-            if (needsUpdate) {
-                this.api.layoutApi.createOrUpdateLayout(layoutToSave);
-            }
-        };
+        this.rowSummaryService = new RowSummaryService_1.RowSummaryService(this.api);
+    }
+    onAdaptableReady() {
+        this.rowSummaryService.onAdapterReady();
         this.api.eventApi.on('LayoutChanged', (layoutChangedInfo) => {
             var _a;
             if (layoutChangedInfo.newLayoutState.CurrentLayout !==
@@ -63,17 +35,9 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 this.handleLayoutChange();
             }
         });
-    }
-    updateOldConfig() {
-        /**
-         * Viewport mode does not support a few
-         * features instead of complicating the
-         * logic where layout is applied, it is easier and
-         * less error prone to just remove it.
-         */
-        if (this.api.gridApi.getAgGridRowModelType() === 'viewport') {
-            this.api.layoutApi.getLayouts().forEach(this.clearUnsuportedFeaturesFromLayout);
-        }
+        requestAnimationFrame(() => {
+            this.api.layoutApi.internalApi.fireLayoutChangedEvent('ADAPTABLE_READY', null, this.api.layoutApi.getLayoutState());
+        });
     }
     getModuleAdaptableObjects() {
         return this.api.layoutApi.getLayouts();
@@ -141,69 +105,53 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     hasNamedQueryReferences() {
         return true;
     }
-    handleAdaptableReady() {
-        requestAnimationFrame(() => {
-            this.api.layoutApi.internalApi.fireLayoutChangedEvent('ADAPTABLE_READY', null, this.api.layoutApi.getLayoutState());
-        });
-    }
-    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.createColumnMenuItemShowPopup('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.createColumnMenuItemClickFunction('Change Caption', 'edit', () => this.api.layoutApi.showChangeColumnCaption(column)));
-                }
-                if (column.hideable) {
-                    returnColumnMenuItems.push(this.createColumnMenuItemClickFunction('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.createColumnMenuItemClickFunction('Column (Preserve Selection)', 'column-add', () => {
-                        this.api.columnApi.addColumnToSelection(column.columnId);
-                    }));
-                    selectMenuItems.push(this.createColumnMenuItemClickFunction('Column (Reset Selection)', 'columns', () => {
-                        this.api.columnApi.selectColumn(column.columnId);
-                    }));
-                }
-                else {
-                    selectMenuItems.push(this.createColumnMenuItemClickFunction('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.createColumnMenuItemClickFunction('Whole Grid', this.moduleInfo.Glyph, () => {
-                this.api.gridApi.selectAll();
-            }));
-            returnColumnMenuItems.push({
-                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.createColumnMenuItemShowPopup('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',
             }));
@@ -212,38 +160,26 @@ 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', 'select-off', () => {
                 this.api.gridApi.deselectAll();
-            };
-            returnColumnMenuItems.push(this.createColumnMenuItemClickFunction('Clear Selected Cells', 'undo', clickFunction));
-            if (this.isModuleAvailable()) {
-                let gridMenuItems = [];
-                let autoSizeFunction = () => {
-                    this.api.columnApi.autosizeAllColumns();
-                };
-                gridMenuItems.push(this.createColumnMenuItemClickFunction('Auto Size', 'arrow-expand', autoSizeFunction));
-                let clickFunction = () => {
-                    this.api.gridApi.selectAll();
-                };
-                gridMenuItems.push(this.createColumnMenuItemClickFunction('Select', 'tab-unselected', clickFunction));
-                returnColumnMenuItems.push({
-                    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;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
         const selectedCellInfo = (_a = menuContext.selectedCellInfo) !== null && _a !== void 0 ? _a : this.api.gridApi.getSelectedCellInfo();
         if (((_b = selectedCellInfo === null || selectedCellInfo === void 0 ? void 0 : selectedCellInfo.gridCells) === null || _b === void 0 ? void 0 : _b.length) !== 1) {
             return;
@@ -284,7 +220,9 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         }
         const data = (0, flattenDeep_1.default)(getData(menuContext.rowNode.childrenAfterFilter));
         const rowGroups = currentLayout.RowGroupedColumns;
-        const cellValue = isPivotColumn ? menuContext.rowNode.aggData[columnId] : gridCell.displayValue;
+        const cellValue = isPivotColumn
+            ? (_o = (_m = menuContext.rowNode) === null || _m === void 0 ? void 0 : _m.aggData) === null || _o === void 0 ? void 0 : _o[columnId]
+            : gridCell.displayValue;
         const popupProps = {
             hasPivotValue: isPivotColumn,
             columnId,
@@ -296,6 +234,7 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             pivotColumnId,
         };
         return {
+            name: 'layout-aggregated-view',
             module: this.moduleInfo.ModuleName,
             isVisible: true,
             label: 'Expand Aggregated Value',
@@ -325,7 +264,7 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return this.getModuleAdaptableObjects().map((layout) => this.toView(layout));
     }
     toView(layout) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g;
         const maxColumnsToDisplay = (_b = (_a = this.api.optionsApi.getLayoutOptions().layoutViewOptions) === null || _a === void 0 ? void 0 : _a.maxColumnsToDisplay) !== null && _b !== void 0 ? _b : 10;
         const columnIdToFriendlyName = (columnId) => {
             return this.api.columnApi.getFriendlyNameForColumnId(columnId);
@@ -337,7 +276,7 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             const firstNColumns = columns
                 .slice(0, maxColumnsToDisplay)
                 .map((column) => columnIdToFriendlyName(column));
-            columns = [...firstNColumns, `and other ${extraColumns}`];
+            columns = [...firstNColumns, `and ${extraColumns} more`];
         }
         else {
             columns = columns.map((column) => columnIdToFriendlyName(column));
@@ -394,6 +333,22 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 (layout === null || layout === void 0 ? void 0 : layout.GridFilter) &&
                     StringExtensions_1.default.IsNotNullOrEmpty(layout.GridFilter.Expression) &&
                     (0, getGridFilterPreview_1.getGridFilterViewItems)(layout),
+                ((_g = layout === null || layout === void 0 ? void 0 : layout.RowSummaries) === null || _g === void 0 ? void 0 : _g.length) && {
+                    name: 'Row Summaries',
+                    values: layout === null || layout === void 0 ? void 0 : layout.RowSummaries.map((rowSummary) => {
+                        var _a;
+                        const columns = Object.entries((_a = rowSummary.ColumnsMap) !== null && _a !== void 0 ? _a : {})
+                            .map(([columnId, expression]) => {
+                            if (columnId === 'Source' || columnId === 'Uuid') {
+                                return '';
+                            }
+                            return `${expression}(${columnIdToFriendlyName(columnId)})`;
+                        })
+                            .filter(Boolean)
+                            .join(', ');
+                        return `${rowSummary.Position}: ${columns}`;
+                    }),
+                },
             ].filter(Boolean),
             abObject: layout,
         };
@@ -439,7 +394,7 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             .setUpScheduleJobs();
         // CustomSort, FlashingCell, FormatColumn
         // we need to refresh the column defs, as some configs may have changed
-        this.api.internalApi.getAdaptableInstance().setupColumns();
+        this.api.internalApi.getAdaptableInstance().updateColumnModelAndRefreshGrid();
     }
     getReferencedNamedQueryNames(layout) {
         var _a;

package/src/Strategy/NamedQueryModule.d.ts

@@ -8,7 +8,6 @@ import { IModule } from './Interface/IModule';
 export declare class NamedQueryModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
     getModuleAdaptableObjects(): AdaptableObject[];
-    updateOldConfig(): void;
     getTeamSharingAction(): TeamSharingImportInfo<NamedQuery>;
     getExplicitlyReferencedColumnIds(namedQuery: NamedQuery): string[];
     getReferencedNamedQueryNames(namedQuery: NamedQuery): string[];

package/src/Strategy/NamedQueryModule.js

@@ -4,7 +4,6 @@ exports.NamedQueryModule = void 0;
 const tslib_1 = require("tslib");
 const NamedQueryRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/NamedQueryRedux"));
 const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
-const ArrayExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/ArrayExtensions"));
 const EditCurrentQueryButton_1 = require("../View/NamedQuery/EditCurrentQueryButton");
 const NamedQueryWizard_1 = require("../View/NamedQuery/Wizard/NamedQueryWizard");
 const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
@@ -16,24 +15,6 @@ class NamedQueryModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     getModuleAdaptableObjects() {
         return this.api.namedQueryApi.getNamedQueries();
     }
-    updateOldConfig() {
-        // - move named queries from old Query State to this Module
-        // Note: GridFilter Module moves the "old" CurrentQuery into Layout
-        const oldQueryState = this.api.internalApi.getAdaptableState().Query;
-        const oldNamedQueries = oldQueryState.NamedQueries;
-        if (ArrayExtensions_1.default.IsNotNullOrEmpty(oldNamedQueries)) {
-            const currentNamedQueries = this.api.namedQueryApi.getNamedQueries();
-            oldNamedQueries.forEach((oldNamedQuery) => {
-                const currentQuery = currentNamedQueries.find((q) => q.Name === oldNamedQuery.Name);
-                if (!currentQuery) {
-                    this.api.namedQueryApi.addNamedQuery(oldNamedQuery);
-                }
-            });
-        }
-        if (oldQueryState) {
-            this.api.namedQueryApi.internalApi.cleanupQueryRedux();
-        }
-    }
     getTeamSharingAction() {
         return {
             ModuleEntities: this.api.namedQueryApi.getNamedQueries(),

package/src/Strategy/{NotesModule.d.ts → NoteModule.d.ts}

@@ -2,9 +2,9 @@ import { AdaptableApi } from '../Api/AdaptableApi';
 import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { IModule } from './Interface/IModule';
-export declare class NotesModule extends AdaptableModuleBase implements IModule {
+export declare class NoteModule extends AdaptableModuleBase implements IModule {
     private adaptable;
     constructor(api: AdaptableApi);
-    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
-    private getAddRemoveNoteMenuItems;
+    isModuleAvailable(): boolean;
+    createContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
 }

package/src/Strategy/NoteModule.js

@@ -0,0 +1,60 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NoteModule = 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 NoteModule extends AdaptableModuleBase_1.AdaptableModuleBase {
+    constructor(api) {
+        super(ModuleConstants.NoteModuleId, ModuleConstants.NoteFriendlyName, 'note', 'NotePopup', 'Notes', api);
+        this.adaptable = api.internalApi.getAdaptableInstance();
+    }
+    isModuleAvailable() {
+        // Note module doesn't support autogenerated primary keys
+        return super.isModuleAvailable() && !this.api.optionsApi.getAutogeneratePrimaryKey();
+    }
+    createContextMenuItems(menuContext) {
+        var _a, _b, _c;
+        if (!this.isModuleAvailable()) {
+            return;
+        }
+        if (!this.api.noteApi.internalApi.areNotesSupported()) {
+            return;
+        }
+        const isReadOnly = this.adaptable.api.entitlementApi.getEntitlementAccessLevelForModule(this.moduleInfo.ModuleName) === 'ReadOnly';
+        if (isReadOnly) {
+            return undefined;
+        }
+        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;
+        }
+        const [note] = (_c = this.adaptable.api.noteApi.getNotesForCell({
+            PrimaryKeyValue: menuContext.primaryKeyValue,
+            ColumnId: menuContext.adaptableColumn.columnId,
+        })) !== null && _c !== void 0 ? _c : [];
+        if (note) {
+            return [
+                this.createMenuItemClickFunction('note-remove', 'Remove Note', this.moduleInfo.Glyph, () => {
+                    this.api.noteApi.deleteNote(note);
+                }),
+            ];
+        }
+        else {
+            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);
+                }),
+            ];
+        }
+    }
+}
+exports.NoteModule = NoteModule;

package/src/Strategy/PlusMinusModule.d.ts

@@ -17,9 +17,9 @@ export declare class PlusMinusModule extends AdaptableModuleBase implements IPlu
     }): AdaptableObject[];
     getExplicitlyReferencedColumnIds(plusMinusNudge: PlusMinusNudge): string[];
     getReferencedNamedQueryNames(plusMinusNudge: PlusMinusNudge): string[];
-    handleAdaptableReady(): void;
+    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

@@ -37,7 +37,7 @@ class PlusMinusModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         }
         return this.api.namedQueryApi.internalApi.getReferencedNamedQueryNames((_b = plusMinusNudge.Rule) === null || _b === void 0 ? void 0 : _b.BooleanExpression);
     }
-    handleAdaptableReady() {
+    onAdaptableReady() {
         let plusMinusNudges = this.api.plusMinusApi.getAllPlusMinus();
         this.shouldHandleKeyDown = ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(plusMinusNudges);
         if (this.shouldHandleKeyDown) {
@@ -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,
@@ -64,7 +64,7 @@ class PlusMinusModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 source: 'ColumnMenu',
             };
             return [
-                this.createColumnMenuItemShowPopup('Create Plus/Minus Rule', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam),
+                this.createMenuItemShowPopup('plus-minus-add', 'Create Plus/Minus Rule', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam),
             ];
         }
     }

package/src/Strategy/ScheduleModule.d.ts

@@ -6,7 +6,7 @@ import { IScheduleModule } from './Interface/IScheduleModule';
 export declare class ScheduleModule extends AdaptableModuleBase implements IScheduleModule {
     private scheduleJobs;
     constructor(api: AdaptableApi);
-    handleAdaptableReady(): void;
+    onAdaptableReady(): void;
     setUpScheduleJobs(): void;
     private addSchedule;
     private addMidnightRefreshSchedule;

package/src/Strategy/ScheduleModule.js

@@ -40,7 +40,7 @@ class ScheduleModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         this.scheduleJobs = [];
         this.addMidnightRefreshSchedule();
     }
-    handleAdaptableReady() {
+    onAdaptableReady() {
         this.setUpScheduleJobs();
     }
     setUpScheduleJobs() {

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,20 +10,20 @@ 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.createColumnMenuItemReduxAction('Open ' + this.moduleInfo.FriendlyName, this.moduleInfo.Glyph, PopupRedux.PopupShowScreen()),
+            this.createMenuItemReduxAction('settings-panel-open', 'Open ' + this.moduleInfo.FriendlyName, this.moduleInfo.Glyph, PopupRedux.PopupShowScreen()),
         ];
     }
-    addContextMenuItems(menuContext) {
+    createContextMenuItems(menuContext) {
         return [
-            this.createColumnMenuItemReduxAction('Open ' + this.moduleInfo.FriendlyName, this.moduleInfo.Glyph, PopupRedux.PopupShowScreen()),
+            this.createMenuItemReduxAction('settings-panel-open', 'Open ' + this.moduleInfo.FriendlyName, this.moduleInfo.Glyph, PopupRedux.PopupShowScreen()),
         ];
     }
-    addModuleMenuItem(source) {
+    createModuleMenuItem(source) {
         if (this.isModuleAvailable()) {
-            return this.createColumnMenuItemReduxAction('Open ' + this.moduleInfo.FriendlyName, this.moduleInfo.Glyph, PopupRedux.PopupShowScreen());
+            return this.createMenuItemReduxAction('settings-panel-open', 'Open ' + this.moduleInfo.FriendlyName, this.moduleInfo.Glyph, PopupRedux.PopupShowScreen());
         }
     }
 }

package/src/Strategy/ShortcutModule.d.ts

@@ -14,7 +14,7 @@ export declare class ShortcutModule extends AdaptableModuleBase implements IShor
     }): AdaptableObject[];
     hasNamedQueryReferences(): boolean;
     getTeamSharingAction(): TeamSharingImportInfo<Shortcut>;
-    handleAdaptableReady(): void;
+    onAdaptableReady(): void;
     checkListenToKeyDown(): void;
     private handleKeyDown;
     private calculateShortcut;

package/src/Strategy/ShortcutModule.js

@@ -31,7 +31,7 @@ class ShortcutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             EditAction: ShortcutRedux.ShortcutEdit,
         };
     }
-    handleAdaptableReady() {
+    onAdaptableReady() {
         this.checkListenToKeyDown();
         this.adaptable._on('CellEditorKeyDown', (cellEditorKeyDownEvent) => {
             this.handleKeyDown(cellEditorKeyDownEvent);

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
@@ -32,6 +32,7 @@ class SmartEditModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     source: 'ContextMenu',
                 };
                 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

@@ -9,13 +9,12 @@ import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
 import { StyledColumn } from '../PredefinedConfig/StyledColumnState';
 export declare class StyledColumnModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
-    updateOldConfig(): void;
     getModuleAdaptableObjects(config?: {
         includeLayoutNotAssociatedObjects?: boolean;
     }): 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;
@@ -23,4 +22,5 @@ export declare class StyledColumnModule extends AdaptableModuleBase implements I
     getViewProperties(): AdaptableModuleView;
     canBeAssociatedWithLayouts(): boolean;
     private getTypeLabel;
+    private getTypeName;
 }