@adaptabletools/adaptable 17.0.0-canary.0 → 17.0.0-canary.2

package/src/Redux/ActionsReducers/GridRedux.js

@@ -83,6 +83,7 @@ export const LAYOUT_DRAFT_COLUMN_FILTER_SUSPEND = 'LAYOUT_DRAFT_COLUMN_FILTER_SU
 export const LAYOUT_DRAFT_COLUMN_FILTER_SUSPEND_ALL = 'LAYOUT_DRAFT_COLUMN_FILTER_SUSPEND_ALL';
 export const LAYOUT_DRAFT_COLUMN_FILTER_UNSUSPEND = 'LAYOUT_DRAFT_COLUMN_FILTER_UNSUSPEND';
 export const LAYOUT_DRAFT_COLUMN_FILTER_UNSUSPEND_ALL = 'LAYOUT_DRAFT_COLUMN_FILTER_UNSUSPEND_ALL';
+export const LAYOUT_DRAFT_GRID_FILTER_SET = 'LAYOUT_DRAFT_GRID_FILTER_SET';
 export const GridSetColumns = (Columns) => ({
     type: GRID_SET_COLUMNS,
     columns: Columns,
@@ -187,6 +188,10 @@ export const LayoutDraftColumnFilterUnsuspend = (columnFilter) => ({
 export const LayoutDraftColumnFilterUnsuspendAll = () => ({
     type: LAYOUT_DRAFT_COLUMN_FILTER_UNSUSPEND_ALL,
 });
+export const LayoutDraftGridFilterSet = (gridFilter) => ({
+    type: LAYOUT_DRAFT_GRID_FILTER_SET,
+    gridFilter,
+});
 const initialState = {
     Columns: EMPTY_ARRAY,
     CurrentLayout: null,
@@ -361,6 +366,19 @@ export const GridReducer = (state = initialState, action) => {
                 });
             }
         }
+        case LAYOUT_DRAFT_GRID_FILTER_SET: {
+            const currentDraftLayout = state.CurrentLayout;
+            if (currentDraftLayout) {
+                const gridFilter = action.gridFilter;
+                const CurrentLayout = Object.assign(Object.assign({}, currentDraftLayout), { GridFilter: gridFilter });
+                if (!gridFilter) {
+                    delete CurrentLayout.GridFilter;
+                }
+                return Object.assign({}, state, {
+                    CurrentLayout,
+                });
+            }
+        }
         case LAYOUT_SELECT: {
             return Object.assign({}, state, {
                 CurrentLayout: null,

package/src/Redux/ActionsReducers/LayoutRedux.d.ts

@@ -2,6 +2,14 @@ import * as Redux from 'redux';
 import { AdaptableState } from '../../../types';
 import { LayoutState, Layout } from '../../PredefinedConfig/LayoutState';
 import { ColumnFilter } from '../../types';
+/**
+ * @ReduxAction A new caption / header has been set for a Column in the Layout
+ */
+export declare const LAYOUT_SET_COLUMN_CAPTION = "LAYOUT_SET_COLUMN_CAPTION";
+/**
+ * @ReduxAction Layout Module is ready
+ */
+export declare const LAYOUT_READY = "LAYOUT_READY";
 /**
  * @ReduxAction A Layout has been added
  */
@@ -47,21 +55,37 @@ export declare const LAYOUT_COLUMN_FILTER_CLEAR_ALL = "LAYOUT_COLUMN_FILTER_CLEA
  */
 export declare const LAYOUT_COLUMN_FILTER_CLEAR = "LAYOUT_COLUMN_FILTER_CLEAR";
 /**
- * @ReduxAction Filter is suspended
+ * @ReduxAction Column Filter is suspended
  */
 export declare const LAYOUT_COLUMN_FILTER_SUSPEND = "LAYOUT_COLUMN_FILTER_SUSPEND";
 /**
- * @ReduxAction Filter is un-suspended, or activated
+ * @ReduxAction Column Filter is un-suspended, or activated
  */
 export declare const LAYOUT_COLUMN_FILTER_UNSUSPEND = "LAYOUT_COLUMN_FILTER_UNSUSPEND";
 /**
- * @ReduxAction Filter is suspended
+ * @ReduxAction All Column Filters are suspended
  */
 export declare const LAYOUT_COLUMN_FILTER_SUSPEND_ALL = "LAYOUT_COLUMN_FILTER_SUSPEND_ALL";
 /**
- * @ReduxAction Filter is un-suspended, or activated
+ * @ReduxAction All Column Filters are un-suspended, or activated
  */
 export declare const LAYOUT_COLUMN_FILTER_UNSUSPEND_ALL = "LAYOUT_COLUMN_FILTER_UNSUSPEND_ALL";
+/**
+ * @ReduxAction Grid Filter is un-suspended, or activated
+ */
+export declare const LAYOUT_GRID_FILTER_SUSPEND = "LAYOUT_GRID_FILTER_SUSPEND";
+/**
+ * @ReduxAction Grid Filter is un-suspended, or activated
+ */
+export declare const LAYOUT_GRID_FILTER_UNSUSPEND = "LAYOUT_GRID_FILTER_UNSUSPEND";
+/**
+ * @ReduxAction Edit Grid filter
+ */
+export declare const LAYOUT_GRID_FILTER_SET = "LAYOUT_GRID_FILTER_SET";
+/**
+ * @ReduxAction The Grid Filter has been cleared
+ */
+export declare const LAYOUT_GRID_FILTER_CLEAR = "LAYOUT_GRID_FILTER_CLEAR";
 export interface LayoutColumnFilterAction extends Redux.Action {
     columnFilter: ColumnFilter;
 }
@@ -83,6 +107,12 @@ export interface LayoutColumnFilterUnSuspendAction extends LayoutColumnFilterAct
 }
 export interface LayoutColumnFilterUnSuspendAllAction extends Redux.Action {
 }
+export interface LayoutGridFilterSuspendAction extends Redux.Action {
+}
+export interface LayoutGridFilterUnSuspendAction extends Redux.Action {
+}
+export interface LayoutGridFilterClearAction extends Redux.Action {
+}
 export declare const LayoutColumnFilterAdd: (columnFilter: ColumnFilter) => LayoutColumnFilterAddAction;
 export declare const LayoutColumnFilterEdit: (columnFilter: ColumnFilter) => LayoutColumnFilterEditAction;
 export declare const LayoutColumnFilterSet: (columnFilter: ColumnFilter) => LayoutColumnFilterSetAction;
@@ -92,22 +122,13 @@ export declare const LayoutColumnFilterSuspend: (columnFilter: ColumnFilter) =>
 export declare const LayoutColumnFilterUnSuspend: (columnFilter: ColumnFilter) => LayoutColumnFilterUnSuspendAction;
 export declare const LayoutColumnFilterSuspendAll: () => LayoutColumnFilterSuspendAllAction;
 export declare const LayoutColumnFilterUnSuspendAll: () => LayoutColumnFilterUnSuspendAllAction;
-/**
- * @ReduxAction Edit Grid filter
- */
-export declare const LAYOUT_GRID_FILTER_SET = "LAYOUT_GRID_FILTER_SET";
 export interface LayoutGridFilterSetAction extends Redux.Action {
     gridFilter?: string;
 }
 export declare const LayoutGridFilterSet: (gridFilter?: string) => LayoutGridFilterSetAction;
-/**
- * @ReduxAction A new caption / header has been set for a Column in the Layout
- */
-export declare const LAYOUT_SET_COLUMN_CAPTION = "LAYOUT_SET_COLUMN_CAPTION";
-/**
- * @ReduxAction Layout Module is ready
- */
-export declare const LAYOUT_READY = "LAYOUT_READY";
+export declare const LayoutGridFilterSuspend: () => LayoutGridFilterSuspendAction;
+export declare const LayoutGridFilterUnSuspend: () => LayoutGridFilterUnSuspendAction;
+export declare const LayoutGridFilterClear: () => LayoutGridFilterClearAction;
 export interface LayoutAction extends Redux.Action {
     layout: Layout;
 }

package/src/Redux/ActionsReducers/LayoutRedux.js

@@ -1,5 +1,13 @@
 import { EMPTY_ARRAY, EMPTY_STRING } from '../../Utilities/Constants/GeneralConstants';
 import AdaptableHelper from '../../Utilities/Helpers/AdaptableHelper';
+/**
+ * @ReduxAction A new caption / header has been set for a Column in the Layout
+ */
+export const LAYOUT_SET_COLUMN_CAPTION = 'LAYOUT_SET_COLUMN_CAPTION';
+/**
+ * @ReduxAction Layout Module is ready
+ */
+export const LAYOUT_READY = 'LAYOUT_READY';
 /**
  * @ReduxAction A Layout has been added
  */
@@ -45,21 +53,37 @@ export const LAYOUT_COLUMN_FILTER_CLEAR_ALL = 'LAYOUT_COLUMN_FILTER_CLEAR_ALL';
  */
 export const LAYOUT_COLUMN_FILTER_CLEAR = 'LAYOUT_COLUMN_FILTER_CLEAR';
 /**
- * @ReduxAction Filter is suspended
+ * @ReduxAction Column Filter is suspended
  */
 export const LAYOUT_COLUMN_FILTER_SUSPEND = 'LAYOUT_COLUMN_FILTER_SUSPEND';
 /**
- * @ReduxAction Filter is un-suspended, or activated
+ * @ReduxAction Column Filter is un-suspended, or activated
  */
 export const LAYOUT_COLUMN_FILTER_UNSUSPEND = 'LAYOUT_COLUMN_FILTER_UNSUSPEND';
 /**
- * @ReduxAction Filter is suspended
+ * @ReduxAction All Column Filters are suspended
  */
 export const LAYOUT_COLUMN_FILTER_SUSPEND_ALL = 'LAYOUT_COLUMN_FILTER_SUSPEND_ALL';
 /**
- * @ReduxAction Filter is un-suspended, or activated
+ * @ReduxAction All Column Filters are un-suspended, or activated
  */
 export const LAYOUT_COLUMN_FILTER_UNSUSPEND_ALL = 'LAYOUT_COLUMN_FILTER_UNSUSPEND_ALL';
+/**
+ * @ReduxAction Grid Filter is un-suspended, or activated
+ */
+export const LAYOUT_GRID_FILTER_SUSPEND = 'LAYOUT_GRID_FILTER_SUSPEND';
+/**
+ * @ReduxAction Grid Filter is un-suspended, or activated
+ */
+export const LAYOUT_GRID_FILTER_UNSUSPEND = 'LAYOUT_GRID_FILTER_UNSUSPEND';
+/**
+ * @ReduxAction Edit Grid filter
+ */
+export const LAYOUT_GRID_FILTER_SET = 'LAYOUT_GRID_FILTER_SET';
+/**
+ * @ReduxAction The Grid Filter has been cleared
+ */
+export const LAYOUT_GRID_FILTER_CLEAR = 'LAYOUT_GRID_FILTER_CLEAR';
 // Column Filter Methods
 export const LayoutColumnFilterAdd = (columnFilter) => ({
     type: LAYOUT_COLUMN_FILTER_ADD,
@@ -94,22 +118,19 @@ export const LayoutColumnFilterSuspendAll = () => ({
 export const LayoutColumnFilterUnSuspendAll = () => ({
     type: LAYOUT_COLUMN_FILTER_UNSUSPEND_ALL,
 });
-/**
- * @ReduxAction Edit Grid filter
- */
-export const LAYOUT_GRID_FILTER_SET = 'LAYOUT_GRID_FILTER_SET';
 export const LayoutGridFilterSet = (gridFilter) => ({
     type: LAYOUT_GRID_FILTER_SET,
     gridFilter,
 });
-/**
- * @ReduxAction A new caption / header has been set for a Column in the Layout
- */
-export const LAYOUT_SET_COLUMN_CAPTION = 'LAYOUT_SET_COLUMN_CAPTION';
-/**
- * @ReduxAction Layout Module is ready
- */
-export const LAYOUT_READY = 'LAYOUT_READY';
+export const LayoutGridFilterSuspend = () => ({
+    type: LAYOUT_GRID_FILTER_SUSPEND,
+});
+export const LayoutGridFilterUnSuspend = () => ({
+    type: LAYOUT_GRID_FILTER_UNSUSPEND,
+});
+export const LayoutGridFilterClear = () => ({
+    type: LAYOUT_GRID_FILTER_CLEAR,
+});
 export const LayoutAdd = (layout) => ({
     type: LAYOUT_ADD,
     layout,
@@ -330,6 +351,38 @@ export const LayoutReducer = (state = initialState, action) => {
                     return layout;
                 }) });
         }
+        case LAYOUT_GRID_FILTER_SUSPEND: {
+            const Layouts = state.Layouts.map((layout) => {
+                if (layout.Name === currentLayout.Name) {
+                    return Object.assign(Object.assign({}, layout), { GridFilter: Object.assign(Object.assign({}, layout.GridFilter), { IsSuspended: true }) });
+                }
+                return layout;
+            });
+            return Object.assign(Object.assign({}, state), { Layouts });
+        }
+        case LAYOUT_GRID_FILTER_UNSUSPEND: {
+            const Layouts = state.Layouts.map((layout) => {
+                if (layout.Name === currentLayout.Name) {
+                    return Object.assign(Object.assign({}, layout), { GridFilter: Object.assign(Object.assign({}, layout.GridFilter), { IsSuspended: false }) });
+                }
+                return layout;
+            });
+            return Object.assign(Object.assign({}, state), { Layouts });
+        }
+        case LAYOUT_GRID_FILTER_CLEAR: {
+            const Layouts = state.Layouts.map((layout) => {
+                let gridFilter = currentLayout.GridFilter;
+                if (gridFilter) {
+                    gridFilter.IsSuspended = false;
+                    gridFilter.Expression = '';
+                }
+                if (layout.Name === currentLayout.Name) {
+                    return Object.assign(Object.assign({}, layout), { gridFilter });
+                }
+                return layout;
+            });
+            return Object.assign(Object.assign({}, state), { Layouts });
+        }
         default:
             return state;
     }

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

@@ -4,7 +4,7 @@ export declare function AddStateSource(stateObject: any, source: 'Config' | 'Use
 export declare function ProcessKeepUserDefinedRevision(configState: any, currentUserState: any): any;
 export declare function MergeStateFunction(oldState: any, newState: any): any;
 export declare function MergeState(oldState: any, newState: any): any;
-declare type TypeReducer = (state: AdaptableState, action: {
+type TypeReducer = (state: AdaptableState, action: {
     type: string;
     State?: {
         [s: string]: ConfigState;

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

@@ -4,8 +4,8 @@ import { IAdaptableStore } from './Interface/IAdaptableStore';
 import { ConfigState } from '../../PredefinedConfig/ConfigState';
 import { AdaptableState } from '../../PredefinedConfig/AdaptableState';
 import { PredefinedConfig } from '../../PredefinedConfig/PredefinedConfig';
-declare type EmitterCallback = (data?: any) => any;
-declare type EmitterAnyCallback = (eventName: string, data?: any) => any;
+type EmitterCallback = (data?: any) => any;
+type EmitterAnyCallback = (eventName: string, data?: any) => any;
 export declare const INIT_STATE = "INIT_STATE";
 export declare const LOAD_STATE = "LOAD_STATE";
 export interface ResetUserDataAction extends Redux.Action {

package/src/Redux/Store/AdaptableStore.js

@@ -269,10 +269,10 @@ export class AdaptableStore {
 // this is the main function for dealing with Redux Actions which require additional functionality to be triggered.
 // Please document each use case where we have to use the Store rather than a module or a popup screen
 // This should ideally be the ONLY place where we LISTEN to store changes
-const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
+const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
     return function (next) {
         return function (action) {
-            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;
             switch (action.type) {
                 /*******************
                  * NAMED QUERY ACTIONS
@@ -693,10 +693,10 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         const actionTyped = action;
                         const searchText = actionTyped.quickSearchText;
                         if (StringExtensions.IsNotNullOrEmpty(searchText)) {
-                            adaptable.setAgQuickSearch(searchText);
+                            adaptable.setAgGridQuickSearch(searchText);
                         }
                         else {
-                            adaptable.setAgQuickSearch('');
+                            adaptable.setAgGridQuickSearch('');
                         }
                     }
                     return returnAction;
@@ -718,7 +718,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 }
                 /**
                  * Use Case: Column Filters have changed
-                 * Action: Apply grid filtering and fire associated events
+                 * Action: Apply Column Filtering and fire associated events
                  */
                 case LayoutRedux.LAYOUT_COLUMN_FILTER_ADD:
                 case LayoutRedux.LAYOUT_COLUMN_FILTER_EDIT:
@@ -731,7 +731,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 case LayoutRedux.LAYOUT_COLUMN_FILTER_UNSUSPEND_ALL: {
                     let returnAction;
                     // needs to be called before 'next' so previous and next column filters are known
-                    const shouldTriggerGridFiltering = adaptable.api.columnFilterApi.internalApi.shouldNewColumnFilterTriggerGridFiltering(action);
+                    const shouldTriggerColumnFiltering = adaptable.api.columnFilterApi.internalApi.shouldNewColumnFilterTriggerColumnFiltering(action);
                     const currentLayout = adaptable.api.layoutApi.getCurrentLayout();
                     if (((_g = adaptable.adaptableOptions.layoutOptions) === null || _g === void 0 ? void 0 : _g.autoSaveLayouts) &&
                         !currentLayout.IsReadOnly) {
@@ -773,11 +773,12 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                                 draftLayoutAction = GridRedux.LayoutDraftColumnFilterUnsuspendAll();
                                 break;
                         }
+                        //  GRID FILTER
                         returnAction = next(draftLayoutAction);
                     }
                     setTimeout(() => {
-                        if (shouldTriggerGridFiltering) {
-                            adaptable.applyGridFiltering();
+                        if (shouldTriggerColumnFiltering) {
+                            adaptable.applyColumnFiltering();
                         }
                     }, 5);
                     adaptable.api.columnFilterApi.internalApi.fireColumnFilterAppliedEvent();
@@ -786,13 +787,39 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 }
                 /**
                  * Use Case: Grid Filter has changed
-                 * Action: Filter the Grid
+                 * Action: Apply Grid Filtering and fire associated events
                  */
-                case LayoutRedux.LAYOUT_GRID_FILTER_SET: {
-                    let ret = next(action);
+                case LayoutRedux.LAYOUT_GRID_FILTER_SET:
+                case LayoutRedux.LAYOUT_GRID_FILTER_CLEAR:
+                case LayoutRedux.LAYOUT_GRID_FILTER_SUSPEND:
+                case LayoutRedux.LAYOUT_GRID_FILTER_UNSUSPEND: {
                     setTimeout(() => adaptable.applyGridFiltering(), 5);
-                    adaptable.api.gridFilterApi.internalApi.fireGridFilterApplied();
-                    return ret;
+                    adaptable.api.gridFilterApi.internalApi.fireGridFilterAppliedEvent();
+                    adaptable.api.layoutApi.internalApi.fireLayoutChangedEvent(action.type, null, middlewareAPI.getState().Layout);
+                    const currentLayout = adaptable.api.layoutApi.getCurrentLayout();
+                    let returnAction;
+                    if (((_h = adaptable.adaptableOptions.layoutOptions) === null || _h === void 0 ? void 0 : _h.autoSaveLayouts) &&
+                        !currentLayout.IsReadOnly) {
+                        returnAction = action;
+                    }
+                    else {
+                        // save in draft
+                        switch (action.type) {
+                            case LayoutRedux.LAYOUT_GRID_FILTER_SET:
+                                returnAction = GridRedux.LayoutDraftGridFilterSet(Object.assign(Object.assign({}, currentLayout.GridFilter), { Expression: action.gridFilter }));
+                                break;
+                            case LayoutRedux.LAYOUT_GRID_FILTER_CLEAR:
+                                returnAction = GridRedux.LayoutDraftGridFilterSet(null);
+                                break;
+                            case LayoutRedux.LAYOUT_GRID_FILTER_SUSPEND:
+                                returnAction = GridRedux.LayoutDraftGridFilterSet(Object.assign(Object.assign({}, currentLayout.GridFilter), { IsSuspended: true }));
+                                break;
+                            case LayoutRedux.LAYOUT_GRID_FILTER_UNSUSPEND:
+                                returnAction = GridRedux.LayoutDraftGridFilterSet(Object.assign(Object.assign({}, currentLayout.GridFilter), { IsSuspended: false }));
+                                break;
+                        }
+                    }
+                    return next(returnAction);
                 }
                 /*******************
                  * DATA SOURCE ACTIONS
@@ -931,11 +958,11 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     let returnAction = next(action);
                     const newLayoutState = middlewareAPI.getState().Layout;
                     adaptable.api.layoutApi.internalApi.fireLayoutChangedEvent(action.type, oldLayoutState, newLayoutState);
-                    const oldFilters = (_h = oldLayoutState.Layouts.find((l) => l.Name == oldLayoutState.CurrentLayout)) === null || _h === void 0 ? void 0 : _h.ColumnFilters;
-                    const newFilters = (_j = newLayoutState.Layouts.find((l) => l.Name == newLayoutState.CurrentLayout)) === null || _j === void 0 ? void 0 : _j.ColumnFilters;
+                    const oldFilters = (_j = oldLayoutState.Layouts.find((l) => l.Name == oldLayoutState.CurrentLayout)) === null || _j === void 0 ? void 0 : _j.ColumnFilters;
+                    const newFilters = (_k = newLayoutState.Layouts.find((l) => l.Name == newLayoutState.CurrentLayout)) === null || _k === void 0 ? void 0 : _k.ColumnFilters;
                     // Tell Grid to apply filtering if filters have been changed in a loaded Layout
                     if (adaptable.api.columnFilterApi.internalApi.areColumnFiltersDifferent(oldFilters, newFilters)) {
-                        adaptable.applyGridFiltering();
+                        adaptable.applyColumnFiltering();
                     }
                     if (returnAction.type == LayoutRedux.LAYOUT_SELECT ||
                         returnAction.type == LayoutRedux.LAYOUT_DELETE ||
@@ -949,7 +976,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                             // tell grid the layout has been selected
                             adaptable.setLayout(currentLayout);
                         }
-                        if (!((_k = adaptable.adaptableOptions.layoutOptions) === null || _k === void 0 ? void 0 : _k.autoSaveLayouts)) {
+                        if (!((_l = adaptable.adaptableOptions.layoutOptions) === null || _l === void 0 ? void 0 : _l.autoSaveLayouts)) {
                             middlewareAPI.dispatch(GridRedux.LayoutUpdateCurrentDraft(currentLayout));
                         }
                     }
@@ -957,7 +984,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         returnAction.type == LayoutRedux.LAYOUT_SAVE) {
                         const actionTyped = action;
                         // if autosave is false
-                        if (!((_l = adaptable.adaptableOptions.layoutOptions) === null || _l === void 0 ? void 0 : _l.autoSaveLayouts)) {
+                        if (!((_m = adaptable.adaptableOptions.layoutOptions) === null || _m === void 0 ? void 0 : _m.autoSaveLayouts)) {
                             // and the current layout is saved, make sure we also update the draft
                             if (actionTyped.layout.Name === newLayoutState.CurrentLayout) {
                                 middlewareAPI.dispatch(GridRedux.LayoutUpdateCurrentDraft(actionTyped.layout));
@@ -1594,4 +1621,4 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
             }
         };
     };
-};
+});

package/src/Strategy/AdaptableModuleBase.d.ts

@@ -50,7 +50,6 @@ export declare abstract class AdaptableModuleBase implements IModule {
     createColumnMenuItemClickFunction(Label: string, Icon: AdaptableSystemIconName, ClickFunction: () => void): MenuItemDoClickFunction;
     createColumnMenuItemReduxAction(Label: string, Icon: AdaptableSystemIconName, Action: Action): MenuItemDoReduxAction;
     createColumnMenuItemShowPopup(Label: string, ComponentName: string, Icon: AdaptableSystemIconName, PopupParams?: ModuleParams): MenuItemShowPopup;
-    canCreateColumnMenuItem(column: AdaptableColumn, minimumAccessLevel: AccessLevel, functionType?: 'sort' | 'editable' | 'style' | 'filter' | 'quickfilter' | 'numeric'): boolean;
     getTeamSharingAction(): TeamSharingImportInfo<AdaptableObject> | undefined;
     getModuleNamedQueryReferences(): string[];
     getModuleCalculatedColumnReferences(): CalculatedColumn[];

package/src/Strategy/AdaptableModuleBase.js

@@ -1,4 +1,3 @@
-import { StringExtensions } from '../Utilities/Extensions/StringExtensions';
 import { MenuItemShowPopup, MenuItemDoReduxAction, MenuItemDoClickFunction, } from '../Utilities/MenuItem';
 import ArrayExtensions from '../Utilities/Extensions/ArrayExtensions';
 /**
@@ -117,35 +116,6 @@ export class AdaptableModuleBase {
     createColumnMenuItemShowPopup(Label, ComponentName, Icon, PopupParams) {
         return new MenuItemShowPopup(Label, this.moduleInfo.ModuleName, ComponentName, Icon, true, PopupParams);
     }
-    canCreateColumnMenuItem(column, minimumAccessLevel, functionType) {
-        if (!this.hasRequiredAccessLevel(minimumAccessLevel)) {
-            return false;
-        }
-        if (!column) {
-            return false;
-        }
-        if (StringExtensions.IsNotNullOrEmpty(functionType)) {
-            if (functionType == 'sort' && !column.isSparkline) {
-                return column.sortable;
-            }
-            else if (functionType == 'editable') {
-                return !column.readOnly;
-            }
-            else if (functionType == 'style') {
-                return !column.isSparkline;
-            }
-            else if (functionType == 'numeric') {
-                return column.dataType == 'Number';
-            }
-            else if (functionType == 'filter') {
-                return column.filterable;
-            }
-            else if (functionType == 'quickfilter') {
-                return this.api.columnApi.internalApi.usesAdaptableQuickFilter(column.columnId);
-            }
-        }
-        return true;
-    }
     getTeamSharingAction() {
         return undefined;
     }

package/src/Strategy/AlertModule.js

@@ -40,7 +40,7 @@ export class AlertModule extends AdaptableModuleBase {
         });
         this.api.eventApi.on('GridDataChanged', (gridDataChangedInfo) => {
             if (gridDataChangedInfo.rowTrigger === 'Edit') {
-                // changed row alerts should be handled by standard 'Any' ('AnyChange') Predicate
+                // changed row alerts should be handled by standard 'AnyChange' Predicate
                 return;
             }
             this.handleGridDataChanged(gridDataChangedInfo);

package/src/Strategy/ChartingModule.js

@@ -22,6 +22,7 @@ export class ChartingModule extends AdaptableModuleBase {
             }
             if (!('Name' in newChartDefinition)) {
                 // default to chartId
+                // @ts-ignore possible because First iteration had no 'Name' and model was under 'model' key (lowercase)
                 newChartDefinition.Name = newChartDefinition.Model.chartId;
             }
             return newChartDefinition;
@@ -87,15 +88,17 @@ export class ChartingModule extends AdaptableModuleBase {
                         `Row end index: ${chart.Model.cellRange.rowEndIndex}`,
                         chart.Model.cellRange.columnStart &&
                             `Column start: ${typeof chart.Model.cellRange.columnStart === 'string'
-                                ? chart.Model.cellRange.columnStart
-                                : chart.Model.cellRange.columnStart.getColId()}`,
+                                ? this.api.columnApi.getFriendlyNameForColumnId(chart.Model.cellRange.columnStart)
+                                : this.api.columnApi.getFriendlyNameForColumnId(chart.Model.cellRange.columnStart.getColId())}`,
                         chart.Model.cellRange.columnEnd &&
                             `Column start: ${typeof chart.Model.cellRange.columnEnd === 'string'
-                                ? chart.Model.cellRange.columnEnd
-                                : chart.Model.cellRange.columnEnd.getColId()}`,
+                                ? this.api.columnApi.getFriendlyNameForColumnId(chart.Model.cellRange.columnEnd)
+                                : this.api.columnApi.getFriendlyNameForColumnId(chart.Model.cellRange.columnEnd.getColId())}`,
                         ((_a = chart.Model.cellRange.columns) === null || _a === void 0 ? void 0 : _a.length) &&
                             `Columns ${chart.Model.cellRange.columns
-                                .map((column) => (typeof column === 'string' ? column : column.getColId()))
+                                .map((column) => typeof column === 'string'
+                                ? this.api.columnApi.getFriendlyNameForColumnId(column)
+                                : this.api.columnApi.getFriendlyNameForColumnId(column.getColId()))
                                 .join(', ')}`,
                     ].filter(Boolean),
                 },

package/src/Strategy/ColumnFilterModule.d.ts

@@ -8,6 +8,7 @@ import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
 import { ColumnFilter } from '../types';
 export declare class ColumnFilterModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
+    setModuleEntitlement(): void;
     getModuleAdaptableObjects(): AdaptableObject[];
     getExplicitlyReferencedColumnIds(columnFilter: ColumnFilter): string[];
     hasNamedQueryReferences(): boolean;
@@ -15,6 +16,7 @@ export declare class ColumnFilterModule extends AdaptableModuleBase implements I
     handleAdaptableReady(): void;
     addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
+    private getExistingColumnFilter;
     getTeamSharingAction(): TeamSharingImportInfo<ColumnFilter>;
     toViewCompact(filter: ColumnFilter): AdaptableObjectCompactView;
     toView(filter: ColumnFilter): AdaptableObjectView;