@adaptabletools/adaptable 10.0.0 → 10.0.4-canary.0

package/src/agGrid/Adaptable.js

@@ -416,7 +416,7 @@ class Adaptable {
                 this.isInitialised = true;
             });
             if (this.abContainerElement == null) {
-                this.abContainerElement = this.getadaptableContainerElement();
+                this.abContainerElement = this.getAdaptableContainerElement();
             }
             if (this.abContainerElement != null) {
                 this.abContainerElement.innerHTML = '';
@@ -484,17 +484,19 @@ class Adaptable {
         });
     }
     performAudit(action, oldState, newState) {
-        const adaptableStateChangedInfo = {
-            actionName: action.type,
-            clientTimestamp: new Date(),
-            userName: this.adaptableOptions.userName,
-            adaptableId: this.adaptableOptions.adaptableId,
-            adaptableStateKey: this.adaptableOptions.adaptableStateKey,
-            action: action,
-            oldState: oldState,
-            newState: newState,
-        };
-        this.api.eventApi.emit('AdaptableStateChanged', adaptableStateChangedInfo);
+        if (this.isInitialised) {
+            const adaptableStateChangedInfo = {
+                actionName: action.type,
+                clientTimestamp: new Date(),
+                userName: this.adaptableOptions.userName,
+                adaptableId: this.adaptableOptions.adaptableId,
+                adaptableStateKey: this.adaptableOptions.adaptableStateKey,
+                action: action,
+                oldState: oldState,
+                newState: newState,
+            };
+            this.api.eventApi.emit('AdaptableStateChanged', adaptableStateChangedInfo);
+        }
     }
     initializeAgGrid() {
         var _a;
@@ -734,19 +736,19 @@ 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) => {
@@ -838,7 +840,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];
@@ -866,7 +869,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;
@@ -874,7 +877,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) {
@@ -903,7 +906,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);
@@ -916,7 +919,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);
@@ -950,8 +953,28 @@ class Adaptable {
             .join(' ');
         return classNames;
     }
+    getEditableCellClass(abColumn, params) {
+        const editableCellStyle = this.api.userInterfaceApi.getEditableCellStyle();
+        if (!(editableCellStyle === null || editableCellStyle === void 0 ? void 0 : editableCellStyle.ClassName)) {
+            return null;
+        }
+        const isCellEditable = this.api.gridApi.areCellsEditable([
+            this.getGridCellFromRowNode(params.node, abColumn.columnId),
+        ]);
+        return isCellEditable ? editableCellStyle.ClassName : null;
+    }
+    getReadonlyCellClass(abColumn, params) {
+        const readonlyCellStyle = this.api.userInterfaceApi.getReadOnlyCellStyle();
+        if (!(readonlyCellStyle === null || readonlyCellStyle === void 0 ? void 0 : readonlyCellStyle.ClassName)) {
+            return null;
+        }
+        const isCellReadonly = !this.api.gridApi.areCellsEditable([
+            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) {
@@ -961,7 +984,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) {
@@ -1023,7 +1046,7 @@ class Adaptable {
     }
     setColumnOrder(VisibleColumnList) {
         const newColumnState = this.getSortedColumnStateForVisibleColumns(VisibleColumnList);
-        this.gridOptions.columnApi.setColumnState(newColumnState);
+        this.gridOptions.columnApi.applyColumnState({ state: newColumnState, applyOrder: true });
         this.updateColumnsIntoStore();
     }
     persistLayout(layout) {
@@ -1177,7 +1200,7 @@ class Adaptable {
             if (shouldUpdatePivoted) {
                 this.gridOptions.columnApi.setPivotMode(pivoted);
             }
-            this.gridOptions.columnApi.setColumnState(newColState);
+            this.gridOptions.columnApi.applyColumnState({ state: newColState, applyOrder: true });
             this.api.gridApi.setColumnSorts(layout.ColumnSorts);
             this.gridOptions.columnApi.setPivotColumns(layout.PivotColumns || []);
             // aggrid 25.1.0 introduced a bug such that a layout that has a grouped column, if the column has enableRowGroup: true but not rowGroup: true
@@ -1325,7 +1348,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++) {
@@ -1365,7 +1388,9 @@ class Adaptable {
                     isMaster: !!(node.master != null && node.master == true),
                     isExpanded: !!(node.expanded != null && node.expanded == true),
                     isGroup: !!(node.group != null && node.group == true),
-                    level: node.level,
+                    isSelected: true,
+                    isDisplayed: node.displayed == true,
+                    rowGroupLevel: node.level,
                 };
                 const gridRow = {
                     primaryKeyValue: this.getPrimaryKeyValueFromRowNode(node),
@@ -1384,20 +1409,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;
                 }
             }
@@ -1407,7 +1432,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;
                         }
@@ -1419,18 +1444,19 @@ class Adaptable {
     cancelEdit() {
         this.gridOptions.api.stopEditing(true);
     }
-    getDistinctValuesForColumn(column, visibleRowsOnly, skipRowNode) {
+    getDistinctValuesForColumn(column, visibleRowsOnly, skipRowNode, permittedValues) {
         let returnValues = [];
         // this function does NOT look up for server values but actually it should...
         // that is currently commented out in the column api function (previously in filter form)
-        const permittedValues = this.api.userInterfaceApi.getPermittedValuesForColumn(column);
+        permittedValues = permittedValues !== null && permittedValues !== void 0 ? permittedValues : this.api.userInterfaceApi.getPermittedValuesForColumn(column);
         if (ArrayExtensions_1.ArrayExtensions.IsNotNull(permittedValues)) {
             returnValues = permittedValues.map((pv) => {
                 return {
                     rawValue: pv,
                     displayValue: pv,
                     normalisedValue: pv,
-                    columnId: column.ColumnId,
+                    columnId: column.columnId,
+                    column: column,
                     rowNode: undefined,
                 };
             });
@@ -1438,7 +1464,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);
                     }
@@ -1446,7 +1472,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);
                     }
@@ -1456,6 +1482,46 @@ class Adaptable {
         const uniqueVals = uniqBy_1.default(returnValues, 'displayValue');
         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,
+            values: () => undefined,
+        };
+        let preparedPermittedValues = undefined;
+        try {
+            preparedPermittedValues = await (permittedValues === null || permittedValues === void 0 ? void 0 : permittedValues.values(column, filter));
+        }
+        catch (error) {
+            LoggingHelper_1.ConsoleLogError(`Failed to load filter permitted values`, column, filter, error);
+        }
+        return {
+            suppressClientSideFilter: permittedValues.suppressClientSideFiltering,
+            gridCells: this.getDistinctValuesForColumn(column, visibleRowsOnly, skipRowNode, preparedPermittedValues),
+        };
+    }
+    async getDistinctCustomSortValuesForColumn(column, visibleRowsOnly, skipRowNode) {
+        const permittedValues = await this.api.userInterfaceApi.getCustomSortPermittedValuesForColumn(column);
+        let preparedPermittedValues = undefined;
+        try {
+            preparedPermittedValues = await (permittedValues === null || permittedValues === void 0 ? void 0 : permittedValues.values(column));
+        }
+        catch (error) {
+            LoggingHelper_1.ConsoleLogError(`Failed to load custom sort permitted values`, column, error);
+        }
+        return this.getDistinctValuesForColumn(column, visibleRowsOnly, skipRowNode, preparedPermittedValues);
+    }
+    async getDistinctBulkUpdateValuesForColumn(column, visibleRowsOnly, selectedGridCells, skipRowNode) {
+        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));
+        }
+        catch (error) {
+            LoggingHelper_1.ConsoleLogError(`Failed to load bulk permitted values`, error, column, selectedGridCells);
+        }
+        return this.getDistinctValuesForColumn(column, visibleRowsOnly, skipRowNode, preparedPermittedValues);
+    }
     getColumnValueDisplayValuePairList(columnId, visibleRowsOnly, onlyIncludeIds) {
         const returnArray = [];
         let permittedMap = new Map();
@@ -1469,7 +1535,7 @@ class Adaptable {
                     rawValue: pv,
                     displayValue: pv,
                     normalisedValue: pv,
-                    columnId: columnId,
+                    column: abColumn,
                     rowNode: undefined,
                 });
             });
@@ -1518,7 +1584,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;
         }
@@ -1563,7 +1629,7 @@ class Adaptable {
             rawValue: rawValue,
             displayValue: displayValue,
             normalisedValue: normalisedvalue,
-            columnId: columnId,
+            column: abColumn,
             primaryKeyValue: pkValue,
             rowNode: rowNode,
         };
@@ -1794,9 +1860,12 @@ class Adaptable {
         ];
     }
     getColDefsForFreeTextColumns() {
-        let filterable = this.api.internalApi.getAdaptableOptions().filterOptions
+        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'
                 ? AdaptableNumberEditor_1.AdaptableNumberEditor
                 : freeTextColumn.DataType === 'Date'
@@ -1808,10 +1877,16 @@ class Adaptable {
                 colId: freeTextColumn.ColumnId,
                 editable: true,
                 hide: true,
-                filter: filterable,
-                sortable: true,
-                resizable: true,
-                enableRowGroup: true,
+                width: freeTextColumnSettings.Width,
+                enableValue: freeTextColumnSettings.Aggregatable,
+                filter: freeTextColumnSettings.Filterable,
+                floatingFilter: freeTextColumnSettings.Filterable,
+                resizable: freeTextColumnSettings.Resizable,
+                enableRowGroup: freeTextColumnSettings.Groupable,
+                sortable: freeTextColumnSettings.Sortable,
+                enablePivot: freeTextColumnSettings.Pivotable,
+                suppressMenu: freeTextColumnSettings.SuppressMenu,
+                suppressMovable: freeTextColumnSettings.SuppressMovable,
                 cellEditor: dataTypeEditor !== null && dataTypeEditor !== void 0 ? dataTypeEditor : (freeTextColumn.TextEditor && freeTextColumn.TextEditor == 'Large'
                     ? 'agLargeTextCellEditor'
                     : 'agTextCellEditor'),
@@ -1846,15 +1921,24 @@ class Adaptable {
         }
     }
     getColDefsForActionColumns() {
+        const defaultActionColumnSettings = {
+            resizable: true,
+            suppressMenu: false,
+            suppressMovable: false,
+        };
         return this.api.userInterfaceApi.getAllActionColumn().map((actionColumn) => {
+            const actionColumnSettings = Object.assign(Object.assign({}, defaultActionColumnSettings), actionColumn.actionColumnSettings);
             const newColDef = {
                 headerName: actionColumn.friendlyName ? actionColumn.friendlyName : actionColumn.columnId,
                 colId: actionColumn.columnId,
-                editable: false,
                 hide: false,
+                editable: false,
+                width: actionColumnSettings.width,
+                resizable: actionColumnSettings.resizable,
+                suppressMenu: actionColumnSettings.suppressMenu,
+                suppressMovable: actionColumnSettings.suppressMovable,
                 filter: false,
                 sortable: false,
-                resizable: true,
                 enableRowGroup: false,
                 cellRenderer: ActionColumnRenderer_1.ActionColumnRenderer,
                 type: [GeneralConstants_1.AB_SPECIAL_COLUMN, 'abColDefObject'],
@@ -1881,16 +1965,17 @@ class Adaptable {
         this.setLayout();
     }
     getColDefsForCalculatedColumns() {
+        const specialColumnsAreFilterable = this.adaptableOptions.filterOptions
+            .enableFilterOnSpecialColumns
+            ? this.adaptableOptions.filterOptions.enableFilterOnSpecialColumns
+            : true;
+        const defaultCalculatedColumnSettings = ObjectFactory_1.CreateEmptyCalculatedColumn(specialColumnsAreFilterable)
+            .CalculatedColumnSettings;
         return this.api.calculatedColumnApi.getAllCalculatedColumn().map((calculatedColumn) => {
             var _a;
-            if (!calculatedColumn.CalculatedColumnSettings) {
-                let filterable = this.adaptableOptions.filterOptions.enableFilterOnSpecialColumns
-                    ? this.adaptableOptions.filterOptions.enableFilterOnSpecialColumns
-                    : true;
-                calculatedColumn.CalculatedColumnSettings = ObjectFactory_1.CreateEmptyCalculatedColumn(filterable).CalculatedColumnSettings;
-            }
-            if (!calculatedColumn.CalculatedColumnSettings.DataType) {
-                calculatedColumn.CalculatedColumnSettings.DataType = this.CalculatedColumnExpressionService.GetCalculatedColumnDataType((_a = calculatedColumn.Query) === null || _a === void 0 ? void 0 : _a.ScalarExpression);
+            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);
             }
             const newColDef = {
                 headerName: calculatedColumn.FriendlyName
@@ -1899,25 +1984,27 @@ class Adaptable {
                 colId: calculatedColumn.ColumnId,
                 hide: true,
                 editable: false,
-                width: calculatedColumn.CalculatedColumnSettings.Width,
-                enableValue: calculatedColumn.CalculatedColumnSettings.Aggregatable,
-                filter: calculatedColumn.CalculatedColumnSettings.Filterable,
-                floatingFilter: calculatedColumn.CalculatedColumnSettings.Filterable,
-                resizable: calculatedColumn.CalculatedColumnSettings.Resizable,
-                enableRowGroup: calculatedColumn.CalculatedColumnSettings.Groupable,
-                sortable: calculatedColumn.CalculatedColumnSettings.Sortable,
-                enablePivot: calculatedColumn.CalculatedColumnSettings.Pivotable,
+                width: calculatedColumnSettings.Width,
+                enableValue: calculatedColumnSettings.Aggregatable,
+                filter: calculatedColumnSettings.Filterable,
+                floatingFilter: calculatedColumnSettings.Filterable,
+                resizable: calculatedColumnSettings.Resizable,
+                enableRowGroup: calculatedColumnSettings.Groupable,
+                sortable: calculatedColumnSettings.Sortable,
+                enablePivot: calculatedColumnSettings.Pivotable,
+                suppressMenu: calculatedColumnSettings.SuppressMenu,
+                suppressMovable: calculatedColumnSettings.SuppressMovable,
                 type: [
                     GeneralConstants_1.AB_SPECIAL_COLUMN,
-                    this.agGridHelper.getAgGridDataType(calculatedColumn.CalculatedColumnSettings.DataType),
+                    this.agGridHelper.getAgGridDataType(calculatedColumnSettings.DataType),
                 ],
                 valueGetter: (params) => {
                     var _a;
                     return this.CalculatedColumnExpressionService.ComputeExpressionValue((_a = calculatedColumn.Query) === null || _a === void 0 ? void 0 : _a.ScalarExpression, params.node);
                 },
             };
-            if (calculatedColumn.CalculatedColumnSettings.ShowToolTip != null &&
-                calculatedColumn.CalculatedColumnSettings.ShowToolTip == true) {
+            if (calculatedColumnSettings.ShowToolTip != null &&
+                calculatedColumnSettings.ShowToolTip == true) {
                 newColDef.tooltipValueGetter = () => {
                     var _a;
                     return (_a = calculatedColumn.Query) === null || _a === void 0 ? void 0 : _a.ScalarExpression;
@@ -1986,7 +2073,7 @@ class Adaptable {
         this.emitter = null;
         this._adaptableReady = false;
         Adaptable.dismissInstance(this);
-        const abContainerElement = this.getadaptableContainerElement();
+        const abContainerElement = this.getAdaptableContainerElement();
         if (config && !config.unmount) {
             return;
         }
@@ -2018,7 +2105,7 @@ class Adaptable {
                 height: 65,
                 Columns: this.api.columnApi.getColumns().map((col) => {
                     return {
-                        columnFriendlyName: col.FriendlyName,
+                        columnFriendlyName: col.friendlyName,
                         width: 200,
                         textAlign: 'start',
                     };
@@ -2035,7 +2122,7 @@ class Adaptable {
                 height: 30,
                 Columns: this.api.columnApi.getColumns().map((col) => {
                     return {
-                        columnFriendlyName: col.FriendlyName,
+                        columnFriendlyName: col.friendlyName,
                         width: 200,
                         textAlign: 'start',
                     };
@@ -2048,7 +2135,7 @@ class Adaptable {
     getCurrentIPPStyle() {
         return this.agGridHelper.getCurrentIPPStyle();
     }
-    getadaptableContainerElement() {
+    getAdaptableContainerElement() {
         if (!this.abContainerElement) {
             let containerOptionsContainer = this.adaptableOptions.containerOptions.adaptableContainer;
             this.abContainerElement =
@@ -2084,7 +2171,7 @@ class Adaptable {
     initInternalGridLogic() {
         LoggingHelper_1.LogAdaptableInfo(`Initializing InternalGridLogic...`);
         if (this.abContainerElement == null) {
-            this.abContainerElement = this.getadaptableContainerElement();
+            this.abContainerElement = this.getAdaptableContainerElement();
         }
         if (this.abContainerElement == null) {
             if (typeof this.adaptableOptions.containerOptions.adaptableContainer === 'string') {
@@ -2315,11 +2402,21 @@ class Adaptable {
         RowNodeProto.dispatchLocalEvent = function (event) {
             const node = event.node;
             const result = RowNode_dispatchLocalEvent.apply(this, arguments);
+            const extractGridApiFromRowNode = (rowNode) => {
+                var _a, _b, _c, _d;
+                // starting with AG Grid 26.1.0 the gridApi is wrapped in a Beans property
+                // while older versions than 26.1.0 had a direct property
+                const rowNodeApi = (_c = (_b = (_a = rowNode) === null || _a === void 0 ? void 0 : _a.beans) === null || _b === void 0 ? void 0 : _b.gridApi) !== null && _c !== void 0 ? _c : (_d = rowNode) === null || _d === void 0 ? void 0 : _d.gridApi;
+                if (!rowNodeApi) {
+                    LoggingHelper_1.LogAdaptableWarning(`No GridAPI found in passed RowNode, this should never happen!`, rowNode);
+                }
+                return rowNodeApi;
+            };
             // we don't know from which instance of aggrid this is coming,
             // as this fn is shared by all instances
             if (node) {
                 Adaptable.forEachAdaptable((adaptable) => {
-                    if (node.gridApi !== adaptable.gridOptions.api) {
+                    if (extractGridApiFromRowNode(node) !== adaptable.gridOptions.api) {
                         // the event is coming from another aggrid instance
                         // so IGNORE IT
                         return;
@@ -2561,6 +2658,8 @@ class Adaptable {
             const cellClass = (params) => {
                 const isQuickSearchActive = hasQuickSearchStyleClassName && this.isQuickSearchActive(abColumn, params);
                 const primaryKeyValue = this.getPrimaryKeyValueFromRowNode(params.node);
+                const editableClassName = this.getEditableCellClass(abColumn, params);
+                const readonlyClassName = this.getReadonlyCellClass(abColumn, params);
                 let returnValue = [
                     this.getExcelClassNameForCell(colId, primaryKeyValue),
                     typeof userCellClass === 'function' ? userCellClass(params) : userCellClass,
@@ -2569,6 +2668,8 @@ class Adaptable {
                         ? this.getConditionalStyleCellClass(conditionalStyles, abColumn, params)
                         : null,
                     isQuickSearchActive ? quickSearchStyleClassName : null,
+                    editableClassName,
+                    readonlyClassName,
                 ]
                     .filter((x) => !!x)
                     .join(' ');
@@ -2581,7 +2682,8 @@ class Adaptable {
         return `--excel-cell-${colId}-${primaryKeyValue}`;
     }
     setupColumnCellEditor({ colId, col }) {
-        const editLookUpItem = this.api.userInterfaceApi.getEditLookUpItemForColumn(colId);
+        const adaptableColumn = this.api.columnApi.getColumnFromId(colId);
+        const editLookUpItem = this.api.userInterfaceApi.getEditLookUpItemForColumn(adaptableColumn);
         this.setColDefProperty(col, 'cellEditor', () => {
             if (editLookUpItem) {
                 return this.isModulePresent('rich-select')
@@ -2589,10 +2691,13 @@ class Adaptable {
                     : 'agSelectCellEditor';
             }
         });
-        this.setColDefProperty(col, 'cellEditorParams', () => {
+        this.setColDefProperty(col, 'cellEditorParams', (params) => {
             if (editLookUpItem) {
-                return {
-                    values: this.api.userInterfaceApi.getEditLookUpValuesForEditLookUpItem(editLookUpItem, colId),
+                return (params) => {
+                    const gridCell = this.getGridCellFromRowNode(params === null || params === void 0 ? void 0 : params.node, colId);
+                    return {
+                        values: this.api.userInterfaceApi.getEditLookUpValuesForEditLookUpItem(editLookUpItem, gridCell),
+                    };
                 };
             }
         });
@@ -2605,7 +2710,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);
@@ -2674,13 +2779,13 @@ class Adaptable {
                 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;
@@ -2799,7 +2904,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',
@@ -2894,7 +2999,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',
@@ -2916,13 +3021,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',
@@ -2947,7 +3053,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);
@@ -2986,7 +3092,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;
@@ -2994,7 +3100,7 @@ class Adaptable {
                             else {
                                 this.api.scopeApi
                                     .getColumnsForScope(conditionalStyle.Scope)
-                                    .map((c) => c.ColumnId)
+                                    .map((c) => c.columnId)
                                     .forEach((colId) => {
                                     dataChangedScope.columnIds.add(colId);
                                 });
@@ -3012,10 +3118,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);
                             });
@@ -3029,7 +3135,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();
             }
@@ -3113,7 +3219,7 @@ class Adaptable {
     getVendorGridColumnFieldForColumn(abColumn) {
         const agGridColumn = this.gridOptions.columnApi
             .getAllColumns()
-            .find((c) => c.getColId() === abColumn.ColumnId);
+            .find((c) => c.getColId() === abColumn.columnId);
         return agGridColumn.getColDef().field || '';
     }
     setRowGroupColumns(columnIds) {
@@ -3225,7 +3331,7 @@ class Adaptable {
             }
             return state;
         });
-        this.gridOptions.columnApi.setColumnState(newColumnState);
+        this.gridOptions.columnApi.applyColumnState({ state: newColumnState, applyOrder: true });
         this.gridOptions.api.onSortChanged();
     }
     clearColumnSort() {
@@ -3240,6 +3346,26 @@ class Adaptable {
         }
         this.gridOptions.api.setRowData(dataSource);
     }
+    getGridData() {
+        var _a;
+        const data = [];
+        (_a = this.gridOptions) === null || _a === void 0 ? void 0 : _a.api.forEachNode((rowNode) => {
+            if (!this.isGroupRowNode(rowNode)) {
+                data.push(rowNode.data);
+            }
+        });
+        return data;
+    }
+    getFilteredData() {
+        var _a;
+        const data = [];
+        (_a = this.gridOptions) === null || _a === void 0 ? void 0 : _a.api.forEachNodeAfterFilter((rowNode) => {
+            if (!this.isGroupRowNode(rowNode)) {
+                data.push(rowNode.data);
+            }
+        });
+        return data;
+    }
     loadDataSource(dataSource) {
         if (this.hasAutogeneratedPrimaryKey()) {
             this.addSyntheticPrimaryKey(dataSource);
@@ -3263,11 +3389,15 @@ class Adaptable {
             this.addSyntheticPrimaryKey(dataRows);
         }
         dataUpdateConfig = dataUpdateConfig || {};
+        const newData = { add: dataRows };
+        if (dataUpdateConfig.addIndex !== undefined) {
+            newData.addIndex = dataUpdateConfig.addIndex;
+        }
         if (dataUpdateConfig.runAsync) {
-            this.gridOptions.api.applyTransactionAsync({ add: dataRows }, dataUpdateConfig.callback);
+            this.gridOptions.api.applyTransactionAsync(newData, dataUpdateConfig.callback);
         }
         else {
-            this.gridOptions.api.applyTransaction({ add: dataRows });
+            this.gridOptions.api.applyTransaction(newData);
         }
     }
     deleteRows(dataRows, dataUpdateConfig) {
@@ -3289,7 +3419,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();
         }
     }
@@ -3597,21 +3727,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;
@@ -3623,7 +3755,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 = {