@adaptabletools/adaptable-cjs 22.1.0-canary.1 → 22.1.1-canary.0

package/src/AdaptableState/Common/AdaptableFormatPresets.js

@@ -0,0 +1,186 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveDisplayFormat = exports.isAdaptableNumericFormatPreset = exports.NUMERIC_FORMAT_PRESETS = void 0;
+/**
+ * Concrete options associated with each numeric preset. The wizard and
+ * runtime resolver both pull from this single source of truth.
+ */
+exports.NUMERIC_FORMAT_PRESETS = {
+    Percentage: {
+        FractionDigits: 2,
+        FractionSeparator: '.',
+        IntegerDigits: undefined,
+        IntegerSeparator: ',',
+        Prefix: '',
+        Suffix: '%',
+        Multiplier: 100,
+        Parentheses: false,
+    },
+    Thousand: {
+        FractionDigits: undefined,
+        FractionSeparator: '.',
+        IntegerDigits: undefined,
+        IntegerSeparator: ',',
+        Prefix: '',
+        Suffix: 'K',
+        Multiplier: 0.001,
+        Parentheses: false,
+    },
+    Million: {
+        FractionDigits: undefined,
+        FractionSeparator: '.',
+        IntegerDigits: undefined,
+        IntegerSeparator: ',',
+        Prefix: '',
+        Suffix: 'M',
+        Multiplier: 0.000001,
+        Parentheses: false,
+    },
+    Billion: {
+        FractionDigits: undefined,
+        FractionSeparator: '.',
+        IntegerDigits: undefined,
+        IntegerSeparator: ',',
+        Prefix: '',
+        Suffix: 'B',
+        Multiplier: 0.000000001,
+        Parentheses: false,
+    },
+    BasisPoints: {
+        FractionDigits: 0,
+        FractionSeparator: '.',
+        IntegerDigits: undefined,
+        IntegerSeparator: ',',
+        Prefix: '',
+        Suffix: ' bps',
+        Multiplier: 10000,
+        Parentheses: false,
+    },
+    Dollar: {
+        FractionDigits: 2,
+        FractionSeparator: '.',
+        IntegerDigits: undefined,
+        IntegerSeparator: ',',
+        Prefix: '$',
+        Suffix: '',
+        Multiplier: 1,
+        Parentheses: false,
+    },
+    Sterling: {
+        FractionDigits: 2,
+        FractionSeparator: '.',
+        IntegerDigits: undefined,
+        IntegerSeparator: ',',
+        Prefix: '£',
+        Suffix: '',
+        Multiplier: 1,
+        Parentheses: false,
+    },
+    Euro: {
+        FractionDigits: 2,
+        FractionSeparator: '.',
+        IntegerDigits: undefined,
+        IntegerSeparator: ',',
+        Prefix: '€',
+        Suffix: '',
+        Multiplier: 1,
+        Parentheses: false,
+    },
+    Yen: {
+        FractionDigits: 0,
+        FractionSeparator: '.',
+        IntegerDigits: undefined,
+        IntegerSeparator: ',',
+        Prefix: '¥',
+        Suffix: '',
+        Multiplier: 1,
+        Parentheses: false,
+    },
+    Bitcoin: {
+        FractionDigits: 8,
+        FractionSeparator: '.',
+        IntegerDigits: undefined,
+        IntegerSeparator: ',',
+        Prefix: '₿',
+        Suffix: '',
+        Multiplier: 1,
+        Parentheses: false,
+    },
+    Integer: {
+        FractionDigits: 0,
+        FractionSeparator: '.',
+        IntegerDigits: undefined,
+        IntegerSeparator: ',',
+        Prefix: '',
+        Suffix: '',
+        Multiplier: 1,
+        Parentheses: false,
+    },
+    Decimal: {
+        FractionDigits: 2,
+        FractionSeparator: '.',
+        IntegerDigits: undefined,
+        IntegerSeparator: ',',
+        Prefix: '',
+        Suffix: '',
+        Multiplier: 1,
+        Parentheses: false,
+    },
+    Accounting: {
+        FractionDigits: 2,
+        FractionSeparator: '.',
+        IntegerDigits: undefined,
+        IntegerSeparator: ',',
+        Prefix: '',
+        Suffix: '',
+        Multiplier: 1,
+        Parentheses: true,
+    },
+    FXRate: {
+        FractionDigits: 4,
+        FractionSeparator: '.',
+        IntegerDigits: undefined,
+        IntegerSeparator: '',
+        Prefix: '',
+        Suffix: '',
+        Multiplier: 1,
+        Parentheses: false,
+    },
+    Scientific: {
+        FractionDigits: 2,
+        FractionSeparator: '.',
+        IntegerDigits: undefined,
+        IntegerSeparator: undefined,
+        Prefix: '',
+        Suffix: '',
+        Multiplier: 1,
+        Parentheses: false,
+        Notation: 'scientific',
+    },
+};
+/**
+ * Type guard: `true` if the value is a known numeric preset name.
+ */
+const isAdaptableNumericFormatPreset = (value) => {
+    return typeof value === 'string' && value in exports.NUMERIC_FORMAT_PRESETS;
+};
+exports.isAdaptableNumericFormatPreset = isAdaptableNumericFormatPreset;
+/**
+ * Resolve a `DisplayFormat` (preset name or concrete object) into a
+ * concrete `AdaptableFormat`. Returns `undefined` if the input is
+ * `undefined`. A bare preset name is expanded into a `NumberFormatter`
+ * with the corresponding options.
+ */
+const resolveDisplayFormat = (displayFormat) => {
+    if (displayFormat == null) {
+        return undefined;
+    }
+    if ((0, exports.isAdaptableNumericFormatPreset)(displayFormat)) {
+        return {
+            Formatter: 'NumberFormatter',
+            Options: { ...exports.NUMERIC_FORMAT_PRESETS[displayFormat] },
+        };
+    }
+    return displayFormat;
+};
+exports.resolveDisplayFormat = resolveDisplayFormat;

package/src/AdaptableState/Common/Menu.d.ts

@@ -20,7 +20,7 @@ export declare const ADAPTABLE_COLUMN_MENU_ITEMS: readonly ["calculated-column-e
 /**
  * List of Shipped Adaptable Context Menu Items
  */
-export declare const ADAPTABLE_CONTEXT_MENU_ITEMS: readonly ["menu-group", "alert-clear", "bulk-update-apply", "calculated-column-edit", "cell-summary-show", "column-group", "column-filter-group", "column-filter-on-cell-value", "column-filter-clear", "column-filter-suspend", "column-filter-unsuspend", "column-info-show", "comment-add", "comment-remove", "dashboard-group", "dashboard-collapse", "dashboard-configure", "dashboard-dock", "dashboard-expand", "dashboard-float", "dashboard-hide", "dashboard-show", "data-import", "edit-group", "export-group", "export-all-data", "export-all-data-excel-download", "export-all-data-visualexcel-download", "export-all-data-csv", "export-all-data-csv-download", "export-all-data-csv-clipboard", "export-all-data-json", "export-all-data-json-download", "export-all-data-json-clipboard", "export-current-layout", "export-current-layout-excel-download", "export-current-layout-visualexcel-download", "export-current-layout-csv", "export-current-layout-csv-download", "export-current-layout-csv-clipboard", "export-current-layout-json", "export-current-layout-json-download", "export-current-layout-json-clipboard", "export-selected-data", "export-selected-data-excel-download", "export-selected-data-visualexcel-download", "export-selected-data-csv", "export-selected-data-csv-download", "export-selected-data-csv-clipboard", "export-selected-data-json", "export-selected-data-json-download", "export-selected-data-json-clipboard", "fdc3-broadcast", "fdc3-raise-intent", "flashing-cell-clear", "flashing-row-clear", "grid-group", "grid-info-show", "layout-aggregated-view", "layout-auto-size", "layout-clear-selection", "layout-edit", "layout-select-all", "note-add", "note-remove", "settings-panel-open", "smart-edit-apply", "system-status-show"];
+export declare const ADAPTABLE_CONTEXT_MENU_ITEMS: readonly ["menu-group", "alert-clear", "bulk-update-apply", "calculated-column-edit", "cell-summary-show", "column-group", "column-filter-group", "column-filter-on-cell-value", "column-filter-clear", "column-filter-suspend", "column-filter-unsuspend", "column-info-show", "comment-add", "comment-remove", "comment-show", "dashboard-group", "dashboard-collapse", "dashboard-configure", "dashboard-dock", "dashboard-expand", "dashboard-float", "dashboard-hide", "dashboard-show", "data-import", "edit-group", "export-group", "export-all-data", "export-all-data-excel-download", "export-all-data-visualexcel-download", "export-all-data-csv", "export-all-data-csv-download", "export-all-data-csv-clipboard", "export-all-data-json", "export-all-data-json-download", "export-all-data-json-clipboard", "export-current-layout", "export-current-layout-excel-download", "export-current-layout-visualexcel-download", "export-current-layout-csv", "export-current-layout-csv-download", "export-current-layout-csv-clipboard", "export-current-layout-json", "export-current-layout-json-download", "export-current-layout-json-clipboard", "export-selected-data", "export-selected-data-excel-download", "export-selected-data-visualexcel-download", "export-selected-data-csv", "export-selected-data-csv-download", "export-selected-data-csv-clipboard", "export-selected-data-json", "export-selected-data-json-download", "export-selected-data-json-clipboard", "fdc3-broadcast", "fdc3-raise-intent", "flashing-cell-clear", "flashing-row-clear", "grid-group", "grid-info-show", "layout-aggregated-view", "layout-auto-size", "layout-clear-selection", "layout-edit", "layout-select-all", "note-add", "note-remove", "note-show", "settings-panel-open", "smart-edit-apply", "system-status-show"];
 /**
  *  Menu item used by Adaptable in Context Menus
  */

package/src/AdaptableState/Common/Menu.js

@@ -74,6 +74,7 @@ exports.ADAPTABLE_CONTEXT_MENU_ITEMS = [
     'column-info-show',
     'comment-add',
     'comment-remove',
+    'comment-show',
     'dashboard-group',
     'dashboard-collapse',
     'dashboard-configure',
@@ -125,6 +126,7 @@ exports.ADAPTABLE_CONTEXT_MENU_ITEMS = [
     'layout-select-all',
     'note-add',
     'note-remove',
+    'note-show',
     'settings-panel-open',
     'smart-edit-apply',
     'system-status-show',

package/src/AdaptableState/FormatColumnState.d.ts

@@ -1,6 +1,6 @@
 import { BaseState } from './BaseState';
 import { AdaptableStyle } from './Common/AdaptableStyle';
-import { AdaptableFormat } from './Common/AdaptableFormat';
+import { DisplayFormat } from './Common/AdaptableFormatPresets';
 import { ColumnScope } from './Common/ColumnScope';
 import { RowScope } from './Common/RowScope';
 import { XOR } from '../Utilities/Extensions/TypeExtensions';
@@ -44,9 +44,12 @@ export interface FormatColumn extends SuspendableObject {
      */
     Style?: AdaptableStyle;
     /**
-     * Display Format to apply to Column can be Numeric, String or Date
+     * Display Format to apply to Column. Can be a concrete `AdaptableFormat`
+     * (Numeric, String or Date) **or** the name of a numeric preset such as
+     * `'Percentage'`, `'Thousand'`, `'Million'`, `'Dollar'`, `'Sterling'`,
+     * which is resolved at render time.
      */
-    DisplayFormat?: AdaptableFormat;
+    DisplayFormat?: DisplayFormat;
     /**
      * Which types of Rows to apply format (data, grouped, summary, total)
      */

package/src/Api/EventApi.d.ts

@@ -16,6 +16,12 @@ export interface EventApi {
      * @param callback
      */
     off(eventName: 'GridSorted', callback: (gridSortedInfo: GridSortedInfo) => void): void;
+    /**
+     * Event fired whenever a Grid Filter is applied in AdapTable
+     * @param eventName GridFilterApplied
+     * @param callback GridFilterAppliedInfo which provides details of the Grid Filter that was applied
+     * @returns the unsubscribe function
+     */
     on(eventName: 'GridFilterApplied', callback: (gridFilterAppliedInfo: GridFilterAppliedInfo) => void): VoidFunction;
     /**
      * Unsubscribe from GridFilterApplied
@@ -347,10 +353,4 @@ export interface EventApi {
      * @param callbackFdc3MessageInfo
      */
     off(eventName: 'Fdc3Message', callback: (fdc3MessageInfo: Fdc3MessageInfo) => void): void;
-    emitSync(eventName: 'BeforeAdaptableStateChange', data?: any): any[];
-    emitSync(eventName: 'DashboardChanged', data?: any): any[];
-    emitSync(eventName: 'FlashingCellDisplayed', data?: any): any[];
-    emitSync(eventName: 'AdaptableDestroy'): any[];
-    emit(eventName: 'RowFormSubmitted' | 'AdaptableReady' | 'AlertFired' | 'BeforeAdaptableStateChange' | 'AdaptableStateChanged' | 'AdaptableStateReloaded' | 'CellChanged' | 'ChartChanged' | 'CheckboxColumnClicked' | 'CustomToolbarConfigured' | 'DashboardChanged' | 'DataImported' | 'DataSetSelected' | 'ColumnFilterApplied' | 'Fdc3Message' | 'RowChanged' | 'GridSorted' | 'LayoutChanged' | 'CalculatedColumnChanged' | 'LiveDataChanged' | 'ScheduleTriggered' | 'SearchChanged' | 'CellSelectionChanged' | 'RowSelectionChanged' | 'SystemStatusMessageDisplayed' | 'TeamSharingEntityChanged' | 'ThemeChanged' | 'GridFilterApplied' | 'CommentChanged', data?: any): Promise<any>;
-    destroy(): void;
 }

package/src/Api/Implementation/EntitlementApiImpl.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.EntitlementApiImpl = void 0;
 const ApiBase_1 = require("./ApiBase");
 const EntitlementInternalApi_1 = require("../Internal/EntitlementInternalApi");
+const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 class EntitlementApiImpl extends ApiBase_1.ApiBase {
     internalApi;
     constructor(_adaptable) {
@@ -37,19 +38,19 @@ class EntitlementApiImpl extends ApiBase_1.ApiBase {
             // if still here then return their default Access Level
             return defaultAccessLevel;
         }
-        return 'Full';
+        return GeneralConstants_1.ACCESS_LEVEL_FULL;
     }
     isObjectReadonly(object) {
         return object.IsReadOnly;
     }
     isModuleHiddenEntitlement(adaptableModule) {
-        return this.getEntitlementAccessLevelForModule(adaptableModule) == 'Hidden';
+        return this.getEntitlementAccessLevelForModule(adaptableModule) == GeneralConstants_1.ACCESS_LEVEL_HIDDEN;
     }
     isModuleFullEntitlement(adaptableModule) {
-        return this.getEntitlementAccessLevelForModule(adaptableModule) == 'Full';
+        return this.getEntitlementAccessLevelForModule(adaptableModule) == GeneralConstants_1.ACCESS_LEVEL_FULL;
     }
     isModuleReadOnlyEntitlement(adaptableModule) {
-        return this.getEntitlementAccessLevelForModule(adaptableModule) == 'ReadOnly';
+        return this.getEntitlementAccessLevelForModule(adaptableModule) == GeneralConstants_1.ACCESS_LEVEL_READ_ONLY;
     }
 }
 exports.EntitlementApiImpl = EntitlementApiImpl;

package/src/Api/Implementation/FormatColumnApiImpl.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FormatColumnApiImpl = void 0;
 const tslib_1 = require("tslib");
+const AdaptableFormatPresets_1 = require("../../AdaptableState/Common/AdaptableFormatPresets");
 const FormatColumnRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/FormatColumnRedux"));
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/ArrayExtensions"));
@@ -34,7 +35,10 @@ class FormatColumnApiImpl extends ApiBase_1.ApiBase {
             return undefined;
         }
         const formatColumn = formatColumns.find((fc) => fc.DisplayFormat != undefined);
-        return formatColumn ? formatColumn.DisplayFormat : undefined;
+        // Resolve numeric preset names (e.g. 'Dollar') into the concrete
+        // AdaptableFormat object so external callers always receive a fully
+        // structured format.
+        return formatColumn ? (0, AdaptableFormatPresets_1.resolveDisplayFormat)(formatColumn.DisplayFormat) : undefined;
     }
     getSuspendedFormatColumns(config) {
         return this.getFormatColumns(config).filter((formatColumn) => formatColumn.IsSuspended);
@@ -104,10 +108,11 @@ class FormatColumnApiImpl extends ApiBase_1.ApiBase {
         return formatColumns.filter((fc) => this.getColumnScopeApi().scopeHasColumns(fc.Scope));
     }
     hasCustomDisplayFormatter(formatColumn) {
-        if (!formatColumn || !formatColumn.DisplayFormat || !formatColumn.DisplayFormat.Options) {
+        const resolved = (0, AdaptableFormatPresets_1.resolveDisplayFormat)(formatColumn?.DisplayFormat);
+        if (!resolved || !resolved.Options) {
             return false;
         }
-        const options = formatColumn.DisplayFormat.Options;
+        const options = resolved.Options;
         const columnCustomFormatters = options?.CustomDisplayFormats ?? [];
         if (!columnCustomFormatters?.length) {
             return false;

package/src/Api/Implementation/GridApiImpl.js

@@ -116,18 +116,7 @@ class GridApiImpl extends ApiBase_1.ApiBase {
         return transactionResult;
     }
     setCellValue(cellUpdateRequest) {
-        const abColumn = this.getColumnApi().getColumnWithColumnId(cellUpdateRequest.columnId);
-        if (!abColumn) {
-            this.logWarn(`setCellValue() - column not found for columnId: ${cellUpdateRequest.columnId}`);
-            return;
-        }
-        const rowNode = cellUpdateRequest.rowNode ?? this.getRowNodeForPrimaryKey(cellUpdateRequest.primaryKeyValue);
-        if (!rowNode) {
-            this.logWarn(`setCellValue() - rowNode not found for primaryKeyValue: ${cellUpdateRequest.primaryKeyValue}`);
-            return;
-        }
-        this._adaptable.setDataValue(cellUpdateRequest.newValue, abColumn, cellUpdateRequest.primaryKeyValue, rowNode);
-        this.refreshCell(rowNode, abColumn.columnId);
+        this._adaptable.updateCell(cellUpdateRequest);
     }
     setCellValues(cellUpdateRequests) {
         cellUpdateRequests?.forEach((cellUpdateRequest) => this.setCellValue(cellUpdateRequest));

package/src/Api/Internal/FormatColumnInternalApi.js

@@ -8,6 +8,7 @@ const FormatHelper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/
 const ObjectFactory_1 = tslib_1.__importDefault(require("../../Utilities/ObjectFactory"));
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 const AdaptableLogger_1 = require("../../agGrid/AdaptableLogger");
+const AdaptableFormatPresets_1 = require("../../AdaptableState/Common/AdaptableFormatPresets");
 function getParentGroup(source) {
     if (!source) {
         return undefined;
@@ -355,11 +356,12 @@ class FormatColumnInternalApi extends ApiBase_1.ApiBase {
         if (!mostRelevantFormatColumn) {
             return headerName;
         }
-        if (mostRelevantFormatColumn.DisplayFormat?.Formatter !== 'StringFormatter') {
+        const resolvedDisplayFormat = (0, AdaptableFormatPresets_1.resolveDisplayFormat)(mostRelevantFormatColumn.DisplayFormat);
+        if (resolvedDisplayFormat?.Formatter !== 'StringFormatter') {
             // headers are always strings, so we can only use StringFormatter
             return headerName;
         }
-        const formattedHeaderName = this.getFormatColumnApi().internalApi.getStringFormattedValue(headerName, null, abColumn, mostRelevantFormatColumn.DisplayFormat.Options);
+        const formattedHeaderName = this.getFormatColumnApi().internalApi.getStringFormattedValue(headerName, null, abColumn, resolvedDisplayFormat.Options);
         return formattedHeaderName;
     }
 }

package/src/Api/Internal/LayoutInternalApi.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LayoutInternalApi = void 0;
 const tslib_1 = require("tslib");
+const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 const ModuleConstants_1 = require("../../Utilities/Constants/ModuleConstants");
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/ArrayExtensions"));
 const ApiBase_1 = require("../Implementation/ApiBase");
@@ -47,10 +48,12 @@ class LayoutInternalApi extends ApiBase_1.ApiBase {
             layoutSupportedFeatures.ColumnFilters = false;
             layoutSupportedFeatures.GridFilter = false;
         }
-        if (this.getEntitlementApi().getEntitlementAccessLevelForModule(ModuleConstants_1.ColumnFilterModuleId) == 'Hidden') {
+        if (this.getEntitlementApi().getEntitlementAccessLevelForModule(ModuleConstants_1.ColumnFilterModuleId) ==
+            GeneralConstants_1.ACCESS_LEVEL_HIDDEN) {
             layoutSupportedFeatures.GridFilter = false;
         }
-        if (this.getEntitlementApi().getEntitlementAccessLevelForModule(ModuleConstants_1.GridFilterModuleId) == 'Hidden') {
+        if (this.getEntitlementApi().getEntitlementAccessLevelForModule(ModuleConstants_1.GridFilterModuleId) ==
+            GeneralConstants_1.ACCESS_LEVEL_HIDDEN) {
             layoutSupportedFeatures.GridFilter = false;
         }
         if (this._adaptable?.getAgGridRowModelType?.() !== 'clientSide') {

package/src/Redux/Store/AdaptableStore.js

@@ -1246,8 +1246,8 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                 case SmartEditRedux.SMART_EDIT_APPLY: {
                     const actionTyped = action;
                     let thePreview = middlewareAPI.getState().Internal.SmartEdit.SmartEditPreviewInfo;
-                    let newValues = PreviewHelper_1.PreviewHelper.GetCellUpdateRequestsFromPreview(thePreview, actionTyped.bypassValidationWarnings);
-                    adaptable.api.gridApi.setCellValues(newValues);
+                    let cellUpdateRequests = PreviewHelper_1.PreviewHelper.GetCellUpdateRequestsFromPreview(thePreview, actionTyped.bypassValidationWarnings);
+                    adaptable.api.gridApi.setCellValues(cellUpdateRequests);
                     adaptable.api.internalApi.hidePopupScreen();
                     return next(action);
                 }
@@ -1291,8 +1291,8 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                 case BulkUpdateRedux.BULK_UPDATE_APPLY: {
                     const actionTyped = action;
                     let thePreview = middlewareAPI.getState().Internal.BulkUpdate.BulkUpdatePreviewInfo;
-                    let newValues = PreviewHelper_1.PreviewHelper.GetCellUpdateRequestsFromPreview(thePreview, actionTyped.bypassValidationWarnings);
-                    adaptable.api.gridApi.setCellValues(newValues);
+                    let cellUpdateRequests = PreviewHelper_1.PreviewHelper.GetCellUpdateRequestsFromPreview(thePreview, actionTyped.bypassValidationWarnings);
+                    adaptable.api.gridApi.setCellValues(cellUpdateRequests);
                     adaptable.api.internalApi.hidePopupScreen();
                     return next(action);
                 }

package/src/Strategy/AdaptableModuleBase.js

@@ -4,6 +4,7 @@ exports.AdaptableModuleBase = void 0;
 const tslib_1 = require("tslib");
 const MenuItem_1 = require("../Utilities/MenuItem");
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/ArrayExtensions"));
+const GeneralConstants_1 = require("../Utilities/Constants/GeneralConstants");
 /**
  * Base class for all strategies and does most of the work of creating menus
  */
@@ -35,11 +36,11 @@ class AdaptableModuleBase {
     }
     getViewAccessLevel() {
         // override where necessary (ex. only 'Full' accessLevel should be displayed)
-        return 'ReadOnly';
+        return GeneralConstants_1.ACCESS_LEVEL_READ_ONLY;
     }
     getEditAccessLevel() {
         // override where necessary
-        return 'Full';
+        return GeneralConstants_1.ACCESS_LEVEL_FULL;
     }
     getAgGridModuleDependencies() {
         // override where necessary
@@ -261,14 +262,14 @@ class AdaptableModuleBase {
         return returnValue;
     }
     hasRequiredAccessLevel(requiredAccessLevel) {
-        if (this.AccessLevel === 'Hidden') {
+        if (this.AccessLevel === GeneralConstants_1.ACCESS_LEVEL_HIDDEN) {
             return false;
         }
-        if (requiredAccessLevel === 'ReadOnly') {
-            return this.AccessLevel === 'ReadOnly' || this.AccessLevel === 'Full';
+        if (requiredAccessLevel === GeneralConstants_1.ACCESS_LEVEL_READ_ONLY) {
+            return (this.AccessLevel === GeneralConstants_1.ACCESS_LEVEL_READ_ONLY || this.AccessLevel === GeneralConstants_1.ACCESS_LEVEL_FULL);
         }
-        if (requiredAccessLevel === 'Full') {
-            return this.AccessLevel === 'Full';
+        if (requiredAccessLevel === GeneralConstants_1.ACCESS_LEVEL_FULL) {
+            return this.AccessLevel === GeneralConstants_1.ACCESS_LEVEL_FULL;
         }
         // else requiredAccessLevel === 'Hidden' -- does NOT make sense unless a Module is programmatically disabled
         return false;

package/src/Strategy/AlertModule.d.ts

@@ -19,7 +19,7 @@ export declare class AlertModule extends AdaptableModuleBase implements ICellDat
     getModuleAdaptableObjects(config?: LayoutExtendedConfig): AdaptableObject[];
     getExplicitlyReferencedColumnIds(alertDefinition: AlertDefinition): string[];
     getReferencedNamedQueryNames(alertDefinition: AlertDefinition): string[];
-    createContextMenuItems(menuContext: ContextMenuContext): MenuItemShowPopup<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "grid-group" | "grid-info-show" | "layout-edit" | "settings-panel-open" | "system-status-show" | "menu-group" | "alert-clear" | "bulk-update-apply" | "column-filter-on-cell-value" | "comment-add" | "comment-remove" | "edit-group" | "export-group" | "export-all-data" | "export-all-data-excel-download" | "export-all-data-visualexcel-download" | "export-all-data-csv" | "export-all-data-csv-download" | "export-all-data-csv-clipboard" | "export-all-data-json" | "export-all-data-json-download" | "export-all-data-json-clipboard" | "export-current-layout" | "export-current-layout-excel-download" | "export-current-layout-visualexcel-download" | "export-current-layout-csv" | "export-current-layout-csv-download" | "export-current-layout-csv-clipboard" | "export-current-layout-json" | "export-current-layout-json-download" | "export-current-layout-json-clipboard" | "export-selected-data" | "export-selected-data-excel-download" | "export-selected-data-visualexcel-download" | "export-selected-data-csv" | "export-selected-data-csv-download" | "export-selected-data-csv-clipboard" | "export-selected-data-json" | "export-selected-data-json-download" | "export-selected-data-json-clipboard" | "fdc3-broadcast" | "fdc3-raise-intent" | "flashing-cell-clear" | "flashing-row-clear" | "layout-aggregated-view" | "layout-auto-size" | "layout-clear-selection" | "layout-select-all" | "note-add" | "note-remove" | "smart-edit-apply">[];
+    createContextMenuItems(menuContext: ContextMenuContext): MenuItemShowPopup<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "grid-group" | "grid-info-show" | "layout-edit" | "settings-panel-open" | "system-status-show" | "menu-group" | "alert-clear" | "bulk-update-apply" | "column-filter-on-cell-value" | "comment-add" | "comment-remove" | "comment-show" | "edit-group" | "export-group" | "export-all-data" | "export-all-data-excel-download" | "export-all-data-visualexcel-download" | "export-all-data-csv" | "export-all-data-csv-download" | "export-all-data-csv-clipboard" | "export-all-data-json" | "export-all-data-json-download" | "export-all-data-json-clipboard" | "export-current-layout" | "export-current-layout-excel-download" | "export-current-layout-visualexcel-download" | "export-current-layout-csv" | "export-current-layout-csv-download" | "export-current-layout-csv-clipboard" | "export-current-layout-json" | "export-current-layout-json-download" | "export-current-layout-json-clipboard" | "export-selected-data" | "export-selected-data-excel-download" | "export-selected-data-visualexcel-download" | "export-selected-data-csv" | "export-selected-data-csv-download" | "export-selected-data-csv-clipboard" | "export-selected-data-json" | "export-selected-data-json-download" | "export-selected-data-json-clipboard" | "fdc3-broadcast" | "fdc3-raise-intent" | "flashing-cell-clear" | "flashing-row-clear" | "layout-aggregated-view" | "layout-auto-size" | "layout-clear-selection" | "layout-select-all" | "note-add" | "note-remove" | "note-show" | "smart-edit-apply">[];
     private handleCellDataChanged;
     private handleRowDataChanged;
     private handleReactiveAlertTriggered;

package/src/Strategy/BulkUpdateModule.d.ts

@@ -7,7 +7,7 @@ import { AccessLevel, AdaptableApi } from '../types';
 export declare class BulkUpdateModule extends AdaptableModuleBase implements IBulkUpdateModule {
     constructor(api: AdaptableApi);
     getViewAccessLevel(): AccessLevel;
-    createContextMenuItems(menuContext: ContextMenuContext): MenuItemShowPopup<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "grid-group" | "grid-info-show" | "layout-edit" | "settings-panel-open" | "system-status-show" | "menu-group" | "alert-clear" | "bulk-update-apply" | "column-filter-on-cell-value" | "comment-add" | "comment-remove" | "edit-group" | "export-group" | "export-all-data" | "export-all-data-excel-download" | "export-all-data-visualexcel-download" | "export-all-data-csv" | "export-all-data-csv-download" | "export-all-data-csv-clipboard" | "export-all-data-json" | "export-all-data-json-download" | "export-all-data-json-clipboard" | "export-current-layout" | "export-current-layout-excel-download" | "export-current-layout-visualexcel-download" | "export-current-layout-csv" | "export-current-layout-csv-download" | "export-current-layout-csv-clipboard" | "export-current-layout-json" | "export-current-layout-json-download" | "export-current-layout-json-clipboard" | "export-selected-data" | "export-selected-data-excel-download" | "export-selected-data-visualexcel-download" | "export-selected-data-csv" | "export-selected-data-csv-download" | "export-selected-data-csv-clipboard" | "export-selected-data-json" | "export-selected-data-json-download" | "export-selected-data-json-clipboard" | "fdc3-broadcast" | "fdc3-raise-intent" | "flashing-cell-clear" | "flashing-row-clear" | "layout-aggregated-view" | "layout-auto-size" | "layout-clear-selection" | "layout-select-all" | "note-add" | "note-remove" | "smart-edit-apply">[];
+    createContextMenuItems(menuContext: ContextMenuContext): MenuItemShowPopup<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "grid-group" | "grid-info-show" | "layout-edit" | "settings-panel-open" | "system-status-show" | "menu-group" | "alert-clear" | "bulk-update-apply" | "column-filter-on-cell-value" | "comment-add" | "comment-remove" | "comment-show" | "edit-group" | "export-group" | "export-all-data" | "export-all-data-excel-download" | "export-all-data-visualexcel-download" | "export-all-data-csv" | "export-all-data-csv-download" | "export-all-data-csv-clipboard" | "export-all-data-json" | "export-all-data-json-download" | "export-all-data-json-clipboard" | "export-current-layout" | "export-current-layout-excel-download" | "export-current-layout-visualexcel-download" | "export-current-layout-csv" | "export-current-layout-csv-download" | "export-current-layout-csv-clipboard" | "export-current-layout-json" | "export-current-layout-json-download" | "export-current-layout-json-clipboard" | "export-selected-data" | "export-selected-data-excel-download" | "export-selected-data-visualexcel-download" | "export-selected-data-csv" | "export-selected-data-csv-download" | "export-selected-data-csv-clipboard" | "export-selected-data-json" | "export-selected-data-json-download" | "export-selected-data-json-clipboard" | "fdc3-broadcast" | "fdc3-raise-intent" | "flashing-cell-clear" | "flashing-row-clear" | "layout-aggregated-view" | "layout-auto-size" | "layout-clear-selection" | "layout-select-all" | "note-add" | "note-remove" | "note-show" | "smart-edit-apply">[];
     checkCorrectCellSelection(): BulkUpdateValidationResult;
     buildPreviewValues(bulkUpdateValue: any): PreviewInfo;
 }

package/src/Strategy/BulkUpdateModule.js

@@ -8,12 +8,13 @@ const PreviewHelper_1 = require("../Utilities/Helpers/PreviewHelper");
 const StringExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/StringExtensions"));
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/ArrayExtensions"));
 const ObjectFactory_1 = tslib_1.__importDefault(require("../Utilities/ObjectFactory"));
+const GeneralConstants_1 = require("../Utilities/Constants/GeneralConstants");
 class BulkUpdateModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.BulkUpdateModuleId, ModuleConstants.BulkUpdateFriendlyName, 'edit-table', 'BulkUpdatePopup', 'Update multiple cell simultaneously with a new or existing value', api);
     }
     getViewAccessLevel() {
-        return 'Full';
+        return GeneralConstants_1.ACCESS_LEVEL_FULL;
     }
     createContextMenuItems(menuContext) {
         let menuItemShowPopup = undefined;

package/src/Strategy/CalculatedColumnModule.d.ts

@@ -21,7 +21,7 @@ export declare class CalculatedColumnModule extends AdaptableModuleBase implemen
     getExplicitlyReferencedColumnIds(calculatedColumn: CalculatedColumn): string[];
     getReferencedNamedQueryNames(calculatedColumn: CalculatedColumn): string[];
     createColumnMenuItems(column: AdaptableColumn): import("../Utilities/MenuItem").MenuItemShowPopup<"separator" | "calculated-column-edit" | "cell-summary-show" | "chart-show" | "column-group" | "column-filter-group" | "column-filter-bar-hide" | "column-filter-bar-show" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "custom-sort-add" | "custom-sort-edit" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "flashing-cell-add" | "flashing-cell-delete" | "format-column-add" | "format-column-edit" | "free-text-column-edit" | "grid-group" | "grid-info-show" | "layout-column-caption-change" | "layout-column-hide" | "layout-edit" | "layout-column-select" | "layout-column-select-preserve" | "layout-column-select-reset" | "layout-grid-select" | "plus-minus-add" | "settings-panel-open" | "styling-group" | "styled-column-badge-add" | "styled-column-badge-edit" | "styled-column-gradient-add" | "styled-column-gradient-edit" | "styled-column-percent-bar-add" | "styled-column-percent-bar-edit" | "styled-column-sparkline-add" | "styled-column-sparkline-edit" | "system-status-show" | "_navbar">[];
-    createContextMenuItems(menuContext: ContextMenuContext): import("../Utilities/MenuItem").MenuItemShowPopup<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "grid-group" | "grid-info-show" | "layout-edit" | "settings-panel-open" | "system-status-show" | "menu-group" | "alert-clear" | "bulk-update-apply" | "column-filter-on-cell-value" | "comment-add" | "comment-remove" | "edit-group" | "export-group" | "export-all-data" | "export-all-data-excel-download" | "export-all-data-visualexcel-download" | "export-all-data-csv" | "export-all-data-csv-download" | "export-all-data-csv-clipboard" | "export-all-data-json" | "export-all-data-json-download" | "export-all-data-json-clipboard" | "export-current-layout" | "export-current-layout-excel-download" | "export-current-layout-visualexcel-download" | "export-current-layout-csv" | "export-current-layout-csv-download" | "export-current-layout-csv-clipboard" | "export-current-layout-json" | "export-current-layout-json-download" | "export-current-layout-json-clipboard" | "export-selected-data" | "export-selected-data-excel-download" | "export-selected-data-visualexcel-download" | "export-selected-data-csv" | "export-selected-data-csv-download" | "export-selected-data-csv-clipboard" | "export-selected-data-json" | "export-selected-data-json-download" | "export-selected-data-json-clipboard" | "fdc3-broadcast" | "fdc3-raise-intent" | "flashing-cell-clear" | "flashing-row-clear" | "layout-aggregated-view" | "layout-auto-size" | "layout-clear-selection" | "layout-select-all" | "note-add" | "note-remove" | "smart-edit-apply">[];
+    createContextMenuItems(menuContext: ContextMenuContext): import("../Utilities/MenuItem").MenuItemShowPopup<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "grid-group" | "grid-info-show" | "layout-edit" | "settings-panel-open" | "system-status-show" | "menu-group" | "alert-clear" | "bulk-update-apply" | "column-filter-on-cell-value" | "comment-add" | "comment-remove" | "comment-show" | "edit-group" | "export-group" | "export-all-data" | "export-all-data-excel-download" | "export-all-data-visualexcel-download" | "export-all-data-csv" | "export-all-data-csv-download" | "export-all-data-csv-clipboard" | "export-all-data-json" | "export-all-data-json-download" | "export-all-data-json-clipboard" | "export-current-layout" | "export-current-layout-excel-download" | "export-current-layout-visualexcel-download" | "export-current-layout-csv" | "export-current-layout-csv-download" | "export-current-layout-csv-clipboard" | "export-current-layout-json" | "export-current-layout-json-download" | "export-current-layout-json-clipboard" | "export-selected-data" | "export-selected-data-excel-download" | "export-selected-data-visualexcel-download" | "export-selected-data-csv" | "export-selected-data-csv-download" | "export-selected-data-csv-clipboard" | "export-selected-data-json" | "export-selected-data-json-download" | "export-selected-data-json-clipboard" | "fdc3-broadcast" | "fdc3-raise-intent" | "flashing-cell-clear" | "flashing-row-clear" | "layout-aggregated-view" | "layout-auto-size" | "layout-clear-selection" | "layout-select-all" | "note-add" | "note-remove" | "note-show" | "smart-edit-apply">[];
     getTeamSharingAction(): TeamSharingImportInfo<CalculatedColumn>;
     toView(calculateColumn: CalculatedColumn): {
         items: AdaptableObjectItemView[];

package/src/Strategy/CellSummaryModule.d.ts

@@ -22,7 +22,7 @@ export declare class CellSummaryModule extends AdaptableModuleBase implements IC
     getModuleUnavailableMessage(): string | undefined;
     getViewAccessLevel(): AccessLevel;
     createColumnMenuItems(column: AdaptableColumn): import("../Utilities/MenuItem").MenuItemShowPopup<"separator" | "calculated-column-edit" | "cell-summary-show" | "chart-show" | "column-group" | "column-filter-group" | "column-filter-bar-hide" | "column-filter-bar-show" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "custom-sort-add" | "custom-sort-edit" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "flashing-cell-add" | "flashing-cell-delete" | "format-column-add" | "format-column-edit" | "free-text-column-edit" | "grid-group" | "grid-info-show" | "layout-column-caption-change" | "layout-column-hide" | "layout-edit" | "layout-column-select" | "layout-column-select-preserve" | "layout-column-select-reset" | "layout-grid-select" | "plus-minus-add" | "settings-panel-open" | "styling-group" | "styled-column-badge-add" | "styled-column-badge-edit" | "styled-column-gradient-add" | "styled-column-gradient-edit" | "styled-column-percent-bar-add" | "styled-column-percent-bar-edit" | "styled-column-sparkline-add" | "styled-column-sparkline-edit" | "system-status-show" | "_navbar">[];
-    createContextMenuItems(menuContext: ContextMenuContext): import("../Utilities/MenuItem").MenuItemShowPopup<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "grid-group" | "grid-info-show" | "layout-edit" | "settings-panel-open" | "system-status-show" | "menu-group" | "alert-clear" | "bulk-update-apply" | "column-filter-on-cell-value" | "comment-add" | "comment-remove" | "edit-group" | "export-group" | "export-all-data" | "export-all-data-excel-download" | "export-all-data-visualexcel-download" | "export-all-data-csv" | "export-all-data-csv-download" | "export-all-data-csv-clipboard" | "export-all-data-json" | "export-all-data-json-download" | "export-all-data-json-clipboard" | "export-current-layout" | "export-current-layout-excel-download" | "export-current-layout-visualexcel-download" | "export-current-layout-csv" | "export-current-layout-csv-download" | "export-current-layout-csv-clipboard" | "export-current-layout-json" | "export-current-layout-json-download" | "export-current-layout-json-clipboard" | "export-selected-data" | "export-selected-data-excel-download" | "export-selected-data-visualexcel-download" | "export-selected-data-csv" | "export-selected-data-csv-download" | "export-selected-data-csv-clipboard" | "export-selected-data-json" | "export-selected-data-json-download" | "export-selected-data-json-clipboard" | "fdc3-broadcast" | "fdc3-raise-intent" | "flashing-cell-clear" | "flashing-row-clear" | "layout-aggregated-view" | "layout-auto-size" | "layout-clear-selection" | "layout-select-all" | "note-add" | "note-remove" | "smart-edit-apply">[];
+    createContextMenuItems(menuContext: ContextMenuContext): import("../Utilities/MenuItem").MenuItemShowPopup<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "grid-group" | "grid-info-show" | "layout-edit" | "settings-panel-open" | "system-status-show" | "menu-group" | "alert-clear" | "bulk-update-apply" | "column-filter-on-cell-value" | "comment-add" | "comment-remove" | "comment-show" | "edit-group" | "export-group" | "export-all-data" | "export-all-data-excel-download" | "export-all-data-visualexcel-download" | "export-all-data-csv" | "export-all-data-csv-download" | "export-all-data-csv-clipboard" | "export-all-data-json" | "export-all-data-json-download" | "export-all-data-json-clipboard" | "export-current-layout" | "export-current-layout-excel-download" | "export-current-layout-visualexcel-download" | "export-current-layout-csv" | "export-current-layout-csv-download" | "export-current-layout-csv-clipboard" | "export-current-layout-json" | "export-current-layout-json-download" | "export-current-layout-json-clipboard" | "export-selected-data" | "export-selected-data-excel-download" | "export-selected-data-visualexcel-download" | "export-selected-data-csv" | "export-selected-data-csv-download" | "export-selected-data-csv-clipboard" | "export-selected-data-json" | "export-selected-data-json-download" | "export-selected-data-json-clipboard" | "fdc3-broadcast" | "fdc3-raise-intent" | "flashing-cell-clear" | "flashing-row-clear" | "layout-aggregated-view" | "layout-auto-size" | "layout-clear-selection" | "layout-select-all" | "note-add" | "note-remove" | "note-show" | "smart-edit-apply">[];
     createCellSummaryInfo(selectedCellInfo: SelectedCellInfo): CellSummmaryInfo;
     private getNumberFormatOptions;
     private formatValue;

package/src/Strategy/CellSummaryModule.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CellSummaryModule = void 0;
 const tslib_1 = require("tslib");
+const GeneralConstants_1 = require("../Utilities/Constants/GeneralConstants");
 const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
 const ArrayExtensions_1 = require("../Utilities/Extensions/ArrayExtensions");
 const ObjectFactory_1 = tslib_1.__importDefault(require("../Utilities/ObjectFactory"));
@@ -30,7 +31,7 @@ class CellSummaryModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return undefined;
     }
     getViewAccessLevel() {
-        return 'Full';
+        return GeneralConstants_1.ACCESS_LEVEL_FULL;
     }
     createColumnMenuItems(column) {
         if (!this.isModuleVisible()) {

package/src/Strategy/ColumnFilterModule.js

@@ -7,6 +7,7 @@ const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/Mod
 const LayoutRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/LayoutRedux"));
 const InternalRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/InternalRedux"));
 const FilterStatusBarSubPanelPopover_1 = require("../View/Filter/FilterStatusBarSubPanelPopover");
+const GeneralConstants_1 = require("../Utilities/Constants/GeneralConstants");
 const getLayoutFilterViewItems_1 = require("./Utilities/Layout/getLayoutFilterViewItems");
 class ColumnFilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
@@ -29,8 +30,11 @@ class ColumnFilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             .getDataService()
             .on('CellDataChanged', (cellDataChangedInfo) => {
             if (!cellDataChangedInfo.preventEdit) {
-                const changedColumnId = cellDataChangedInfo.column.columnId;
-                this.api.filterApi.columnFilterApi.resetFilterValues(changedColumnId);
+                const changedColumn = cellDataChangedInfo.column;
+                if (!changedColumn.filterable) {
+                    return;
+                }
+                this.api.filterApi.columnFilterApi.resetFilterValues(changedColumn.columnId);
             }
         });
         // we reset the filter cache on sort change, because we might have columns
@@ -53,7 +57,7 @@ class ColumnFilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     setModuleEntitlement() {
         if (!this.api.optionsApi.getFilterOptions().useAdaptableFiltering) {
-            this.AccessLevel = 'Hidden';
+            this.AccessLevel = GeneralConstants_1.ACCESS_LEVEL_HIDDEN;
         }
         else {
             this.AccessLevel = this.api.entitlementApi.getEntitlementAccessLevelForModule(this.moduleInfo.ModuleName);