@adaptabletools/adaptable 10.0.4-canary.1 → 10.0.4-canary.2

package/src/Redux/ActionsReducers/LayoutRedux.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LayoutReducer = exports.LayoutReady = exports.LayoutUpdateCurrentDraft = exports.LayoutSelect = exports.LayoutSave = exports.LayoutDelete = exports.LayoutAdd = exports.LAYOUT_READY = exports.LAYOUT_UPDATE_CURRENT_DRAFT = exports.LAYOUT_SAVE = exports.LAYOUT_SELECT = exports.LAYOUT_DELETE = exports.LAYOUT_EDIT = exports.LAYOUT_ADD = void 0;
+exports.LayoutReducer = exports.LayoutReady = exports.LayoutUpdateCurrentDraft = exports.LayoutSelect = exports.LayoutSetColumnCaption = exports.LayoutSave = exports.LayoutDelete = exports.LayoutAdd = exports.LAYOUT_READY = exports.LAYOUT_UPDATE_CURRENT_DRAFT = exports.LAYOUT_SET_COLUMN_CAPTION = exports.LAYOUT_SAVE = exports.LAYOUT_SELECT = exports.LAYOUT_DELETE = exports.LAYOUT_EDIT = exports.LAYOUT_ADD = void 0;
 const tslib_1 = require("tslib");
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 const AdaptableHelper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/AdaptableHelper"));
@@ -24,6 +24,10 @@ exports.LAYOUT_SELECT = 'LAYOUT_SELECT';
  * @ReduxAction A Layout has been (auto)saved
  */
 exports.LAYOUT_SAVE = 'LAYOUT_SAVE';
+/**
+ * @ReduxAction A new caption / header has been set for a Column in the Layout
+ */
+exports.LAYOUT_SET_COLUMN_CAPTION = 'LAYOUT_SET_COLUMN_CAPTION';
 exports.LAYOUT_UPDATE_CURRENT_DRAFT = 'LAYOUT_UPDATE_CURRENT_DRAFT';
 /**
  * @ReduxAction Layout Module is ready
@@ -41,6 +45,12 @@ exports.LayoutSave = (layout) => ({
     type: exports.LAYOUT_SAVE,
     layout,
 });
+exports.LayoutSetColumnCaption = (layoutName, columnId, caption) => ({
+    type: exports.LAYOUT_SET_COLUMN_CAPTION,
+    layoutName,
+    columnId,
+    caption,
+});
 exports.LayoutSelect = (layoutName) => ({
     type: exports.LAYOUT_SELECT,
     layoutName,
@@ -83,6 +93,19 @@ exports.LayoutReducer = (state = initialState, action) => {
             const newLayouts = state.Layouts.filter((abObject) => abObject.Uuid !== actionLayout.Uuid);
             return Object.assign(Object.assign({}, state), { CurrentLayout: state.CurrentLayout === actionLayout.Name ? newLayouts[0].Name : state.CurrentLayout, Layouts: newLayouts });
         }
+        case exports.LAYOUT_SET_COLUMN_CAPTION: {
+            const setColumnCaptionAction = action;
+            const currentLayoutName = setColumnCaptionAction.layoutName;
+            let currentLayout = state.Layouts.find((l) => l.Name === currentLayoutName);
+            if (currentLayout) {
+                currentLayout.ColumnHeadersMap[setColumnCaptionAction.columnId] =
+                    setColumnCaptionAction.caption;
+                return Object.assign({}, state, {
+                    Layouts: state.Layouts.map((abObject) => abObject.Uuid === currentLayout.Uuid ? currentLayout : abObject),
+                });
+            }
+            return state;
+        }
         default:
             return state;
     }

package/src/Redux/DeadRedux.d.ts

@@ -1,25 +1,21 @@
 import * as Redux from 'redux';
-import { FlashingCellState } from '../PredefinedConfig/DeprecatedState';
-import { UpdatedRowState } from '../PredefinedConfig/DeprecatedState';
-import { PercentBarState } from '../PredefinedConfig/DeprecatedState';
-import { GradientColumnState } from '../PredefinedConfig/DeprecatedState';
 export declare const GRADIENT_COLUMN_CLEAR = "GRADIENT_COLUMN_CLEAR";
 export interface GradientColumnClearAction extends Redux.Action {
 }
 export declare const GradientColumnClear: () => GradientColumnClearAction;
-export declare const GradientColumnReducer: Redux.Reducer<GradientColumnState>;
+export declare const GradientColumnReducer: Redux.Reducer<any>;
 export declare const PERCENT_BAR_CLEAR = "PERCENT_BAR_CLEAR";
 export interface PercentBarClearAction extends Redux.Action {
 }
 export declare const PercentBarClear: () => PercentBarClearAction;
-export declare const PercentBarReducer: Redux.Reducer<PercentBarState>;
+export declare const PercentBarReducer: Redux.Reducer<any>;
 export declare const FLASHING_CELL_CLEAR = "FLASHING_CELL_CLEAR";
 export interface FlashingCellClearAction extends Redux.Action {
 }
 export declare const FlashingCellClear: () => FlashingCellClearAction;
-export declare const FlashingCellReducer: Redux.Reducer<FlashingCellState>;
+export declare const FlashingCellReducer: Redux.Reducer<any>;
 export declare const UPDATED_ROW_CLEAR = "UPDATED_ROW_CLEAR";
 export interface UpdatedRowClearAction extends Redux.Action {
 }
 export declare const UpdatedRowClear: () => UpdatedRowClearAction;
-export declare const UpdatedRowReducer: Redux.Reducer<UpdatedRowState>;
+export declare const UpdatedRowReducer: Redux.Reducer<any>;

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

@@ -66,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) => {
@@ -95,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
@@ -313,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) {
@@ -682,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) {
@@ -1049,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);
@@ -1122,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));
@@ -1195,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: {
@@ -1246,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/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

@@ -63,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
@@ -72,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()
@@ -98,98 +97,6 @@ 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()) {

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

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

package/src/Strategy/ExportModule.d.ts

@@ -3,7 +3,7 @@ import { IExportModule } from './Interface/IExportModule';
 import { ExportDestination } from '../PredefinedConfig/Common/Enums';
 import { Report } from '../PredefinedConfig/ExportState';
 import { TeamSharingImportInfo } from '../PredefinedConfig/TeamSharingState';
-import { AdaptableMenuItem, MenuContext } from '../PredefinedConfig/Common/Menu';
+import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
 export declare class ExportModule extends AdaptableModuleBase implements IExportModule {
@@ -12,7 +12,7 @@ export declare class ExportModule extends AdaptableModuleBase implements IExport
     getExplicitlyReferencedColumnIds(report: Report): string[];
     getReferencedNamedQueryNames(report: Report): string[];
     updateOldConfig(): void;
-    addContextMenuItems(menuContext: MenuContext): AdaptableMenuItem[] | undefined;
+    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     export(report: Report, exportDestination: ExportDestination | string): void;
     private isCustomDestination;
     private convertReportToJSON;

package/src/Strategy/FilterModule.d.ts

@@ -1,6 +1,6 @@
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
-import { AdaptableMenuItem, MenuContext } from '../PredefinedConfig/Common/Menu';
+import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
 import { TeamSharingImportInfo } from '../PredefinedConfig/TeamSharingState';
 import { ColumnFilter } from '../PredefinedConfig/FilterState';
 import { IModule } from './Interface/IModule';
@@ -12,7 +12,7 @@ export declare class FilterModule extends AdaptableModuleBase implements IModule
     getExplicitlyReferencedColumnIds(columnFilter: ColumnFilter): string[];
     hasNamedQueryReferences(): boolean;
     handleAdaptableReady(): void;
-    addContextMenuItems(menuContext: MenuContext): AdaptableMenuItem[] | undefined;
+    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
     getTeamSharingAction(): TeamSharingImportInfo<ColumnFilter>;
 }

package/src/Strategy/FormatColumnModule.js

@@ -133,7 +133,7 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (formatColumn) {
             return formatColumn;
         }
-        // special columns (CalculatedColumn & FreeTextColumns) are not yet part of the underlying AG-Grid colDefs
+        // special columns (Calculated, FreeText, Action) are not yet part of AG-GridS colDefs
         // so we have to check if the given columnId is a special column
         const isSpecialColumn = !!this.api.calculatedColumnApi.getCalculatedColumnForColumnId(columnId) ||
             !!this.api.freeTextColumnApi.getFreeTextColumnById(columnId);

package/src/Strategy/GridInfoModule.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 { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
 import { IModule } from './Interface/IModule';
 import { AdaptableApi } from '../Api/AdaptableApi';
@@ -8,5 +8,5 @@ export declare class GridInfoModule extends AdaptableModuleBase implements IModu
     constructor(api: AdaptableApi);
     getViewAccessLevel(): AccessLevel;
     addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
-    addContextMenuItems(menuContext: MenuContext): AdaptableMenuItem[] | undefined;
+    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
 }

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

@@ -1,5 +1,5 @@
 import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
-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';
@@ -35,7 +35,7 @@ export interface IModule {
     AccessLevel: AccessLevel;
     addModuleMenuItem(source: 'ModuleMenu' | 'ModuleButton'): AdaptableMenuItem | undefined;
     addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
-    addContextMenuItems(menuContext: MenuContext): AdaptableMenuItem[] | undefined;
+    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     setModuleEntitlement(): void;
     isModuleAvailable(): boolean;
     isModuleEditable(): boolean;

package/src/Strategy/LayoutModule.d.ts

@@ -1,6 +1,6 @@
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { LayoutState, Layout } from '../PredefinedConfig/LayoutState';
-import { AdaptableMenuItem, MenuContext } from '../PredefinedConfig/Common/Menu';
+import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
 import { TeamSharingImportInfo } from '../PredefinedConfig/TeamSharingState';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
 import { AdaptableApi } from '../Api/AdaptableApi';
@@ -14,6 +14,6 @@ export declare class LayoutModule extends AdaptableModuleBase implements IModule
     hasNamedQueryReferences(): boolean;
     handleAdaptableReady(): void;
     addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
-    addContextMenuItems(menuContext: MenuContext): AdaptableMenuItem[] | undefined;
+    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     getTeamSharingAction(): TeamSharingImportInfo<Layout>;
 }

package/src/Strategy/LayoutModule.js

@@ -38,15 +38,28 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     addColumnMenuItems(column) {
         let returnColumnMenuItems = [];
         if (this.isModuleEditable()) {
-            returnColumnMenuItems.push(this.createColumnMenuItemShowPopup('Edit Layout', this.moduleInfo.Popup, this.moduleInfo.Glyph, {
-                action: 'Edit',
-                source: 'ColumnMenu',
-            }));
-            if (column && column.hideable) {
-                returnColumnMenuItems.push(this.createColumnMenuItemClickFunction('Hide Column', 'hide-column', () => {
-                    this.api.columnApi.hideColumn(column.columnId);
+            const isReadOnlyLayout = this.api.layoutApi.isCurrentLayoutReadOnly();
+            if (!isReadOnlyLayout) {
+                returnColumnMenuItems.push(this.createColumnMenuItemShowPopup('Edit Layout', this.moduleInfo.Popup, this.moduleInfo.Glyph, {
+                    action: 'Edit',
+                    source: 'ColumnMenu',
                 }));
             }
+            if (column) {
+                if (!isReadOnlyLayout) {
+                    returnColumnMenuItems.push(this.createColumnMenuItemClickFunction('Change Caption', 'edit', () => {
+                        let newname = prompt('Enter a new Caption for the Column');
+                        if (newname) {
+                            this.api.layoutApi.setColumnCaption(column.columnId, newname);
+                        }
+                    }));
+                }
+                if (column.hideable) {
+                    returnColumnMenuItems.push(this.createColumnMenuItemClickFunction('Hide Column', 'hide-column', () => {
+                        this.api.columnApi.hideColumn(column.columnId);
+                    }));
+                }
+            }
             let selectMenuItems = [];
             if (column) {
                 selectMenuItems.push(this.createColumnMenuItemClickFunction('Column', 'column-chooser', () => {
@@ -67,7 +80,7 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     addContextMenuItems(menuContext) {
         let returnColumnMenuItems = [];
-        if (this.isModuleEditable()) {
+        if (this.isModuleEditable() && !this.api.layoutApi.isCurrentLayoutReadOnly()) {
             returnColumnMenuItems.push(this.createColumnMenuItemShowPopup('Edit Layout', this.moduleInfo.Popup, this.moduleInfo.Glyph, {
                 action: 'Edit',
                 source: 'ColumnMenu',

package/src/Strategy/SmartEditModule.d.ts

@@ -4,13 +4,13 @@ import { IModuleActionReturn } from './Interface/IModuleActionReturn';
 import { ISmartEditModule } from './Interface/ISmartEditModule';
 import { PreviewInfo } from '../Utilities/Interface/Preview';
 import { GridCell } from '../PredefinedConfig/Selection/GridCell';
-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';
 export declare class SmartEditModule extends AdaptableModuleBase implements ISmartEditModule {
     constructor(api: AdaptableApi);
     getViewAccessLevel(): AccessLevel;
-    addContextMenuItems(menuContext: MenuContext): AdaptableMenuItem[] | undefined;
+    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     ApplySmartEdit(newValues: GridCell[]): void;
     CheckCorrectCellSelection(): IModuleActionReturn<boolean>;
     BuildPreviewValues(smartEditValue: number, smartEditOperation: MathOperation): PreviewInfo;