@adaptabletools/adaptable 19.2.4 → 20.0.0-canary.0

package/src/Api/Implementation/ColumnApiImpl.js

@@ -2,19 +2,76 @@ import { ApiBase } from './ApiBase';
 import * as GeneralConstants from '../../Utilities/Constants/GeneralConstants';
 import * as ModuleConstants from '../../Utilities/Constants/ModuleConstants';
 import { ColumnInternalApi } from '../Internal/ColumnInternalApi';
-import { createBaseContext } from '../../Utilities/ObjectFactory';
+import { GROUP_COLUMN_ID__MULTI_PREFIX, GROUP_COLUMN_ID__SINGLE, } from '../../layout-manager/src/normalizeLayoutModel';
 import ArrayExtensions from '../../Utilities/Extensions/ArrayExtensions';
-import { logDeprecationExternal } from '../../Utilities/logDeprecation';
-import { ADAPTABLE_ROW_ACTION_BUTTONS } from '../../Utilities/Constants/GeneralConstants';
 export function isAutoRowGroupColumn(columnId) {
     // put this here as there might be other indicators we are not aware of
     // perhaps with non auto groups ?
     //https://www.ag-grid.com/javascript-grid-grouping/
-    return columnId === null || columnId === void 0 ? void 0 : columnId.startsWith(GeneralConstants.AG_GRID_GROUPED_COLUMN);
+    return columnId?.startsWith(GeneralConstants.AG_GRID_GROUPED_COLUMN);
 }
-export function isAutoPivotColumn(columnId) {
+const ROW_GROUP_COLUMN_DEFAULTS = {
+    columnId: '',
+    isTreeColumn: false,
+    friendlyName: 'Group',
+    isPrimaryKey: false,
+    readOnly: false,
+    visible: true,
+    alwaysHidden: false,
+    fieldOnly: false,
+    queryable: false,
+    sortable: false,
+    filterable: false,
+    groupable: false,
+    pivotable: false,
+    aggregatable: false,
+    moveable: true,
+    hideable: false,
+    exportable: true,
+    isGrouped: true,
+    isGeneratedRowGroupColumn: true,
+    isGeneratedPivotResultColumn: false,
+    isFixed: false,
+    pinned: null,
+    isSparkline: false,
+    dataType: 'text',
+    isCalculatedColumn: false,
+    isFreeTextColumn: false,
+    isActionColumn: false,
+};
+export function generateAutoRowGroupSingleColumn() {
+    return {
+        ...ROW_GROUP_COLUMN_DEFAULTS,
+        columnId: GROUP_COLUMN_ID__SINGLE,
+    };
+}
+const TREE_COLUMN_FRIENDLY_NAME = '[Tree Column]';
+export function generateAutoTreeSingleColumn() {
+    return {
+        ...ROW_GROUP_COLUMN_DEFAULTS,
+        columnId: GROUP_COLUMN_ID__SINGLE,
+        isTreeColumn: true,
+        friendlyName: TREE_COLUMN_FRIENDLY_NAME,
+    };
+}
+export function generateAutoRowGroupColumnForColumn(column) {
+    return {
+        ...ROW_GROUP_COLUMN_DEFAULTS,
+        columnId: GROUP_COLUMN_ID__MULTI_PREFIX + column.columnId,
+        friendlyName: column.friendlyName,
+        dataType: column.dataType,
+    };
+}
+export function getFriendlyNameForPivotResultColumn(columnId) {
+    return `[Pivot] ${columnId
+        .split('_')
+        .slice(1)
+        .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
+        .join(' ')}`;
+}
+export function isPivotResultColumn(columnId) {
     // put this here as there might be other indicators we are not aware of?
-    return columnId === null || columnId === void 0 ? void 0 : columnId.startsWith(GeneralConstants.AG_GRID_PIVOT_COLUMN);
+    return columnId?.startsWith(GeneralConstants.AG_GRID_PIVOT_COLUMN);
 }
 export class ColumnApiImpl extends ApiBase {
     constructor(_adaptable) {
@@ -22,26 +79,28 @@ export class ColumnApiImpl extends ApiBase {
         this.internalApi = new ColumnInternalApi(_adaptable);
     }
     getColumns() {
-        var _a;
-        return (_a = this.getGridApi().getGridState().Columns) !== null && _a !== void 0 ? _a : [];
+        return this.getGridApi().getInternalState().Columns ?? [];
     }
-    getStandardColumns() {
-        var _a;
-        const cols = (_a = this.getColumns()) === null || _a === void 0 ? void 0 : _a.filter((c) => !this.isActionRowButtonColumn(c.columnId));
-        return cols !== null && cols !== void 0 ? cols : [];
+    getSpecialColumns() {
+        const cols = this.getColumns()?.filter((c) => this.internalApi.isSpecialColumn(c.columnId, c));
+        return cols ?? [];
     }
     getNonSpecialColumns() {
-        var _a;
-        const cols = (_a = this.getStandardColumns()) === null || _a === void 0 ? void 0 : _a.filter((c) => !this.getColumnApi().isSpecialColumn(c.columnId));
-        return cols !== null && cols !== void 0 ? cols : [];
+        const cols = this.getColumns()?.filter((c) => !this.internalApi.isSpecialColumn(c.columnId, c));
+        return cols ?? [];
+    }
+    getUIAvailableColumns() {
+        return this.getColumns().filter((c) => !c.alwaysHidden);
     }
     getVisibleColumns() {
         const layout = this.getLayoutApi().getCurrentLayout();
-        const visibleCols = layout.Columns.reduce((acc, colId) => {
-            acc[colId] = true;
+        const visibleCols = layout.TableColumns.reduce((acc, colId) => {
+            if (layout.ColumnVisibility?.[colId] !== false) {
+                acc.add(colId);
+            }
             return acc;
-        }, {});
-        return this.getColumns().filter((c) => visibleCols[c.columnId]);
+        }, new Set());
+        return this.getColumns().filter((c) => visibleCols.has(c.columnId));
     }
     selectColumn(columnId) {
         this._adaptable.selectColumn(columnId);
@@ -76,26 +135,32 @@ export class ColumnApiImpl extends ApiBase {
     isAutoRowGroupColumn(columnId) {
         return isAutoRowGroupColumn(columnId);
     }
-    isAutoPivotColumn(columnId) {
-        return isAutoPivotColumn(columnId);
+    isPivotResultColumn(columnId) {
+        return isPivotResultColumn(columnId);
+    }
+    isAutoRowGroupColumnForSingle(columnId) {
+        return columnId === GROUP_COLUMN_ID__SINGLE;
     }
-    isActionRowButtonColumn(columnId) {
-        return columnId === ADAPTABLE_ROW_ACTION_BUTTONS;
+    isAutoRowGroupColumnForMulti(columnId) {
+        return columnId.startsWith(GROUP_COLUMN_ID__MULTI_PREFIX);
     }
     isCalculatedColumn(columnId) {
-        return (this.getAdaptableApi()
-            .calculatedColumnApi.getCalculatedColumns()
+        return (this.getCalculatedColumnApi()
+            .getCalculatedColumns()
             .find((cc) => cc.ColumnId == columnId) != null);
     }
     isFreeTextColumn(columnId) {
-        return (this.getAdaptableApi()
-            .freeTextColumnApi.getFreeTextColumns()
+        return (this.getFreeTextColumnApi()
+            .getFreeTextColumns()
             .find((cc) => cc.ColumnId == columnId) != null);
     }
     isActionColumn(columnId) {
-        var _a;
-        return (((_a = this.getAdaptableApi()
-            .actionColumnApi.getActionColumns()) === null || _a === void 0 ? void 0 : _a.find((cc) => cc.columnId == columnId)) != null);
+        return (this.getActionColumnApi()
+            .getActionColumns()
+            ?.find((cc) => cc.columnId == columnId) != null);
+    }
+    isFdc3Column(columnId) {
+        return this.getFdc3Api().internalApi.getFdc3ColumnIds().includes(columnId);
     }
     getColumnWithColumnId(columnId, logWarning) {
         if (columnId == undefined) {
@@ -105,9 +170,6 @@ export class ColumnApiImpl extends ApiBase {
         if (ArrayExtensions.IsNullOrEmpty(this.getColumns())) {
             return;
         }
-        if (this.isAutoPivotColumn(columnId)) {
-            return;
-        }
         const foundColumn = this.getColumns().find((c) => c.columnId == columnId);
         if (foundColumn) {
             return foundColumn;
@@ -122,68 +184,82 @@ export class ColumnApiImpl extends ApiBase {
         if (!column) {
             return false;
         }
-        return (column === null || column === void 0 ? void 0 : column.dataType) == 'Number';
+        return column?.dataType == 'number';
     }
     hasBooleanDataType(columnId) {
         const column = this.getColumnWithColumnId(columnId);
         if (!column) {
             return false;
         }
-        return (column === null || column === void 0 ? void 0 : column.dataType) == 'Boolean';
+        return column?.dataType == 'boolean';
     }
     hasArrayDataType(columnId) {
-        return this.hasStringArrayDataType(columnId) || this.hasNumericArrayDataType(columnId);
+        return this.hasTextArrayDataType(columnId) || this.hasNumericArrayDataType(columnId);
     }
-    hasStringArrayDataType(columnId) {
+    hasTextArrayDataType(columnId) {
         const column = this.getColumnWithColumnId(columnId);
         if (!column) {
             return false;
         }
-        return (column === null || column === void 0 ? void 0 : column.dataType) == 'StringArray';
+        return column?.dataType === 'textArray';
     }
     hasNumericArrayDataType(columnId) {
         const column = this.getColumnWithColumnId(columnId);
         if (!column) {
             return false;
         }
-        return ((column === null || column === void 0 ? void 0 : column.dataType) == 'NumberArray' ||
-            (column === null || column === void 0 ? void 0 : column.dataType) == 'TupleNumberArray' ||
-            (column === null || column === void 0 ? void 0 : column.dataType) == 'ObjectNumberArray');
+        return (column?.dataType === 'numberArray' ||
+            column?.dataType === 'tupleArray' ||
+            column?.dataType === 'objectArray');
     }
     hasDateDataType(columnId) {
         const column = this.getColumnWithColumnId(columnId);
         if (!column) {
             return false;
         }
-        return (column === null || column === void 0 ? void 0 : column.dataType) == 'Date';
+        return column?.dataType === 'date' || column?.dataType === 'dateString';
     }
     getColumnDataTypeForColumnId(columnId) {
-        const column = this.getColumnWithColumnId(columnId); // this.getColumns().find(c => c.ColumnId == columnId);
+        const column = this.getColumnWithColumnId(columnId); // this.getColumns().find(c => c.ColumnId === columnId);
         if (!column) {
             return undefined;
         }
         return column.dataType;
     }
-    getFriendlyNameForColumnId(columnId) {
-        if (this.isAutoPivotColumn(columnId)) {
-            return GeneralConstants.EMPTY_STRING;
+    getFriendlyNameForColumnId(columnId, layout) {
+        if (this.isPivotResultColumn(columnId)) {
+            return getFriendlyNameForPivotResultColumn(columnId);
         }
-        const foundColumn = this.getColumns().find((c) => c.columnId == columnId);
-        if (foundColumn) {
+        const foundColumn = this.getColumns().find((c) => c.columnId === columnId);
+        const isRowGroupColumn = this.isAutoRowGroupColumn(columnId);
+        if (foundColumn &&
+            foundColumn.friendlyName &&
+            !foundColumn.friendlyName.includes(GeneralConstants.MISSING_COLUMN) &&
+            !isRowGroupColumn) {
+            return foundColumn.friendlyName;
+        }
+        if (foundColumn?.isTreeColumn && isRowGroupColumn) {
             return foundColumn.friendlyName;
         }
         let result = columnId + GeneralConstants.MISSING_COLUMN;
         if (this.isAutoRowGroupColumn(columnId)) {
-            const currentLayout = this.getLayoutApi().getCurrentLayout();
-            if (currentLayout === null || currentLayout === void 0 ? void 0 : currentLayout.RowGroupedColumns) {
-                result = `[Grouped column: ${currentLayout.RowGroupedColumns.join(', ')}]`;
+            if (this.getGridApi().isTreeDataGrid()) {
+                return TREE_COLUMN_FRIENDLY_NAME;
+            }
+            const currentLayout = layout ?? this.getLayoutApi().getCurrentLayout();
+            if (currentLayout?.RowGroupedColumns?.length) {
+                const groupedByLabel = this.isAutoRowGroupColumnForSingle(columnId)
+                    ? currentLayout.RowGroupedColumns.map((colId) => this.getFriendlyNameForColumnId(colId, layout)).join(', ')
+                    : this.getFriendlyNameForColumnId(columnId.replace(GROUP_COLUMN_ID__MULTI_PREFIX, ''), layout);
+                result = `[Grouped Column: ${groupedByLabel}]`;
+                return result;
             }
         }
         this.logMissingColumnWarning(columnId);
         return result;
     }
     doesColumnExist(columnId) {
-        const foundColumn = this.getColumns().find((c) => c.columnId == columnId);
+        const foundColumn = this.getColumns().find((c) => c.columnId === columnId);
         return foundColumn ? true : false;
     }
     getFriendlyNamesForColumnIds(columnIds) {
@@ -200,7 +276,7 @@ export class ColumnApiImpl extends ApiBase {
         if (friendlyName.includes(GeneralConstants.MISSING_COLUMN)) {
             return friendlyName.replace(GeneralConstants.MISSING_COLUMN, ''); // Ids should stay "pure"
         }
-        const foundColumn = this.getColumns().find((c) => c.friendlyName == friendlyName);
+        const foundColumn = this.getColumns().find((c) => c.friendlyName === friendlyName);
         if (foundColumn) {
             return foundColumn.columnId;
         }
@@ -219,7 +295,7 @@ export class ColumnApiImpl extends ApiBase {
     }
     getColumnsWithFriendlyNames(friendlyNames) {
         return friendlyNames
-            .map((friendlyName) => this.getColumns().find((x) => x.friendlyName == friendlyName))
+            .map((friendlyName) => this.getColumns().find((x) => x.friendlyName === friendlyName))
             .filter(Boolean);
     }
     getColumnsWithColumnIds(columnIds, logWarning = true) {
@@ -240,7 +316,7 @@ export class ColumnApiImpl extends ApiBase {
         if (ArrayExtensions.IsNullOrEmpty(this.getColumns())) {
             return null;
         }
-        const foundColumn = this.getColumns().find((c) => c.friendlyName == columnFriendlyName);
+        const foundColumn = this.getColumns().find((c) => c.friendlyName === columnFriendlyName);
         if (foundColumn) {
             return foundColumn;
         }
@@ -249,30 +325,30 @@ export class ColumnApiImpl extends ApiBase {
         }
         return null;
     }
-    getColumnsOfType(dataType) {
+    getColumnsWithDataType(dataType) {
         switch (dataType) {
-            case 'Boolean':
+            case 'boolean':
                 return this.getBooleanColumns();
-            case 'Date':
+            case 'date':
                 return this.getDateColumns();
-            case 'Number':
+            case 'number':
                 return this.getNumericColumns();
-            case 'String':
-                return this.getStringColumns();
-            case 'StringArray':
-                return this.getStringArrayColumns();
-            case 'NumberArray':
+            case 'text':
+                return this.getTextColumns();
+            case 'textArray':
+                return this.getTextArrayColumns();
+            case 'numberArray':
                 return this.getNumberArrayColumns();
-            case 'ObjectNumberArray':
+            case 'objectArray':
                 return this.getObjectNumberArrayColumns();
-            case 'TupleNumberArray':
+            case 'tupleArray':
                 return this.getTupleNumberArrayColumns();
             default:
                 return this.getColumns();
         }
     }
     getNumericColumns() {
-        return this.getColumns().filter((c) => c.dataType == 'Number');
+        return this.getColumns().filter((c) => c.dataType === 'number');
     }
     getNumericArrayColumns() {
         return this.getNumberArrayColumns()
@@ -280,46 +356,46 @@ export class ColumnApiImpl extends ApiBase {
             .concat(this.getObjectNumberArrayColumns());
     }
     getNumberArrayColumns() {
-        return this.getColumns().filter((c) => c.dataType == 'NumberArray');
+        return this.getColumns().filter((c) => c.dataType === 'numberArray');
     }
     getTupleNumberArrayColumns() {
-        return this.getColumns().filter((c) => c.dataType == 'TupleNumberArray');
+        return this.getColumns().filter((c) => c.dataType === 'tupleArray');
     }
     getObjectNumberArrayColumns() {
-        return this.getColumns().filter((c) => c.dataType == 'ObjectNumberArray');
+        return this.getColumns().filter((c) => c.dataType === 'objectArray');
     }
-    getStringColumns() {
-        return this.getColumns().filter((c) => c.dataType == 'String');
+    getTextColumns() {
+        return this.getColumns().filter((c) => c.dataType === 'text');
     }
-    getStringArrayColumns() {
-        return this.getColumns().filter((c) => c.dataType == 'StringArray');
+    getTextArrayColumns() {
+        return this.getColumns().filter((c) => c.dataType === 'textArray');
     }
     getDateColumns() {
-        return this.getColumns().filter((c) => c.dataType == 'Date');
+        return this.getColumns().filter((c) => c.dataType === 'date' || c.dataType === 'dateString');
     }
     getBooleanColumns() {
-        return this.getColumns().filter((c) => c.dataType == 'Boolean');
+        return this.getColumns().filter((c) => c.dataType === 'boolean');
     }
     getArrayColumns() {
-        return this.getColumns().filter((c) => c.dataType == 'NumberArray' ||
-            c.dataType == 'TupleNumberArray' ||
-            c.dataType == 'ObjectNumberArray' ||
-            c.dataType == 'StringArray');
+        return this.getColumns().filter((c) => c.dataType === 'numberArray' ||
+            c.dataType === 'tupleArray' ||
+            c.dataType === 'objectArray' ||
+            c.dataType === 'textArray');
     }
     getSortableColumns() {
-        return this.getColumns().filter((c) => c.sortable);
+        return this.getUIAvailableColumns().filter((c) => c.sortable);
     }
     getFilterableColumns() {
-        return this.getColumns().filter((c) => c.filterable);
+        return this.getUIAvailableColumns().filter((c) => c.filterable);
     }
     getGroupableColumns() {
-        return this.getColumns().filter((c) => c.groupable);
+        return this.getUIAvailableColumns().filter((c) => c.groupable);
     }
     getPivotableColumns() {
-        return this.getColumns().filter((c) => c.pivotable);
+        return this.getUIAvailableColumns().filter((c) => c.pivotable);
     }
     getAggregatableColumns() {
-        return this.getColumns().filter((c) => c.aggregatable && c.dataType == 'Number');
+        return this.getUIAvailableColumns().filter((c) => c.aggregatable && c.dataType === 'number');
     }
     getQueryableColumns() {
         return this.getColumns().filter((c) => c.queryable);
@@ -327,6 +403,9 @@ export class ColumnApiImpl extends ApiBase {
     getExportableColumns() {
         return this.getColumns().filter((c) => c.exportable);
     }
+    getAlwaysHiddenColumns() {
+        return this.getColumns().filter((c) => c.alwaysHidden);
+    }
     logMissingColumnWarning(columnId) {
         if (this.getColumnOptions().showMissingColumnsWarning === true) {
             if (!this.isAutoRowGroupColumn(columnId) &&
@@ -341,16 +420,10 @@ export class ColumnApiImpl extends ApiBase {
         return this.getColumnWithColumnId(this.getOptions().primaryKey);
     }
     getDefaultAggFunc(columnId) {
-        var _a, _b, _c;
         const abColumn = this.getColumnWithColumnId(columnId);
         const availableAggregationFunctions = abColumn.availableAggregationFunctions;
-        const agColumn = (_b = (_a = this.internalApi.getAgGridColumnForAdaptableColumn(columnId)) === null || _a === void 0 ? void 0 : _a.getColDef) === null || _b === void 0 ? void 0 : _b.call(_a);
-        return (_c = agColumn === null || agColumn === void 0 ? void 0 : agColumn.defaultAggFunc) !== null && _c !== void 0 ? _c : availableAggregationFunctions[0];
-    }
-    isSpecialColumn(columnId) {
-        return (this.isCalculatedColumn(columnId) ||
-            this.isFreeTextColumn(columnId) ||
-            this.isActionColumn(columnId));
+        const agColumn = this.internalApi.getAgGridColumnForAdaptableColumn(columnId)?.getColDef?.();
+        return agColumn?.defaultAggFunc ?? availableAggregationFunctions[0];
     }
     openColumnInfoSettingsPanel() {
         this.showModulePopup(ModuleConstants.ColumnInfoModuleId);
@@ -358,7 +431,12 @@ export class ColumnApiImpl extends ApiBase {
     getColumnTypes() {
         const columnTypes = this.getOptions().columnOptions.columnTypes;
         if (typeof columnTypes === 'function') {
-            return columnTypes(createBaseContext(this.getAdaptableApi()));
+            const types = this.internalApi.getAllAgGridColumnTypes();
+            const columnTypesContext = {
+                types,
+                ...this.getAdaptableInternalApi().buildBaseContext(),
+            };
+            return columnTypes(columnTypesContext);
         }
         else {
             return columnTypes;
@@ -367,33 +445,23 @@ export class ColumnApiImpl extends ApiBase {
     getColumnsByColumnType(columnType) {
         const abColumns = this.getColumns();
         return abColumns.filter((c) => {
-            var _a;
-            return ((_a = c.columnTypes) !== null && _a !== void 0 ? _a : []).includes(columnType);
+            return (c.columnTypes ?? []).includes(columnType);
         });
     }
     getRowGroupedColumns() {
-        var _a;
-        return (_a = this.getLayoutApi()
-            .getCurrentRowGroupsColumnIds()) === null || _a === void 0 ? void 0 : _a.map((n) => {
+        return this.getLayoutApi()
+            .getCurrentRowGroupsColumnIds()
+            ?.map((n) => {
             return this.getColumnWithColumnId(n);
         });
     }
-    getDistinctDisplayValuesForColumn(columnId) {
-        return this.getGridApi().internalApi.getDistinctDisplayValuesForColumn(columnId);
-    }
     setColumnCaption(columnId, caption) {
         return this.getLayoutApi().setColumnCaption(columnId, caption);
     }
-    updateColumnConfiguration(columnConfig) {
-        logDeprecationExternal(this.getAdatableLogger(), 'ColumnApi', 'updateColumnConfiguration', 'GridApi', 'updateAgGridColumnState');
-        this.getGridApi().updateAgGridColumnState(columnConfig);
-    }
-    updateColumnConfigurations(columnConfigs) {
-        logDeprecationExternal(this.getAdatableLogger(), 'ColumnApi', 'updateColumnConfigurations', 'GridApi', 'updateAgGridColumnStates');
-        this.getGridApi().updateAgGridColumnStates(columnConfigs);
+    getAGGridColDefForColumnId(columnId) {
+        return this.getAgGridApi().getColumnDef(columnId);
     }
-    setColumnDefinitions(columnDefinitions) {
-        logDeprecationExternal(this.getAdatableLogger(), 'ColumnApi', 'setColumnDefinitions', 'GridApi', 'setAgGridColumnDefinitions');
-        this.getGridApi().setAgGridColumnDefinitions(columnDefinitions);
+    getAGGridColumnForColumnId(columnId) {
+        return this.getAgGridApi().getColumn(columnId);
     }
 }

package/src/Api/Implementation/ColumnFilterApiImpl.d.ts

@@ -1,7 +1,7 @@
 import { ApiBase } from './ApiBase';
 import { AdaptablePredicateDef, ColumnFilterDef } from '../../PredefinedConfig/Common/AdaptablePredicate';
 import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
-import { ColumnFilter, ColumnFilterConfig } from '../../types';
+import { ColumnFilter, ColumnFilterPredicate } from '../../types';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { ColumnFilterInternalApi } from '../Internal/ColumnFilterInternalApi';
 import { ColumnFilterApi } from '../ColumnFilterApi';
@@ -21,6 +21,8 @@ export declare class ColumnFilterApiImpl extends ApiBase implements ColumnFilter
     setColumnFilters(columnFilters: ColumnFilter[]): ColumnFilter[] | null;
     clearColumnFilter(columnFilter: ColumnFilter): void;
     clearColumnFiltersForColumns(columns: string[]): void;
+    getColumnFilterForColumn(columnId: string): ColumnFilter | undefined;
+    clearColumnFilterForColumn(columnId: string): void;
     clearColumnFilters(): void;
     clearAndSetColumnFilters(columnFilters: ColumnFilter[]): void;
     columnFilterToString(columnFilter: ColumnFilter): string;
@@ -34,11 +36,9 @@ export declare class ColumnFilterApiImpl extends ApiBase implements ColumnFilter
      * @param filter
      */
     isColumnFilterActive(filter: ColumnFilter): boolean;
-    setColumnFilterForColumn(columnId: string, columnFilterConfig: ColumnFilterConfig): void;
+    setColumnFilterForColumn(columnId: string, columnFilterPredicate: ColumnFilterPredicate): void;
     suspendColumnFilter(columnFilter: ColumnFilter): void;
     unSuspendColumnFilter(columnFilter: ColumnFilter): void;
     suspendAllColumnFilters(): void;
     unSuspendAllColumnFilters(): void;
-    getColumnFilterForColumn(columnId: string): ColumnFilter | undefined;
-    clearColumnFilterForColumn(columnId: string): void;
 }