@adaptabletools/adaptable 16.2.4 → 17.0.0-canary.0

package/src/agGrid/Adaptable.js

@@ -1,74 +1,70 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AdaptableNoCodeWizard = exports.Adaptable = void 0;
-const tslib_1 = require("tslib");
-const core_1 = require("@ag-grid-community/core");
-const merge_1 = tslib_1.__importDefault(require("lodash/merge"));
-const debounce_1 = tslib_1.__importDefault(require("lodash/debounce"));
-const isEqual_1 = tslib_1.__importDefault(require("lodash/isEqual"));
-const throttle_1 = tslib_1.__importDefault(require("lodash/throttle"));
-const uniqBy_1 = tslib_1.__importDefault(require("lodash/uniqBy"));
-const React = tslib_1.__importStar(require("react"));
-const clamp_1 = tslib_1.__importDefault(require("lodash/clamp"));
-const AdaptableApiImpl_1 = require("../Api/Implementation/AdaptableApiImpl");
-const Enums_1 = require("../PredefinedConfig/Common/Enums");
-const Uuid_1 = require("../PredefinedConfig/Uuid");
-const AdaptableStore_1 = require("../Redux/Store/AdaptableStore");
-const GeneralConstants = tslib_1.__importStar(require("../Utilities/Constants/GeneralConstants"));
-const GeneralConstants_1 = require("../Utilities/Constants/GeneralConstants");
-const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
-const ModuleConstants_1 = require("../Utilities/Constants/ModuleConstants");
-const DefaultAdaptableOptions_1 = require("../Utilities/Defaults/DefaultAdaptableOptions");
-const Emitter_1 = tslib_1.__importDefault(require("../Utilities/Emitter"));
-const ArrayExtensions_1 = require("../Utilities/Extensions/ArrayExtensions");
-const StringExtensions_1 = require("../Utilities/Extensions/StringExtensions");
-const getScrollbarSize_1 = tslib_1.__importDefault(require("../Utilities/getScrollbarSize"));
-const AdaptableHelper_1 = tslib_1.__importDefault(require("../Utilities/Helpers/AdaptableHelper"));
-const Helper_1 = require("../Utilities/Helpers/Helper");
-const ObjectFactory_1 = require("../Utilities/ObjectFactory");
+import { CssClassManager, Events, Grid, GridApi, ModuleNames, ModuleRegistry, RowNode, } from '@ag-grid-community/core';
+import merge from 'lodash/merge';
+import debounce from 'lodash/debounce';
+import lodashIsEqual from 'lodash/isEqual';
+import throttle from 'lodash/throttle';
+import uniqBy from 'lodash/uniqBy';
+import * as React from 'react';
+import clamp from 'lodash/clamp';
+import { AdaptableApiImpl } from '../Api/Implementation/AdaptableApiImpl';
+import { FilterOnDataChangeOptions } from '../PredefinedConfig/Common/Enums';
+import { createUuid } from '../PredefinedConfig/Uuid';
+import { AdaptableStore, INIT_STATE } from '../Redux/Store/AdaptableStore';
+import * as GeneralConstants from '../Utilities/Constants/GeneralConstants';
+import { AB_SPECIAL_COLUMN, ADAPTABLE_ROW_ACTION_BUTTONS, AUTOGENERATED_PK_COLUMN, BLANK_DISTINCT_COLUMN_VALUE, DARK_THEME, HALF_SECOND, LIGHT_THEME, } from '../Utilities/Constants/GeneralConstants';
+import * as ModuleConstants from '../Utilities/Constants/ModuleConstants';
+import { NamedQueryModuleId } from '../Utilities/Constants/ModuleConstants';
+import { DefaultAdaptableOptions } from '../Utilities/Defaults/DefaultAdaptableOptions';
+import Emitter from '../Utilities/Emitter';
+import { ArrayExtensions } from '../Utilities/Extensions/ArrayExtensions';
+import { StringExtensions } from '../Utilities/Extensions/StringExtensions';
+import getScrollbarSize from '../Utilities/getScrollbarSize';
+import AdaptableHelper from '../Utilities/Helpers/AdaptableHelper';
+import { Helper } from '../Utilities/Helpers/Helper';
+import { createBaseContext, CreateEmptyCalculatedColumn, CreateEmptyFreeTextColumn, } from '../Utilities/ObjectFactory';
 // services
-const CalculatedColumnExpressionService_1 = require("../Utilities/Services/CalculatedColumnExpressionService");
-const DataService_1 = require("../Utilities/Services/DataService");
-const LicenseService_1 = require("../Utilities/Services/LicenseService");
-const TeamSharingService_1 = require("../Utilities/Services/TeamSharingService");
-const ReportService_1 = require("../Utilities/Services/ReportService");
-const ModuleService_1 = require("../Utilities/Services/ModuleService");
-const ValidationService_1 = require("../Utilities/Services/ValidationService");
-const EntitlementService_1 = require("../Utilities/Services/EntitlementService");
-const QueryLanguageService_1 = require("../Utilities/Services/QueryLanguageService");
-const AlertService_1 = require("../Utilities/Services/AlertService");
-const AdaptableView_1 = require("../View/AdaptableView");
-const AdaptableWizardView_1 = tslib_1.__importDefault(require("../View/AdaptableWizardView"));
-const AdaptableToolPanel_1 = require("../View/Components/ToolPanel/AdaptableToolPanel");
-const UIHelper_1 = tslib_1.__importDefault(require("../View/UIHelper"));
-const ActionColumnRenderer_1 = require("./ActionColumnRenderer");
-const agGridHelper_1 = require("./agGridHelper");
-const agGridMenuHelper_1 = require("./agGridMenuHelper");
+import { CalculatedColumnExpressionService } from '../Utilities/Services/CalculatedColumnExpressionService';
+import { DataService } from '../Utilities/Services/DataService';
+import { LicenseService } from '../Utilities/Services/LicenseService';
+import { TeamSharingService } from '../Utilities/Services/TeamSharingService';
+import { ReportService } from '../Utilities/Services/ReportService';
+import { ModuleService } from '../Utilities/Services/ModuleService';
+import { ValidationService } from '../Utilities/Services/ValidationService';
+import { EntitlementService } from '../Utilities/Services/EntitlementService';
+import { QueryLanguageService } from '../Utilities/Services/QueryLanguageService';
+import { AlertService } from '../Utilities/Services/AlertService';
+import { AdaptableApp } from '../View/AdaptableView';
+import AdaptableWizardView from '../View/AdaptableWizardView';
+import { getAdaptableToolPanelAgGridComponent } from '../View/Components/ToolPanel/AdaptableToolPanel';
+import UIHelper from '../View/UIHelper';
+import { ActionColumnRenderer, ReactActionColumnRenderer } from './ActionColumnRenderer';
+import { agGridHelper } from './agGridHelper';
+import { agGridMenuHelper } from './agGridMenuHelper';
 // components
-const FilterWrapper_1 = require("./FilterWrapper");
-const FloatingFilterWrapper_1 = require("./FloatingFilterWrapper");
-const StyleHelper_1 = require("../Utilities/Helpers/StyleHelper");
-const AdaptableNumberEditor_1 = require("./editors/AdaptableNumberEditor");
-const AdaptableDateEditor_1 = require("./editors/AdaptableDateEditor");
-const waitForCondition_1 = require("../Utilities/waitForCondition");
-const publishTimestamp_1 = tslib_1.__importDefault(require("../../publishTimestamp"));
-const MetamodelService_1 = require("../Utilities/Services/MetamodelService");
-const DocumentationLinkConstants_1 = require("../Utilities/Constants/DocumentationLinkConstants");
-const CheckboxRenderer_1 = require("./CheckboxRenderer");
-const DateHelper_1 = require("../Utilities/Helpers/DateHelper");
-const StatusBarState_1 = require("../PredefinedConfig/StatusBarState");
-const createAgStatusPanelComponent_1 = require("./createAgStatusPanelComponent");
-const AdaptableStatusBar_1 = require("../View/StatusBar/AdaptableStatusBar");
-const RowEditService_1 = require("../Utilities/Services/RowEditService");
-const weightedAverage_1 = require("./weightedAverage");
-const AggregationColumns_1 = require("../PredefinedConfig/Common/AggregationColumns");
-const renderReactRoot_1 = require("../renderReactRoot");
-const ChartingService_1 = require("../Utilities/Services/ChartingService");
-const ThemeService_1 = require("../Utilities/Services/ThemeService");
-const AdaptableLogger_1 = require("./AdaptableLogger");
-const attachAddaptableColumnTypes_1 = require("./attachAddaptableColumnTypes");
-const FormatHelper_1 = require("../Utilities/Helpers/FormatHelper");
-const Fdc3Service_1 = require("../Utilities/Services/Fdc3Service");
+import { FilterWrapperFactory } from './FilterWrapper';
+import { FloatingFilterWrapperFactory } from './FloatingFilterWrapper';
+import { convertAdaptableStyleToCSS, convertCSSAbsoluteFontSizeToPt, getVariableColor, normalizeStyleForAgGrid, sanitizeStyle, } from '../Utilities/Helpers/StyleHelper';
+import { AdaptableNumberEditor, ReactAdaptableNumberEditor } from './editors/AdaptableNumberEditor';
+import { AdaptableDateEditor, ReactAdaptableDateEditor } from './editors/AdaptableDateEditor';
+import { waitForCondition } from '../Utilities/waitForCondition';
+import publishTimestamp from '../../publishTimestamp';
+import { MetamodelService } from '../Utilities/Services/MetamodelService';
+import { AgGridModulesDocsLink, PrimaryKeyDocsLink, } from '../Utilities/Constants/DocumentationLinkConstants';
+import { CheckboxEditor } from './CheckboxRenderer';
+import { parseDateValue } from '../Utilities/Helpers/DateHelper';
+import { ADAPTABLE_STATUS_PANEL } from '../PredefinedConfig/StatusBarState';
+import { createAgStatusPanelComponent } from './createAgStatusPanelComponent';
+import { AdaptableStatusBar } from '../View/StatusBar/AdaptableStatusBar';
+import { RowEditService } from '../Utilities/Services/RowEditService';
+import { weightedAverage } from './weightedAverage';
+import { WEIGHTED_AVERAGE_AGG_FN_NAME, } from '../PredefinedConfig/Common/AggregationColumns';
+import { renderReactRoot as defaultRenderReactRoot } from '../renderReactRoot';
+import { ChartingService } from '../Utilities/Services/ChartingService';
+import { ThemeService } from '../Utilities/Services/ThemeService';
+import { AdaptableLogger } from './AdaptableLogger';
+import { attachColumnTypes } from './attachAddaptableColumnTypes';
+import { DateFormatter } from '../Utilities/Helpers/FormatHelper';
+import { Fdc3Service } from '../Utilities/Services/Fdc3Service';
 const tinycolor = require('tinycolor2');
 const GROUP_PATH_SEPARATOR = '/';
 // IMPORTANT - we need colId to be set in order for safeSetColDefs to work correctly
@@ -88,14 +84,14 @@ const assignColId = (colDef, logger) => {
         }
     }
 };
-const RowNodeProto = core_1.RowNode.prototype;
+const RowNodeProto = RowNode.prototype;
 const RowNode_dispatchLocalEvent = RowNodeProto.dispatchLocalEvent;
-const GridApi_setColumnDefs = core_1.GridApi.prototype.setColumnDefs;
+const GridApi_setColumnDefs = GridApi.prototype.setColumnDefs;
 ['addCssClass', 'removeCssClass', 'containsCssClass', 'addOrRemoveCssClass'].forEach((methodName) => {
     // @ts-ignore
-    const CssClassManager_originalMethod = core_1.CssClassManager.prototype[methodName];
+    const CssClassManager_originalMethod = CssClassManager.prototype[methodName];
     // @ts-ignore
-    core_1.CssClassManager.prototype[methodName] = function () {
+    CssClassManager.prototype[methodName] = function () {
         return this.getGui() ? CssClassManager_originalMethod.apply(this, arguments) : undefined;
     };
 });
@@ -112,7 +108,7 @@ RowNodeProto.dispatchLocalEvent = function (event) {
         // starting with AG Grid 26.1.0 the gridApi is wrapped in a Beans property
         const rowNodeApi = (_a = rowNode === null || rowNode === void 0 ? void 0 : rowNode.beans) === null || _a === void 0 ? void 0 : _a.gridApi;
         if (!rowNodeApi) {
-            AdaptableLogger_1.AdaptableLogger.consoleErrorBase(`No GridAPI found in passed RowNode, this should never happen!`, rowNode);
+            AdaptableLogger.consoleErrorBase(`No GridAPI found in passed RowNode, this should never happen!`, rowNode);
         }
         return rowNodeApi;
     };
@@ -151,7 +147,7 @@ const forEachColumn = (cols, fn, parentColGroup) => {
     });
 };
 const adaptableInstances = {};
-class Adaptable {
+export class Adaptable {
     constructor() {
         this.variant = 'vanilla';
         this.colDefPropertyCache = new Map();
@@ -185,7 +181,7 @@ class Adaptable {
         this._adaptableReady = false;
         this.isDestroyed = false;
         this.supressReact18RenderWarning = false;
-        this.renderReactRoot = (node, container) => (0, renderReactRoot_1.renderReactRoot)(node, container, this.supressReact18RenderWarning);
+        this.renderReactRoot = (node, container) => defaultRenderReactRoot(node, container, this.supressReact18RenderWarning);
         this.isPluginLoaded = (pluginId) => {
             const plugins = this.adaptableOptions.plugins || [];
             for (let i = 0, len = plugins.length; i < len; i++) {
@@ -199,34 +195,34 @@ class Adaptable {
         this.isAgGridReady = () => {
             var _a, _b;
             const waitTimeout = (_b = (_a = this.adaptableOptions.containerOptions) === null || _a === void 0 ? void 0 : _a.agGridContainerWaitTimeout) !== null && _b !== void 0 ? _b : 60000;
-            return (0, waitForCondition_1.waitForCondition)(() => !!this.gridOptions.api, waitTimeout);
+            return waitForCondition(() => !!this.gridOptions.api, waitTimeout);
         };
         // debounced methods
-        this.debouncedSetColumnIntoStore = (0, debounce_1.default)(() => {
+        this.debouncedSetColumnIntoStore = debounce(() => {
             if (this.isDestroyed || !this.gridOptions.api) {
                 return;
             }
             this.updateColumnsIntoStore();
-        }, GeneralConstants_1.HALF_SECOND);
-        this.debouncedSaveGridLayout = (0, debounce_1.default)(() => {
+        }, HALF_SECOND);
+        this.debouncedSaveGridLayout = debounce(() => {
             if (this.isDestroyed || !this.gridOptions.api) {
                 return;
             }
             this.updateLayoutFromGrid();
-        }, GeneralConstants_1.HALF_SECOND);
-        this.debouncedSetSelectedCells = (0, debounce_1.default)(() => {
+        }, HALF_SECOND);
+        this.debouncedSetSelectedCells = debounce(() => {
             if (this.isDestroyed || !this.gridOptions.api) {
                 return;
             }
             this.setSelectedCells();
         }, 250);
-        this.debouncedSetSelectedRows = (0, debounce_1.default)(() => {
+        this.debouncedSetSelectedRows = debounce(() => {
             if (this.isDestroyed || !this.gridOptions.api) {
                 return;
             }
             this.setSelectedRows();
-        }, GeneralConstants_1.HALF_SECOND);
-        this.debouncedFilterGrid = (0, debounce_1.default)((callback = () => { }) => {
+        }, HALF_SECOND);
+        this.debouncedFilterGrid = debounce((callback = () => { }) => {
             if (this.isDestroyed || !this.gridOptions.api) {
                 return;
             }
@@ -234,7 +230,7 @@ class Adaptable {
             if (callback) {
                 callback();
             }
-        }, GeneralConstants_1.HALF_SECOND);
+        }, HALF_SECOND);
         /**
          * This creates a clone of the current column definitions. If config.removeEmpty is true, will also remove empty column groups
          *
@@ -286,7 +282,7 @@ class Adaptable {
     static init(adaptableOptions, agGridConfig) {
         var _a;
         if (!((_a = agGridConfig === null || agGridConfig === void 0 ? void 0 : agGridConfig.modules) === null || _a === void 0 ? void 0 : _a.length)) {
-            AdaptableLogger_1.AdaptableLogger.consoleErrorBase(`No AG Grid modules were provided, thus limiting AdapTables features significantly!\n\nRead further info here:${DocumentationLinkConstants_1.AgGridModulesDocsLink}`);
+            AdaptableLogger.consoleErrorBase(`No AG Grid modules were provided, thus limiting AdapTables features significantly!\n\nRead further info here:${AgGridModulesDocsLink}`);
         }
         return Adaptable.initInternal(adaptableOptions, Object.assign(Object.assign({}, agGridConfig), { supressReact18RenderWarning: true }));
     }
@@ -347,7 +343,7 @@ class Adaptable {
         }
     }
     static collectInstance(adaptable) {
-        adaptable._id = adaptable.adaptableOptions.adaptableId || (0, Uuid_1.createUuid)();
+        adaptable._id = adaptable.adaptableOptions.adaptableId || createUuid();
         adaptableInstances[adaptable._id] = adaptable;
     }
     static forEachAdaptable(fn) {
@@ -361,7 +357,7 @@ class Adaptable {
     // the 'old' constructor which takes an Adaptable adaptable object
     // this is still used internally but should not be used externally as a preference
     async init(adaptableOptions, runtimeConfig, _staticInit) {
-        this.logger = new AdaptableLogger_1.AdaptableLogger(adaptableOptions.adaptableId || String(Date.now()));
+        this.logger = new AdaptableLogger(adaptableOptions.adaptableId || String(Date.now()));
         const perfAdaptableInit = this.logger.beginPerf(`Adaptable init()`);
         this.supressReact18RenderWarning = !!runtimeConfig.supressReact18RenderWarning;
         if (runtimeConfig.renderReactRoot) {
@@ -393,18 +389,19 @@ class Adaptable {
 !!!!!!! Use const api = await Adaptable.init(adaptableOptions) instead.
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!`);
         }
-        this.emitter = new Emitter_1.default();
+        this.emitter = new Emitter();
         this.runtimeConfig = runtimeConfig;
         this.gridOptions = this.runtimeConfig.gridOptions;
+        this._rawAdaptableOptions = adaptableOptions;
         // we create AdaptableOptions by merging the values provided by the user with the defaults (where no value has been set)
-        this.adaptableOptions = AdaptableHelper_1.default.assignAdaptableOptions(adaptableOptions);
+        this.adaptableOptions = AdaptableHelper.assignAdaptableOptions(adaptableOptions);
         if (this.hasAutogeneratedPrimaryKey()) {
             this.logger
                 .warn(`Autogenerated primary key (adaptableOptions.autogeneratedPrimaryKey = TRUE) should be used only as a last resort,
       when no unique column is available, as it limits some Adaptable functionalities!
 
-      For more details see: ${DocumentationLinkConstants_1.PrimaryKeyDocsLink}`);
-            this.adaptableOptions.primaryKey = GeneralConstants_1.AUTOGENERATED_PK_COLUMN;
+      For more details see: ${PrimaryKeyDocsLink}`);
+            this.adaptableOptions.primaryKey = AUTOGENERATED_PK_COLUMN;
         }
         Adaptable.collectInstance(this);
         if (this.gridOptions.allowContextMenuWithControlKey === undefined) {
@@ -415,13 +412,13 @@ class Adaptable {
         this.forPlugins((plugin) => plugin.afterInitOptions(this, this.adaptableOptions));
         this.registerAdaptableAggFuncs();
         // get the api ready
-        this.api = new AdaptableApiImpl_1.AdaptableApiImpl(this);
+        this.api = new AdaptableApiImpl(this);
         this.forPlugins((plugin) => plugin.afterInitApi(this, this.api));
         // data source needs to be created early
-        this.DataService = new DataService_1.DataService(this);
+        this.DataService = new DataService(this);
         // set up the ag Grid helper and menu helper
-        this.agGridHelper = new agGridHelper_1.agGridHelper(this, this.gridOptions);
-        this.agGridMenuHelper = new agGridMenuHelper_1.agGridMenuHelper(this, this.gridOptions);
+        this.agGridHelper = new agGridHelper(this, this.gridOptions);
+        this.agGridMenuHelper = new agGridMenuHelper(this, this.gridOptions);
         // Build the default group sort comparator - will get custom sort values (but not functions) in real time
         // TODO: if  a custom 'aggFunc' property is defined (see setupColumnAggFunc()), it won't be evaluated
         if (this.adaptableOptions.groupingOptions.autoOrderGroupedColumns) {
@@ -438,20 +435,20 @@ class Adaptable {
         this.initStore();
         // create the services
         this.LicenseService = this.initLicenseService();
-        this.ChartingService = new ChartingService_1.ChartingService(this.api);
-        this.ThemeService = new ThemeService_1.ThemeService(this.api);
-        this.ValidationService = new ValidationService_1.ValidationService(this.api);
-        this.ReportService = new ReportService_1.ReportService(this.api);
-        this.ModuleService = new ModuleService_1.ModuleService(this.api);
-        this.CalculatedColumnExpressionService = new CalculatedColumnExpressionService_1.CalculatedColumnExpressionService(this.api);
-        this.EntitlementService = new EntitlementService_1.EntitlementService(this.api);
-        this.QueryLanguageService = new QueryLanguageService_1.QueryLanguageService(this.api);
-        this.AlertService = new AlertService_1.AlertService(this.api);
-        this.TeamSharingService = new TeamSharingService_1.TeamSharingService(this.api);
-        this.Fdc3Service = new Fdc3Service_1.Fdc3Service(this.api);
+        this.ChartingService = new ChartingService(this.api);
+        this.ThemeService = new ThemeService(this.api);
+        this.ValidationService = new ValidationService(this.api);
+        this.ReportService = new ReportService(this.api);
+        this.ModuleService = new ModuleService(this.api);
+        this.CalculatedColumnExpressionService = new CalculatedColumnExpressionService(this.api);
+        this.EntitlementService = new EntitlementService(this.api);
+        this.QueryLanguageService = new QueryLanguageService(this.api);
+        this.AlertService = new AlertService(this.api);
+        this.TeamSharingService = new TeamSharingService(this.api);
+        this.Fdc3Service = new Fdc3Service(this.api);
         // @ts-ignore
-        this.RowEditService = new RowEditService_1.RowEditService(this.api);
-        this.MetamodelService = new MetamodelService_1.MetamodelService(() => this.api.optionsApi.getAdaptableOptions());
+        this.RowEditService = new RowEditService(this.api);
+        this.MetamodelService = new MetamodelService(() => this.api.optionsApi.getAdaptableOptions());
         // validate the provided AdaptableOptions
         this.MetamodelService.validateAdaptableOptionsValues();
         this.forPlugins((plugin) => plugin.afterInitServices(this));
@@ -464,14 +461,14 @@ class Adaptable {
             this.gridOptions.api.__adaptable = this;
         }
         this.gridOptions.columnTypes = this.gridOptions.columnTypes || {};
-        (0, attachAddaptableColumnTypes_1.attachColumnTypes)(this.gridOptions);
+        attachColumnTypes(this.gridOptions);
         if (this.gridOptions.columnTypes.abColDefNumber.cellEditor === undefined) {
             this.gridOptions.columnTypes.abColDefNumber.cellEditor =
-                this.variant === 'react' ? AdaptableNumberEditor_1.ReactAdaptableNumberEditor : AdaptableNumberEditor_1.AdaptableNumberEditor;
+                this.variant === 'react' ? ReactAdaptableNumberEditor : AdaptableNumberEditor;
         }
         if (this.gridOptions.columnTypes.abColDefDate.cellEditor === undefined) {
             this.gridOptions.columnTypes.abColDefDate.cellEditor =
-                this.variant === 'react' ? AdaptableDateEditor_1.ReactAdaptableDateEditor : AdaptableDateEditor_1.AdaptableDateEditor;
+                this.variant === 'react' ? ReactAdaptableDateEditor : AdaptableDateEditor;
         }
         return this.initializeAgGrid().then((initialized) => {
             if (!initialized) {
@@ -504,7 +501,7 @@ class Adaptable {
                 const perfInitInternalGridLogic = this.logger.beginPerf('InitInternalGridLogic');
                 this.initInternalGridLogic();
                 perfInitInternalGridLogic.end();
-                AdaptableHelper_1.default.checkValidPrimaryKey(this);
+                AdaptableHelper.checkValidPrimaryKey(this);
             }, (e) => {
                 this.logger.error('Failed to Init Modules : ', e);
                 // for now we initialize the grid even if initialising Modules has failed (perhaps revisit this?)
@@ -520,16 +517,16 @@ class Adaptable {
             }
             if (this.abContainerElement != null) {
                 this.abContainerElement.innerHTML = '';
-                this.unmountReactRoot = this.renderReactRoot((0, AdaptableView_1.AdaptableApp)({ Adaptable: this }), this.abContainerElement);
+                this.unmountReactRoot = this.renderReactRoot(AdaptableApp({ Adaptable: this }), this.abContainerElement);
             }
             // create debounce methods that take a time based on user settings
-            this.throttleFilterOnEditDataChange = (0, throttle_1.default)(
+            this.throttleFilterOnEditDataChange = throttle(
             // the extra function is to make sure we have a reference to ag-grid-api
-            () => this.gridOptions.api.onFilterChanged(), this.adaptableOptions.filterOptions.filterActionOnUserDataChange.throttleDelay, {
+            () => this.gridOptions.api.onFilterChanged(), this.adaptableOptions.columnFilterOptions.filterActionOnUserDataChange.throttleDelay, {
                 trailing: true,
                 leading: false,
             });
-            this.throttleFilterOnTickingDataChange = (0, throttle_1.default)(() => this.gridOptions.api.onFilterChanged(), this.adaptableOptions.filterOptions.filterActionOnExternalDataChange.throttleDelay, {
+            this.throttleFilterOnTickingDataChange = throttle(() => this.gridOptions.api.onFilterChanged(), this.adaptableOptions.columnFilterOptions.filterActionOnExternalDataChange.throttleDelay, {
                 trailing: true,
                 leading: false,
             });
@@ -574,12 +571,12 @@ class Adaptable {
     }
     initStore() {
         const perfNewAdaptableStore = this.logger.beginPerf(`new AdaptableStore()`);
-        this.adaptableStore = new AdaptableStore_1.AdaptableStore(this, this.isAgGridReady());
+        this.adaptableStore = new AdaptableStore(this, this.isAgGridReady());
         perfNewAdaptableStore.end();
         this.adaptableStore.onAny((eventName, data) => {
             this.performAudit(data.action, data.state, data.newState);
             this.forPlugins((plugin) => plugin.onStoreEvent(eventName, data, this.adaptableStore));
-            if (eventName == AdaptableStore_1.INIT_STATE) {
+            if (eventName == INIT_STATE) {
                 const perfInitState = this.logger.beginPerf('InitState');
                 const perfUpdateOldConfig = this.logger.beginPerf('updateOldConfig()');
                 this.adaptableModules.forEach((m) => m.updateOldConfig());
@@ -647,7 +644,7 @@ class Adaptable {
         const adaptableSideBarDef = this.createAdaptableSideBarDef();
         if (!!adaptableSideBarDef) {
             this.gridOptions.components = this.gridOptions.components || {};
-            this.gridOptions.components.AdaptableToolPanel = (0, AdaptableToolPanel_1.getAdaptableToolPanelAgGridComponent)(this);
+            this.gridOptions.components.AdaptableToolPanel = getAdaptableToolPanelAgGridComponent(this);
         }
         if (this.agGridHelper.isSideBarDefObject(adaptableSideBarDef)) {
             this.setGridOptionsProperty('sideBar', () => {
@@ -703,7 +700,7 @@ class Adaptable {
         if ((_a = this.runtimeConfig.modules) === null || _a === void 0 ? void 0 : _a.length) {
             gridParams = { modules: this.runtimeConfig.modules };
         }
-        grid = new core_1.Grid(agGridContainer, this.gridOptions, gridParams);
+        grid = new Grid(agGridContainer, this.gridOptions, gridParams);
         perfAgGridInstance.end();
         // add our adaptable object to the grid options api object
         // this is VERY useful for when we need to access Adaptable inside of agGrid only functions
@@ -801,12 +798,12 @@ class Adaptable {
         this.setGridOptionsProperty('statusBar', (originalStatusBar) => {
             var _a, _b;
             const statusPanels = (_b = ((_a = originalStatusBar === null || originalStatusBar === void 0 ? void 0 : originalStatusBar.statusPanels) !== null && _a !== void 0 ? _a : [])) === null || _b === void 0 ? void 0 : _b.map((statusPanel) => {
-                if (statusPanel.statusPanel === StatusBarState_1.ADAPTABLE_STATUS_PANEL) {
+                if (statusPanel.statusPanel === ADAPTABLE_STATUS_PANEL) {
                     adaptableStatusPanelKeys.push(statusPanel.key);
                     const context = {
                         Key: statusPanel.key,
                     };
-                    return Object.assign(Object.assign({}, statusPanel), { statusPanel: (0, createAgStatusPanelComponent_1.createAgStatusPanelComponent)(AdaptableStatusBar_1.AdaptableStatusBar, this, context) });
+                    return Object.assign(Object.assign({}, statusPanel), { statusPanel: createAgStatusPanelComponent(AdaptableStatusBar, this, context) });
                 }
                 return statusPanel;
             });
@@ -825,28 +822,28 @@ class Adaptable {
         return (_c = (_b = (_a = this.gridOptions) === null || _a === void 0 ? void 0 : _a.statusBar) === null || _b === void 0 ? void 0 : _b.statusPanels) !== null && _c !== void 0 ? _c : [];
     }
     filterOnEditDataChange() {
-        if (this.adaptableOptions.filterOptions.filterActionOnUserDataChange.applyFilter ==
-            Enums_1.FilterOnDataChangeOptions.Always) {
+        if (this.adaptableOptions.columnFilterOptions.filterActionOnUserDataChange.applyFilter ==
+            FilterOnDataChangeOptions.Always) {
             this.gridOptions.api.onFilterChanged();
         }
-        else if (this.adaptableOptions.filterOptions.filterActionOnUserDataChange.applyFilter ==
-            Enums_1.FilterOnDataChangeOptions.Throttle) {
+        else if (this.adaptableOptions.columnFilterOptions.filterActionOnUserDataChange.applyFilter ==
+            FilterOnDataChangeOptions.Throttle) {
             this.throttleFilterOnEditDataChange();
         }
     }
     filterOnTickingDataChange() {
-        if (this.adaptableOptions.filterOptions.filterActionOnExternalDataChange.applyFilter ==
-            Enums_1.FilterOnDataChangeOptions.Always) {
+        if (this.adaptableOptions.columnFilterOptions.filterActionOnExternalDataChange.applyFilter ==
+            FilterOnDataChangeOptions.Always) {
             this.gridOptions.api.onFilterChanged();
         }
-        else if (this.adaptableOptions.filterOptions.filterActionOnExternalDataChange.applyFilter ==
-            Enums_1.FilterOnDataChangeOptions.Throttle) {
+        else if (this.adaptableOptions.columnFilterOptions.filterActionOnExternalDataChange.applyFilter ==
+            FilterOnDataChangeOptions.Throttle) {
             this.throttleFilterOnTickingDataChange();
         }
     }
     applyGridFiltering() {
-        if (this.api.filterApi.isQuickFilterAvailable()) {
-            if (this.api.filterApi.isQuickFilterVisible()) {
+        if (this.api.columnFilterApi.isQuickFilterAvailable()) {
+            if (this.api.columnFilterApi.isQuickFilterVisible()) {
                 this.showQuickFilter();
             }
             else {
@@ -978,11 +975,11 @@ class Adaptable {
      * The combination of styled column and format cells
      * This functiond decides when the two can be merged.
      */
-    getFormatColumnAndStyledColumnCellStyle(abColumn, colId, params) {
-        let styledColumn = this.api.styledColumnApi.getStyledColumnForColumnId(colId);
+    getFormatColumnAndStyledColumnCellStyle(gridCell, params) {
+        let styledColumn = this.api.styledColumnApi.getStyledColumnForColumnId(gridCell.column.columnId);
         let styledColumnStyle = {};
         if (styledColumn && !(styledColumn === null || styledColumn === void 0 ? void 0 : styledColumn.IsSuspended)) {
-            const styledCellStyle = this.getStyledColumnStyle(styledColumn, abColumn, params);
+            const styledCellStyle = this.getStyledColumnStyle(styledColumn, gridCell.column, params);
             // for percentbar we want to merge
             if (styledColumn.PercentBarStyle || styledColumn.BadgeStyle) {
                 styledColumnStyle = styledCellStyle;
@@ -992,8 +989,8 @@ class Adaptable {
                 return styledCellStyle;
             }
         }
-        const activeFormatColumnsWithStyle = this.api.formatColumnApi.internalApi.getFormatColumnsWithStyleForColumn(abColumn);
-        return Object.assign(Object.assign({}, this.getFormatColumnCellStyle(abColumn, activeFormatColumnsWithStyle, params)), styledColumnStyle);
+        const activeFormatColumnsWithStyle = this.api.formatColumnApi.internalApi.getFormatColumnsWithStyleForColumn(gridCell.column);
+        return Object.assign(Object.assign({}, this.getFormatColumnCellStyle(gridCell.column, activeFormatColumnsWithStyle, params)), styledColumnStyle);
     }
     getStyledColumnStyle(styledColumn, abColumn, params) {
         let style = {};
@@ -1010,7 +1007,7 @@ class Adaptable {
                  * Color should always be in bounds, it should not overflow.
                  * If the value is out of range, it shoul set the maximum/minimum color.
                  */
-                colValue = (0, clamp_1.default)(params.value, minColumnValue, maxColumnValue);
+                colValue = clamp(params.value, minColumnValue, maxColumnValue);
             }
             else {
                 return style;
@@ -1037,7 +1034,7 @@ class Adaptable {
             if (reverseGradient) {
                 alpha = 1 - alpha;
             }
-            const preparedColor = (0, StyleHelper_1.getVariableColor)(cellBackColor);
+            const preparedColor = getVariableColor(cellBackColor);
             // if no range match, do not apply color (black in this case)
             if (cellBackColor) {
                 style.backgroundColor = tinycolor(preparedColor).setAlpha(alpha).toRgbString();
@@ -1098,21 +1095,21 @@ class Adaptable {
     getActiveAlertWithHighlightRow(params) {
         return this.api.alertApi.internalApi.getAdaptableAlertWithHighlightRow(params.node);
     }
-    getAlertCellStyle(col, params) {
-        const alert = this.getActiveAlertWithHighlightCell(col, params);
+    getAlertCellStyle(gridCell, params) {
+        const alert = this.getActiveAlertWithHighlightCell(gridCell.column, params);
         if (alert) {
             const highlightCell = alert.alertDefinition.AlertProperties.HighlightCell;
             if (typeof highlightCell === 'object') {
                 return this.convertAdaptableStyleToCSS(highlightCell);
             }
             return {
-                backgroundColor: UIHelper_1.default.getColorByMessageType(alert.alertDefinition.MessageType),
+                backgroundColor: UIHelper.getColorByMessageType(alert.alertDefinition.MessageType),
             };
         }
     }
-    getAlertCellClass(col, params) {
+    getAlertCellClass(gridCell, params) {
         var _a, _b;
-        const alert = this.getActiveAlertWithHighlightCell(col, params);
+        const alert = this.getActiveAlertWithHighlightCell(gridCell.column, params);
         const highlightCell = (_b = (_a = alert === null || alert === void 0 ? void 0 : alert.alertDefinition) === null || _a === void 0 ? void 0 : _a.AlertProperties) === null || _b === void 0 ? void 0 : _b.HighlightCell;
         return typeof highlightCell === 'object' && (highlightCell === null || highlightCell === void 0 ? void 0 : highlightCell.ClassName)
             ? highlightCell === null || highlightCell === void 0 ? void 0 : highlightCell.ClassName
@@ -1134,17 +1131,15 @@ class Adaptable {
             return typeof highlightRow === 'object'
                 ? this.convertAdaptableStyleToCSS(highlightRow)
                 : {
-                    backgroundColor: UIHelper_1.default.getColorByMessageType(alert.alertDefinition.MessageType),
+                    backgroundColor: UIHelper.getColorByMessageType(alert.alertDefinition.MessageType),
                 };
         }
         return null;
     }
-    getFlashingCellStyle(col, params) {
+    getFlashingCellStyle(gridCell, params) {
         var _a;
-        const primaryKey = params.node.aggData
-            ? params.node.id
-            : this.getPrimaryKeyValueFromRowNode(params.node);
-        const flashingCell = this.api.flashingCellApi.internalApi.getAdaptableFlashingCellFor(primaryKey, col.columnId);
+        const primaryKey = params.node.aggData ? params.node.id : gridCell.primaryKeyValue;
+        const flashingCell = this.api.flashingCellApi.internalApi.getAdaptableFlashingCellFor(primaryKey, gridCell.column.columnId);
         if (!flashingCell) {
             return {};
         }
@@ -1154,13 +1149,13 @@ class Adaptable {
                 ? flashingCell.flashingCellDefinition.DownChangeStyle
                 : flashingCell.flashingCellDefinition.NeutralChangeStyle)) !== null && _a !== void 0 ? _a : {});
     }
-    getNoteCellClassName(col, params) {
+    getNoteCellClassName(gridCell, params) {
         if (!this.api.internalApi.getModuleService().isModuleAvailable('Notes')) {
             return;
         }
         const cellPosition = {
-            PrimaryKeyValue: this.getPrimaryKeyValueFromRowNode(params.node),
-            ColumnId: col.columnId,
+            PrimaryKeyValue: gridCell.primaryKeyValue,
+            ColumnId: gridCell.column.columnId,
         };
         const cellNotes = this.api.notesApi.getCellNotes(cellPosition);
         if (!(cellNotes === null || cellNotes === void 0 ? void 0 : cellNotes.length)) {
@@ -1168,12 +1163,10 @@ class Adaptable {
         }
         return 'ab-Cell-Note';
     }
-    getFlashingCellClass(col, params) {
+    getFlashingCellClass(gridcell, params) {
         var _a, _b, _c;
-        const primaryKey = params.node.aggData
-            ? params.node.id
-            : this.getPrimaryKeyValueFromRowNode(params.node);
-        const flashingCell = this.api.flashingCellApi.internalApi.getAdaptableFlashingCellFor(primaryKey, col.columnId);
+        const primaryKey = params.node.aggData ? params.node.id : gridcell.primaryKeyValue;
+        const flashingCell = this.api.flashingCellApi.internalApi.getAdaptableFlashingCellFor(primaryKey, gridcell.column.columnId);
         if (!flashingCell) {
             return;
         }
@@ -1185,13 +1178,12 @@ class Adaptable {
                     ? (_c = flashingCell.flashingCellDefinition.NeutralChangeStyle) === null || _c === void 0 ? void 0 : _c.ClassName
                     : undefined;
     }
-    getCellHighlightStyle(col, params) {
-        const primaryKeyValue = this.getPrimaryKeyValueFromRowNode(params.node);
+    getCellHighlightStyle(gridCell, params) {
         const cellHightlight = this.api.internalApi
             .getSystemState()
             .HighlightedCells.find((cellHighlightInfo) => {
-            return (col.columnId === cellHighlightInfo.columnId &&
-                cellHighlightInfo.primaryKeyValue === primaryKeyValue);
+            return (gridCell.column.columnId === cellHighlightInfo.columnId &&
+                cellHighlightInfo.primaryKeyValue === gridCell.primaryKeyValue);
         });
         if (cellHightlight) {
             return this.convertAdaptableStyleToCSS(cellHightlight.highlightStyle);
@@ -1223,17 +1215,16 @@ class Adaptable {
     }
     getQuickSearchCellStyle() {
         const quickSearchStyle = this.api.quickSearchApi.getQuickSearchStyle();
-        if (!quickSearchStyle || StringExtensions_1.StringExtensions.IsNotNullOrEmpty(quickSearchStyle.ClassName)) {
+        if (!quickSearchStyle || StringExtensions.IsNotNullOrEmpty(quickSearchStyle.ClassName)) {
             return undefined;
         }
         return this.convertAdaptableStyleToCSS(quickSearchStyle);
     }
-    getEditableCellStyle(abColumn, params) {
+    getEditableCellStyle(gridCell, params) {
         const editableCellStyle = this.api.userInterfaceApi.getEditableCellStyle();
         if (!editableCellStyle) {
             return undefined;
         }
-        const gridCell = this.getGridCellFromRowNode(params.node, abColumn.columnId);
         if (gridCell) {
             if (this.api.gridApi.isCellEditable(gridCell)) {
                 return this.convertAdaptableStyleToCSS(editableCellStyle);
@@ -1241,12 +1232,11 @@ class Adaptable {
         }
         return undefined;
     }
-    getReadOnlyCellStyle(abColumn, params) {
+    getReadOnlyCellStyle(gridCell, params) {
         const editableCellStyle = this.api.userInterfaceApi.getReadOnlyCellStyle();
         if (!editableCellStyle) {
             return undefined;
         }
-        const gridCell = this.getGridCellFromRowNode(params.node, abColumn.columnId);
         if (gridCell) {
             if (!this.api.gridApi.isCellEditable(gridCell)) {
                 return this.convertAdaptableStyleToCSS(editableCellStyle);
@@ -1254,52 +1244,56 @@ class Adaptable {
         }
         return undefined;
     }
-    getEditableCellClass(abColumn, params) {
+    getEditableCellClass(gridCell, params) {
         const editableCellStyle = this.api.userInterfaceApi.getEditableCellStyle();
         if (!(editableCellStyle === null || editableCellStyle === void 0 ? void 0 : editableCellStyle.ClassName)) {
             return null;
         }
-        const isCellEditable = this.api.gridApi.isCellEditable(this.getGridCellFromRowNode(params.node, abColumn.columnId));
+        const isCellEditable = this.api.gridApi.isCellEditable(gridCell);
         return isCellEditable ? editableCellStyle.ClassName : null;
     }
-    getReadonlyCellClass(abColumn, params) {
+    getReadonlyCellClass(gridCell, params) {
         const readonlyCellStyle = this.api.userInterfaceApi.getReadOnlyCellStyle();
         if (!(readonlyCellStyle === null || readonlyCellStyle === void 0 ? void 0 : readonlyCellStyle.ClassName)) {
             return null;
         }
-        const isCellReadonly = !this.api.gridApi.isCellEditable(this.getGridCellFromRowNode(params.node, abColumn.columnId));
+        const isCellReadonly = !this.api.gridApi.isCellEditable(gridCell);
         return isCellReadonly ? readonlyCellStyle.ClassName : null;
     }
-    isQuickSearchActive(abColumn, params) {
-        const isPivotColumn = this.api.columnApi.isAutoPivotColumn(
-        // abColumn is the column that is based on, not the actual column
-        params.column.getColId());
-        if (abColumn.isExcludedFromQuickSearch) {
+    isQuickSearchActive(gridCell, params) {
+        let quickSearchValue = this.api.quickSearchApi.getQuickSearchValue();
+        if (StringExtensions.IsNullOrEmpty(quickSearchValue)) {
+            return false;
+        }
+        if (gridCell.column.isExcludedFromQuickSearch) {
             return false;
         }
         if (!params.node) {
             return false;
         }
-        if (!isPivotColumn &&
+        if (!gridCell.isPivotCell &&
             !this.api.optionsApi.getQuickSearchOptions().runQuickSearchOnRowGroups &&
             params.node.group) {
             return false;
         }
         if (!this.api.optionsApi.getQuickSearchOptions().runQuickSearchOnPivotColumns &&
-            isPivotColumn) {
-            return false;
-        }
-        let quickSearchValue = this.api.quickSearchApi.getQuickSearchValue();
-        if (StringExtensions_1.StringExtensions.IsNullOrEmpty(quickSearchValue)) {
+            gridCell.isPivotCell) {
             return false;
         }
-        let displayValue = this.api.gridApi.getDisplayValueFromRowNode(params.node, abColumn.columnId);
-        if (this.api.optionsApi.getQuickSearchOptions().runQuickSearchOnPivotColumns && isPivotColumn) {
-            displayValue = params.value;
+        if (this.api.optionsApi.getQuickSearchOptions().runQuickSearchOnPivotColumns &&
+            gridCell.isPivotCell) {
+            gridCell.displayValue = params.value;
         }
         const ignoreCase = !this.adaptableOptions.quickSearchOptions.runQuickSearchWithCaseSensitivity;
-        const v = ignoreCase ? String(displayValue).toLocaleLowerCase() : String(displayValue);
+        const v = ignoreCase
+            ? String(gridCell.displayValue).toLocaleLowerCase()
+            : String(gridCell.displayValue);
         const i = ignoreCase ? String(quickSearchValue).toLocaleLowerCase() : String(quickSearchValue);
+        const applyQuickSearchFunction = this.adaptableOptions.quickSearchOptions.shouldApplyQuickSearch;
+        if (applyQuickSearchFunction) {
+            const quickSearchContext = Object.assign(Object.assign({}, createBaseContext(this.api)), { gridCell, quickSearchValue: quickSearchValue });
+            return applyQuickSearchFunction(quickSearchContext);
+        }
         return v.indexOf(i) !== -1;
     }
     getPrimaryKeyValueFromRowNode(rowNode) {
@@ -1483,7 +1477,7 @@ class Adaptable {
                         colDef === null || colDef === void 0 ? void 0 : colDef.defaultAggFunc) !== null && _e !== void 0 ? _e : 'sum';
                 }
                 else if (adaptableAggFunc && adaptableAggFunc.type === 'weightedAverage') {
-                    aggFunc = AggregationColumns_1.WEIGHTED_AVERAGE_AGG_FN_NAME;
+                    aggFunc = WEIGHTED_AVERAGE_AGG_FN_NAME;
                 }
                 else if (typeof aggFuncFromLayout === 'string') {
                     aggFunc = aggFuncFromLayout;
@@ -1498,7 +1492,7 @@ class Adaptable {
                 newColState.sort = null;
                 newColState.sortIndex = null;
             }
-            isChanged = isChanged || !(0, isEqual_1.default)(newColState, oldColState);
+            isChanged = isChanged || !lodashIsEqual(newColState, oldColState);
             return newColState;
         })
             .filter((x) => !!x);
@@ -1646,7 +1640,7 @@ class Adaptable {
             layout = this.api.layoutApi.getCurrentLayout();
         }
         if (this.api.layoutApi.internalApi.areExpandedRowGroupsSavedInLayouts() &&
-            ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(layout.ExpandedRowGroupValues)) {
+            ArrayExtensions.IsNotNullOrEmpty(layout.ExpandedRowGroupValues)) {
             this.expandRowGroupsForValues(layout.ExpandedRowGroupValues);
         }
         if (this.adaptableOptions.layoutOptions.displayRowGroups === 'expanded') {
@@ -1823,7 +1817,7 @@ class Adaptable {
             //  dont perform row selection in pivot mode
             return undefined;
         }
-        if (ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(nodes)) {
+        if (ArrayExtensions.IsNotNullOrEmpty(nodes)) {
             nodes.forEach((node) => {
                 const rowInfo = {
                     isMaster: !!(node.master != null && node.master == true),
@@ -1903,7 +1897,7 @@ class Adaptable {
         // that is currently commented out in the column api function (previously in filter form)
         permittedValues =
             permittedValues !== null && permittedValues !== void 0 ? permittedValues : this.api.userInterfaceApi.getPermittedValuesForColumn(column);
-        if (ArrayExtensions_1.ArrayExtensions.IsNotNull(permittedValues)) {
+        if (ArrayExtensions.IsNotNull(permittedValues)) {
             returnValues = permittedValues.map((pv) => {
                 return {
                     rawValue: pv,
@@ -1912,6 +1906,8 @@ class Adaptable {
                     columnId: column.columnId,
                     column: column,
                     rowNode: undefined,
+                    isPivotCell: false,
+                    isRowGroupCell: false,
                 };
             });
         }
@@ -1929,17 +1925,17 @@ class Adaptable {
                     const gridCell = this.addDistinctColumnValue(rowNode, column.columnId);
                     if (gridCell && gridCell.rowNode !== skipRowNode) {
                         if (gridCell.rawValue == undefined &&
-                            this.adaptableOptions.filterOptions.includeBlankFilterValues) {
-                            gridCell.rawValue = GeneralConstants_1.BLANK_DISTINCT_COLUMN_VALUE;
-                            gridCell.displayValue = GeneralConstants_1.BLANK_DISTINCT_COLUMN_VALUE;
-                            gridCell.normalisedValue = GeneralConstants_1.BLANK_DISTINCT_COLUMN_VALUE;
+                            this.adaptableOptions.columnFilterOptions.includeBlankFilterValues) {
+                            gridCell.rawValue = BLANK_DISTINCT_COLUMN_VALUE;
+                            gridCell.displayValue = BLANK_DISTINCT_COLUMN_VALUE;
+                            gridCell.normalisedValue = BLANK_DISTINCT_COLUMN_VALUE;
                         }
                         returnValues.push(gridCell);
                     }
                 });
             }
         }
-        let uniqueVals = (0, uniqBy_1.default)(returnValues, (dataItem) => {
+        let uniqueVals = uniqBy(returnValues, (dataItem) => {
             const value = dataItem.rawValue;
             if (value instanceof Date) {
                 return value.toISOString();
@@ -1947,9 +1943,9 @@ class Adaptable {
             return value;
         });
         if (column.dataType == 'String' && this.api.predicateApi.useCaseSensitivity()) {
-            uniqueVals = (0, uniqBy_1.default)(uniqueVals, (d) => d.displayValue.toLowerCase());
+            uniqueVals = uniqBy(uniqueVals, (d) => d.displayValue.toLowerCase());
         }
-        return uniqueVals.slice(0, this.adaptableOptions.filterOptions.maxFilterValuesToDisplay);
+        return uniqueVals.slice(0, this.adaptableOptions.columnFilterOptions.maxFilterValuesToDisplay);
     }
     async getDistinctFilterValuesForColumn(column, visibleRowsOnly, filter, skipRowNode) {
         var _a;
@@ -2018,7 +2014,7 @@ class Adaptable {
         // NB.  this currently contains a small bug as we dont check for visibility so if using permitted values then ALL are returned :(
         const abColumn = this.api.columnApi.getColumnWithColumnId(columnId);
         const permittedValuesForColumn = this.api.userInterfaceApi.getPermittedValuesForColumn(abColumn);
-        if (ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(permittedValuesForColumn)) {
+        if (ArrayExtensions.IsNotNullOrEmpty(permittedValuesForColumn)) {
             permittedValuesForColumn.forEach((pv) => {
                 permittedMap.set(pv, {
                     rawValue: pv,
@@ -2026,6 +2022,8 @@ class Adaptable {
                     normalisedValue: pv,
                     column: abColumn,
                     rowNode: undefined,
+                    isPivotCell: false,
+                    isRowGroupCell: false,
                 });
             });
         }
@@ -2055,14 +2053,14 @@ class Adaptable {
                 eachFn(rowNode, columnId);
             });
         }
-        return returnArray.slice(0, this.adaptableOptions.filterOptions.maxFilterValuesToDisplay);
+        return returnArray.slice(0, this.adaptableOptions.columnFilterOptions.maxFilterValuesToDisplay);
     }
     addDistinctColumnValue(rowNode, columnId) {
         // we do not return the values of the aggregates when in grouping mode
         // otherwise they would appear in the filter dropdown etc....
         if (rowNode && !this.isGroupRowNode(rowNode)) {
             const returnValue = this.getGridCellFromRowNode(rowNode, columnId);
-            if (Helper_1.Helper.objectExists(returnValue)) {
+            if (Helper.objectExists(returnValue)) {
                 return returnValue;
             }
         }
@@ -2070,6 +2068,9 @@ class Adaptable {
             return undefined;
         }
     }
+    /**
+     * Don't think that this is used - a good thing as its quite verbose
+     */
     getDisplayValue(primaryKey, columnId) {
         let returnValue;
         if (this.useRowNodeLookUp) {
@@ -2099,6 +2100,8 @@ class Adaptable {
         const rawValue = this.getRawValueFromRowNode(rowNode, columnId);
         const displayValue = this.getDisplayValueFromRawValue(rowNode, columnId, rawValue);
         const normalisedValue = this.getNormalisedValueFromRawValue(rawValue, abColumn);
+        const isPivotCell = this.api.columnApi.isAutoPivotColumn(columnId);
+        const isRowGroupCell = rowNode.group;
         return {
             rawValue: rawValue,
             displayValue: displayValue,
@@ -2106,6 +2109,8 @@ class Adaptable {
             column: abColumn,
             primaryKeyValue: pkValue,
             rowNode: rowNode,
+            isPivotCell,
+            isRowGroupCell,
         };
     }
     getDisplayValueFromRowNode(rowNode, columnId) {
@@ -2178,7 +2183,7 @@ class Adaptable {
         }
         if (dataType === 'Number') {
             // empty string or space should not be converted to 0
-            return typeof rawValue !== 'number' && StringExtensions_1.StringExtensions.IsNumeric(rawValue)
+            return typeof rawValue !== 'number' && StringExtensions.IsNumeric(rawValue)
                 ? Number(rawValue)
                 : rawValue;
         }
@@ -2186,7 +2191,7 @@ class Adaptable {
             return typeof rawValue !== 'boolean' ? Boolean(rawValue) : rawValue;
         }
         if (dataType === 'Date') {
-            return rawValue instanceof Date ? rawValue : (0, DateHelper_1.parseDateValue)(rawValue);
+            return rawValue instanceof Date ? rawValue : parseDateValue(rawValue);
         }
         return rawValue;
     }
@@ -2281,12 +2286,12 @@ class Adaptable {
         return this.gridOptions.api.getRenderedNodes();
     }
     selectNodes(rowNodes, clearSelection) {
-        if (ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(rowNodes)) {
+        if (ArrayExtensions.IsNotNullOrEmpty(rowNodes)) {
             rowNodes.forEach((node) => this.selectNode(node, clearSelection));
         }
     }
     deSelectNodes(rowNodes, clearSelection) {
-        if (ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(rowNodes)) {
+        if (ArrayExtensions.IsNotNullOrEmpty(rowNodes)) {
             rowNodes.forEach((node) => this.deSelectNode(node, clearSelection));
         }
     }
@@ -2386,20 +2391,20 @@ class Adaptable {
         ];
     }
     getColDefsForFreeTextColumns() {
-        const defaultFreeTextColumnSettings = (0, ObjectFactory_1.CreateEmptyFreeTextColumn)().FreeTextColumnSettings;
+        const defaultFreeTextColumnSettings = CreateEmptyFreeTextColumn().FreeTextColumnSettings;
         return this.api.freeTextColumnApi.getFreeTextColumns().map((freeTextColumn) => {
             var _a;
             const freeTextColumnSettings = Object.assign(Object.assign({}, defaultFreeTextColumnSettings), freeTextColumn.FreeTextColumnSettings);
             const dataTypeEditor = freeTextColumnSettings.DataType === 'Number'
-                ? AdaptableNumberEditor_1.AdaptableNumberEditor
+                ? AdaptableNumberEditor
                 : freeTextColumnSettings.DataType === 'Date'
-                    ? AdaptableDateEditor_1.AdaptableDateEditor
+                    ? AdaptableDateEditor
                     : null;
             const columnTypes = [
-                GeneralConstants_1.AB_SPECIAL_COLUMN,
+                AB_SPECIAL_COLUMN,
                 this.agGridHelper.getAgGridDataType(freeTextColumnSettings.DataType),
             ];
-            if (ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty((_a = freeTextColumn === null || freeTextColumn === void 0 ? void 0 : freeTextColumn.FreeTextColumnSettings) === null || _a === void 0 ? void 0 : _a.ColumnTypes)) {
+            if (ArrayExtensions.IsNotNullOrEmpty((_a = freeTextColumn === null || freeTextColumn === void 0 ? void 0 : freeTextColumn.FreeTextColumnSettings) === null || _a === void 0 ? void 0 : _a.ColumnTypes)) {
                 columnTypes.push(...freeTextColumn.FreeTextColumnSettings.ColumnTypes);
             }
             const newColDef = {
@@ -2528,11 +2533,14 @@ class Adaptable {
         return [
             {
                 headerName: '',
-                colId: GeneralConstants_1.ADAPTABLE_ROW_ACTION_BUTTONS,
+                colId: ADAPTABLE_ROW_ACTION_BUTTONS,
                 hide: false,
                 editable: false,
                 // 15px is the icon width + left&right padding + left&right border
-                width: actionButtons.length * (UIHelper_1.default.getSimpleButtonPaddingWidth() * 2 + 15) + 2,
+                width: Math.max(actionButtons.length * (UIHelper.getSimpleButtonPaddingWidth() * 2 + 15) + 2, 
+                // If the width of the column is to small, the width will not be applied
+                // this triggers the setLayout an infinite loop because the width read from the grid is always different
+                40),
                 resizable: false,
                 lockVisible: true,
                 suppressColumnsToolPanel: true,
@@ -2545,9 +2553,9 @@ class Adaptable {
                 pinned: this.adaptableOptions.actionRowOptions.actionRowButtonOptions.position === 'pinnedRight'
                     ? 'right'
                     : 'left',
-                cellRenderer: this.variant === 'react' ? ActionColumnRenderer_1.ReactActionColumnRenderer : ActionColumnRenderer_1.ActionColumnRenderer,
-                cellClass: GeneralConstants_1.ADAPTABLE_ROW_ACTION_BUTTONS,
-                type: [GeneralConstants_1.AB_SPECIAL_COLUMN, 'abColDefObject'],
+                cellRenderer: this.variant === 'react' ? ReactActionColumnRenderer : ActionColumnRenderer,
+                cellClass: ADAPTABLE_ROW_ACTION_BUTTONS,
+                type: [AB_SPECIAL_COLUMN, 'abColDefObject'],
             },
         ];
     }
@@ -2571,8 +2579,8 @@ class Adaptable {
                 filter: false,
                 sortable: false,
                 enableRowGroup: false,
-                cellRenderer: this.variant === 'react' ? ActionColumnRenderer_1.ReactActionColumnRenderer : ActionColumnRenderer_1.ActionColumnRenderer,
-                type: [GeneralConstants_1.AB_SPECIAL_COLUMN, 'abColDefObject'],
+                cellRenderer: this.variant === 'react' ? ReactActionColumnRenderer : ActionColumnRenderer,
+                type: [AB_SPECIAL_COLUMN, 'abColDefObject'],
             };
             this.logger.info('Setting up Action Column: ' + actionColumn.columnId);
             return newColDef;
@@ -2583,7 +2591,7 @@ class Adaptable {
         const specialColDefs = this.getColDefsForSpecialColumns();
         const isSpecialColDef = (colDef) => {
             const { type } = colDef;
-            if (type === GeneralConstants_1.AB_SPECIAL_COLUMN || (Array.isArray(type) && type.includes(GeneralConstants_1.AB_SPECIAL_COLUMN))) {
+            if (type === AB_SPECIAL_COLUMN || (Array.isArray(type) && type.includes(AB_SPECIAL_COLUMN))) {
                 return true;
             }
             return false;
@@ -2641,7 +2649,7 @@ class Adaptable {
         this.setLayout();
     }
     getColDefsForCalculatedColumns() {
-        const defaultCalculatedColumnSettings = (0, ObjectFactory_1.CreateEmptyCalculatedColumn)().CalculatedColumnSettings;
+        const defaultCalculatedColumnSettings = CreateEmptyCalculatedColumn().CalculatedColumnSettings;
         return this.api.calculatedColumnApi.getCalculatedColumns().map((calculatedColumn) => {
             const calculatedColumnSettings = Object.assign(Object.assign({}, defaultCalculatedColumnSettings), calculatedColumn.CalculatedColumnSettings);
             if (!calculatedColumnSettings.DataType) {
@@ -2649,10 +2657,10 @@ class Adaptable {
                     this.CalculatedColumnExpressionService.getCalculatedColumnDataType(calculatedColumn.Query);
             }
             const columnTypes = [
-                GeneralConstants_1.AB_SPECIAL_COLUMN,
+                AB_SPECIAL_COLUMN,
                 this.agGridHelper.getAgGridDataType(calculatedColumnSettings.DataType),
             ];
-            if (ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(calculatedColumnSettings.ColumnTypes)) {
+            if (ArrayExtensions.IsNotNullOrEmpty(calculatedColumnSettings.ColumnTypes)) {
                 columnTypes.push(...calculatedColumnSettings.ColumnTypes);
             }
             const isExternalEvaluation = !this.api.expressionApi.internalApi.evaluateExpressionInAdaptableQL('CalculatedColumn', calculatedColumn, this.api.expressionApi.getAdaptableQueryExpression(calculatedColumn.Query));
@@ -2741,15 +2749,15 @@ class Adaptable {
     destroy(config) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3;
         if (this.gridOptions && this.gridOptions.api) {
-            this.gridOptions.api.removeEventListener(core_1.Events.EVENT_FIRST_DATA_RENDERED, this.listenerFirstDataRendered);
-            this.gridOptions.api.removeEventListener(core_1.Events.EVENT_COLUMN_PIVOT_MODE_CHANGED, this.listenerPivotModeChanged);
-            this.gridOptions.api.removeEventListener(core_1.Events.EVENT_COLUMN_PIVOT_CHANGED, this.listenerPivotChanged);
-            this.gridOptions.api.removeEventListener(core_1.Events.EVENT_CELL_EDITING_STARTED, this.listenerCellEditingStarted);
-            this.gridOptions.api.removeEventListener(core_1.Events.EVENT_COLUMN_ROW_GROUP_CHANGED, this.listenerColumnRowGroupChanged);
-            this.gridOptions.api.removeEventListener(core_1.Events.EVENT_RANGE_SELECTION_CHANGED, this.listenerRangeSelectionChanged);
-            this.gridOptions.api.removeEventListener(core_1.Events.EVENT_COLUMN_RESIZED, this.listenerColumnResized);
-            this.gridOptions.api.removeEventListener(core_1.Events.EVENT_SORT_CHANGED, this.listenerSortChanged);
-            this.gridOptions.api.removeEventListener(core_1.Events.EVENT_MODEL_UPDATED, this.listenerModelUpdated);
+            this.gridOptions.api.removeEventListener(Events.EVENT_FIRST_DATA_RENDERED, this.listenerFirstDataRendered);
+            this.gridOptions.api.removeEventListener(Events.EVENT_COLUMN_PIVOT_MODE_CHANGED, this.listenerPivotModeChanged);
+            this.gridOptions.api.removeEventListener(Events.EVENT_COLUMN_PIVOT_CHANGED, this.listenerPivotChanged);
+            this.gridOptions.api.removeEventListener(Events.EVENT_CELL_EDITING_STARTED, this.listenerCellEditingStarted);
+            this.gridOptions.api.removeEventListener(Events.EVENT_COLUMN_ROW_GROUP_CHANGED, this.listenerColumnRowGroupChanged);
+            this.gridOptions.api.removeEventListener(Events.EVENT_RANGE_SELECTION_CHANGED, this.listenerRangeSelectionChanged);
+            this.gridOptions.api.removeEventListener(Events.EVENT_COLUMN_RESIZED, this.listenerColumnResized);
+            this.gridOptions.api.removeEventListener(Events.EVENT_SORT_CHANGED, this.listenerSortChanged);
+            this.gridOptions.api.removeEventListener(Events.EVENT_MODEL_UPDATED, this.listenerModelUpdated);
             this.gridOptions.api.removeGlobalListener(this.listenerGlobalSetRowSelection);
             this.gridOptions.api.removeGlobalListener(this.listenerGlobalColumnEventsThatTriggerStateChange);
             this.gridOptions.api.removeGlobalListener(this.listenerGlobalColumnEventsThatTriggerAutoLayoutSave);
@@ -2966,12 +2974,12 @@ class Adaptable {
          * Action: Set Columns in store and filter grid
          */
         const columnEventsThatTriggersStateChange = [
-            core_1.Events.EVENT_COLUMN_MOVED,
-            core_1.Events.EVENT_GRID_COLUMNS_CHANGED,
-            core_1.Events.EVENT_COLUMN_EVERYTHING_CHANGED,
-            core_1.Events.EVENT_DISPLAYED_COLUMNS_CHANGED,
-            core_1.Events.EVENT_COLUMN_VISIBLE,
-            core_1.Events.EVENT_NEW_COLUMNS_LOADED,
+            Events.EVENT_COLUMN_MOVED,
+            Events.EVENT_GRID_COLUMNS_CHANGED,
+            Events.EVENT_COLUMN_EVERYTHING_CHANGED,
+            Events.EVENT_DISPLAYED_COLUMNS_CHANGED,
+            Events.EVENT_COLUMN_VISIBLE,
+            Events.EVENT_NEW_COLUMNS_LOADED,
         ];
         this.gridOptions.api.addGlobalListener((this.listenerGlobalColumnEventsThatTriggerStateChange = (type) => {
             if (columnEventsThatTriggersStateChange.indexOf(type) > -1) {
@@ -2982,7 +2990,7 @@ class Adaptable {
          * Use Case: User has started inline editing but its distabled in Action Row Options
          * Action: Stop editing
          */
-        this.gridOptions.api.addEventListener(core_1.Events.EVENT_CELL_EDITING_STARTED, (this.listenerCellEditingStarted = () => {
+        this.gridOptions.api.addEventListener(Events.EVENT_CELL_EDITING_STARTED, (this.listenerCellEditingStarted = () => {
             var _a;
             if ((_a = this.adaptableOptions.actionRowOptions) === null || _a === void 0 ? void 0 : _a.disableInlineEditing)
                 this.gridOptions.api.stopEditing();
@@ -2993,7 +3001,7 @@ class Adaptable {
          * Action2: Ensure that we have set column data types
          * Note: Deals with scenario where the data is provided to AdapTable after grid has been setup
          */
-        this.gridOptions.api.addEventListener(core_1.Events.EVENT_FIRST_DATA_RENDERED, (this.listenerFirstDataRendered = () => {
+        this.gridOptions.api.addEventListener(Events.EVENT_FIRST_DATA_RENDERED, (this.listenerFirstDataRendered = () => {
             this.checkColumnsDataTypeSet();
             this.api.calculatedColumnApi.refreshAggregatedCalculatedColumns();
             this.setLayout();
@@ -3003,7 +3011,7 @@ class Adaptable {
          * Action 1: Autosize pivot columns when entering pivot mode (if autosize pivot in Layout is true)
          * Action 2: Set pivot mode on / off in api as necessary
          */
-        this.gridOptions.api.addEventListener(core_1.Events.EVENT_COLUMN_PIVOT_MODE_CHANGED, (this.listenerPivotModeChanged = (params) => {
+        this.gridOptions.api.addEventListener(Events.EVENT_COLUMN_PIVOT_MODE_CHANGED, (this.listenerPivotModeChanged = (params) => {
             if (params.type == 'columnPivotModeChanged' &&
                 params.columnApi != null &&
                 params.columnApi.columnController != null &&
@@ -3021,7 +3029,7 @@ class Adaptable {
          * Use Case: A pivot column has changed
          * Action: Autosize pivot columns (if autosize pivot in Layout is true)
          */
-        this.gridOptions.api.addEventListener(core_1.Events.EVENT_COLUMN_PIVOT_CHANGED, (this.listenerPivotChanged = (params) => {
+        this.gridOptions.api.addEventListener(Events.EVENT_COLUMN_PIVOT_CHANGED, (this.listenerPivotChanged = (params) => {
             if (params.type == 'columnPivotChanged' &&
                 params.columnApi != null &&
                 params.columnApi.columnController != null &&
@@ -3036,13 +3044,13 @@ class Adaptable {
          * Action: Save the Layout (on a debounce)
          */
         const columnEventsThatTriggersAutoLayoutSave = [
-            core_1.Events.EVENT_COLUMN_PINNED,
-            core_1.Events.EVENT_COLUMN_PIVOT_CHANGED,
-            core_1.Events.EVENT_COLUMN_PIVOT_MODE_CHANGED,
-            core_1.Events.EVENT_DISPLAYED_COLUMNS_CHANGED,
-            core_1.Events.EVENT_SORT_CHANGED,
-            core_1.Events.EVENT_COLUMN_ROW_GROUP_CHANGED,
-            core_1.Events.EVENT_COLUMN_VALUE_CHANGED,
+            Events.EVENT_COLUMN_PINNED,
+            Events.EVENT_COLUMN_PIVOT_CHANGED,
+            Events.EVENT_COLUMN_PIVOT_MODE_CHANGED,
+            Events.EVENT_DISPLAYED_COLUMNS_CHANGED,
+            Events.EVENT_SORT_CHANGED,
+            Events.EVENT_COLUMN_ROW_GROUP_CHANGED,
+            Events.EVENT_COLUMN_VALUE_CHANGED,
         ];
         // ADD filter event
         this.gridOptions.api.addGlobalListener((this.listenerGlobalColumnEventsThatTriggerAutoLayoutSave = (type) => {
@@ -3052,8 +3060,8 @@ class Adaptable {
         }));
         // Save Layout if Display Row Groups is "dynamic"
         const rowGroupEventsThatTriggersAutoLayoutSave = [
-            core_1.Events.EVENT_ROW_GROUP_OPENED,
-            core_1.Events.EVENT_EXPAND_COLLAPSE_ALL,
+            Events.EVENT_ROW_GROUP_OPENED,
+            Events.EVENT_EXPAND_COLLAPSE_ALL,
         ];
         this.gridOptions.api.addGlobalListener((this.listenerGlobalRowGroupEventsThatTriggerAutoLayoutSave = (type) => {
             if (rowGroupEventsThatTriggersAutoLayoutSave.indexOf(type) > -1) {
@@ -3066,7 +3074,7 @@ class Adaptable {
          * Use Case: Column Row Grouping changes and 'restoreUngroupedColumns' is true
          * Action: Make the column invisiblel
          */
-        this.gridOptions.api.addEventListener(core_1.Events.EVENT_COLUMN_ROW_GROUP_CHANGED, (this.listenerColumnRowGroupChanged = (params) => {
+        this.gridOptions.api.addEventListener(Events.EVENT_COLUMN_ROW_GROUP_CHANGED, (this.listenerColumnRowGroupChanged = (params) => {
             var _a, _b;
             if (this.api.internalApi.isGridInPivotMode()) {
                 return;
@@ -3080,7 +3088,7 @@ class Adaptable {
          * Action 1: Save the Layout (on a debounce)
          * Action 2: Emit the internal ColumnResized event - used by Sparkline Column (in Charts)
          */
-        this.gridOptions.api.addEventListener(core_1.Events.EVENT_COLUMN_RESIZED, (this.listenerColumnResized = (params) => {
+        this.gridOptions.api.addEventListener(Events.EVENT_COLUMN_RESIZED, (this.listenerColumnResized = (params) => {
             if (params.finished == true && params.type == 'columnResized' && params.column) {
                 this.debouncedSaveGridLayout();
             }
@@ -3090,12 +3098,12 @@ class Adaptable {
          * Action: Set Selected Rows (on a debeounce)
          */
         const columnEventsThatTriggerSetRowSelection = [
-            core_1.Events.EVENT_ROW_GROUP_OPENED,
-            core_1.Events.EVENT_SELECTION_CHANGED,
-            core_1.Events.EVENT_ROW_SELECTED,
+            Events.EVENT_ROW_GROUP_OPENED,
+            Events.EVENT_SELECTION_CHANGED,
+            Events.EVENT_ROW_SELECTED,
         ];
         this.gridOptions.api.addGlobalListener((this.listenerGlobalSetRowSelection = (type) => {
-            if (ArrayExtensions_1.ArrayExtensions.ContainsItem(columnEventsThatTriggerSetRowSelection, type)) {
+            if (ArrayExtensions.ContainsItem(columnEventsThatTriggerSetRowSelection, type)) {
                 this.debouncedSetSelectedRows();
             }
         }));
@@ -3103,7 +3111,7 @@ class Adaptable {
          * Use Case: User has selected a range of cells
          * Action: Set Selected Cells (on a debounce)
          */
-        this.gridOptions.api.addEventListener(core_1.Events.EVENT_RANGE_SELECTION_CHANGED, (this.listenerRangeSelectionChanged = (params) => {
+        this.gridOptions.api.addEventListener(Events.EVENT_RANGE_SELECTION_CHANGED, (this.listenerRangeSelectionChanged = (params) => {
             if (params.finished == true) {
                 this.debouncedSetSelectedCells();
             }
@@ -3113,7 +3121,7 @@ class Adaptable {
          * Action1: Update AdapTable Sort Info
          * Action2: Set Selected Cells (on a debounce)
          */
-        this.gridOptions.api.addEventListener(core_1.Events.EVENT_SORT_CHANGED, (this.listenerSortChanged = () => {
+        this.gridOptions.api.addEventListener(Events.EVENT_SORT_CHANGED, (this.listenerSortChanged = () => {
             this.onSortChanged();
             this.debouncedSetSelectedCells();
             this._emit('SortChanged');
@@ -3123,7 +3131,7 @@ class Adaptable {
          * Use Case: Model has updated
          * Action: If user has set to see grouping totals as header create a pinned row (bit of a hack)
          */
-        this.gridOptions.api.addEventListener(core_1.Events.EVENT_MODEL_UPDATED, (this.listenerModelUpdated = (params) => {
+        this.gridOptions.api.addEventListener(Events.EVENT_MODEL_UPDATED, (this.listenerModelUpdated = (params) => {
             if (showGroupingTotalsAsHeader) {
                 if (params && params.api) {
                     const pinnedData = params.api.getPinnedTopRow(0);
@@ -3139,18 +3147,18 @@ class Adaptable {
             }
         }));
         const eventsThatTriggerChartingChanges = [
-            core_1.Events.EVENT_CHART_CREATED,
+            Events.EVENT_CHART_CREATED,
             /** Chart Range selection has changed */
-            core_1.Events.EVENT_CHART_RANGE_SELECTION_CHANGED,
+            Events.EVENT_CHART_RANGE_SELECTION_CHANGED,
             /** Chart Options have changed */
-            core_1.Events.EVENT_CHART_OPTIONS_CHANGED,
+            Events.EVENT_CHART_OPTIONS_CHANGED,
             /** Chart was destroyed */
-            core_1.Events.EVENT_CHART_DESTROYED,
+            Events.EVENT_CHART_DESTROYED,
         ];
         const chartingModule = this.ModuleService.getModuleById('Charting');
         if (chartingModule.isModuleAvailable()) {
             this.gridOptions.api.addGlobalListener((type, params) => {
-                if (ArrayExtensions_1.ArrayExtensions.ContainsItem(eventsThatTriggerChartingChanges, type)) {
+                if (ArrayExtensions.ContainsItem(eventsThatTriggerChartingChanges, type)) {
                     this.ChartingService.onChartModelChange(this.getChartModels(), type, params);
                 }
             });
@@ -3184,9 +3192,9 @@ class Adaptable {
                 if (this.isDestroyed) {
                     return true;
                 }
-                const columnFilters = this.api.filterApi.getActiveColumnFilters();
-                const isFilterActive = ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(columnFilters);
-                const isQueryActive = StringExtensions_1.StringExtensions.IsNotNullOrEmpty(this.api.queryApi.getCurrentQuery());
+                const columnFilters = this.api.columnFilterApi.getActiveColumnFilters();
+                const isFilterActive = ArrayExtensions.IsNotNullOrEmpty(columnFilters);
+                const isQueryActive = StringExtensions.IsNotNullOrEmpty(this.api.gridFilterApi.getCurrentGridFilterExpression());
                 return (isFilterActive ||
                     isQueryActive ||
                     // it means that originalIsExternalFilterPresent will be called so we reinit that collection
@@ -3198,30 +3206,30 @@ class Adaptable {
                 if (this.isDestroyed) {
                     return true;
                 }
-                // first we assess Query (if its running locally)
+                // first we assess a Grid Filter (if its running locally)
                 if (!this.isGroupRowNode(node)) {
-                    const currentQuery = this.api.queryApi.getCurrentQuery();
-                    if (currentQuery) {
-                        const evaluateQueryOnClient = this.api.expressionApi.internalApi.evaluateExpressionInAdaptableQL('Query', undefined, currentQuery);
+                    const currentGridFilter = this.api.gridFilterApi.getCurrentGridFilterExpression();
+                    if (currentGridFilter) {
+                        const evaluateQueryOnClient = this.api.expressionApi.internalApi.evaluateExpressionInAdaptableQL('NamedQuery', undefined, currentGridFilter);
                         if (evaluateQueryOnClient) {
-                            const isCurrentQueryValid = this.api.expressionApi.isValidBooleanExpression(currentQuery, ModuleConstants_1.QueryModuleId, `Invalid CurrentQuery '${currentQuery}'`);
+                            const isCurrentQueryValid = this.api.expressionApi.isValidBooleanExpression(currentGridFilter, NamedQueryModuleId, `Invalid Grid Filter '${currentGridFilter}'`);
                             if (!isCurrentQueryValid ||
                                 !this.api.internalApi
                                     .getQueryLanguageService()
-                                    .evaluateBooleanExpression(currentQuery, ModuleConstants_1.QueryModuleId, node)) {
+                                    .evaluateBooleanExpression(currentGridFilter, NamedQueryModuleId, node)) {
                                 return false;
                             }
                         }
                     }
                 }
-                const columnFilters = this.api.filterApi.getActiveColumnFilters();
+                const columnFilters = this.api.columnFilterApi.getActiveColumnFilters();
                 try {
                     if (columnFilters.length > 0) {
                         for (const columnFilter of columnFilters) {
                             const evaluateFilterOnClient = this.api.expressionApi.internalApi.evaluatePredicatesInAdaptableQL('Filter', columnFilter, [columnFilter.Predicate]);
                             if (evaluateFilterOnClient) {
                                 // we then assess filters (if running locally)
-                                if (!this.api.filterApi.internalApi.evaluateColumnFilter(columnFilter, node)) {
+                                if (!this.api.columnFilterApi.internalApi.evaluateColumnFilter(columnFilter, node)) {
                                     return false;
                                 }
                             }
@@ -3250,9 +3258,9 @@ class Adaptable {
     }
     updateColumnFilterActiveState() {
         var _a;
-        const columnFilters = this.api.filterApi.getActiveColumnFilters();
-        const activeFilters = (_a = columnFilters === null || columnFilters === void 0 ? void 0 : columnFilters.filter) === null || _a === void 0 ? void 0 : _a.call(columnFilters, (columnFilter) => this.api.filterApi.isFilterActive(columnFilter));
-        const isFilterActive = ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(activeFilters);
+        const columnFilters = this.api.columnFilterApi.getActiveColumnFilters();
+        const activeFilters = (_a = columnFilters === null || columnFilters === void 0 ? void 0 : columnFilters.filter) === null || _a === void 0 ? void 0 : _a.call(columnFilters, (columnFilter) => this.api.columnFilterApi.isFilterActive(columnFilter));
+        const isFilterActive = ArrayExtensions.IsNotNullOrEmpty(activeFilters);
         const columnsWithActiveFilters = {};
         if (isFilterActive) {
             // used in particular at init time to show the filter icon correctly
@@ -3427,10 +3435,11 @@ class Adaptable {
             const quickSearchStyle = this.getQuickSearchCellStyle();
             const hasQuickSearchStyle = quickSearchStyle != undefined;
             const cellStyle = (params) => {
-                const isQuickSearchActive = hasQuickSearchStyle && this.isQuickSearchActive(abColumn, params);
+                const gridCell = this.getGridCellFromRowNode(params.node, abColumn.columnId);
+                const isQuickSearchActive = hasQuickSearchStyle && this.isQuickSearchActive(gridCell, params);
                 const userDefined = typeof userCellStyle === 'function' ? userCellStyle(params) : userCellStyle;
-                const result = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, userDefined), this.getReadOnlyCellStyle(abColumn, params)), this.getEditableCellStyle(abColumn, params)), this.getFormatColumnAndStyledColumnCellStyle(abColumn, colId, params)), (isQuickSearchActive ? quickSearchStyle : {})), this.getAlertCellStyle(abColumn, params)), this.getFlashingCellStyle(abColumn, params)), this.getCellHighlightStyle(abColumn, params));
-                return (0, StyleHelper_1.normalizeStyleForAgGrid)(result);
+                const result = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, userDefined), this.getReadOnlyCellStyle(gridCell, params)), this.getEditableCellStyle(gridCell, params)), this.getFormatColumnAndStyledColumnCellStyle(gridCell, params)), (isQuickSearchActive ? quickSearchStyle : {})), this.getAlertCellStyle(gridCell, params)), this.getFlashingCellStyle(gridCell, params)), this.getCellHighlightStyle(gridCell, params));
+                return normalizeStyleForAgGrid(result);
             };
             return cellStyle;
         });
@@ -3439,25 +3448,25 @@ class Adaptable {
         this.setColDefProperty(col, 'cellClass', (userCellClass) => {
             const formatColumns = this.api.formatColumnApi.internalApi.getFormatColumnWithStyleClassNameForColumn(abColumn);
             const quickSearchStyleClassName = this.api.quickSearchApi.getQuickSearchStyle().ClassName;
-            const hasQuickSearchStyleClassName = StringExtensions_1.StringExtensions.IsNotNullOrEmpty(quickSearchStyleClassName);
+            const hasQuickSearchStyleClassName = StringExtensions.IsNotNullOrEmpty(quickSearchStyleClassName);
             const cellClass = (params) => {
-                const primaryKeyValue = this.getPrimaryKeyValueFromRowNode(params.node);
+                const gridCell = this.getGridCellFromRowNode(params.node, abColumn.columnId);
                 // if a Visual Data export is in progress, we are interested only in the Excel Style Class
                 if (this.api.exportApi.internalApi.isVisualDataExportInProgress()) {
                     const userDefinedCellClass = typeof userCellClass === 'function' ? userCellClass(params) : userCellClass;
-                    const cellClassKey = this.getExcelClassNameForCell(colId, primaryKeyValue, userDefinedCellClass);
+                    const cellClassKey = this.getExcelClassNameForCell(colId, gridCell.primaryKeyValue, userDefinedCellClass);
                     return this.api.internalApi
                         .getReportService()
                         .getExcelStyleIdForCellClassKey(cellClassKey);
                 }
-                const isQuickSearchActive = hasQuickSearchStyleClassName && this.isQuickSearchActive(abColumn, params);
-                const editableClassName = this.getEditableCellClass(abColumn, params);
-                const readonlyClassName = this.getReadonlyCellClass(abColumn, params);
-                const highlightAlertClassName = this.getAlertCellClass(abColumn, params);
-                const flashingClassName = this.getFlashingCellClass(abColumn, params);
+                const isQuickSearchActive = hasQuickSearchStyleClassName && this.isQuickSearchActive(gridCell, params);
+                const editableClassName = this.getEditableCellClass(gridCell, params);
+                const readonlyClassName = this.getReadonlyCellClass(gridCell, params);
+                const highlightAlertClassName = this.getAlertCellClass(gridCell, params);
+                const flashingClassName = this.getFlashingCellClass(gridCell, params);
                 const styledColumn = this.api.styledColumnApi.getStyledColumnForColumnId(colId);
                 const hasStyledColumn = !!styledColumn && !styledColumn.IsSuspended;
-                const noteClassName = this.getNoteCellClassName(abColumn, params);
+                const noteClassName = this.getNoteCellClassName(gridCell, params);
                 const returnValue = [
                     typeof userCellClass === 'function' ? userCellClass(params) : userCellClass,
                     !hasStyledColumn && formatColumns.length
@@ -3493,11 +3502,11 @@ class Adaptable {
     setupColumnCellEditor({ colId, col }) {
         const adaptableColumn = this.api.columnApi.getColumnWithColumnId(colId);
         const editLookUpItem = this.api.userInterfaceApi.getEditLookUpItemForColumn(adaptableColumn);
-        const hasRichSelectCellEditor = this.isAgGridModulePresent(core_1.ModuleNames.RichSelectModule);
+        const hasRichSelectCellEditor = this.isAgGridModulePresent(ModuleNames.RichSelectModule);
         this.setColDefProperty(col, 'cellEditor', () => {
             const styledColumn = this.api.styledColumnApi.getActiveStyledColumnForColumn(adaptableColumn);
             if (styledColumn && !(styledColumn === null || styledColumn === void 0 ? void 0 : styledColumn.IsSuspended) && styledColumn.CheckBoxStyle) {
-                return CheckboxRenderer_1.CheckboxEditor;
+                return CheckboxEditor;
             }
             if (editLookUpItem) {
                 return hasRichSelectCellEditor ? 'agRichSelectCellEditor' : 'agSelectCellEditor';
@@ -3543,7 +3552,7 @@ class Adaptable {
             const styledColumn = this.api.styledColumnApi.getStyledColumnForColumnId(abColumn.columnId);
             if (styledColumn && !styledColumn.IsSuspended) {
                 if (styledColumn.SparkLineStyle) {
-                    const sparklineOptions = (0, merge_1.default)({}, userDefined === null || userDefined === void 0 ? void 0 : userDefined.sparklineOptions, styledColumn.SparkLineStyle.options);
+                    const sparklineOptions = merge({}, userDefined === null || userDefined === void 0 ? void 0 : userDefined.sparklineOptions, styledColumn.SparkLineStyle.options);
                     return Object.assign(Object.assign({}, userDefined), { sparklineOptions });
                 }
             }
@@ -3568,7 +3577,7 @@ class Adaptable {
                             returnValue = params.value;
                         }
                         if (textOptions.includes('PercentageValue')) {
-                            const clampedValue = Helper_1.Helper.clamp(params.value, min, max);
+                            const clampedValue = Helper.clamp(params.value, min, max);
                             const percentageValue = ((clampedValue - min) / (max - min)) * 100;
                             returnValue += ' ' + `(${percentageValue.toFixed(0)}%)`;
                         }
@@ -3653,7 +3662,7 @@ class Adaptable {
             var _a;
             // set the default to the AG Grid provided values
             // from https://github.com/ag-grid/ag-grid/blob/v26.1.0/community-modules/core/src/ts/columns/columnModel.ts#L2515
-            let resultHeaderName = userHeaderName !== null && userHeaderName !== void 0 ? userHeaderName : StringExtensions_1.StringExtensions.CamelCaseToHumanText(col.getColDef().field);
+            let resultHeaderName = userHeaderName !== null && userHeaderName !== void 0 ? userHeaderName : StringExtensions.CamelCaseToHumanText(col.getColDef().field);
             const layoutCustomHeader = (_a = this.api.layoutApi.getCurrentLayout().ColumnHeadersMap) === null || _a === void 0 ? void 0 : _a[col.getColId()];
             if (layoutCustomHeader) {
                 resultHeaderName = layoutCustomHeader;
@@ -3675,7 +3684,7 @@ class Adaptable {
                 return;
             }
             this.gridOptions.api.destroyFilter(col);
-            return (0, FilterWrapper_1.FilterWrapperFactory)(this);
+            return FilterWrapperFactory(this);
         });
     }
     setupColumnFloatingFilter({ col, colDef }) {
@@ -3685,7 +3694,7 @@ class Adaptable {
             if (isFloatingFilterDisabled) {
                 return;
             }
-            return (0, FloatingFilterWrapper_1.FloatingFilterWrapperFactory)(this);
+            return FloatingFilterWrapperFactory(this);
         });
         this.setColDefProperty(col, 'floatingFilterComponentParams', () => {
             if (isFloatingFilterDisabled) {
@@ -3842,7 +3851,7 @@ class Adaptable {
         this.api.themeApi.applyCurrentTheme();
     }
     applyFinalRendering() {
-        this.embedColumnMenu = this.isAgGridModulePresent(core_1.ModuleNames.MenuModule);
+        this.embedColumnMenu = this.isAgGridModulePresent(ModuleNames.MenuModule);
         if (this.gridOptions.treeData && this.gridOptions.treeData == true) {
             this.api.internalApi.setTreeModeOn();
         }
@@ -3852,7 +3861,7 @@ class Adaptable {
         this.agGridHelper.checkShouldClearExistingFiltersOrSearches();
     }
     isAgGridModulePresent(moduleName) {
-        const standardAgGridRegistrationCheck = core_1.ModuleRegistry.__isRegistered(moduleName, this.gridOptions.gridId);
+        const standardAgGridRegistrationCheck = ModuleRegistry.__isRegistered(moduleName, this.gridOptions.gridId);
         if (standardAgGridRegistrationCheck) {
             return true;
         }
@@ -3864,7 +3873,7 @@ class Adaptable {
         // because of that we have to check ALL grid IDs to see if the module is registered
         // TODO AFL: we should recheck this later, it seems AG Grid is already refactoring this faulty registration process
         // @ts-ignore
-        const gridModulesMap = core_1.ModuleRegistry.gridModulesMap;
+        const gridModulesMap = ModuleRegistry.gridModulesMap;
         let allModulesMap = {};
         Object.keys(gridModulesMap).forEach((gridId) => {
             allModulesMap = Object.assign(Object.assign({}, allModulesMap), gridModulesMap[gridId]);
@@ -4011,7 +4020,7 @@ class Adaptable {
     getFormatColumnExpressionStylesChanges(dataChangedScope, cellDataChangedInfos) {
         const formatColumnsWithExpression = [];
         formatColumnsWithExpression.push(...this.api.formatColumnApi.internalApi.getFormatColumnsWithExpression());
-        if (ArrayExtensions_1.ArrayExtensions.IsNullOrEmpty(formatColumnsWithExpression)) {
+        if (ArrayExtensions.IsNullOrEmpty(formatColumnsWithExpression)) {
             return;
         }
         cellDataChangedInfos.forEach((cellDataChangedInfo) => {
@@ -4051,7 +4060,7 @@ class Adaptable {
             let columnComparison = this.api.styledColumnApi.internalApi.getColumnComparisonForStyledColumn(sc);
             if (columnComparison) {
                 let affectedColumnIds = this.api.styledColumnApi.internalApi.getColumnIdsFromColumnComparison(columnComparison);
-                if (ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(affectedColumnIds)) {
+                if (ArrayExtensions.IsNotNullOrEmpty(affectedColumnIds)) {
                     cellDataChangedInfos.forEach((cellDataChangedInfo) => {
                         if (affectedColumnIds.includes(cellDataChangedInfo.column.columnId)) {
                             dataChangedScope.columnIds.add(sc.ColumnId);
@@ -4063,7 +4072,7 @@ class Adaptable {
     }
     checkChangedCellCurrentlySelected(cellDataChangedInfo) {
         let selectedCellInfo = this.api.gridApi.getSelectedCellInfo();
-        if (selectedCellInfo && ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(selectedCellInfo.gridCells)) {
+        if (selectedCellInfo && ArrayExtensions.IsNotNullOrEmpty(selectedCellInfo.gridCells)) {
             let matchingCell = selectedCellInfo.gridCells.find((gc) => gc.primaryKeyValue == cellDataChangedInfo.primaryKeyValue &&
                 gc.column == cellDataChangedInfo.column);
             if (matchingCell) {
@@ -4071,7 +4080,7 @@ class Adaptable {
             }
         }
         let selectedRowInfo = this.api.gridApi.getSelectedRowInfo();
-        if (selectedRowInfo && ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(selectedRowInfo.gridRows)) {
+        if (selectedRowInfo && ArrayExtensions.IsNotNullOrEmpty(selectedRowInfo.gridRows)) {
             let matchingRow = selectedRowInfo.gridRows.find((gr) => gr.primaryKeyValue == cellDataChangedInfo.primaryKeyValue);
             if (matchingRow) {
                 this.setSelectedRows();
@@ -4135,7 +4144,7 @@ class Adaptable {
         this.gridOptions.api.onGroupExpandedOrCollapsed();
     }
     expandRowGroupsForValues(columnValues) {
-        if (ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(columnValues)) {
+        if (ArrayExtensions.IsNotNullOrEmpty(columnValues)) {
             const expandedKeys = columnValues.reduce((acc, key) => {
                 acc[key] = true;
                 return acc;
@@ -4440,7 +4449,7 @@ class Adaptable {
     }
     getFirstGroupedColumn() {
         let groupedColumns = this.gridOptions.columnApi.getRowGroupColumns();
-        if (ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(groupedColumns)) {
+        if (ArrayExtensions.IsNotNullOrEmpty(groupedColumns)) {
             let groupedColumn = groupedColumns[0];
             return this.api.columnApi.getColumnWithColumnId(groupedColumn.getColId());
         }
@@ -4500,7 +4509,7 @@ class Adaptable {
         return (this.gridOptions.rowSelection === 'single' || this.gridOptions.rowSelection === 'multiple');
     }
     isGridRangeSelectable() {
-        let isRangeSelectionModuleRegistered = this.isAgGridModulePresent(core_1.ModuleNames.RangeSelectionModule);
+        let isRangeSelectionModuleRegistered = this.isAgGridModulePresent(ModuleNames.RangeSelectionModule);
         return isRangeSelectionModuleRegistered && this.gridOptions.enableRangeSelection === true;
     }
     isGridGroupable() {
@@ -4546,7 +4555,7 @@ class Adaptable {
         return false;
     }
     showQuickFilter() {
-        const height = this.api.optionsApi.getFilterOptions().quickFilterHeight;
+        const height = this.api.optionsApi.getColumnFilterOptions().quickFilterHeight;
         this.gridOptions.api.setFloatingFiltersHeight(height);
     }
     hideQuickFilter() {
@@ -4656,10 +4665,10 @@ class Adaptable {
         const getAgGridLightThemeName = () => this.getAgGridLightThemeName();
         const getAgGridDarkThemeName = () => getAgGridLightThemeName() + '-dark';
         if (newTheme && (isSystemTheme || variantTheme)) {
-            if ((variantTheme || themeName) === GeneralConstants_1.LIGHT_THEME) {
+            if ((variantTheme || themeName) === LIGHT_THEME) {
                 newTheme.AgGridClassName = newTheme.AgGridClassName || getAgGridLightThemeName();
             }
-            if ((variantTheme || themeName) === GeneralConstants_1.DARK_THEME) {
+            if ((variantTheme || themeName) === DARK_THEME) {
                 newTheme.AgGridClassName = newTheme.AgGridClassName || getAgGridDarkThemeName();
             }
         }
@@ -4687,14 +4696,14 @@ class Adaptable {
                 container.classList.add(newTheme.AgGridClassName);
             }
             container.classList.add('ab-Grid');
-            if (this.adaptableOptions.filterOptions.indicateFilteredColumns) {
+            if (this.adaptableOptions.columnFilterOptions.indicateFilteredColumns) {
                 container.classList.add('ab-Grid--indicate-filtered-columns');
             }
         }
         // MAC LIKE SCROLLBARS
         if (this.adaptableOptions.userInterfaceOptions &&
             this.adaptableOptions.userInterfaceOptions.useCustomMacLikeScrollbars &&
-            (0, getScrollbarSize_1.default)() > 0) {
+            getScrollbarSize() > 0) {
             el.classList.add('ab--custom-mac-like-scrollbars');
         }
         else {
@@ -4744,13 +4753,13 @@ class Adaptable {
         return this.gridOptions.api;
     }
     canGenerateCharts() {
-        return (this.isAgGridModulePresent(core_1.ModuleNames.GridChartsModule) && this.gridOptions.enableCharts);
+        return (this.isAgGridModulePresent(ModuleNames.GridChartsModule) && this.gridOptions.enableCharts);
     }
     canDisplaySparklines() {
-        return this.isAgGridModulePresent(core_1.ModuleNames.SparklinesModule);
+        return this.isAgGridModulePresent(ModuleNames.SparklinesModule);
     }
     canExportToExcel() {
-        return this.isAgGridModulePresent(core_1.ModuleNames.ExcelExportModule);
+        return this.isAgGridModulePresent(ModuleNames.ExcelExportModule);
     }
     exportToExcel(reportData, fileName) {
         const columnDefs = reportData.columns.map((column) => ({
@@ -4790,7 +4799,7 @@ class Adaptable {
             rowData: reportData.rows,
         };
         let gridParams = { modules: this.getAgGridRegisteredModules() };
-        const grid = new core_1.Grid(document.createElement('div'), gridOptions, gridParams);
+        const grid = new Grid(document.createElement('div'), gridOptions, gridParams);
         gridOptions.api.exportDataAsExcel({
             sheetName: 'Sheet 1',
             fileName: fileName,
@@ -4884,7 +4893,7 @@ class Adaptable {
                         }
                         return result;
                     }, {}));
-                    const sanitizedAdaptableStyle = (0, StyleHelper_1.sanitizeStyle)(adaptableStyle);
+                    const sanitizedAdaptableStyle = sanitizeStyle(adaptableStyle);
                     if (Object.values(sanitizedAdaptableStyle).some((style) => style != null)) {
                         excelStyles.push(this.convertCSSToExcelStyle(sanitizedAdaptableStyle));
                     }
@@ -4913,7 +4922,7 @@ class Adaptable {
                                 // we have to pass the date in the ISO format to Excel
                                 // see https://www.ag-grid.com/javascript-data-grid/excel-export-data-types/#dates
                                 // we can NOT use Date.toISOString() because we don't want the timezone corrections to kick in
-                                const isoFormattedValue = (0, FormatHelper_1.DateFormatter)(normalisedValue, {
+                                const isoFormattedValue = DateFormatter(normalisedValue, {
                                     Pattern: `yyyy-MM-dd'T'HH:mm:ss.SSS`,
                                 });
                                 if (isoFormattedValue) {
@@ -4942,7 +4951,7 @@ class Adaptable {
         this.setExcelStylesForExport();
         this.gridOptions.api.exportDataAsExcel({
             sheetName: 'Sheet 1',
-            fileName: this.ReportService.getReportFileName(this.adaptableOptions.adaptableId),
+            fileName: this.ReportService.getReportFileName(this.adaptableOptions.adaptableId, 'Excel'),
             // delegate the cell value processing to Adaptable
             processCellCallback: ({ node, column, value }) => {
                 var _a;
@@ -4983,11 +4992,11 @@ class Adaptable {
         });
     }
     convertAdaptableStyleToCSS(style) {
-        return (0, StyleHelper_1.convertAdaptableStyleToCSS)(style);
+        return convertAdaptableStyleToCSS(style);
     }
     convertCSSToExcelStyle(style) {
         const getHexColor = (color) => {
-            const preparedColor = (0, StyleHelper_1.getVariableColor)(color);
+            const preparedColor = getVariableColor(color);
             const t = tinycolor(preparedColor);
             const a = t.getAlpha();
             return tinycolor.mix(tinycolor('white'), t, a * 100).toHexString();
@@ -5014,7 +5023,7 @@ class Adaptable {
         }
         if (style.textAlign) {
             result.alignment = {
-                horizontal: StringExtensions_1.StringExtensions.CapitaliseFirstLetter(style.textAlign),
+                horizontal: StringExtensions.CapitaliseFirstLetter(style.textAlign),
             };
         }
         if (style.color != null) {
@@ -5042,7 +5051,7 @@ class Adaptable {
             if (!result.font) {
                 result.font = {};
             }
-            result.font.size = (0, StyleHelper_1.convertCSSAbsoluteFontSizeToPt)(style.fontSize);
+            result.font.size = convertCSSAbsoluteFontSizeToPt(style.fontSize);
         }
         return result;
     }
@@ -5082,23 +5091,23 @@ class Adaptable {
     }
     addSyntheticPrimaryKey(rowData = []) {
         for (let i = 0; i < rowData.length; i++) {
-            rowData[i][GeneralConstants_1.AUTOGENERATED_PK_COLUMN] = (0, Uuid_1.createUuid)();
+            rowData[i][AUTOGENERATED_PK_COLUMN] = createUuid();
         }
     }
     // add a synthetic PK only if missing (useful in case of updating row data)
     addSyntheticPrimaryKeyIfMissing(rowData = []) {
-        this.adaptableOptions.primaryKey = GeneralConstants_1.AUTOGENERATED_PK_COLUMN;
+        this.adaptableOptions.primaryKey = AUTOGENERATED_PK_COLUMN;
         for (let i = 0; i < rowData.length; i++) {
-            if (!rowData[i][GeneralConstants_1.AUTOGENERATED_PK_COLUMN]) {
-                rowData[i][GeneralConstants_1.AUTOGENERATED_PK_COLUMN] = (0, Uuid_1.createUuid)();
+            if (!rowData[i][AUTOGENERATED_PK_COLUMN]) {
+                rowData[i][AUTOGENERATED_PK_COLUMN] = createUuid();
             }
         }
     }
     initLicenseService() {
         const globalObject = typeof globalThis !== 'undefined' ? globalThis : window;
         const licenseKey = globalObject.ADAPTABLE_LICENSE_KEY || this.api.optionsApi.getLicenseKey();
-        return new LicenseService_1.LicenseService(this, licenseKey, {
-            publishedAt: publishTimestamp_1.default,
+        return new LicenseService(this, licenseKey, {
+            publishedAt: publishTimestamp,
         });
     }
     showCharts(chartsDefinitions, chartContainer) {
@@ -5165,14 +5174,14 @@ class Adaptable {
     registerAdaptableAggFuncs() {
         this.setGridOptionsProperty('aggFuncs', (originalAggFuncs) => {
             const aggregationFunctions = originalAggFuncs || {};
-            aggregationFunctions[AggregationColumns_1.WEIGHTED_AVERAGE_AGG_FN_NAME] = (params) => {
+            aggregationFunctions[WEIGHTED_AVERAGE_AGG_FN_NAME] = (params) => {
                 const columnId = params.column.getColId();
                 const adaptableAggFunc = this.getActiveAdaptableAggFuncForCol(columnId);
                 if (!adaptableAggFunc) {
                     return undefined;
                 }
                 if (adaptableAggFunc.type === 'weightedAverage') {
-                    return (0, weightedAverage_1.weightedAverage)(params, params.colDef.colId, adaptableAggFunc.weightedColumnId);
+                    return weightedAverage(params, params.colDef.colId, adaptableAggFunc.weightedColumnId);
                 }
                 return undefined;
             };
@@ -5185,7 +5194,7 @@ class Adaptable {
     mapAggregationColumnsFromGrid(aggFuncFromGrid, currentLayout) {
         return Object.entries(aggFuncFromGrid).reduce((acc, [colId, agg]) => {
             const adaptableAggFunc = this.getActiveAdaptableAggFuncForCol(colId);
-            if ((adaptableAggFunc === null || adaptableAggFunc === void 0 ? void 0 : adaptableAggFunc.type) === 'weightedAverage' && agg === AggregationColumns_1.WEIGHTED_AVERAGE_AGG_FN_NAME) {
+            if ((adaptableAggFunc === null || adaptableAggFunc === void 0 ? void 0 : adaptableAggFunc.type) === 'weightedAverage' && agg === WEIGHTED_AVERAGE_AGG_FN_NAME) {
                 // do not override the agg func
                 acc[colId] = currentLayout.AggregationColumns[colId];
             }
@@ -5280,8 +5289,7 @@ class Adaptable {
         return newColumnOrder;
     }
 }
-exports.Adaptable = Adaptable;
-class AdaptableNoCodeWizard {
+export class AdaptableNoCodeWizard {
     /**
      * @param adaptableOptions
      */
@@ -5292,12 +5300,12 @@ class AdaptableNoCodeWizard {
         this.adaptableOptions = adaptableOptions;
         this.init = extraOptions.onInit || defaultInit;
         this.extraOptions = extraOptions;
-        this.agGridModules = core_1.ModuleRegistry.__getRegisteredModules(agGridOptons === null || agGridOptons === void 0 ? void 0 : agGridOptons.gridOptions.gridId);
+        this.agGridModules = ModuleRegistry.__getRegisteredModules(agGridOptons === null || agGridOptons === void 0 ? void 0 : agGridOptons.gridOptions.gridId);
         this.render();
     }
     render(container) {
         var _a;
-        let id = DefaultAdaptableOptions_1.DefaultAdaptableOptions.containerOptions.adaptableContainer || 'adaptable';
+        let id = DefaultAdaptableOptions.containerOptions.adaptableContainer || 'adaptable';
         if (!container) {
             let containerOptionsContainer = (_a = this.adaptableOptions.containerOptions) === null || _a === void 0 ? void 0 : _a.adaptableContainer;
             if (containerOptionsContainer) {
@@ -5316,7 +5324,7 @@ class AdaptableNoCodeWizard {
         // this allows people to customize the wizard dimensions & styling
         // when it's visible
         container.classList.add('adaptable--in-wizard');
-        const unmount = (0, renderReactRoot_1.renderReactRoot)(React.createElement(AdaptableWizardView_1.default, Object.assign(Object.assign({ adaptableOptions: this.adaptableOptions }, this.extraOptions), { onInit: (adaptableOptions, gridOptions) => {
+        const unmount = defaultRenderReactRoot(React.createElement(AdaptableWizardView, Object.assign(Object.assign({ adaptableOptions: this.adaptableOptions }, this.extraOptions), { onInit: (adaptableOptions, gridOptions) => {
                 container.classList.remove('adaptable--in-wizard');
                 unmount();
                 this.init({
@@ -5327,4 +5335,3 @@ class AdaptableNoCodeWizard {
             } })), container, true);
     }
 }
-exports.AdaptableNoCodeWizard = AdaptableNoCodeWizard;