@adaptabletools/adaptable 13.1.1 → 14.0.0-canary.1

package/src/agGrid/Adaptable.js

@@ -434,6 +434,7 @@ class Adaptable {
         this.QueryLanguageService = new QueryLanguageService_1.QueryLanguageService(this.api);
         this.AlertService = new AlertService_1.AlertService(this.api);
         this.TeamSharingService = new TeamSharingService_1.TeamSharingService(this.api);
+        // @ts-ignore
         this.RowEditService = new RowEditService_1.RowEditService(this.api);
         this.MetamodelService = new MetamodelService_1.MetamodelService(() => this.api.internalApi.getAdaptableOptions());
         this.forPlugins((plugin) => plugin.afterInitServices(this));
@@ -900,7 +901,7 @@ class Adaptable {
                 allColumns.push(this.createAdaptableColumn(agGridColumn, colsToGroups));
             }
         });
-        this.api.internalApi.setColumns(allColumns);
+        this.api.gridApi.internalApi.setColumns(allColumns);
     }
     createAdaptableColumn(agGridColumn, colsToGroups) {
         const abColumn = this.agGridHelper.createAdaptableColumnFromAgGridColumn(agGridColumn, colsToGroups);
@@ -931,8 +932,8 @@ class Adaptable {
         let colValue = params.value;
         if (this.api.gridApi.isGroupRowNode(params.node)) {
             if (styledColumn.IncludeGroupedRows) {
-                const minColumnValue = this.api.columnApi.getMinValueForNumericColumn(abColumn);
-                const maxColumnValue = this.api.columnApi.getMaxValueForNumericColumn(abColumn);
+                const minColumnValue = this.api.styledColumnApi.internalApi.getMinValueForNumericColumn(abColumn);
+                const maxColumnValue = this.api.styledColumnApi.internalApi.getMaxValueForNumericColumn(abColumn);
                 /**
                  * Color should always be in bounds, it should not overflow.
                  * If the value is out of range, it shoul set the maximum/minimum color.
@@ -944,15 +945,15 @@ class Adaptable {
             }
         }
         if (gradientStyle) {
-            const min = this.api.styledColumnApi.getNumericStyleMinValue(styledColumn, abColumn, params.node, colValue);
-            const max = this.api.styledColumnApi.getNumericStyleMaxValue(styledColumn, abColumn, params.node, colValue);
+            const min = this.api.styledColumnApi.internalApi.getNumericStyleMinValue(styledColumn, abColumn, params.node, colValue);
+            const max = this.api.styledColumnApi.internalApi.getNumericStyleMaxValue(styledColumn, abColumn, params.node, colValue);
             let cellBackColor;
             let reverseGradient = false;
             if (gradientStyle.ColumnComparison) {
                 cellBackColor = gradientStyle.ColumnComparison.Color;
             }
             else {
-                const matchingRange = this.api.styledColumnApi.findRangeForColumn(gradientStyle.CellRanges, abColumn, gradientStyle.RangeValueType, colValue);
+                const matchingRange = this.api.styledColumnApi.internalApi.findRangeForColumn(gradientStyle.CellRanges, abColumn, gradientStyle.RangeValueType, colValue);
                 if (matchingRange) {
                     cellBackColor = matchingRange.Color;
                     reverseGradient = matchingRange.ReverseGradient;
@@ -1003,7 +1004,7 @@ class Adaptable {
             return {};
         }
         const relevantFormatColumnsWithStyle = activeFormatColumnsWithStyle.filter((formatColumn) => {
-            return this.api.formatColumnApi.isFormatColumnRelevantForColumn(formatColumn, abColumn, params);
+            return this.api.formatColumnApi.internalApi.isFormatColumnRelevantForColumn(formatColumn, abColumn, params);
         });
         return this.getFormatColumnAdaptableStyle(relevantFormatColumnsWithStyle);
     }
@@ -1012,7 +1013,7 @@ class Adaptable {
             .map((formatColumn) => {
             var _a, _b;
             if (((_a = formatColumn.Style) === null || _a === void 0 ? void 0 : _a.ClassName) &&
-                this.api.formatColumnApi.isFormatColumnRelevantForColumn(formatColumn, abColumn, params)) {
+                this.api.formatColumnApi.internalApi.isFormatColumnRelevantForColumn(formatColumn, abColumn, params)) {
                 return (_b = formatColumn.Style) === null || _b === void 0 ? void 0 : _b.ClassName;
             }
         })
@@ -1020,10 +1021,10 @@ class Adaptable {
         return classNames;
     }
     getActiveAlertWithHighlightCell(col, params) {
-        return this.api.internalApi.getAdaptableAlertWithHighlightCell(col.columnId, params.node);
+        return this.api.alertApi.internalApi.getAdaptableAlertWithHighlightCell(col.columnId, params.node);
     }
     getActiveAlertWithHighlightRow(params) {
-        return this.api.internalApi.getAdaptableAlertWithHighlightRow(params.node);
+        return this.api.alertApi.internalApi.getAdaptableAlertWithHighlightRow(params.node);
     }
     getAlertCellStyle(col, params) {
         const alert = this.getActiveAlertWithHighlightCell(col, params);
@@ -1071,7 +1072,7 @@ class Adaptable {
         const primaryKey = params.node.aggData
             ? params.node.id
             : this.getPrimaryKeyValueFromRowNode(params.node);
-        const flashingCell = this.api.internalApi.getAdaptableFlashingCellFor(primaryKey, col.columnId);
+        const flashingCell = this.api.flashingCellApi.internalApi.getAdaptableFlashingCellFor(primaryKey, col.columnId);
         if (!flashingCell) {
             return {};
         }
@@ -1086,7 +1087,7 @@ class Adaptable {
         const primaryKey = params.node.aggData
             ? params.node.id
             : this.getPrimaryKeyValueFromRowNode(params.node);
-        const flashingCell = this.api.internalApi.getAdaptableFlashingCellFor(primaryKey, col.columnId);
+        const flashingCell = this.api.flashingCellApi.internalApi.getAdaptableFlashingCellFor(primaryKey, col.columnId);
         if (!flashingCell) {
             return;
         }
@@ -1148,7 +1149,7 @@ class Adaptable {
         }
         const gridCell = this.getGridCellFromRowNode(params.node, abColumn.columnId);
         if (gridCell) {
-            if (this.api.gridApi.areCellsEditable([gridCell])) {
+            if (this.api.gridApi.isCellEditable(gridCell)) {
                 return this.convertAdaptableStyleToCSS(editableCellStyle);
             }
         }
@@ -1161,7 +1162,7 @@ class Adaptable {
         }
         const gridCell = this.getGridCellFromRowNode(params.node, abColumn.columnId);
         if (gridCell) {
-            if (!this.api.gridApi.areCellsEditable([gridCell])) {
+            if (!this.api.gridApi.isCellEditable(gridCell)) {
                 return this.convertAdaptableStyleToCSS(editableCellStyle);
             }
         }
@@ -1172,9 +1173,7 @@ class Adaptable {
         if (!(editableCellStyle === null || editableCellStyle === void 0 ? void 0 : editableCellStyle.ClassName)) {
             return null;
         }
-        const isCellEditable = this.api.gridApi.areCellsEditable([
-            this.getGridCellFromRowNode(params.node, abColumn.columnId),
-        ]);
+        const isCellEditable = this.api.gridApi.isCellEditable(this.getGridCellFromRowNode(params.node, abColumn.columnId));
         return isCellEditable ? editableCellStyle.ClassName : null;
     }
     getReadonlyCellClass(abColumn, params) {
@@ -1182,9 +1181,7 @@ class Adaptable {
         if (!(readonlyCellStyle === null || readonlyCellStyle === void 0 ? void 0 : readonlyCellStyle.ClassName)) {
             return null;
         }
-        const isCellReadonly = !this.api.gridApi.areCellsEditable([
-            this.getGridCellFromRowNode(params.node, abColumn.columnId),
-        ]);
+        const isCellReadonly = !this.api.gridApi.isCellEditable(this.getGridCellFromRowNode(params.node, abColumn.columnId));
         return isCellReadonly ? readonlyCellStyle.ClassName : null;
     }
     isQuickSearchActive(abColumn, params) {
@@ -1278,7 +1275,7 @@ class Adaptable {
             this.api.layoutApi.createOrUpdateLayout(layout);
         }
         else {
-            this.api.internalApi.updateCurrentDraftLayout(layout);
+            this.api.layoutApi.internalApi.updateCurrentDraftLayout(layout);
         }
     }
     setLayout(layout) {
@@ -1436,7 +1433,7 @@ class Adaptable {
         this.gridOptions.columnApi.getColumns().forEach((col) => {
             const colDef = col.getColDef();
             const colId = col.getColId();
-            const abColumn = this.api.columnApi.getColumnFromId(colId);
+            const abColumn = this.api.columnApi.getColumnWithColumnId(colId);
             const colSetupInfo = {
                 col,
                 colDef,
@@ -1504,7 +1501,7 @@ class Adaptable {
         if (!layout) {
             layout = this.api.layoutApi.getCurrentLayout();
         }
-        if (this.api.layoutApi.areExpandedRowGroupsSavedInLayouts() &&
+        if (this.api.layoutApi.internalApi.areExpandedRowGroupsSavedInLayouts() &&
             ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(layout.ExpandedRowGroupValues)) {
             this.expandRowGroupsForValues(layout.ExpandedRowGroupValues);
         }
@@ -1569,7 +1566,7 @@ class Adaptable {
         });
         groupedColumns = groupedColumns.filter((x) => !!x);
         pivotedColumns = pivotedColumns.filter((x) => !!x);
-        if ((_b = (_a = this.adaptableOptions) === null || _a === void 0 ? void 0 : _a.generalOptions) === null || _b === void 0 ? void 0 : _b.keepGroupedColumnIndex) {
+        if ((_b = (_a = this.adaptableOptions) === null || _a === void 0 ? void 0 : _a.generalOptions) === null || _b === void 0 ? void 0 : _b.restoreUngroupedColumns) {
             columnOrder = this.restoreUnGroupColumnOrder({
                 columnOrder,
                 newGroupColumns: groupedColumns,
@@ -1590,7 +1587,7 @@ class Adaptable {
         }
         layout.EnablePivot = this.gridOptions.columnApi.isPivotMode();
         layout.PivotColumns = pivotColumns;
-        if (this.api.layoutApi.areExpandedRowGroupsSavedInLayouts()) {
+        if (this.api.layoutApi.internalApi.areExpandedRowGroupsSavedInLayouts()) {
             layout.ExpandedRowGroupValues = this.getExpandRowGroupsKeys();
         }
         this.persistLayout(layout);
@@ -1628,7 +1625,7 @@ class Adaptable {
                         for (const column of rangeSelection.columns) {
                             if (column != null) {
                                 const colId = column.getColId();
-                                const selectedColumn = this.api.columnApi.getColumnFromId(colId);
+                                const selectedColumn = this.api.columnApi.getColumnWithColumnId(colId);
                                 if (selectedColumn &&
                                     columns.find((c) => c.columnId == selectedColumn.columnId) == null) {
                                     columns.push(selectedColumn);
@@ -1652,7 +1649,7 @@ class Adaptable {
             columns: columns,
             gridCells: selectedCells,
         };
-        this.api.internalApi.setSelectedCells(selectedCellInfo);
+        this.api.gridApi.internalApi.setSelectedCells(selectedCellInfo);
         this._emit('CellsSelected');
         this.agGridHelper.fireSelectionChangedEvent();
         return selectedCellInfo;
@@ -1687,7 +1684,7 @@ class Adaptable {
             });
         }
         const selectedRowInfo = { gridRows: selectedRows };
-        this.api.internalApi.setSelectedRows(selectedRowInfo);
+        this.api.gridApi.internalApi.setSelectedRows(selectedRowInfo);
         this.agGridHelper.fireSelectionChangedEvent();
         return selectedRowInfo;
     }
@@ -1832,7 +1829,7 @@ class Adaptable {
         let permittedMap = new Map();
         // check if there are permitted column values for that column
         // NB.  this currently contains a small bug as we dont check for visibility so if using permitted values then ALL are returned :(
-        const abColumn = this.api.columnApi.getColumnFromId(columnId);
+        const abColumn = this.api.columnApi.getColumnWithColumnId(columnId);
         const permittedValuesForColumn = this.api.userInterfaceApi.getPermittedValuesForColumn(abColumn);
         if (ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(permittedValuesForColumn)) {
             permittedValuesForColumn.forEach((pv) => {
@@ -1886,23 +1883,6 @@ class Adaptable {
             return undefined;
         }
     }
-    isCustomRenderedColumn(column) {
-        if (!column || column.isGrouped) {
-            return false;
-        }
-        // we need to return false if the column has a cell renderer i think...
-        const colDef = this.gridOptions.api.getColumnDef(column.columnId);
-        if (colDef && colDef.cellRenderer != null) {
-            return true;
-        }
-        if (this.api.columnApi.isStyledNumericColumn(column)) {
-            return true;
-        }
-        if (this.api.columnApi.isBooleanColumn(column)) {
-            return true;
-        }
-        return false;
-    }
     getDisplayValue(primaryKey, columnId) {
         let returnValue;
         if (this.useRowNodeLookUp) {
@@ -1927,7 +1907,7 @@ class Adaptable {
         if (rowNode == null) {
             return undefined;
         }
-        const abColumn = this.api.columnApi.getColumnFromId(columnId);
+        const abColumn = this.api.columnApi.getColumnWithColumnId(columnId);
         const pkValue = this.getPrimaryKeyValueFromRowNode(rowNode);
         const rawValue = this.getRawValueFromRowNode(rowNode, columnId);
         const displayValue = this.getDisplayValueFromRawValue(rowNode, columnId, rawValue);
@@ -1949,15 +1929,16 @@ class Adaptable {
         return this.getDisplayValueFromRawValue(rowNode, columnId, rawValue);
     }
     getDisplayValueFromRawValue(rowNode, columnId, rawValue) {
-        const abColumn = this.api.columnApi.getColumnFromId(columnId);
-        const isRenderedColumn = this.api.columnApi.isStyledNumericColumn(abColumn);
-        if (isRenderedColumn) {
-            const colDef = this.gridOptions.api.getColumnDef(columnId);
-            if (typeof colDef.valueFormatter == 'function') {
-                return this.getFormattedValue(rowNode, rawValue, columnId, colDef, colDef.valueFormatter);
-            }
-            return this.agGridHelper.getCleanValue(rawValue);
-        }
+        // no need for this case, it's handled below after the ActionColumn logic
+        // const abColumn: AdaptableColumn = this.api.columnApi.getColumnWithColumnId(columnId);
+        // const isCustomRenderedColumn = this.api.styledColumnApi.hasPercentBarStyle(columnId);
+        // if (isCustomRenderedColumn) {
+        //   const colDef = this.gridOptions.api!.getColumnDef(columnId);
+        //   if (typeof colDef.valueFormatter == 'function') {
+        //     return this.getFormattedValue(rowNode, rawValue, columnId, colDef, colDef.valueFormatter);
+        //   }
+        //   return this.agGridHelper.getCleanValue(rawValue);
+        // }
         const isActionColumn = this.api.columnApi.isActionColumn(columnId);
         if (isActionColumn) {
             return this.agGridHelper.getCleanValue(rawValue);
@@ -2069,9 +2050,13 @@ class Adaptable {
         }
         return rowNodes;
     }
-    forAllRowNodesDo(func) {
+    forAllRowNodesDo(func, config) {
         this.gridOptions.api.forEachNode((rowNode) => {
-            func(rowNode);
+            const includeGroupRows = (config === null || config === void 0 ? void 0 : config.includeGroupRows) || !this.isGroupRowNode(rowNode);
+            const filterFnFulfilled = !(config === null || config === void 0 ? void 0 : config.filterFn) || (config === null || config === void 0 ? void 0 : config.filterFn(rowNode));
+            if (includeGroupRows && filterFnFulfilled) {
+                func(rowNode);
+            }
         });
     }
     forAllVisibleRowNodesDo(func) {
@@ -2088,13 +2073,7 @@ class Adaptable {
     }
     getAllRowNodes(config) {
         let rowNodes = [];
-        this.gridOptions.api.forEachNode((rowNode, rowIndex) => {
-            const includeGroupRows = (config === null || config === void 0 ? void 0 : config.includeGroupRows) || !this.isGroupRowNode(rowNode);
-            const filterFnFulfilled = !(config === null || config === void 0 ? void 0 : config.filterFn) || (config === null || config === void 0 ? void 0 : config.filterFn(rowNode));
-            if (includeGroupRows && filterFnFulfilled) {
-                rowNodes.push(rowNode);
-            }
-        });
+        this.forAllRowNodesDo((rowNode) => rowNodes.push(rowNode), config);
         return rowNodes;
     }
     getRowsInViewport() {
@@ -2206,7 +2185,7 @@ class Adaptable {
     }
     getColDefsForFreeTextColumns() {
         const defaultFreeTextColumnSettings = (0, ObjectFactory_1.CreateEmptyFreeTextColumn)().FreeTextColumnSettings;
-        return this.api.freeTextColumnApi.getAllFreeTextColumn().map((freeTextColumn) => {
+        return this.api.freeTextColumnApi.getFreeTextColumns().map((freeTextColumn) => {
             var _a;
             const freeTextColumnSettings = Object.assign(Object.assign({}, defaultFreeTextColumnSettings), freeTextColumn.FreeTextColumnSettings);
             const dataTypeEditor = freeTextColumn.DataType === 'Number'
@@ -2246,7 +2225,7 @@ class Adaptable {
                 cellRenderer: freeTextColumn.DataType && freeTextColumn.DataType == 'Boolean'
                     ? this.agGridHelper.createCheckboxRendererComp(freeTextColumn.ColumnId, false)
                     : undefined,
-                valueGetter: (params) => this.api.freeTextColumnApi.getFreeTextColumnValueFromRowNode(freeTextColumn, params.node),
+                valueGetter: (params) => this.api.freeTextColumnApi.getFreeTextColumnValueForRowNode(freeTextColumn, params.node),
             };
             if (freeTextColumnSettings.HeaderToolTip) {
                 newColDef.headerTooltip = freeTextColumnSettings.HeaderToolTip;
@@ -2272,7 +2251,7 @@ class Adaptable {
         }
     }
     getColDefsForRowEditColumns() {
-        const actionRowButtons = this.adaptableOptions.actionOptions.actionRowButtons;
+        const actionRowButtons = this.api.actionApi.getActionRowButtons();
         if (!(actionRowButtons === null || actionRowButtons === void 0 ? void 0 : actionRowButtons.length)) {
             return [];
         }
@@ -2378,7 +2357,7 @@ class Adaptable {
             suppressMenu: false,
             suppressMovable: false,
         };
-        return this.api.actionApi.getAllActionColumn().map((actionColumn) => {
+        return this.api.actionApi.getActionColumns().map((actionColumn) => {
             const actionColumnSettings = Object.assign(Object.assign({}, defaultActionColumnSettings), actionColumn.actionColumnSettings);
             const newColDef = {
                 headerName: actionColumn.friendlyName ? actionColumn.friendlyName : actionColumn.columnId,
@@ -2455,7 +2434,7 @@ class Adaptable {
     }
     getColDefsForCalculatedColumns() {
         const defaultCalculatedColumnSettings = (0, ObjectFactory_1.CreateEmptyCalculatedColumn)().CalculatedColumnSettings;
-        return this.api.calculatedColumnApi.getAllCalculatedColumn().map((calculatedColumn) => {
+        return this.api.calculatedColumnApi.getCalculatedColumns().map((calculatedColumn) => {
             const calculatedColumnSettings = Object.assign(Object.assign({}, defaultCalculatedColumnSettings), calculatedColumn.CalculatedColumnSettings);
             if (!calculatedColumnSettings.DataType) {
                 calculatedColumnSettings.DataType =
@@ -2468,7 +2447,7 @@ class Adaptable {
             if (ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(calculatedColumnSettings.ColumnTypes)) {
                 columnTypes.push(...calculatedColumnSettings.ColumnTypes);
             }
-            const isExternalEvaluation = !this.api.internalApi.evaluateExpressionInAdaptableQL('CalculatedColumn', this.api.queryLanguageApi.getAdaptableQueryExpression(calculatedColumn.Query));
+            const isExternalEvaluation = !this.api.queryLanguageApi.internalApi.evaluateExpressionInAdaptableQL('CalculatedColumn', this.api.queryLanguageApi.getAdaptableQueryExpression(calculatedColumn.Query));
             const newColDef = {
                 headerName: calculatedColumn.FriendlyName
                     ? calculatedColumn.FriendlyName
@@ -2861,7 +2840,7 @@ class Adaptable {
             if (this.api.internalApi.isGridInPivotMode()) {
                 return;
             }
-            if ((_b = (_a = this.adaptableOptions) === null || _a === void 0 ? void 0 : _a.generalOptions) === null || _b === void 0 ? void 0 : _b.keepGroupedColumnIndex) {
+            if ((_b = (_a = this.adaptableOptions) === null || _a === void 0 ? void 0 : _a.generalOptions) === null || _b === void 0 ? void 0 : _b.restoreUngroupedColumns) {
                 this.persistColumnIndexBeforeGrouping(params);
             }
             if (this.adaptableOptions.columnOptions.hideColumnWhenGrouped === true &&
@@ -2999,7 +2978,7 @@ class Adaptable {
                 if (!this.isGroupRowNode(node)) {
                     const currentQuery = this.api.queryApi.getCurrentQuery();
                     if (currentQuery) {
-                        const evaluateQueryOnClient = this.api.internalApi.evaluateExpressionInAdaptableQL('Query', currentQuery);
+                        const evaluateQueryOnClient = this.api.queryLanguageApi.internalApi.evaluateExpressionInAdaptableQL('Query', currentQuery);
                         if (evaluateQueryOnClient) {
                             const isCurrentQueryValid = this.api.queryLanguageApi.isValidBooleanExpression(currentQuery, ModuleConstants_1.QueryModuleId, `Invalid CurrentQuery '${currentQuery}'`);
                             if (!isCurrentQueryValid ||
@@ -3011,14 +2990,14 @@ class Adaptable {
                         }
                     }
                 }
-                const evaluateFilterOnClient = this.api.internalApi.evaluateExpressionInAdaptableQL('Filter');
+                const evaluateFilterOnClient = this.api.queryLanguageApi.internalApi.evaluateExpressionInAdaptableQL('Filter');
                 try {
                     // we then assess filters (if running locally)
                     if (evaluateFilterOnClient) {
                         const columnFilters = this.api.filterApi.getActiveColumnFilters();
                         if (columnFilters.length > 0) {
                             for (const columnFilter of columnFilters) {
-                                if (!this.api.filterApi.evaluateColumnFilter(columnFilter, node)) {
+                                if (!this.api.filterApi.internalApi.evaluateColumnFilter(columnFilter, node)) {
                                     return false;
                                 }
                             }
@@ -3104,7 +3083,7 @@ class Adaptable {
         cols.forEach((col) => {
             const colDef = col.getColDef();
             const colId = col.getColId();
-            const abColumn = this.api.columnApi.getColumnFromId(colId);
+            const abColumn = this.api.columnApi.getColumnWithColumnId(colId);
             const colSetupInfo = {
                 col,
                 colDef,
@@ -3224,8 +3203,8 @@ class Adaptable {
                 fontSize: null,
                 borderColor: null,
             };
-            const activeFormatColumnsWithStyle = this.api.formatColumnApi.getFormatColumnsWithStyleForColumn(abColumn);
-            let styledColumn = this.api.styledColumnApi.getStyledColumnByColumnId(colId);
+            const activeFormatColumnsWithStyle = this.api.formatColumnApi.internalApi.getFormatColumnsWithStyleForColumn(abColumn);
+            let styledColumn = this.api.styledColumnApi.getStyledColumnForColumnId(colId);
             if (styledColumn === null || styledColumn === void 0 ? void 0 : styledColumn.IsSuspended) {
                 styledColumn = null;
             }
@@ -3243,7 +3222,7 @@ class Adaptable {
     }
     setupColumnCellClass({ col, colId, abColumn }) {
         this.setColDefProperty(col, 'cellClass', (userCellClass) => {
-            const formatColumns = this.api.formatColumnApi.getFormatColumnWithStyleClassNameForColumn(abColumn);
+            const formatColumns = this.api.formatColumnApi.internalApi.getFormatColumnWithStyleClassNameForColumn(abColumn);
             const quickSearchStyleClassName = this.api.quickSearchApi.getQuickSearchStyle().ClassName;
             const hasQuickSearchStyleClassName = StringExtensions_1.StringExtensions.IsNotNullOrEmpty(quickSearchStyleClassName);
             const cellClass = (params) => {
@@ -3253,7 +3232,7 @@ class Adaptable {
                 const readonlyClassName = this.getReadonlyCellClass(abColumn, params);
                 const highlightAlertClassName = this.getAlertCellClass(abColumn, params);
                 const flashingClassName = this.getFlashingCellClass(abColumn, params);
-                const styledColumn = this.api.styledColumnApi.getStyledColumnByColumnId(colId);
+                const styledColumn = this.api.styledColumnApi.getStyledColumnForColumnId(colId);
                 const hasStyledColumn = !!styledColumn && !styledColumn.IsSuspended;
                 const returnValue = [
                     this.getExcelClassNameForCell(colId, primaryKeyValue),
@@ -3285,7 +3264,7 @@ class Adaptable {
         return excelClassName;
     }
     setupColumnCellEditor({ colId, col }) {
-        const adaptableColumn = this.api.columnApi.getColumnFromId(colId);
+        const adaptableColumn = this.api.columnApi.getColumnWithColumnId(colId);
         const editLookUpItem = this.api.userInterfaceApi.getEditLookUpItemForColumn(adaptableColumn);
         const hasRichSelectCellEditor = this.isAgGridModulePresent(core_1.ModuleNames.RichSelectModule);
         this.setColDefProperty(col, 'cellEditor', () => {
@@ -3317,7 +3296,7 @@ class Adaptable {
     }
     setupColumnCellRenderer({ col, colId, abColumn }) {
         this.setColDefProperty(col, 'cellRenderer', () => {
-            const styledColumn = this.api.styledColumnApi.getStyledColumnByColumnId(abColumn.columnId);
+            const styledColumn = this.api.styledColumnApi.getStyledColumnForColumnId(abColumn.columnId);
             if (styledColumn && !styledColumn.IsSuspended) {
                 if (styledColumn.PercentBarStyle) {
                     return this.agGridHelper.createPercentBarRendererComp(styledColumn, abColumn);
@@ -3331,7 +3310,7 @@ class Adaptable {
             }
         });
         this.setColDefProperty(col, 'cellRendererParams', (userDefined) => {
-            const styledColumn = this.api.styledColumnApi.getStyledColumnByColumnId(abColumn.columnId);
+            const styledColumn = this.api.styledColumnApi.getStyledColumnForColumnId(abColumn.columnId);
             if (styledColumn && !styledColumn.IsSuspended) {
                 if (styledColumn.SparkLineStyle) {
                     const sparklineOptions = (0, merge_1.default)({}, userDefined === null || userDefined === void 0 ? void 0 : userDefined.sparklineOptions, styledColumn.SparkLineStyle.options);
@@ -3342,15 +3321,15 @@ class Adaptable {
     }
     setupColumnTooltipValueGetter({ col, colId, abColumn }) {
         this.setColDefProperty(col, 'tooltipValueGetter', () => {
-            const styledColumn = this.api.styledColumnApi.getStyledColumnByColumnId(colId);
+            const styledColumn = this.api.styledColumnApi.getStyledColumnForColumnId(colId);
             if (styledColumn &&
                 !styledColumn.IsSuspended &&
                 styledColumn.PercentBarStyle &&
                 styledColumn.PercentBarStyle.ToolTipText) {
                 if (styledColumn === null || styledColumn === void 0 ? void 0 : styledColumn.PercentBarStyle) {
                     return (params) => {
-                        const min = this.api.styledColumnApi.getNumericStyleMinValue(styledColumn, abColumn, params.node, params.value);
-                        const max = this.api.styledColumnApi.getNumericStyleMaxValue(styledColumn, abColumn, params.node, params.value);
+                        const min = this.api.styledColumnApi.internalApi.getNumericStyleMinValue(styledColumn, abColumn, params.node, params.value);
+                        const max = this.api.styledColumnApi.internalApi.getNumericStyleMaxValue(styledColumn, abColumn, params.node, params.value);
                         const textOptions = styledColumn.PercentBarStyle.ToolTipText;
                         let returnValue = '';
                         if (textOptions.includes('CellValue')) {
@@ -3390,7 +3369,7 @@ class Adaptable {
     triggerSetupColumnKeyCreator(colId) {
         const col = this.gridOptions.columnApi.getColumn(colId);
         const colDef = col.getColDef();
-        const abColumn = this.api.columnApi.getColumnFromId(colId);
+        const abColumn = this.api.columnApi.getColumnWithColumnId(colId);
         const colSetupInfo = {
             col,
             colDef,
@@ -3449,7 +3428,7 @@ class Adaptable {
             if (!colDef.filter) {
                 return;
             }
-            if (!this.api.columnApi.usesAdaptableFilterForm(col.getColId())) {
+            if (!this.api.columnApi.internalApi.usesAdaptableFilterForm(col.getColId())) {
                 return;
             }
             this.gridOptions.api.destroyFilter(col);
@@ -3457,7 +3436,8 @@ class Adaptable {
         });
     }
     setupColumnFloatingFilter({ col, colDef }) {
-        const isFloatingFilterDisabled = !colDef.floatingFilter || !this.api.columnApi.usesAdaptableQuickFilter(col.getColId());
+        const isFloatingFilterDisabled = !colDef.floatingFilter ||
+            !this.api.columnApi.internalApi.usesAdaptableQuickFilter(col.getColId());
         this.setColDefProperty(col, 'floatingFilterComponent', () => {
             if (isFloatingFilterDisabled) {
                 return;
@@ -3475,13 +3455,13 @@ class Adaptable {
     }
     setupColumnValueFormatter({ col, abColumn }) {
         this.setColDefProperty(col, 'valueFormatter', (params) => {
-            const activeFormatColumnsWithDisplayFormat = this.api.formatColumnApi.getFormatColumnsWithDisplayFormatForColumn(abColumn);
+            const activeFormatColumnsWithDisplayFormat = this.api.formatColumnApi.internalApi.getFormatColumnsWithDisplayFormatForColumn(abColumn);
             if (!activeFormatColumnsWithDisplayFormat.length) {
                 return;
             }
             return (params) => {
                 const { node, value } = params;
-                const [mostRelevantFormatColumn] = this.api.formatColumnApi.getFormatColumnsRelevantForColumn(activeFormatColumnsWithDisplayFormat, abColumn, { node, value });
+                const [mostRelevantFormatColumn] = this.api.formatColumnApi.internalApi.getFormatColumnsRelevantForColumn(activeFormatColumnsWithDisplayFormat, abColumn, { node, value });
                 if (!mostRelevantFormatColumn) {
                     // ALL FormatColumns are conditional and NONE of them are relevant for this row
                     return value;
@@ -3490,19 +3470,19 @@ class Adaptable {
                 if (mostRelevantFormatColumn.DisplayFormat.Formatter === 'NumberFormatter') {
                     // change the Number format - if the scope allows it
                     if (this.api.scopeApi.isColumnInNumericScope(abColumn, mostRelevantFormatColumn.Scope)) {
-                        return this.api.formatColumnApi.getNumberFormattedValue(params.value, params.node, abColumn, options);
+                        return this.api.formatColumnApi.internalApi.getNumberFormattedValue(params.value, params.node, abColumn, options);
                     }
                 }
                 if (mostRelevantFormatColumn.DisplayFormat.Formatter === 'DateFormatter') {
                     // change the Date format - if the scope allows it
                     if (this.api.scopeApi.isColumnInDateScope(abColumn, mostRelevantFormatColumn.Scope)) {
-                        return this.api.formatColumnApi.getDateFormattedValue(params.value, params.node, abColumn, options);
+                        return this.api.formatColumnApi.internalApi.getDateFormattedValue(params.value, params.node, abColumn, options);
                     }
                 }
                 if (mostRelevantFormatColumn.DisplayFormat.Formatter === 'StringFormatter') {
                     // change the String format - if the scope allows it
                     if (this.api.scopeApi.isColumnInStringsScope(abColumn, mostRelevantFormatColumn.Scope)) {
-                        return this.api.formatColumnApi.getStringFormattedValue(params.value, params.node, abColumn, options);
+                        return this.api.formatColumnApi.internalApi.getStringFormattedValue(params.value, params.node, abColumn, options);
                     }
                 }
                 // should NEVER arrive at this line, but just to be sure
@@ -3530,7 +3510,7 @@ class Adaptable {
     setupColumnValueSetter({ col, colId, abColumn }) {
         this.setColDefProperty(col, 'valueSetter', (userValueSetter) => {
             var _a;
-            const preventEditAlertsForColumn = this.api.alertApi
+            const preventEditAlertsForColumn = this.api.alertApi.internalApi
                 .getAlertDefinitionsWithPreventEdit()
                 .filter((alertDefinition) => {
                 return this.api.scopeApi.isColumnInScope(abColumn, alertDefinition.Scope);
@@ -3559,7 +3539,7 @@ class Adaptable {
                 const cellDataChangedInfo = this.api.internalApi.buildDataChangedInfo({
                     oldValue: params.oldValue,
                     newValue: params.newValue,
-                    column: this.api.columnApi.getColumnFromId(params.column.getColId()),
+                    column: this.api.columnApi.getColumnWithColumnId(params.column.getColId()),
                     primaryKeyValue: this.getPrimaryKeyValueFromRowNode(params.node),
                     rowNode: params.node,
                     trigger: 'edit',
@@ -3599,8 +3579,8 @@ class Adaptable {
         });
     }
     setupColumnComparator({ col, colId, abColumn }) {
-        const customSort = this.api.customSortApi.getCustomSortByColumn(colId);
-        const columnSortComparer = this.api.internalApi.getCustomSortComparer(abColumn);
+        const customSort = this.api.customSortApi.getCustomSortForColumn(colId);
+        const columnSortComparer = this.api.customSortApi.internalApi.getCustomSortComparer(abColumn);
         const comparatorGetter = (propName) => {
             return () => {
                 return this.getActiveColumnComparator(colId, customSort, columnSortComparer);
@@ -3642,14 +3622,14 @@ class Adaptable {
         // rowNode = this.getRowNodeForPrimaryKey(primaryKeyValue);
         let cellDataChangedInfos = [];
         Object.keys(oldData).forEach((key) => {
-            if (this.api.columnApi.doesColumnExist(key)) {
+            if (this.api.columnApi.isColumnInGrid(key)) {
                 const oldValue = oldData[key];
                 const newValue = newData[key];
                 if (oldValue != newValue) {
                     const cellDataChangedInfo = this.api.internalApi.buildDataChangedInfo({
                         oldValue: oldValue,
                         newValue: newValue,
-                        column: this.api.columnApi.getColumnFromId(key),
+                        column: this.api.columnApi.getColumnWithColumnId(key),
                         primaryKeyValue: primaryKeyValue,
                         rowNode: rowNode,
                         trigger: 'tick',
@@ -3667,7 +3647,7 @@ class Adaptable {
         if (oldValue == newValue) {
             return;
         }
-        const abColumn = this.api.columnApi.getColumnFromId(colId);
+        const abColumn = this.api.columnApi.getColumnWithColumnId(colId);
         if (!abColumn) {
             return;
         }
@@ -3723,7 +3703,7 @@ class Adaptable {
             }
             if (cellDataChangedInfo.trigger === 'edit' || cellDataChangedInfo.trigger === 'undo') {
                 this.checkChangedCellCurrentlySelected(cellDataChangedInfo);
-                this.api.freeTextColumnApi.checkFreeTextColumnForDataChange(cellDataChangedInfo);
+                this.api.freeTextColumnApi.internalApi.handleFreeTextColumnDataChange(cellDataChangedInfo);
             }
             this.DataService.CreateDataChangedEvent(cellDataChangedInfo);
             this.resetMinMaxCachedValueForColumn(cellDataChangedInfo.column);
@@ -3752,7 +3732,7 @@ class Adaptable {
     }
     getExpressionStylesChanges(dataChangedScope, cellDataChangedInfos) {
         const formatColumnsWithExpression = [];
-        formatColumnsWithExpression.push(...this.api.formatColumnApi.getFormatColumnsWithExpression());
+        formatColumnsWithExpression.push(...this.api.formatColumnApi.internalApi.getFormatColumnsWithExpression());
         if (ArrayExtensions_1.ArrayExtensions.IsNullOrEmpty(formatColumnsWithExpression)) {
             return;
         }
@@ -3781,10 +3761,10 @@ class Adaptable {
         });
     }
     getStyledColumnComparisonChanges(dataChangedScope, cellDataChangedInfos) {
-        this.api.styledColumnApi.getAllStyledColumn().forEach((sc) => {
-            let columnComparison = this.api.styledColumnApi.getColumnComparisonForStyledColumn(sc);
+        this.api.styledColumnApi.getStyledColumns().forEach((sc) => {
+            let columnComparison = this.api.styledColumnApi.internalApi.getColumnComparisonForStyledColumn(sc);
             if (columnComparison) {
-                let affectedColumnIds = this.api.styledColumnApi.getColumnIdsFromColumnComparison(columnComparison);
+                let affectedColumnIds = this.api.styledColumnApi.internalApi.getColumnIdsFromColumnComparison(columnComparison);
                 if (ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(affectedColumnIds)) {
                     cellDataChangedInfos.forEach((cellDataChangedInfo) => {
                         if (affectedColumnIds.includes(cellDataChangedInfo.column.columnId)) {
@@ -3816,7 +3796,8 @@ class Adaptable {
         const columnIdMap = new Set();
         cellDataChangedInfos.forEach((cellDataChangeInfo) => {
             const styledColumn = this.api.styledColumnApi.getActiveStyledColumnForColumn(cellDataChangeInfo.column);
-            if (styledColumn && this.api.styledColumnApi.hasStyledColumnRelativeCellRange(styledColumn)) {
+            if (styledColumn &&
+                this.api.styledColumnApi.internalApi.hasStyledColumnRelativeCellRange(styledColumn)) {
                 columnIdMap.add(styledColumn.ColumnId);
             }
         });
@@ -3904,7 +3885,7 @@ class Adaptable {
     }
     getExpandRowGroupsKeys() {
         let returnValues = [];
-        if (this.api.layoutApi.areExpandedRowGroupsSavedInLayouts()) {
+        if (this.api.layoutApi.internalApi.areExpandedRowGroupsSavedInLayouts()) {
             this.gridOptions.api.forEachNode((node) => {
                 if (node.group && node.expanded) {
                     let current = node;
@@ -4138,7 +4119,7 @@ class Adaptable {
         let groupedColumns = this.gridOptions.columnApi.getRowGroupColumns();
         if (ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(groupedColumns)) {
             let groupedColumn = groupedColumns[0];
-            return this.api.columnApi.getColumnFromId(groupedColumn.getColId());
+            return this.api.columnApi.getColumnWithColumnId(groupedColumn.getColId());
         }
     }
     checkColumnsDataTypeSet() {
@@ -4301,7 +4282,7 @@ class Adaptable {
         const themeName = typeof theme === 'string' ? theme : theme.Name;
         const themeClassNamesToRemove = [];
         const themesToRemove = [];
-        const allThemes = this.api.themeApi.getAllTheme().map((t) => {
+        const allThemes = this.api.themeApi.getThemes().map((t) => {
             // we mutate the theme later,
             // and since we don't want the mutation to end up in state
             // we better clone it here
@@ -4349,7 +4330,7 @@ class Adaptable {
             }
             return val;
         });
-        const systemThemes = this.api.themeApi.getAllSystemTheme();
+        const systemThemes = this.api.themeApi.getSystemThemes();
         const isSystemTheme = !!systemThemes.filter((t) => t.Name === themeName)[0];
         const container = this.getAgGridContainerElement();
         const getAgGridLightThemeName = () => this.getAgGridLightThemeName();
@@ -4682,7 +4663,7 @@ import "@adaptabletools/adaptable/themes/${themeName}.css"`);
             return;
         }
         let rawValue = rowNode.key;
-        if (this.api.columnApi.getColumnDataTypeFromColumnId(columnId) === 'Date' &&
+        if (this.api.columnApi.getColumnDataTypeForColumnId(columnId) === 'Date' &&
             typeof rawValue === 'string') {
             // AG-Grid converts the value to string, we have to reconvert it back
             const dateRawValue = (0, DateHelper_1.parseDateValue)(rawValue);
@@ -4815,7 +4796,7 @@ import "@adaptabletools/adaptable/themes/${themeName}.css"`);
         if (value !== undefined) {
             return value;
         }
-        const distinctRawValues = this.api.columnApi
+        const distinctRawValues = this.api.gridApi.internalApi
             .getUnsortedDistinctRawValuesForColumn(columnId)
             .map((item) => item.rawValue);
         value = minMax === 'min' ? Math.min(...distinctRawValues) : Math.max(...distinctRawValues);
@@ -4829,7 +4810,8 @@ import "@adaptabletools/adaptable/themes/${themeName}.css"`);
         // what is new
         const newGroups = columnGroupsInGrid.filter((colId) => !columnGroupsInLayout.includes(colId));
         newGroups.forEach((colId) => {
-            const columnIndex = layout.Columns.findIndex((columnIdInLayout) => columnIdInLayout === colId);
+            const columnIndex = layout.Columns.filter((colId) => !(this.api.columnApi.isAutoRowGroupColumn(colId) ||
+                this.api.columnApi.isAutoPivotColumn(colId))).findIndex((columnIdInLayout) => columnIdInLayout === colId);
             // user may group after a column not in layout
             if (columnIndex !== -1) {
                 this.api.internalApi.persistPreviousGroupedColumnsIndex(layout.Uuid, colId, columnIndex);
@@ -4838,7 +4820,7 @@ import "@adaptabletools/adaptable/themes/${themeName}.css"`);
     }
     /**
      * Restores the order previous grouping order.
-     
+  
      */
     restoreUnGroupColumnOrder({ newGroupColumns, columnOrder, }) {
         var _a;
@@ -4856,22 +4838,25 @@ import "@adaptabletools/adaptable/themes/${themeName}.css"`);
             const isStillGrouped = newGroupColumns.includes(colId);
             const isAlreadyInGrid = currentLayout.Columns.includes(colId); // was not just added by ungrouping
             if (isStillGrouped) {
-                break;
+                continue;
             }
             if (isAlreadyInGrid) {
                 // no longer grouped, but already in grid, this means it was already in grid before ungrouping
                 // in this case the state can be cleared
                 this.api.internalApi.persistPreviousGroupedColumnsIndex(currentLayout.Uuid, colId, null);
-                break;
+                continue;
             }
+            // need to ajust index based if grouped
+            const numberOfGroupedColumns = newColumnOrder.filter((colId) => this.api.columnApi.isAutoRowGroupColumn(colId)).length;
+            const adjustedPreviousIndex = previousIndex + numberOfGroupedColumns;
             const indexInGrid = newColumnOrder.indexOf(colId);
-            const hasDifferentPositionAsPreviousLayout = previousIndex !== null && // if null, the reorder was already applied
+            const hasDifferentPositionAsPreviousLayout = adjustedPreviousIndex !== null && // if null, the reorder was already applied
                 indexInGrid > 0 && // needs to be in grid
-                previousIndex !== indexInGrid;
-            const isPreviousPositionInRange = previousIndex < newColumnOrder.length;
+                adjustedPreviousIndex !== indexInGrid;
+            const isPreviousPositionInRange = adjustedPreviousIndex < newColumnOrder.length;
             if (hasDifferentPositionAsPreviousLayout && isPreviousPositionInRange) {
                 newColumnOrder.splice(indexInGrid, 1);
-                newColumnOrder.splice(previousIndex, 0, colId);
+                newColumnOrder.splice(adjustedPreviousIndex, 0, colId);
             }
             this.api.internalApi.persistPreviousGroupedColumnsIndex(currentLayout.Uuid, colId, null);
         }