@adaptabletools/adaptable 10.0.4-canary.0 → 10.0.4-canary.4

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) => {
@@ -751,16 +757,16 @@ class Adaptable {
             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) {
@@ -1479,24 +1485,29 @@ class Adaptable {
                 });
             }
         }
-        const uniqueVals = uniqBy_1.default(returnValues, 'displayValue');
+        const uniqueVals = uniqBy_1.default(returnValues, 'rawValue');
         return uniqueVals.slice(0, this.adaptableOptions.filterOptions.maxFilterValuesToDisplay);
     }
     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),
         };
     }
@@ -1504,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);
@@ -1515,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);
@@ -1543,8 +1563,7 @@ class Adaptable {
         else {
             permittedMap = null;
         }
-        const useRawValue = this.shouldUseRawValueForColumn(abColumn);
-        const eachFn = (rowNode, columnId, useRawValue) => {
+        const eachFn = (rowNode, columnId) => {
             if (rowNode && !this.isGroupRowNode(rowNode)) {
                 const gridCell = this.getGridCellFromRowNode(rowNode, columnId);
                 let allowed = !permittedMap || permittedMap.has(gridCell.displayValue);
@@ -1559,12 +1578,12 @@ class Adaptable {
         };
         if (visibleRowsOnly) {
             this.gridOptions.api.forEachNodeAfterFilter((rowNode) => {
-                eachFn(rowNode, columnId, useRawValue);
+                eachFn(rowNode, columnId);
             });
         }
         else {
             this.gridOptions.api.forEachNode((rowNode) => {
-                eachFn(rowNode, columnId, useRawValue);
+                eachFn(rowNode, columnId);
             });
         }
         return returnArray.slice(0, this.adaptableOptions.filterOptions.maxFilterValuesToDisplay);
@@ -1582,16 +1601,19 @@ class Adaptable {
             return undefined;
         }
     }
-    shouldUseRawValueForColumn(column) {
+    isInternallyRenderedColumn(column) {
         // we need to return false if the column has a cell rendeerer i think...
         const colDef = this.gridOptions.api.getColumnDef(column.columnId);
         if (colDef && colDef.cellRenderer != null) {
-            return true;
+            return false;
         }
         if (this.api.columnApi.isFormatNumericStyleColumn(column)) {
-            return true;
+            return false;
         }
-        return false;
+        if (this.api.columnApi.isBooleanColumn(column)) {
+            return false;
+        }
+        return true;
     }
     getDisplayValue(id, columnId) {
         let returnValue;
@@ -1620,11 +1642,11 @@ class Adaptable {
         if (rowNode == null) {
             return undefined;
         }
+        const abColumn = this.api.columnApi.getColumnFromId(columnId);
         const pkValue = this.getPrimaryKeyValueFromRowNode(rowNode);
         const rawValue = this.getRawValueFromRowNode(rowNode, columnId);
         const displayValue = this.getDisplayValueFromRawValue(columnId, rawValue);
-        const normalisedvalue = this.getNormalisedValueFromRowValue(rawValue, columnId);
-        const abColumn = this.api.columnApi.getColumnFromId(columnId);
+        const normalisedvalue = this.getNormalisedValueFromRowValue(rawValue, displayValue, abColumn);
         return {
             rawValue: rawValue,
             displayValue: displayValue,
@@ -1687,24 +1709,25 @@ class Adaptable {
         };
         return formatterFn(params);
     }
-    getNormalisedValueFromRowValue(rawValue, columnId) {
-        if (rawValue === undefined || rawValue === null) {
+    getNormalisedValueFromRowValue(rawValue, displayValue, column) {
+        const returnValue = this.isInternallyRenderedColumn(column) ? displayValue : rawValue;
+        if (returnValue === undefined || returnValue === null) {
             return rawValue;
         }
-        const dataType = this.api.columnApi.getColumnDataTypeFromColumnId(columnId);
+        const dataType = column.dataType;
         if (dataType === 'String') {
-            return typeof rawValue !== 'string' ? String(rawValue) : rawValue;
+            return typeof rawValue !== 'string' ? String(rawValue) : returnValue;
         }
         if (dataType === 'Number') {
-            return typeof rawValue !== 'number' ? Number(rawValue) : rawValue;
+            return typeof rawValue !== 'number' ? Number(rawValue) : returnValue;
         }
         if (dataType === 'Boolean') {
-            return typeof rawValue !== 'boolean' ? Boolean(rawValue) : rawValue;
+            return typeof rawValue !== 'boolean' ? Boolean(rawValue) : returnValue;
         }
         if (dataType === 'Date') {
-            return rawValue instanceof Date ? rawValue : new Date(rawValue);
+            return rawValue instanceof Date ? returnValue : new Date(rawValue);
         }
-        return rawValue;
+        return returnValue;
     }
     getRawValueFromRowNode(rowNode, columnId) {
         return this.gridOptions.api.getValue(columnId, rowNode);
@@ -1860,10 +1883,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'
@@ -1969,13 +1990,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
@@ -2091,6 +2112,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() {
@@ -2159,12 +2181,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;
     }
@@ -2182,7 +2204,7 @@ class Adaptable {
             }
             return;
         }
-        const gridContainerElement = this.getGridContainerElement();
+        const gridContainerElement = this.getAgGridContainerElement();
         if (gridContainerElement) {
             gridContainerElement.addEventListener('keydown', (event) => this._emit('KeyDown', event));
         }
@@ -2232,7 +2254,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();
                 }
@@ -2350,8 +2372,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)
@@ -2655,7 +2676,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);
@@ -2673,6 +2696,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;
@@ -2773,8 +2814,7 @@ 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;
             }
@@ -2881,7 +2921,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;
                     }
@@ -3216,11 +3256,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 || '';
     }
     setRowGroupColumns(columnIds) {
         this.gridOptions.columnApi.setRowGroupColumns(columnIds);
@@ -3284,15 +3323,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();
         }
@@ -3507,7 +3546,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 || '';
@@ -3524,8 +3563,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;
@@ -3537,10 +3576,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;
@@ -3551,7 +3590,7 @@ class Adaptable {
                 }
             }
         }
-        return this.getVendorGridLightThemeName();
+        return this.getAgGridLightThemeName();
     }
     applyAdaptableTheme(theme) {
         const themeName = typeof theme === 'string' ? theme : theme.Name;
@@ -3607,39 +3646,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) {

package/src/agGrid/agGridHelper.d.ts

@@ -16,10 +16,10 @@ import { FormatColumn } from '../PredefinedConfig/FormatColumnState';
 export declare class agGridHelper {
     private adaptable;
     private gridOptions;
-    private vendorInitialColDefs;
+    private initialAgGridColDefs;
     constructor(adaptable: IAdaptable, gridOptions: GridOptions);
-    getVendorLightThemeName(): string;
-    getVendorDarkThemeName(): string;
+    getAgGridLightThemeName(): string;
+    getAgGridDarkThemeName(): string;
     setUpModules(): Map<AdaptableModule, IModule>;
     TrySetUpNodeIds(): boolean;
     createSparklineCellRendererComp(sparkline: SparklineColumn): ICellRendererFunc | undefined;
@@ -27,7 +27,7 @@ export declare class agGridHelper {
     createNumericStyleRendererFunc(formatColumn: FormatColumn): ICellRendererFunc;
     getCleanValue(value: string): string | undefined;
     getRenderedValue(colDef: ColDef, valueToRender: any): any;
-    createAdaptableColumnFromVendorColumn(vendorColumn: Column, colsToGroups: Record<string, AdaptableColumnGroup>): AdaptableColumn;
+    createAdaptableColumnFromAgGridColumn(agGridColumn: Column, colsToGroups: Record<string, AdaptableColumnGroup>): AdaptableColumn;
     createAdaptableSideBarDefs(showFilterPanel: boolean, showColumnsPanel: boolean): SideBarDef;
     createAdaptableToolPanel(): ToolPanelDef;
     orderToolPanels(toolPanelDefs: (ToolPanelDef | string)[]): void;