@adaptabletools/adaptable 10.0.2 → 10.0.4-canary.2

package/src/Redux/Store/AdaptableReduxLocalStorageEngine.js

@@ -83,6 +83,7 @@ class AdaptableReduxLocalStorageEngine {
         return this.saveNow(state, getState);
     }
     saveNow(state, getState) {
+        var _a;
         const config = {
             adaptableId: this.adaptableId,
             adaptableStateKey: this.adaptableStateKey,
@@ -92,7 +93,11 @@ class AdaptableReduxLocalStorageEngine {
         if (getState) {
             result = getState(state, config);
         }
-        return (this.persistState || persistState)(result, config).catch(rejectWithMessage);
+        const promise = (_a = (this.persistState || persistState)(result, config)) === null || _a === void 0 ? void 0 : _a.catch(rejectWithMessage);
+        if (!(promise instanceof Promise)) {
+            LoggingHelper_1.ConsoleLogByMessageType('stateOptions.persistState should return a promise, it returned', 'Error', promise);
+        }
+        return promise;
     }
 }
 function rejectWithMessage(error) {

package/src/Redux/Store/AdaptableStore.d.ts

@@ -22,7 +22,7 @@ export declare const LoadState: (State: {
     [s: string]: ConfigState;
 }) => LoadStateAction;
 export declare class AdaptableStore implements IAdaptableStore {
-    private isVendorReady;
+    private isAgGridReady;
     TheStore: Redux.Store<AdaptableState>;
     Load: Promise<any>;
     private emitter;
@@ -36,9 +36,9 @@ export declare class AdaptableStore implements IAdaptableStore {
     /**
      *
      * @param adaptable The Adaptable instance
-     * @param isVendorReady A promise which is resolved when the underlying grid is ready for binding
+     * @param isAgGridReady A promise which is resolved when AG Grid is ready for binding
      */
-    constructor(adaptable: IAdaptable, isVendorReady: Promise<any>);
+    constructor(adaptable: IAdaptable, isAgGridReady: Promise<any>);
     getCurrentStorageState(): AdaptableState;
     saveStateNow(adaptable: IAdaptable): Promise<any>;
     loadStore: (adaptable: IAdaptable, adaptableStateKey: string, predefinedConfig?: PredefinedConfig) => Promise<any>;

package/src/Redux/Store/AdaptableStore.js

@@ -43,6 +43,7 @@ const PreviewHelper_1 = require("../../Utilities/Helpers/PreviewHelper");
 const StringExtensions_1 = require("../../Utilities/Extensions/StringExtensions");
 const Emitter_1 = tslib_1.__importDefault(require("../../Utilities/Emitter"));
 const AdaptableToaster_1 = require("../../View/Components/Popups/AdaptableToaster");
+const SystemRedux_1 = require("../ActionsReducers/SystemRedux");
 exports.INIT_STATE = 'INIT_STATE';
 exports.LOAD_STATE = 'LOAD_STATE';
 const NON_PERSIST_ACTIONS = {
@@ -50,6 +51,9 @@ const NON_PERSIST_ACTIONS = {
     '@@INIT': true,
     '@@redux/init': true,
     [exports.INIT_STATE]: true,
+    // progress indicators should NOT interfere with state management as it may lead to race conditions due to load/persist state being async
+    [SystemRedux_1.SYSTEM_PROGRESS_INDICATOR_SHOW]: true,
+    [SystemRedux_1.SYSTEM_PROGRESS_INDICATOR_HIDE]: true,
 };
 exports.InitState = () => ({
     type: exports.INIT_STATE,
@@ -62,13 +66,13 @@ class AdaptableStore {
     /**
      *
      * @param adaptable The Adaptable instance
-     * @param isVendorReady A promise which is resolved when the underlying grid is ready for binding
+     * @param isAgGridReady A promise which is resolved when AG Grid is ready for binding
      */
-    constructor(adaptable, isVendorReady) {
+    constructor(adaptable, isAgGridReady) {
         /*
-    This is the main store for Adaptable State
-    */
-        this.isVendorReady = isVendorReady;
+          This is the main store for Adaptable State
+        */
+        this.isAgGridReady = isAgGridReady;
         this.loadStorageInProgress = false;
         this.loadStateOnStartup = true; // set to false if you want no state
         this.on = (eventName, callback) => {
@@ -91,8 +95,8 @@ class AdaptableStore {
                     this.TheStore.dispatch(exports.LoadState(adaptable.adaptableOptions.stateOptions.applyState(storedState)));
                 }
             })
-                // we need the vendor grid to be ready because several states(ex. Layout) depend on its API
-                .then(() => this.isVendorReady)
+                // we need AG Grid to be ready because several states(ex. Layout) depend on its API
+                .then(() => this.isAgGridReady)
                 .then(() => {
                 this.TheStore.dispatch(exports.InitState());
                 // END STATE LOAD
@@ -309,7 +313,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                  *******************/
                 case SystemRedux.SYSTEM_FLASHING_ALERT_ADD:
                 case SystemRedux.SYSTEM_FLASHING_ALERT_DELETE: {
-                    const { flashingAlert: FlashingAlert, } = action;
+                    const { flashingAlert: FlashingAlert } = action;
                     const { dataChangedInfo } = FlashingAlert;
                     let ret = next(action);
                     if (dataChangedInfo) {
@@ -382,7 +386,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     if (((_c = actionTyped.alert.alertDefinition.AlertProperties) === null || _c === void 0 ? void 0 : _c.HighlightCell) &&
                         actionTyped.alert.dataChangedInfo) {
                         let rowNode = actionTyped.alert.dataChangedInfo.rowNode;
-                        adaptable.refreshCells([rowNode], [actionTyped.alert.dataChangedInfo.columnId], true);
+                        adaptable.refreshCells([rowNode], [actionTyped.alert.dataChangedInfo.column.columnId], true);
                     }
                     return ret;
                 }
@@ -398,7 +402,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         var _a;
                         if (((_a = alert.alertDefinition.AlertProperties) === null || _a === void 0 ? void 0 : _a.HighlightCell) && alert.dataChangedInfo) {
                             let rowNode = alert.dataChangedInfo.rowNode;
-                            adaptable.refreshCells([rowNode], [alert.dataChangedInfo.columnId], true);
+                            adaptable.refreshCells([rowNode], [alert.dataChangedInfo.column.columnId], true);
                         }
                     });
                     return ret;
@@ -412,7 +416,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     let ret = next(action);
                     if (actionTyped.alert.dataChangedInfo) {
                         let rowNode = actionTyped.alert.dataChangedInfo.rowNode;
-                        adaptable.refreshCells([rowNode], [actionTyped.alert.dataChangedInfo.columnId], true);
+                        adaptable.refreshCells([rowNode], [actionTyped.alert.dataChangedInfo.column.columnId], true);
                     }
                     return ret;
                 }
@@ -678,13 +682,15 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 case LayoutRedux.LAYOUT_EDIT:
                 case LayoutRedux.LAYOUT_SAVE:
                 case LayoutRedux.LAYOUT_DELETE:
+                case LayoutRedux.LAYOUT_SET_COLUMN_CAPTION:
                 case LayoutRedux.LAYOUT_SELECT: {
                     const oldLayoutState = middlewareAPI.getState().Layout;
                     let returnAction = next(action);
                     const newLayoutState = middlewareAPI.getState().Layout;
                     adaptable.api.layoutApi.fireLayoutChangedEvent(action.type, oldLayoutState, newLayoutState);
                     if (returnAction.type == LayoutRedux.LAYOUT_SELECT ||
-                        returnAction.type == LayoutRedux.LAYOUT_DELETE) {
+                        returnAction.type == LayoutRedux.LAYOUT_DELETE ||
+                        returnAction.type == LayoutRedux.LAYOUT_SET_COLUMN_CAPTION) {
                         let gridState = middlewareAPI.getState().Grid;
                         let currentLayout = newLayoutState.Layouts.find((l) => l.Name == newLayoutState.CurrentLayout);
                         if (gridState.CurrentLayout) {
@@ -1045,7 +1051,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 case TeamSharingRedux.TEAMSHARING_IMPORT_ITEM: {
                     let returnAction = next(action);
                     const actionTyped = action;
-                    const [importStepActions, needsOverwriteConfirmation,] = adaptable.api.internalApi
+                    const [importStepActions, needsOverwriteConfirmation] = adaptable.api.internalApi
                         .getTeamSharingService()
                         .buildSharedEntityImportActions(actionTyped.SharedEntity);
                     const processImportAction = TeamSharingRedux.TeamSharingProcessImport(importStepActions);
@@ -1118,14 +1124,14 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         .getSharedEntities(adaptableId)
                         .then((sharedEntities) => {
                         // check if remote server has a newer revision
-                        const [localRevision, remoteRevision,] = adaptable.api.internalApi
+                        const [localRevision, remoteRevision] = adaptable.api.internalApi
                             .getTeamSharingService()
                             .getSharedEntityLocalAndRemoteRevisions(ChangedAdaptableObject.Uuid, sharedEntities);
                         if (remoteRevision > localRevision) {
                             // if remote has a newer version, we will NOT overwrite it
                             return;
                         }
-                        const [updatedSharedEntities, newActiveEntities,] = adaptable.api.internalApi
+                        const [updatedSharedEntities, newActiveEntities] = adaptable.api.internalApi
                             .getTeamSharingService()
                             .updateActiveSharedEntity(ChangedAdaptableObject, UserName, sharedEntities);
                         middlewareAPI.dispatch(TeamSharingRedux.TeamSharingLinkItem(...newActiveEntities));
@@ -1191,7 +1197,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 case GridRedux.GRID_REFRESH_CELLS: {
                     const actionTyped = action;
                     let ret = next(action);
-                    adaptable.refreshCells(actionTyped.rows, actionTyped.columnIds, true);
+                    adaptable.refreshCells(actionTyped.rowNodes, actionTyped.columnIds, true);
                     return ret;
                 }
                 case GridRedux.GRID_SET_SORT: {
@@ -1242,6 +1248,9 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                  *******************/
                 case exports.INIT_STATE: {
                     let returnAction = next(action);
+                    if (adaptable.isDestroyed) {
+                        return returnAction;
+                    }
                     // make sure we have the grid columns in state, before we do any layout work
                     adaptable.updateColumnsIntoStore();
                     const layoutState = middlewareAPI.getState().Layout;

package/src/Strategy/AdaptableModuleBase.d.ts

@@ -3,7 +3,7 @@ import { Action } from 'redux';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
 import { ModuleParams } from '../View/Components/SharedProps/ModuleViewPopupProps';
 import { MenuItemShowPopup, MenuItemDoReduxAction, MenuItemDoClickFunction } from '../Utilities/MenuItem';
-import { AdaptableMenuItem, MenuContext } from '../PredefinedConfig/Common/Menu';
+import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
 import { AdaptableModule } from '../PredefinedConfig/Common/Types';
 import { TeamSharingImportInfo } from '../PredefinedConfig/TeamSharingState';
 import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
@@ -33,7 +33,7 @@ export declare abstract class AdaptableModuleBase implements IModule {
     addModuleMenuItem(source: 'ModuleMenu' | 'ModuleButton'): AdaptableMenuItem | undefined;
     addModuleButtonMenuItem(): AdaptableMenuItem | undefined;
     addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
-    addContextMenuItems(menuContext: MenuContext): AdaptableMenuItem[] | undefined;
+    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     createMainMenuItemShowPopup({ Label, ComponentName, Icon, PopupParams, }: {
         Label: string;
         ComponentName: string;

package/src/Strategy/AdaptableModuleBase.js

@@ -118,26 +118,26 @@ class AdaptableModuleBase {
             return false;
         }
         if (StringExtensions_1.StringExtensions.IsNotNullOrEmpty(functionType)) {
-            if (functionType == 'sort' && !column.IsSparkline) {
-                return column.Sortable;
+            if (functionType == 'sort' && !column.isSparkline) {
+                return column.sortable;
             }
             else if (functionType == 'editable') {
-                return !column.ReadOnly;
+                return !column.readOnly;
             }
             else if (functionType == 'style') {
-                return !column.IsSparkline;
+                return !column.isSparkline;
             }
             else if (functionType == 'sparkline') {
-                return column.IsSparkline;
+                return column.isSparkline;
             }
             else if (functionType == 'numeric') {
-                return column.DataType == Enums_1.DataType.Number;
+                return column.dataType == Enums_1.DataType.Number;
             }
             else if (functionType == 'filter') {
-                return column.Filterable;
+                return column.filterable;
             }
             else if (functionType == 'quickfilter') {
-                return this.api.columnApi.usesAdaptableQuickFilter(column.ColumnId);
+                return this.api.columnApi.usesAdaptableQuickFilter(column.columnId);
             }
         }
         return true;

package/src/Strategy/AlertModule.d.ts

@@ -2,7 +2,7 @@ import { AdaptableApi } from '../Api/AdaptableApi';
 import { AlertDefinition } from '../PredefinedConfig/AlertState';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
 import { DataChangedInfo } from '../PredefinedConfig/Common/DataChangedInfo';
-import { AdaptableMenuItem, MenuContext } from '../PredefinedConfig/Common/Menu';
+import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
 import { TeamSharingImportInfo } from '../PredefinedConfig/TeamSharingState';
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { IModule } from './Interface/IModule';
@@ -14,7 +14,7 @@ export declare class AlertModule extends AdaptableModuleBase implements IModule
     getReferencedNamedQueryNames(alertDefinition: AlertDefinition): string[];
     updateOldConfig(): void;
     addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
-    addContextMenuItems(menuContext: MenuContext): AdaptableMenuItem[] | undefined;
+    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     protected handleDataSourceChanged(dataChangedInfo: DataChangedInfo): void;
     private handleReactiveAlertTriggered;
     private showAlertForDefinitions;

package/src/Strategy/AlertModule.js

@@ -22,7 +22,8 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             }
             if (this.api.internalApi.getAdaptableOptions().notificationsOptions
                 .dataChangeDetectionPolicy === 'formattedValue') {
-                const { oldValue, newValue, columnId } = dataChangedInfo;
+                const { oldValue, newValue } = dataChangedInfo;
+                const columnId = dataChangedInfo.column.columnId;
                 const oldFormattedValue = this.api.gridApi.getFormattedValueFromRawValue(columnId, oldValue);
                 const newFormattedValue = this.api.gridApi.getFormattedValueFromRawValue(columnId, newValue);
                 if (oldFormattedValue === newFormattedValue) {
@@ -50,7 +51,7 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         else if (this.api.scopeApi.scopeHasColumns(alertDefinition.Scope)) {
             return this.api.scopeApi
                 .getColumnsForScope(alertDefinition.Scope)
-                .map((adaptableColumn) => adaptableColumn.ColumnId);
+                .map((adaptableColumn) => adaptableColumn.columnId);
         }
         return [];
     }
@@ -62,7 +63,7 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return this.api.queryApi.getReferencedNamedQueryNames(queryExpression);
     }
     updateOldConfig() {
-        var _a, _b, _c;
+        var _a, _b;
         /*
         Need to do 4 things here:
          1. Make all (new) Flashing Alerts have a Predicate if none exists
@@ -71,7 +72,6 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
          4. Convert old Updated Rows into Flashing Alerts
         */
         let oldAlertDefinitions = [];
-        let newAlertDefinitions = [];
         // 1. Make all (new) Flashing Alerts have a Predicate if none exists
         (_a = this.api.alertApi
             .getAlertState()
@@ -97,102 +97,10 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 oldAlertDefinitions.push(alertDefinition);
             }
         });
-        //  3. Convert old Flashing Cells into Flashing Alerts
-        let flashingCellState = this.api.internalApi.getState().FlashingCell;
-        (_c = flashingCellState === null || flashingCellState === void 0 ? void 0 : flashingCellState.FlashingCells) === null || _c === void 0 ? void 0 : _c.forEach((flashingCell) => {
-            if (flashingCell.IsLive) {
-                let upColor = flashingCell.UpColor
-                    ? flashingCell.UpColor
-                    : flashingCellState.DefaultUpColor
-                        ? flashingCellState.DefaultUpColor
-                        : this.api.internalApi.getAdaptableOptions().notificationsOptions
-                            .flashingAlertDefaultProperties.UpChangeStyle.BackColor;
-                let downColor = flashingCell.UpColor
-                    ? flashingCell.DownColor
-                    : flashingCellState.DefautDownColor
-                        ? flashingCellState.DefautDownColor
-                        : this.api.internalApi.getAdaptableOptions().notificationsOptions
-                            .flashingAlertDefaultProperties.DownChangeStyle.BackColor;
-                let duration = flashingCell.FlashingCellDuration
-                    ? flashingCell.FlashingCellDuration
-                    : flashingCellState.DefaultDuration
-                        ? flashingCellState.DefaultDuration
-                        : this.api.internalApi.getAdaptableOptions().notificationsOptions
-                            .flashingAlertDefaultProperties.FlashDuration;
-                let flashingAlertDefinition = {
-                    Rule: {
-                        Predicate: ANY_PREDICATE,
-                    },
-                    FlashTarget: 'cell',
-                    FlashDuration: duration,
-                    Scope: {
-                        ColumnIds: [flashingCell.ColumnId],
-                    },
-                    UpChangeStyle: {
-                        BackColor: upColor,
-                    },
-                    DownChangeStyle: {
-                        BackColor: downColor,
-                    },
-                };
-                //  this.api.alertApi.addFlashingAlertDefinition(flashingAlertDefinition);
-                newAlertDefinitions.push(flashingAlertDefinition);
-                LoggingHelper_1.LogAdaptableWarning(`Updating incorrect Predefined Config for Flashing Alert: ${flashingCell.ColumnId}`);
-            }
-        });
-        // 4. Convert old Updated Rows into Flashing Alerts
-        let updatedRowState = this.api.internalApi.getState().UpdatedRow;
-        if (updatedRowState === null || updatedRowState === void 0 ? void 0 : updatedRowState.EnableUpdatedRow) {
-            let flashingAlertDefinition = {
-                Rule: {
-                    Predicate: ANY_PREDICATE,
-                },
-                FlashTarget: 'row',
-                Scope: {
-                    All: true,
-                },
-            };
-            if (updatedRowState.Duration) {
-                flashingAlertDefinition.FlashDuration =
-                    updatedRowState.Duration == 'Always' ? 'always' : updatedRowState.Duration;
-            }
-            else {
-                flashingAlertDefinition.FlashDuration = 'always';
-            }
-            if (updatedRowState.UpColor) {
-                flashingAlertDefinition.UpChangeStyle = {
-                    BackColor: updatedRowState.UpColor,
-                };
-            }
-            else {
-                flashingAlertDefinition.UpChangeStyle = undefined;
-            }
-            if (updatedRowState.DownColor) {
-                flashingAlertDefinition.DownChangeStyle = {
-                    BackColor: updatedRowState.DownColor,
-                };
-            }
-            else {
-                flashingAlertDefinition.DownChangeStyle = undefined;
-            }
-            if (updatedRowState.NeutralColor) {
-                flashingAlertDefinition.NeutralChangeStyle = {
-                    BackColor: updatedRowState.NeutralColor,
-                };
-            }
-            else {
-                flashingAlertDefinition.NeutralChangeStyle = undefined;
-            }
-            newAlertDefinitions.push(flashingAlertDefinition);
-        }
-        this.api.alertApi.addFlashingAlertDefinitions(newAlertDefinitions);
-        this.api.alertApi.editFlashingAlertDefinitions(oldAlertDefinitions);
-        this.api.internalApi.clearUpdatedRowState();
-        this.api.internalApi.clearFlashingCellState();
     }
     addColumnMenuItems(column) {
         if (column && this.isModuleEditable()) {
-            if (!this.api.columnApi.isCalculatedColumn(column.ColumnId)) {
+            if (!this.api.columnApi.isCalculatedColumn(column.columnId)) {
                 const flashingAlertDefinitions = this.api.alertApi.getFlashingAlertDefinitions();
                 const flashingAlertForCurrentColumn = flashingAlertDefinitions.find((flashingAlertDefinition) => {
                     return this.api.scopeApi.isColumnInScope(column, flashingAlertDefinition.Scope);
@@ -205,7 +113,7 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 return [
                     this.createColumnMenuItemReduxAction('Add Flashing Alert', this.moduleInfo.Glyph, AlertRedux.FlashingAlertDefinitionAdd({
                         Scope: {
-                            ColumnIds: [column.ColumnId],
+                            ColumnIds: [column.columnId],
                         },
                         Rule: {
                             Predicate: { PredicateId: 'Any' },
@@ -229,7 +137,7 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     }
                 }
                 const flashingAlertForRow = this.api.internalApi.getAdaptableFlashingAlertFor(menuContext.primaryKeyValue);
-                const flashingAlertForCell = this.api.internalApi.getAdaptableFlashingAlertFor(menuContext.primaryKeyValue, menuContext.adaptableColumn.ColumnId);
+                const flashingAlertForCell = this.api.internalApi.getAdaptableFlashingAlertFor(menuContext.primaryKeyValue, menuContext.adaptableColumn.columnId);
                 if (flashingAlertForRow && flashingAlertForRow.flashTarget === 'row') {
                     items.push(this.createColumnMenuItemReduxAction('Clear Flashing Alert for Row', this.moduleInfo.Glyph, SystemRedux.SystemFlashingAlertDelete(flashingAlertForRow)));
                 }
@@ -272,12 +180,12 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     showAlertForDefinitions(dataChangedInfo, alertDefinitions = []) {
         alertDefinitions.forEach((alertDefinition) => {
             // might be better to do a single alert with all the messages?
-            this.api.alertApi.showAlert(this.api.columnApi.getFriendlyNameFromColumnId(dataChangedInfo.columnId), this.api.alertApi.getAlertDescription(alertDefinition), alertDefinition, dataChangedInfo);
+            this.api.alertApi.showAlert(dataChangedInfo.column.friendlyName, this.api.alertApi.getAlertDescription(alertDefinition, dataChangedInfo), alertDefinition, dataChangedInfo);
         });
     }
     showFlashingAlertsForDefinitions(dataChangedInfo, flashingAlertDefinitions = []) {
-        const allColumnIds = this.api.columnApi.getColumns().map((c) => c.ColumnId);
-        const columnDataType = this.api.columnApi.getColumnDataTypeFromColumnId(dataChangedInfo.columnId);
+        const allColumnIds = this.api.columnApi.getColumns().map((c) => c.columnId);
+        const columnDataType = dataChangedInfo.column.dataType;
         const numeric = columnDataType === 'Number';
         const isComparableType = numeric || columnDataType === 'Date';
         let up = false;
@@ -292,7 +200,7 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         }
         flashingAlertDefinitions.forEach((flashingAlertDefinition) => {
             const flashTarget = this.api.alertApi.getFlashingAlertFlashTarget(flashingAlertDefinition);
-            const flashColumnIds = { [dataChangedInfo.columnId]: true };
+            const flashColumnIds = { [dataChangedInfo.column.columnId]: true };
             if (flashTarget === 'row') {
                 allColumnIds.forEach((colId) => {
                     flashColumnIds[colId] = true;
@@ -319,7 +227,7 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     getBaseAlertDefinitionsForDataChange(dataChangedEvent, definitions, defaultNoPredicateReturn = false) {
         let relatedAlertDefinitions = definitions
-            .filter((v) => this.api.scopeApi.isColumnInScope(this.api.columnApi.getColumnFromId(dataChangedEvent.columnId), v.Scope))
+            .filter((v) => this.api.scopeApi.isColumnInScope(dataChangedEvent.column, v.Scope))
             .filter((alertDefinition) => !AdaptableQuery_1.isReactiveQuery(alertDefinition.Rule));
         let triggeredAlerts = [];
         if (ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(relatedAlertDefinitions)) {
@@ -353,7 +261,7 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             // TODO send real display value
             displayValue: null,
             node: dataChangedEvent.rowNode,
-            column: this.api.columnApi.getColumnFromId(dataChangedEvent.columnId),
+            column: dataChangedEvent.column,
         }, defaultNoPredicateReturn);
     }
     getTeamSharingAction() {

package/src/Strategy/BulkUpdateModule.d.ts

@@ -1,12 +1,12 @@
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { IBulkUpdateModule, BulkUpdateValidationResult } from './Interface/IBulkUpdateModule';
 import { PreviewInfo } from '../Utilities/Interface/Preview';
-import { AdaptableMenuItem, MenuContext } from '../PredefinedConfig/Common/Menu';
+import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
 import { AccessLevel, AdaptableApi } from '../types';
 export declare class BulkUpdateModule extends AdaptableModuleBase implements IBulkUpdateModule {
     constructor(api: AdaptableApi);
     getViewAccessLevel(): AccessLevel;
-    addContextMenuItems(menuContext: MenuContext): AdaptableMenuItem[] | undefined;
+    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     checkCorrectCellSelection(): BulkUpdateValidationResult;
     buildPreviewValues(bulkUpdateValue: any): PreviewInfo;
 }

package/src/Strategy/BulkUpdateModule.js

@@ -20,7 +20,7 @@ class BulkUpdateModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         let menuItemShowPopup = undefined;
         if (!menuContext.isRowGroupColumn && this.isModuleEditable()) {
             if (menuContext.adaptableColumn &&
-                !menuContext.adaptableColumn.ReadOnly &&
+                !menuContext.adaptableColumn.readOnly &&
                 menuContext.isSelectedCell &&
                 menuContext.isSingleSelectedColumn &&
                 this.api.gridApi.areCellsEditable(menuContext.selectedCellInfo.gridCells)) {
@@ -70,7 +70,7 @@ class BulkUpdateModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             };
         }
         let selectedColumn = selectedCellInfo.columns[0];
-        if (selectedColumn && selectedColumn.ReadOnly) {
+        if (selectedColumn && selectedColumn.readOnly) {
             return {
                 IsValid: false,
                 Alert: {
@@ -99,12 +99,12 @@ class BulkUpdateModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             return null;
         }
         let selectedCellInfo = this.api.gridApi.getSelectedCellInfo();
-        let columnId = '';
+        let column;
         if (!this.api.internalApi.isGridInPivotMode()) {
             if (selectedCellInfo != null && selectedCellInfo.columns.length > 0) {
-                columnId = selectedCellInfo.columns[0].ColumnId;
+                column = this.api.columnApi.getColumnFromId(selectedCellInfo.columns[0].columnId);
                 let typedBulkUpdateValue;
-                switch (selectedCellInfo.columns[0].DataType) {
+                switch (column.dataType) {
                     case Enums_1.DataType.Number:
                         typedBulkUpdateValue = Number(bulkUpdateValue);
                         break;
@@ -119,7 +119,7 @@ class BulkUpdateModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     const dataChangedInfo = this.api.internalApi.buildDataChangedInfo({
                         oldValue: selectedCell.rawValue,
                         newValue: typedBulkUpdateValue,
-                        columnId: selectedCell.columnId,
+                        column: selectedCell.column,
                         primaryKeyValue: selectedCell.primaryKeyValue,
                         rowNode: selectedCell.rowNode,
                         trigger: 'edit',
@@ -139,7 +139,7 @@ class BulkUpdateModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             }
         }
         return {
-            columnId: columnId,
+            column: column,
             previewResults: previewResults,
             previewValidationSummary: PreviewHelper_1.PreviewHelper.GetPreviewValidationSummary(previewResults),
         };

package/src/Strategy/CalculatedColumnModule.js

@@ -40,7 +40,7 @@ class CalculatedColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (column && this.isModuleEditable()) {
             if (this.api.calculatedColumnApi
                 .getAllCalculatedColumn()
-                .find((cc) => cc.ColumnId == column.ColumnId)) {
+                .find((cc) => cc.ColumnId == column.columnId)) {
                 let popupParam = {
                     column: column,
                     action: 'Edit',

package/src/Strategy/CellSummaryModule.d.ts

@@ -1,13 +1,13 @@
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { ICellSummaryModule } from './Interface/ICellSummaryModule';
 import { SelectedCellInfo } from '../PredefinedConfig/Selection/SelectedCellInfo';
-import { AdaptableMenuItem, MenuContext } from '../PredefinedConfig/Common/Menu';
+import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { AccessLevel } from '../PredefinedConfig/Common/Entitlement';
 import { CellSummmary } from '../PredefinedConfig/Common/CellSummary';
 export declare class CellSummaryModule extends AdaptableModuleBase implements ICellSummaryModule {
     constructor(api: AdaptableApi);
     getViewAccessLevel(): AccessLevel;
-    addContextMenuItems(menuContext: MenuContext): AdaptableMenuItem[] | undefined;
+    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     createCellSummary(selectedCellInfo: SelectedCellInfo): CellSummmary;
 }

package/src/Strategy/CellSummaryModule.js

@@ -38,14 +38,14 @@ class CellSummaryModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             let allValues = [];
             let numericColumns = [];
             selectedCellInfo.columns.map((c) => {
-                if (c && c.DataType == Enums_1.DataType.Number) {
-                    numericColumns.push(c.ColumnId);
+                if (c && c.dataType == Enums_1.DataType.Number) {
+                    numericColumns.push(c.columnId);
                 }
             });
             selectedCellInfo.gridCells.forEach((selectedCell) => {
                 let value = selectedCell.rawValue;
                 allValues.push(value);
-                if (ArrayExtensions_1.ArrayExtensions.ContainsItem(numericColumns, selectedCell.columnId)) {
+                if (ArrayExtensions_1.ArrayExtensions.ContainsItem(numericColumns, selectedCell.column.columnId)) {
                     let valueAsNumber = Number(value);
                     // possible that its not a number despite it being a numeric column
                     if (!isNaN(Number(valueAsNumber))) {

package/src/Strategy/ConditionalStyleModule.js

@@ -22,7 +22,7 @@ class ConditionalStyleModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         else if (this.api.scopeApi.scopeHasColumns(conditionalStyle.Scope)) {
             return this.api.scopeApi
                 .getColumnsForScope(conditionalStyle.Scope)
-                .map((adaptableColumn) => adaptableColumn.ColumnId);
+                .map((adaptableColumn) => adaptableColumn.columnId);
         }
         return [];
     }
@@ -73,7 +73,7 @@ class ConditionalStyleModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         this.api.conditionalStyleApi.editConditionalStyles(oldConditionalStyles);
     }
     addColumnMenuItems(column) {
-        if (column && this.isModuleEditable() && !column.IsSparkline) {
+        if (column && this.isModuleEditable() && !column.isSparkline) {
             let conditionalStyles = this.api.conditionalStyleApi.getConditionalStylesForColumn(column);
             let firstConditionalStyle = ArrayExtensions_1.default.IsNotNullOrEmpty(conditionalStyles)
                 ? conditionalStyles.find((cs) => this.api.scopeApi.isColumnInScopeColumns(column, cs.Scope))
@@ -160,7 +160,7 @@ class ConditionalStyleModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             value: value,
             oldValue: null,
             displayValue: column
-                ? this.api.gridApi.getDisplayValueFromRowNode(node, column.ColumnId)
+                ? this.api.gridApi.getDisplayValueFromRowNode(node, column.columnId)
                 : value,
             node: node,
             column: column,

package/src/Strategy/CustomSortModule.js

@@ -19,10 +19,10 @@ class CustomSortModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return false;
     }
     addColumnMenuItems(column) {
-        if (column && this.isModuleEditable() && column.Sortable) {
+        if (column && this.isModuleEditable() && column.sortable) {
             let customSort = this.api.customSortApi
                 .getAllCustomSort()
-                .find((x) => x.ColumnId == column.ColumnId);
+                .find((x) => x.ColumnId == column.columnId);
             let label = customSort ? 'Edit ' : 'Create ';
             // dont show a menu item if there is a custom sort that uses a comparer function
             const columnSortComparer = this.api.internalApi.getCustomSortComparer(column);

package/src/Strategy/DashboardModule.d.ts

@@ -1,5 +1,5 @@
 import { AdaptableModuleBase } from './AdaptableModuleBase';
-import { AdaptableMenuItem, MenuContext } from '../PredefinedConfig/Common/Menu';
+import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
 import { IModule } from './Interface/IModule';
 import { AdaptableApi } from '../Api/AdaptableApi';
 export declare class DashboardModule extends AdaptableModuleBase implements IModule {
@@ -8,6 +8,6 @@ export declare class DashboardModule extends AdaptableModuleBase implements IMod
     updateOldConfig(): void;
     handleAdaptableReady(): void;
     addColumnMenuItems(): AdaptableMenuItem[] | undefined;
-    addContextMenuItems(menuContext: MenuContext): AdaptableMenuItem[] | undefined;
+    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     private buildMenuItems;
 }

package/src/Strategy/DataChangeHistoryModule.js

@@ -27,10 +27,10 @@ class DataChangeHistoryModule extends AdaptableModuleBase_1.AdaptableModuleBase
         if (this.api.internalApi.getState().System.DataChangeHistory.currentMode !== 'ACTIVE') {
             return false;
         }
-        if (this.api.internalApi.getAdaptableOptions().dataChangeHistoryOptions.filterDataChange) {
+        if (this.api.internalApi.getAdaptableOptions().dataChangeHistoryOptions.showDataChange) {
             return this.api.internalApi
                 .getAdaptableOptions()
-                .dataChangeHistoryOptions.filterDataChange(dataChangedInfo);
+                .dataChangeHistoryOptions.showDataChange(dataChangedInfo);
         }
         return true;
     }