@adaptabletools/adaptable 10.0.3 → 10.0.4-canary.3

package/src/agGrid/Adaptable.js

@@ -124,6 +124,7 @@ class Adaptable {
             }
         };
         this._adaptableReady = false;
+        this.isDestroyed = false;
         this.agGridModules = [];
         this.isPluginLoaded = (pluginId) => {
             const plugins = this.adaptableOptions.plugins || [];
@@ -137,7 +138,7 @@ class Adaptable {
         };
         this.isAgGridReady = () => {
             var _a, _b;
-            const waitTimeout = (_b = (_a = this.adaptableOptions.containerOptions) === null || _a === void 0 ? void 0 : _a.vendorContainerWaitTimeout) !== null && _b !== void 0 ? _b : 60000;
+            const waitTimeout = (_b = (_a = this.adaptableOptions.containerOptions) === null || _a === void 0 ? void 0 : _a.agGridContainerWaitTimeout) !== null && _b !== void 0 ? _b : 60000;
             return waitForCondition_1.waitForCondition(() => !!this.gridOptions.api, waitTimeout);
         };
         // debounced methods
@@ -339,7 +340,8 @@ class Adaptable {
         // TODO: if  a custom 'aggFunc' property is defined (see setupColumnAggFunc()), it won't be evaluated
         if (!this.getDefaultGroupOrderComparator(this.gridOptions) &&
             this.adaptableOptions.generalOptions.autoOrderGroupedColumns) {
-            this.gridOptions.defaultGroupOrderComparator = this.agGridHelper.runAdaptableGroupComparerFunction();
+            this.gridOptions.defaultGroupOrderComparator =
+                this.agGridHelper.runAdaptableGroupComparerFunction();
         }
         // we prefer the grid to be NOT instantiated so that we can do it
         // perhaps in future we will force instantiation only?
@@ -357,7 +359,7 @@ class Adaptable {
         this.TeamSharingService = new TeamSharingService_1.TeamSharingService(this);
         this.MetamodelService = new MetamodelService_1.MetamodelService(this);
         this.forPlugins((plugin) => plugin.afterInitServices(this));
-        // Set up Modules - we set up all the Modules suitable for the vendor grid
+        // Set up Modules - we set up all the Modules suitable for AG Grid
         // But users can make some hidden or readonly in their entitlements
         this.modules = this.agGridHelper.setUpModules();
         this.forPlugins((plugin) => plugin.afterInitModules(this, this.modules));
@@ -404,6 +406,9 @@ class Adaptable {
             }
             // Load the store
             this.adaptableStore.Load.then(() => {
+                if (this.isDestroyed) {
+                    return;
+                }
                 this.initInternalGridLogic();
                 AdaptableHelper_1.default.checkValidPrimaryKey(this);
             }, (e) => {
@@ -478,7 +483,7 @@ class Adaptable {
                 this.forPlugins((plugin) => plugin.onAdaptableReady(this, this.adaptableOptions));
                 this.api.eventApi.emit('AdaptableReady', {
                     adaptableApi: this.api,
-                    vendorGrid: this.adaptableOptions.vendorGrid,
+                    gridOptions: this.adaptableOptions.vendorGrid,
                 });
             }
         });
@@ -486,6 +491,7 @@ class Adaptable {
     performAudit(action, oldState, newState) {
         if (this.isInitialised) {
             const adaptableStateChangedInfo = {
+                adaptableApi: this.api,
                 actionName: action.type,
                 clientTimestamp: new Date(),
                 userName: this.adaptableOptions.userName,
@@ -553,12 +559,12 @@ class Adaptable {
                 }
             }
         }
-        const checkVendorContainer = () => {
-            let vendorContainer = this.getGridContainerElement();
-            if (!vendorContainer) {
-                vendorContainer = this.initVendorContainerFromInitializedAgGrid();
-                if (!vendorContainer) {
-                    LoggingHelper_1.ConsoleLogError('You must provide an element id in `containerOptions.vendorContainer`');
+        const checkAgGridContainer = () => {
+            let agGridContainer = this.getAgGridContainerElement();
+            if (!agGridContainer) {
+                agGridContainer = this.initAgGridContainerFromInitializedAgGrid();
+                if (!agGridContainer) {
+                    LoggingHelper_1.ConsoleLogError('You must provide an element id in `containerOptions.agGridContainer`');
                     return false;
                 }
             }
@@ -566,14 +572,14 @@ class Adaptable {
         };
         const isGridInstantiated = this.gridOptions.api && typeof this.gridOptions.api.getValue === 'function';
         if (isGridInstantiated) {
-            if (!checkVendorContainer()) {
+            if (!checkAgGridContainer()) {
                 return Promise.resolve(false);
             }
             return Promise.resolve(true);
         }
         if (this.runtimeConfig.waitForAgGrid) {
             return this.isAgGridReady().then(() => {
-                this.initVendorContainerFromInitializedAgGrid();
+                this.initAgGridContainerFromInitializedAgGrid();
                 return Promise.resolve(true);
             }, () => {
                 LoggingHelper_1.ConsoleLogError(`Could not find any agGrid instance rendered. Could not find reference to ag-grid api. Make sure you pass the same  gridOptions object reference both to Adaptable and AgGrid`);
@@ -581,7 +587,7 @@ class Adaptable {
             });
         }
         else {
-            if (!checkVendorContainer()) {
+            if (!checkAgGridContainer()) {
                 return Promise.resolve(false);
             }
         }
@@ -589,11 +595,11 @@ class Adaptable {
         let grid;
         const modules = (this.adaptableOptions.vendorGrid || {}).modules || [];
         this.agGridModules = [...this.agGridModules, ...modules];
-        const vendorContainer = this.getGridContainerElement();
+        const agGridContainer = this.getAgGridContainerElement();
         if (this.gridOptions.modules) {
             delete this.gridOptions.modules;
         }
-        grid = new all_modules_1.Grid(vendorContainer, this.gridOptions, { modules });
+        grid = new all_modules_1.Grid(agGridContainer, this.gridOptions, { modules });
         // 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
         if (this.gridOptions.api) {
@@ -601,8 +607,8 @@ class Adaptable {
         }
         return Promise.resolve(grid != null);
     }
-    initVendorContainerFromInitializedAgGrid() {
-        if (this.getGridContainerElement()) {
+    initAgGridContainerFromInitializedAgGrid() {
+        if (this.getAgGridContainerElement()) {
             return;
         }
         const layoutElements = this.gridOptions.api
@@ -614,21 +620,21 @@ class Adaptable {
             // aggrid 25.3.0 doesn't have layoutElements anymore, so we try to retrieve this element
             layoutElements.push(this.gridOptions.api.gridBodyCon.eGridBody);
         }
-        let vendorContainer;
+        let agGridContainer;
         for (let i = 0, len = layoutElements.length; i < len; i++) {
             const element = layoutElements[i];
             if (element && element.matches('.ag-root-wrapper, .ag-root')) {
                 const gridContainer = element.closest('[class*="ag-theme"]');
                 if (gridContainer) {
-                    vendorContainer = gridContainer;
+                    agGridContainer = gridContainer;
                     break;
                 }
             }
         }
-        if (!vendorContainer) {
-            LoggingHelper_1.ConsoleLogError(`Could not find the agGrid vendor container. This will probably break some AdapTable functionality.`);
+        if (!agGridContainer) {
+            LoggingHelper_1.ConsoleLogError(`Could not find the AG Grid Container. This will probably break some AdapTable functionality.`);
         }
-        return (this.adaptableOptions.containerOptions.vendorContainer = vendorContainer);
+        return (this.adaptableOptions.containerOptions.agGridContainer = agGridContainer);
     }
     filterOnEditDataChange() {
         if (this.adaptableOptions.filterOptions.filterActionOnUserDataChange.applyFilter ==
@@ -722,7 +728,7 @@ class Adaptable {
         //   }
         // }
         const allColumns = [];
-        const vendorCols = this.gridOptions.columnApi.getAllColumns();
+        const agGridCols = this.gridOptions.columnApi.getAllColumns();
         const columnGroupChildren = this.gridOptions.columnApi.getAllDisplayedColumnGroups();
         const groupsCount = {};
         const colsToGroups = columnGroupChildren.reduce((acc, columnGroup) => {
@@ -736,31 +742,31 @@ class Adaptable {
             const columnsInGroup = columnGroup.getLeafColumns();
             columnsInGroup.forEach((col) => {
                 const group = {
-                    ColumnGroupId: ColumnGroupId,
-                    FriendlyName,
-                    AllowGroupSplit: AllowGroupSplit,
-                    GroupCount: 0,
+                    columnGroupId: ColumnGroupId,
+                    friendlyName: FriendlyName,
+                    allowGroupSplit: AllowGroupSplit,
+                    groupCount: 0,
                 };
-                groupsCount[group.ColumnGroupId] = groupsCount[group.ColumnGroupId] || 0;
-                groupsCount[group.ColumnGroupId] += columnsInGroup.length;
+                groupsCount[group.columnGroupId] = groupsCount[group.columnGroupId] || 0;
+                groupsCount[group.columnGroupId] += columnsInGroup.length;
                 acc[col.getColId()] = group;
             });
             return acc;
         }, {});
         Object.keys(colsToGroups).forEach((colId) => {
-            colsToGroups[colId].GroupCount = groupsCount[colsToGroups[colId].ColumnGroupId];
+            colsToGroups[colId].groupCount = groupsCount[colsToGroups[colId].columnGroupId];
         });
         // TODO sort the visible columns by layout order
-        vendorCols.forEach((vendorColumn) => {
-            const colId = vendorColumn.getColId();
+        agGridCols.forEach((agGridColumn) => {
+            const colId = agGridColumn.getColId();
             if (!this.api.columnApi.isRowGroupColumn(colId)) {
-                allColumns.push(this.createAdaptableColumn(vendorColumn, colsToGroups));
+                allColumns.push(this.createAdaptableColumn(agGridColumn, colsToGroups));
             }
         });
         this.api.internalApi.setColumns(allColumns);
     }
-    createAdaptableColumn(vendorColumn, colsToGroups) {
-        const abColumn = this.agGridHelper.createAdaptableColumnFromVendorColumn(vendorColumn, colsToGroups);
+    createAdaptableColumn(agGridColumn, colsToGroups) {
+        const abColumn = this.agGridHelper.createAdaptableColumnFromAgGridColumn(agGridColumn, colsToGroups);
         return abColumn;
     }
     safeSetColDefs(colDefs) {
@@ -840,7 +846,8 @@ class Adaptable {
             var _a;
             return ((_a = aa.alertDefinition.AlertProperties) === null || _a === void 0 ? void 0 : _a.HighlightCell) &&
                 aa.dataChangedInfo &&
-                aa.dataChangedInfo.columnId === col.ColumnId &&
+                aa.dataChangedInfo.column &&
+                aa.dataChangedInfo.column.columnId === col.columnId &&
                 aa.dataChangedInfo.rowNode === params.node;
         });
         const alert = activeAlerts[0];
@@ -868,7 +875,7 @@ class Adaptable {
     }
     getFlashingAlertCellStyle(col, params) {
         const primaryKeyValue = this.getPrimaryKeyValueFromRowNode(params.node);
-        return this.getFlashingAlertStyleFor(primaryKeyValue, col.ColumnId);
+        return this.getFlashingAlertStyleFor(primaryKeyValue, col.columnId);
     }
     getCellHighlightStyle(col, params) {
         var _a;
@@ -876,7 +883,7 @@ class Adaptable {
         const cellHightlight = this.api.internalApi
             .getSystemState()
             .HighlightedCells.find((cellHighlightInfo) => {
-            return (col.ColumnId === cellHighlightInfo.columnId &&
+            return (col.columnId === cellHighlightInfo.columnId &&
                 cellHighlightInfo.primaryKeyValue === primaryKeyValue);
         });
         if (cellHightlight) {
@@ -905,7 +912,7 @@ class Adaptable {
         if (!editableCellStyle) {
             return undefined;
         }
-        const gridCell = this.getGridCellFromRowNode(params.node, abColumn.ColumnId);
+        const gridCell = this.getGridCellFromRowNode(params.node, abColumn.columnId);
         if (gridCell) {
             if (this.api.gridApi.areCellsEditable([gridCell])) {
                 return this.convertAdaptableStyleToCSS(editableCellStyle);
@@ -918,7 +925,7 @@ class Adaptable {
         if (!editableCellStyle) {
             return undefined;
         }
-        const gridCell = this.getGridCellFromRowNode(params.node, abColumn.ColumnId);
+        const gridCell = this.getGridCellFromRowNode(params.node, abColumn.columnId);
         if (gridCell) {
             if (!this.api.gridApi.areCellsEditable([gridCell])) {
                 return this.convertAdaptableStyleToCSS(editableCellStyle);
@@ -958,7 +965,7 @@ class Adaptable {
             return null;
         }
         const isCellEditable = this.api.gridApi.areCellsEditable([
-            this.getGridCellFromRowNode(params.node, abColumn.ColumnId),
+            this.getGridCellFromRowNode(params.node, abColumn.columnId),
         ]);
         return isCellEditable ? editableCellStyle.ClassName : null;
     }
@@ -968,12 +975,12 @@ class Adaptable {
             return null;
         }
         const isCellReadonly = !this.api.gridApi.areCellsEditable([
-            this.getGridCellFromRowNode(params.node, abColumn.ColumnId),
+            this.getGridCellFromRowNode(params.node, abColumn.columnId),
         ]);
         return isCellReadonly ? readonlyCellStyle.ClassName : null;
     }
     isQuickSearchActive(abColumn, params) {
-        if (abColumn.IsExcludedFromQuickSearch) {
+        if (abColumn.isExcludedFromQuickSearch) {
             return false;
         }
         if (!params.node || params.node.group) {
@@ -983,7 +990,7 @@ class Adaptable {
         if (StringExtensions_1.StringExtensions.IsNullOrEmpty(quickSearchValue)) {
             return false;
         }
-        const columnFilter = ObjectFactory_1.default.CreateColumnFilter(abColumn.ColumnId, 'Contains', [quickSearchValue]);
+        const columnFilter = ObjectFactory_1.default.CreateColumnFilter(abColumn.columnId, 'Contains', [quickSearchValue]);
         return this.api.filterApi.evaluateColumnFilter(columnFilter, params.node);
     }
     getPrimaryKeyValueFromRowNode(rowNode) {
@@ -1347,7 +1354,7 @@ class Adaptable {
                                 const colId = column.getColId();
                                 const selectedColumn = this.api.columnApi.getColumnFromId(colId);
                                 if (selectedColumn &&
-                                    columns.find((c) => c.ColumnId == selectedColumn.ColumnId) == null) {
+                                    columns.find((c) => c.columnId == selectedColumn.columnId) == null) {
                                     columns.push(selectedColumn);
                                 }
                                 for (let rowIndex = y1; rowIndex <= y2; rowIndex++) {
@@ -1408,20 +1415,20 @@ class Adaptable {
     setValue(dataChangedInfo) {
         // note: because we use rownode set data value this will cause Validation to fire
         let newValue;
-        let dataType = this.api.columnApi.getColumnDataTypeFromColumnId(dataChangedInfo.columnId);
+        let dataType = dataChangedInfo.column.dataType;
         newValue =
             dataType == Enums_1.DataType.Number ? Number(dataChangedInfo.newValue) : dataChangedInfo.newValue;
         if (dataType == undefined) {
             return; // no point continuing as probably a wrong  column
         }
         if (dataChangedInfo.rowNode) {
-            dataChangedInfo.rowNode.setDataValue(dataChangedInfo.columnId, newValue);
+            dataChangedInfo.rowNode.setDataValue(dataChangedInfo.column.columnId, newValue);
         }
         else {
             if (this.useRowNodeLookUp) {
                 const rowNode = this.gridOptions.api.getRowNode(dataChangedInfo.primaryKeyValue);
                 if (rowNode != null) {
-                    rowNode.setDataValue(dataChangedInfo.columnId, newValue);
+                    rowNode.setDataValue(dataChangedInfo.column.columnId, newValue);
                     dataChangedInfo.rowNode = rowNode;
                 }
             }
@@ -1431,7 +1438,7 @@ class Adaptable {
                 this.gridOptions.api.getModel().forEachNode((rowNode) => {
                     if (!isUpdated) {
                         if (dataChangedInfo.primaryKeyValue == this.getPrimaryKeyValueFromRowNode(rowNode)) {
-                            rowNode.setDataValue(dataChangedInfo.columnId, newValue);
+                            rowNode.setDataValue(dataChangedInfo.column.columnId, newValue);
                             dataChangedInfo.rowNode = rowNode;
                             isUpdated = true;
                         }
@@ -1454,7 +1461,8 @@ class Adaptable {
                     rawValue: pv,
                     displayValue: pv,
                     normalisedValue: pv,
-                    columnId: column.ColumnId,
+                    columnId: column.columnId,
+                    column: column,
                     rowNode: undefined,
                 };
             });
@@ -1462,7 +1470,7 @@ class Adaptable {
         else {
             if (visibleRowsOnly) {
                 this.gridOptions.api.forEachNodeAfterFilter((rowNode) => {
-                    const gridCell = this.addDistinctColumnValue(rowNode, column.ColumnId);
+                    const gridCell = this.addDistinctColumnValue(rowNode, column.columnId);
                     if (gridCell && gridCell.rawValue != undefined && gridCell.rowNode !== skipRowNode) {
                         returnValues.push(gridCell);
                     }
@@ -1470,7 +1478,7 @@ class Adaptable {
             }
             else {
                 this.gridOptions.api.forEachNode((rowNode) => {
-                    const gridCell = this.addDistinctColumnValue(rowNode, column.ColumnId);
+                    const gridCell = this.addDistinctColumnValue(rowNode, column.columnId);
                     if (gridCell && gridCell.rawValue != undefined && gridCell.rowNode !== skipRowNode) {
                         returnValues.push(gridCell);
                     }
@@ -1483,18 +1491,23 @@ class Adaptable {
     async getDistinctFilterValuesForColumn(column, visibleRowsOnly, filter, skipRowNode) {
         var _a;
         const permittedValues = (_a = this.api.userInterfaceApi.getFilterPermittedValuesForColumn(column)) !== null && _a !== void 0 ? _a : {
-            suppressClientSideFiltering: false,
+            suppressFilterSearchBar: false,
             values: () => undefined,
         };
         let preparedPermittedValues = undefined;
         try {
-            preparedPermittedValues = await (permittedValues === null || permittedValues === void 0 ? void 0 : permittedValues.values(column, filter));
+            const filterPermittedValuesParams = {
+                adaptableApi: this.api,
+                column: column,
+                filter: filter,
+            };
+            preparedPermittedValues = await (permittedValues === null || permittedValues === void 0 ? void 0 : permittedValues.values(filterPermittedValuesParams));
         }
         catch (error) {
             LoggingHelper_1.ConsoleLogError(`Failed to load filter permitted values`, column, filter, error);
         }
         return {
-            suppressClientSideFilter: permittedValues.suppressClientSideFiltering,
+            suppressClientSideFilter: permittedValues.suppressFilterSearchBar,
             gridCells: this.getDistinctValuesForColumn(column, visibleRowsOnly, skipRowNode, preparedPermittedValues),
         };
     }
@@ -1502,7 +1515,11 @@ class Adaptable {
         const permittedValues = await this.api.userInterfaceApi.getCustomSortPermittedValuesForColumn(column);
         let preparedPermittedValues = undefined;
         try {
-            preparedPermittedValues = await (permittedValues === null || permittedValues === void 0 ? void 0 : permittedValues.values(column));
+            const permittedValuesParams = {
+                adaptableApi: this.api,
+                column: column,
+            };
+            preparedPermittedValues = await (permittedValues === null || permittedValues === void 0 ? void 0 : permittedValues.values(permittedValuesParams));
         }
         catch (error) {
             LoggingHelper_1.ConsoleLogError(`Failed to load custom sort permitted values`, column, error);
@@ -1513,7 +1530,12 @@ class Adaptable {
         const permittedValues = await this.api.userInterfaceApi.getBulkUpdatePermittedValuesForColumn(column);
         let preparedPermittedValues = undefined;
         try {
-            preparedPermittedValues = await (permittedValues === null || permittedValues === void 0 ? void 0 : permittedValues.values(column, selectedGridCells));
+            const bulkUpdatePermittedValuesParams = {
+                adaptableApi: this.api,
+                column: column,
+                gridCells: selectedGridCells,
+            };
+            preparedPermittedValues = await (permittedValues === null || permittedValues === void 0 ? void 0 : permittedValues.values(bulkUpdatePermittedValuesParams));
         }
         catch (error) {
             LoggingHelper_1.ConsoleLogError(`Failed to load bulk permitted values`, error, column, selectedGridCells);
@@ -1533,7 +1555,7 @@ class Adaptable {
                     rawValue: pv,
                     displayValue: pv,
                     normalisedValue: pv,
-                    columnId: columnId,
+                    column: abColumn,
                     rowNode: undefined,
                 });
             });
@@ -1582,7 +1604,7 @@ class Adaptable {
     }
     shouldUseRawValueForColumn(column) {
         // we need to return false if the column has a cell rendeerer i think...
-        const colDef = this.gridOptions.api.getColumnDef(column.ColumnId);
+        const colDef = this.gridOptions.api.getColumnDef(column.columnId);
         if (colDef && colDef.cellRenderer != null) {
             return true;
         }
@@ -1627,7 +1649,7 @@ class Adaptable {
             rawValue: rawValue,
             displayValue: displayValue,
             normalisedValue: normalisedvalue,
-            columnId: columnId,
+            column: abColumn,
             primaryKeyValue: pkValue,
             rowNode: rowNode,
         };
@@ -1858,10 +1880,8 @@ class Adaptable {
         ];
     }
     getColDefsForFreeTextColumns() {
-        const specialColumnsAreFilterable = this.api.internalApi.getAdaptableOptions().filterOptions
-            .enableFilterOnSpecialColumns;
-        const defaultFreeTextColumnSettings = ObjectFactory_1.CreateEmptyFreeTextColumn(specialColumnsAreFilterable)
-            .FreeTextColumnSettings;
+        const specialColumnsAreFilterable = this.api.internalApi.getAdaptableOptions().filterOptions.enableFilterOnSpecialColumns;
+        const defaultFreeTextColumnSettings = ObjectFactory_1.CreateEmptyFreeTextColumn(specialColumnsAreFilterable).FreeTextColumnSettings;
         return this.api.freeTextColumnApi.getAllFreeTextColumn().map((freeTextColumn) => {
             const freeTextColumnSettings = Object.assign(Object.assign({}, defaultFreeTextColumnSettings), freeTextColumn.FreeTextColumnSettings);
             const dataTypeEditor = freeTextColumn.DataType === 'Number'
@@ -1967,13 +1987,13 @@ class Adaptable {
             .enableFilterOnSpecialColumns
             ? this.adaptableOptions.filterOptions.enableFilterOnSpecialColumns
             : true;
-        const defaultCalculatedColumnSettings = ObjectFactory_1.CreateEmptyCalculatedColumn(specialColumnsAreFilterable)
-            .CalculatedColumnSettings;
+        const defaultCalculatedColumnSettings = ObjectFactory_1.CreateEmptyCalculatedColumn(specialColumnsAreFilterable).CalculatedColumnSettings;
         return this.api.calculatedColumnApi.getAllCalculatedColumn().map((calculatedColumn) => {
             var _a;
             const calculatedColumnSettings = Object.assign(Object.assign({}, defaultCalculatedColumnSettings), calculatedColumn.CalculatedColumnSettings);
             if (!calculatedColumnSettings.DataType) {
-                calculatedColumnSettings.DataType = this.CalculatedColumnExpressionService.GetCalculatedColumnDataType((_a = calculatedColumn.Query) === null || _a === void 0 ? void 0 : _a.ScalarExpression);
+                calculatedColumnSettings.DataType =
+                    this.CalculatedColumnExpressionService.GetCalculatedColumnDataType((_a = calculatedColumn.Query) === null || _a === void 0 ? void 0 : _a.ScalarExpression);
             }
             const newColDef = {
                 headerName: calculatedColumn.FriendlyName
@@ -2089,6 +2109,7 @@ class Adaptable {
         (_j = this.TeamSharingService) === null || _j === void 0 ? void 0 : _j.destroy();
         (_k = this.MetamodelService) === null || _k === void 0 ? void 0 : _k.destroy();
         (_l = this.LicenseService) === null || _l === void 0 ? void 0 : _l.destroy();
+        this.isDestroyed = true;
     }
     // really really need to do this properly but as a temp fix lets create a default style for when no data
     getDefaultIPPStyle() {
@@ -2103,7 +2124,7 @@ class Adaptable {
                 height: 65,
                 Columns: this.api.columnApi.getColumns().map((col) => {
                     return {
-                        columnFriendlyName: col.FriendlyName,
+                        columnFriendlyName: col.friendlyName,
                         width: 200,
                         textAlign: 'start',
                     };
@@ -2120,7 +2141,7 @@ class Adaptable {
                 height: 30,
                 Columns: this.api.columnApi.getColumns().map((col) => {
                     return {
-                        columnFriendlyName: col.FriendlyName,
+                        columnFriendlyName: col.friendlyName,
                         width: 200,
                         textAlign: 'start',
                     };
@@ -2157,12 +2178,12 @@ class Adaptable {
         }
         return this.abContainerElement;
     }
-    getGridContainerElement() {
+    getAgGridContainerElement() {
         if (!this.gridContainerElement) {
             this.gridContainerElement =
-                typeof this.adaptableOptions.containerOptions.vendorContainer === 'string'
-                    ? document.getElementById(this.adaptableOptions.containerOptions.vendorContainer)
-                    : this.adaptableOptions.containerOptions.vendorContainer;
+                typeof this.adaptableOptions.containerOptions.agGridContainer === 'string'
+                    ? document.getElementById(this.adaptableOptions.containerOptions.agGridContainer)
+                    : this.adaptableOptions.containerOptions.agGridContainer;
         }
         return this.gridContainerElement;
     }
@@ -2180,7 +2201,7 @@ class Adaptable {
             }
             return;
         }
-        const gridContainerElement = this.getGridContainerElement();
+        const gridContainerElement = this.getAgGridContainerElement();
         if (gridContainerElement) {
             gridContainerElement.addEventListener('keydown', (event) => this._emit('KeyDown', event));
         }
@@ -2230,7 +2251,7 @@ class Adaptable {
             const cellEditableFn = this.adaptableOptions.editOptions.isCellEditable;
             if (cellEditableFn) {
                 let gridCell = this.getGridCellFromRowNode(params.node, params.column.getColId());
-                let isEditable = cellEditableFn(gridCell, params.node);
+                let isEditable = cellEditableFn(gridCell);
                 if (!isEditable) {
                     this.gridOptions.api.stopEditing();
                 }
@@ -2348,8 +2369,7 @@ class Adaptable {
             this.onSortChanged();
             this.debouncedSetSelectedCells();
         });
-        const showGroupingTotalsAsHeader = this.adaptableOptions.generalOptions
-            .showGroupingTotalsAsHeader;
+        const showGroupingTotalsAsHeader = this.adaptableOptions.generalOptions.showGroupingTotalsAsHeader;
         /**
          * Use Case: Model has updated
          * Action: If user has set to see grouping totals as header create a pinned row (bit of a hack)
@@ -2653,7 +2673,9 @@ class Adaptable {
             const hasConditionalStylesWithClassNames = ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(conditionalStyles);
             const quickSearchStyleClassName = this.api.quickSearchApi.getQuickSearchStyle().ClassName;
             const hasQuickSearchStyleClassName = StringExtensions_1.StringExtensions.IsNotNullOrEmpty(quickSearchStyleClassName);
+            const classNameMap = {};
             const cellClass = (params) => {
+                var _a;
                 const isQuickSearchActive = hasQuickSearchStyleClassName && this.isQuickSearchActive(abColumn, params);
                 const primaryKeyValue = this.getPrimaryKeyValueFromRowNode(params.node);
                 const editableClassName = this.getEditableCellClass(abColumn, params);
@@ -2671,6 +2693,24 @@ class Adaptable {
                 ]
                     .filter((x) => !!x)
                     .join(' ');
+                const primaryKey = this.getPrimaryKeyValueFromRowNode(params.node);
+                const key = `${primaryKey}:${params.colDef.colId}`;
+                if (classNameMap[key] &&
+                    classNameMap[key] !== returnValue &&
+                    // only hard-reset when removing class-names
+                    // ag-grid does not remove class-names, it accumulates them
+                    // https://www.ag-grid.com/javascript-data-grid/cell-styles/#refresh-of-styles
+                    returnValue.length < ((_a = classNameMap[key]) === null || _a === void 0 ? void 0 : _a.length)) {
+                    setTimeout(() => {
+                        /**
+                         * This is called inside a getter function, inside ag-grid.
+                         * To allow ag-grid run it's logic, the redraw is done inside an timeout
+                         * to make sure it is not done in an inappropriate time.
+                         */
+                        params.api.redrawRows({ rowNodes: [params.node] });
+                    }, 0);
+                }
+                classNameMap[key] = returnValue;
                 return StringExtensions_1.StringExtensions.IsNotNullOrEmpty(returnValue) ? returnValue : undefined;
             };
             return cellClass;
@@ -2692,8 +2732,9 @@ class Adaptable {
         this.setColDefProperty(col, 'cellEditorParams', (params) => {
             if (editLookUpItem) {
                 return (params) => {
+                    const gridCell = this.getGridCellFromRowNode(params === null || params === void 0 ? void 0 : params.node, colId);
                     return {
-                        values: this.api.userInterfaceApi.getEditLookUpValuesForEditLookUpItem(editLookUpItem, colId, params === null || params === void 0 ? void 0 : params.data),
+                        values: this.api.userInterfaceApi.getEditLookUpValuesForEditLookUpItem(editLookUpItem, gridCell),
                     };
                 };
             }
@@ -2707,7 +2748,7 @@ class Adaptable {
                     return this.agGridHelper.createNumericStyleRendererFunc(formatColumn);
                 }
                 if (formatColumn.ColumnStyle.CheckBoxStyle) {
-                    return this.agGridHelper.createCheckboxRendererComp(abColumn.ColumnId, abColumn.ReadOnly);
+                    return this.agGridHelper.createCheckboxRendererComp(abColumn.columnId, abColumn.readOnly);
                 }
             }
             const sparkline = this.api.sparklineColumnApi.getSparklineByColumn(colId);
@@ -2770,19 +2811,18 @@ class Adaptable {
             // 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);
-            const layoutCustomHeader = (_a = this.api.layoutApi.getCurrentLayout()
-                .ColumnHeadersMap) === null || _a === void 0 ? void 0 : _a[col.getColId()];
+            const layoutCustomHeader = (_a = this.api.layoutApi.getCurrentLayout().ColumnHeadersMap) === null || _a === void 0 ? void 0 : _a[col.getColId()];
             if (layoutCustomHeader) {
                 resultHeaderName = layoutCustomHeader;
             }
             // check if the deprecated formatColumn header is used
-            const formatColumn = this.api.formatColumnApi.getFormatColumnForColumnId(abColumn.ColumnId);
+            const formatColumn = this.api.formatColumnApi.getFormatColumnForColumnId(abColumn.columnId);
             if (!layoutCustomHeader && (formatColumn === null || formatColumn === void 0 ? void 0 : formatColumn.HeaderName) && !formatColumn.IsSuspended) {
                 // fallback to the formatColumn property if no Layout custom header is provided
                 resultHeaderName = formatColumn.HeaderName;
             }
             // required here for the initial layout rendering
-            abColumn.FriendlyName = resultHeaderName;
+            abColumn.friendlyName = resultHeaderName;
             return resultHeaderName;
         });
         const newColumnHeader = (_b = col === null || col === void 0 ? void 0 : col.getColDef()) === null || _b === void 0 ? void 0 : _b.headerName;
@@ -2878,7 +2918,7 @@ class Adaptable {
                 var _a;
                 if (cellEditableFn) {
                     let gridCell = this.getGridCellFromRowNode(params.node, params.column.getColId());
-                    let isEditable = cellEditableFn(gridCell, params.node);
+                    let isEditable = cellEditableFn(gridCell);
                     if (!isEditable) {
                         return false;
                     }
@@ -2901,7 +2941,7 @@ class Adaptable {
                 const dataChangedInfo = this.api.internalApi.buildDataChangedInfo({
                     oldValue: params.oldValue,
                     newValue: params.newValue,
-                    columnId: params.column.getColId(),
+                    column: this.api.columnApi.getColumnFromId(params.column.getColId()),
                     primaryKeyValue: this.getPrimaryKeyValueFromRowNode(params.node),
                     rowNode: params.node,
                     trigger: 'edit',
@@ -2996,7 +3036,7 @@ class Adaptable {
                     const dataChangedInfo = this.api.internalApi.buildDataChangedInfo({
                         oldValue: oldValue,
                         newValue: newValue,
-                        columnId: key,
+                        column: this.api.columnApi.getColumnFromId(key),
                         primaryKeyValue: primaryKeyValue,
                         rowNode: rowNode,
                         trigger: 'tick',
@@ -3018,13 +3058,14 @@ class Adaptable {
         if (!primaryKeyValue) {
             return;
         }
-        if (!this.api.columnApi.doesColumnExist(colId)) {
+        const abColumn = this.api.columnApi.getColumnFromId(colId);
+        if (!abColumn) {
             return;
         }
         const dataChangedInfo = this.api.internalApi.buildDataChangedInfo({
             oldValue: oldValue,
             newValue: newValue,
-            columnId: colId,
+            column: abColumn,
             primaryKeyValue: primaryKeyValue,
             rowNode: rowNode,
             trigger: 'edit',
@@ -3049,7 +3090,7 @@ class Adaptable {
         }
         dataChangedInfos.forEach((dataChangedInfo) => {
             if (dataChangedInfo.trigger === 'undo') {
-                LoggingHelper_1.LogAdaptableInfo(`Undo data change: PK(${dataChangedInfo.primaryKeyValue}) Col(${dataChangedInfo.columnId}) RevertedValue(${dataChangedInfo.oldValue}) OriginalValue(${dataChangedInfo.newValue})`);
+                LoggingHelper_1.LogAdaptableInfo(`Undo data change: PK(${dataChangedInfo.primaryKeyValue}) Col(${dataChangedInfo.column}) RevertedValue(${dataChangedInfo.oldValue}) OriginalValue(${dataChangedInfo.newValue})`);
             }
             if (dataChangedInfo.trigger === 'edit' || dataChangedInfo.trigger === 'undo') {
                 this.checkChangedCellCurrentlySelected(dataChangedInfo);
@@ -3088,7 +3129,7 @@ class Adaptable {
                 stylesWithExpression.forEach((conditionalStyle) => {
                     if (!dataChangedScope.wholeRow) {
                         const columnIds = this.api.queryLanguageApi.getColumnsFromExpression(conditionalStyle.Rule.BooleanExpression);
-                        if (columnIds.includes(dataChangedInfo.columnId)) {
+                        if (columnIds.includes(dataChangedInfo.column.columnId)) {
                             if (this.api.scopeApi.scopeIsAll(conditionalStyle.Scope)) {
                                 dataChangedScope.wholeRow = true;
                                 return;
@@ -3096,7 +3137,7 @@ class Adaptable {
                             else {
                                 this.api.scopeApi
                                     .getColumnsForScope(conditionalStyle.Scope)
-                                    .map((c) => c.ColumnId)
+                                    .map((c) => c.columnId)
                                     .forEach((colId) => {
                                     dataChangedScope.columnIds.add(colId);
                                 });
@@ -3114,10 +3155,10 @@ class Adaptable {
                 let affectedColumnIds = this.api.formatColumnApi.getColumnIdsFromColumnComparison(columnComparision);
                 if (ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(affectedColumnIds)) {
                     dataChangedInfos.forEach((dataChangedInfo) => {
-                        if (affectedColumnIds.includes(dataChangedInfo.columnId)) {
+                        if (affectedColumnIds.includes(dataChangedInfo.column.columnId)) {
                             this.api.scopeApi
                                 .getColumnsForScope(fc.Scope)
-                                .map((c) => c.ColumnId)
+                                .map((c) => c.columnId)
                                 .forEach((colId) => {
                                 dataChangedScope.columnIds.add(colId);
                             });
@@ -3131,7 +3172,7 @@ class Adaptable {
         let selectedCellInfo = this.api.gridApi.getSelectedCellInfo();
         if (selectedCellInfo && ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(selectedCellInfo.gridCells)) {
             let matchingCell = selectedCellInfo.gridCells.find((gc) => gc.primaryKeyValue == dataChangedInfo.primaryKeyValue &&
-                gc.columnId == dataChangedInfo.columnId);
+                gc.column == dataChangedInfo.column);
             if (matchingCell) {
                 this.setSelectedCells();
             }
@@ -3212,11 +3253,10 @@ class Adaptable {
             this.gridOptions.api.onGroupExpandedOrCollapsed();
         }
     }
-    getVendorGridColumnFieldForColumn(abColumn) {
-        const agGridColumn = this.gridOptions.columnApi
+    getAgGridColumnForAdaptableColumn(abColumn) {
+        return this.gridOptions.columnApi
             .getAllColumns()
-            .find((c) => c.getColId() === abColumn.ColumnId);
-        return agGridColumn.getColDef().field || '';
+            .find((c) => c.getColId() === abColumn.columnId);
     }
     setRowGroupColumns(columnIds) {
         this.gridOptions.columnApi.setRowGroupColumns(columnIds);
@@ -3280,15 +3320,15 @@ class Adaptable {
         this.gridOptions.api.clearRangeSelection();
     }
     hideColumn(columnId) {
-        let vendorCol = this.gridOptions.columnApi.getColumn(columnId);
-        if (vendorCol) {
+        let agGridColumn = this.gridOptions.columnApi.getColumn(columnId);
+        if (agGridColumn) {
             this.gridOptions.columnApi.setColumnVisible(columnId, false);
             this.updateColumnsIntoStore();
         }
     }
     showColumn(columnId) {
-        let vendorCol = this.gridOptions.columnApi.getColumn(columnId);
-        if (vendorCol) {
+        let agGridColumn = this.gridOptions.columnApi.getColumn(columnId);
+        if (agGridColumn) {
             this.gridOptions.columnApi.setColumnVisible(columnId, true);
             this.updateColumnsIntoStore();
         }
@@ -3415,7 +3455,7 @@ class Adaptable {
     checkColumnsDataTypeSet() {
         // check that we have no unknown columns - if we do then ok
         const firstCol = this.api.columnApi.getColumns()[0];
-        if (firstCol && firstCol.DataType == Enums_1.DataType.Unknown) {
+        if (firstCol && firstCol.dataType == Enums_1.DataType.Unknown) {
             this.updateColumnsIntoStore();
         }
     }
@@ -3503,7 +3543,7 @@ class Adaptable {
     hideQuickFilter() {
         this.gridOptions.api.setFloatingFiltersHeight(0);
     }
-    getVendorColumnType(columnId) {
+    getAgGridColumnType(columnId) {
         var _a;
         const { type } = (_a = this.gridOptions.api.getColumnDef(columnId)) !== null && _a !== void 0 ? _a : {};
         return type || '';
@@ -3520,8 +3560,8 @@ class Adaptable {
             : this.runAdaptableComparerFunction(customSort.ColumnId, customSort.SortedValues);
         return comparerFunction;
     }
-    getVendorGridLightThemeName() {
-        const container = this.getGridContainerElement();
+    getAgGridLightThemeName() {
+        const container = this.getAgGridContainerElement();
         if (container && container.classList) {
             // we detect the ag theme class
             const classList = container.classList;
@@ -3533,10 +3573,10 @@ class Adaptable {
                 }
             }
         }
-        return this.agGridHelper.getVendorLightThemeName();
+        return this.agGridHelper.getAgGridLightThemeName();
     }
-    getVendorGridCurrentThemeName() {
-        const container = this.getGridContainerElement();
+    getAgGridCurrentThemeName() {
+        const container = this.getAgGridContainerElement();
         if (container && container.classList) {
             // we detect the ag theme class
             const classList = container.classList;
@@ -3547,7 +3587,7 @@ class Adaptable {
                 }
             }
         }
-        return this.getVendorGridLightThemeName();
+        return this.getAgGridLightThemeName();
     }
     applyAdaptableTheme(theme) {
         const themeName = typeof theme === 'string' ? theme : theme.Name;
@@ -3603,39 +3643,39 @@ class Adaptable {
         });
         const systemThemes = this.api.themeApi.getAllSystemTheme();
         const isSystemTheme = !!systemThemes.filter((t) => t.Name === themeName)[0];
-        const container = this.getGridContainerElement();
-        const getVendorLightThemeName = () => this.getVendorGridLightThemeName();
-        const getVendorDarkThemeName = () => getVendorLightThemeName() + '-dark';
+        const container = this.getAgGridContainerElement();
+        const getAgGridLightThemeName = () => this.getAgGridLightThemeName();
+        const getAgGridDarkThemeName = () => getAgGridLightThemeName() + '-dark';
         if (newTheme && isSystemTheme) {
             if (themeName === GeneralConstants_1.LIGHT_THEME) {
-                newTheme.VendorGridClassName = newTheme.VendorGridClassName || getVendorLightThemeName();
+                newTheme.AgGridClassName = newTheme.AgGridClassName || getAgGridLightThemeName();
             }
             if (themeName === GeneralConstants_1.DARK_THEME) {
-                newTheme.VendorGridClassName = newTheme.VendorGridClassName || getVendorDarkThemeName();
+                newTheme.AgGridClassName = newTheme.AgGridClassName || getAgGridDarkThemeName();
             }
         }
-        if (!newTheme.VendorGridClassName) {
-            // default the vendor grid to the light theme
-            newTheme.VendorGridClassName = getVendorLightThemeName();
+        if (!newTheme.AgGridClassName) {
+            // default AG Grid to its light theme
+            newTheme.AgGridClassName = getAgGridLightThemeName();
         }
         if (container != null) {
             if (themesToRemove.length) {
                 themesToRemove.forEach((theme) => {
-                    if (theme.VendorGridClassName) {
-                        container.classList.remove(theme.VendorGridClassName);
+                    if (theme.AgGridClassName) {
+                        container.classList.remove(theme.AgGridClassName);
                     }
                 });
             }
-            // also remove all vendor theme class names
-            const vendorClassNamesToRemove = [];
+            // also remove all AG Grid theme class names
+            const agGridClassNamesToRemove = [];
             container.classList.forEach((x) => {
                 if (x && x.indexOf('ag-theme-') === 0) {
-                    vendorClassNamesToRemove.push(x);
+                    agGridClassNamesToRemove.push(x);
                 }
             });
-            vendorClassNamesToRemove.forEach((x) => container.classList.remove(x));
-            if (newTheme && newTheme.VendorGridClassName) {
-                container.classList.add(newTheme.VendorGridClassName);
+            agGridClassNamesToRemove.forEach((x) => container.classList.remove(x));
+            if (newTheme && newTheme.AgGridClassName) {
+                container.classList.add(newTheme.AgGridClassName);
             }
             container.classList.add('ab-Grid');
             if (this.adaptableOptions.filterOptions.indicateFilteredColumns) {
@@ -3723,21 +3763,23 @@ import "@adaptabletools/adaptable/themes/${themeName}.css"`);
     }
     exportToExcel(reportData, fileName) {
         const columnDefs = reportData.columns.map((column) => ({
-            field: column.ColumnId,
-            headerName: column.FriendlyName,
+            field: column.columnId,
+            headerName: column.friendlyName,
         }));
         const NESTED_COL_SEPARATOR = '.';
-        const nestedColumns = reportData.columns.filter((column) => column.ColumnId.includes(NESTED_COL_SEPARATOR));
+        const nestedColumns = reportData.columns.filter((column) => column.columnId.includes(NESTED_COL_SEPARATOR));
         if (nestedColumns.length) {
             // the rowData of nested fields (containing dots) was flattened during the report data extraction and we need to un-flatten it back
             // ex.
             // current state: { field: 'outerKey.innerKey', value: 2}
             // original (desired) state: { field: 'outerKey.innerKey', value: {outerKey: {innerKey: 2}}}
             reportData.rows.forEach((rowDataEntry) => nestedColumns.forEach((nestedColumn) => {
-                const cellExportValue = rowDataEntry[nestedColumn.ColumnId];
+                const cellExportValue = rowDataEntry[nestedColumn.columnId];
                 let intermediaryValue = rowDataEntry;
                 // augment the rowDataEntry with the new object
-                nestedColumn.ColumnId.split(NESTED_COL_SEPARATOR).forEach((nestedKey, index, nestedCols) => {
+                nestedColumn.columnId
+                    .split(NESTED_COL_SEPARATOR)
+                    .forEach((nestedKey, index, nestedCols) => {
                     // we reached the leaf node, so we set the cell value and break
                     if (index === nestedCols.length - 1) {
                         intermediaryValue[nestedKey] = cellExportValue;
@@ -3749,7 +3791,7 @@ import "@adaptabletools/adaptable/themes/${themeName}.css"`);
                     intermediaryValue = intermediaryValue[nestedKey];
                 });
                 // delete the obsolete flattened property
-                delete rowDataEntry[nestedColumn.ColumnId];
+                delete rowDataEntry[nestedColumn.columnId];
             }));
         }
         const gridOptions = {