@adaptabletools/adaptable 17.0.0-canary.0 → 17.0.0-canary.2

package/src/agGrid/Adaptable.js

@@ -13,7 +13,7 @@ import { AdaptableStore, INIT_STATE } from '../Redux/Store/AdaptableStore';
 import * as GeneralConstants from '../Utilities/Constants/GeneralConstants';
 import { AB_SPECIAL_COLUMN, ADAPTABLE_ROW_ACTION_BUTTONS, AUTOGENERATED_PK_COLUMN, BLANK_DISTINCT_COLUMN_VALUE, DARK_THEME, HALF_SECOND, LIGHT_THEME, } from '../Utilities/Constants/GeneralConstants';
 import * as ModuleConstants from '../Utilities/Constants/ModuleConstants';
-import { NamedQueryModuleId } from '../Utilities/Constants/ModuleConstants';
+import { GridFilterModuleId } from '../Utilities/Constants/ModuleConstants';
 import { DefaultAdaptableOptions } from '../Utilities/Defaults/DefaultAdaptableOptions';
 import Emitter from '../Utilities/Emitter';
 import { ArrayExtensions } from '../Utilities/Extensions/ArrayExtensions';
@@ -47,10 +47,9 @@ import { convertAdaptableStyleToCSS, convertCSSAbsoluteFontSizeToPt, getVariable
 import { AdaptableNumberEditor, ReactAdaptableNumberEditor } from './editors/AdaptableNumberEditor';
 import { AdaptableDateEditor, ReactAdaptableDateEditor } from './editors/AdaptableDateEditor';
 import { waitForCondition } from '../Utilities/waitForCondition';
-import publishTimestamp from '../../publishTimestamp';
+import { publishTimestamp } from '../../package.json';
 import { MetamodelService } from '../Utilities/Services/MetamodelService';
 import { AgGridModulesDocsLink, PrimaryKeyDocsLink, } from '../Utilities/Constants/DocumentationLinkConstants';
-import { CheckboxEditor } from './CheckboxRenderer';
 import { parseDateValue } from '../Utilities/Helpers/DateHelper';
 import { ADAPTABLE_STATUS_PANEL } from '../PredefinedConfig/StatusBarState';
 import { createAgStatusPanelComponent } from './createAgStatusPanelComponent';
@@ -65,7 +64,7 @@ import { AdaptableLogger } from './AdaptableLogger';
 import { attachColumnTypes } from './attachAddaptableColumnTypes';
 import { DateFormatter } from '../Utilities/Helpers/FormatHelper';
 import { Fdc3Service } from '../Utilities/Services/Fdc3Service';
-const tinycolor = require('tinycolor2');
+import tinycolor from 'tinycolor2';
 const GROUP_PATH_SEPARATOR = '/';
 // IMPORTANT - we need colId to be set in order for safeSetColDefs to work correctly
 const assignColId = (colDef, logger) => {
@@ -148,6 +147,91 @@ const forEachColumn = (cols, fn, parentColGroup) => {
 };
 const adaptableInstances = {};
 export class Adaptable {
+    get isLive() {
+        return this.isInitialised && !this.isDestroyed;
+    }
+    /**
+     * Initializer for Adaptable
+     *
+     * @param adaptableOptions the AdaptableOptions
+     * @param agGridConfig AG Grid
+     * @returns a Promise containing the AdaptableAPI object in order to enable run-time access to Adaptable's properties and functions
+     */
+    static init(adaptableOptions, agGridConfig) {
+        var _a;
+        if (!((_a = agGridConfig === null || agGridConfig === void 0 ? void 0 : agGridConfig.modules) === null || _a === void 0 ? void 0 : _a.length)) {
+            AdaptableLogger.consoleErrorBase(`No AG Grid modules were provided, thus limiting AdapTables features significantly!\n\nRead further info here:${AgGridModulesDocsLink}`);
+        }
+        return Adaptable.initInternal(adaptableOptions, Object.assign({}, agGridConfig));
+    }
+    /**
+     * Lazy static constructor for Adaptable
+     * Receives an AdaptableOptions object
+     * Returns a Promise containing the AdaptableAPI object in order to enable run-time access to Adaptable's properties and functions
+     * @param adaptableOptions an instance of AdaptableOptions
+     */
+    static async initInternal(adaptableOptions, runtimeConfig) {
+        let promise = null;
+        if (Array.isArray(adaptableOptions.plugins)) {
+            const agGridOptions = {
+                gridOptions: runtimeConfig.gridOptions,
+                modules: runtimeConfig.modules,
+            };
+            // do this
+            for (let plugin of adaptableOptions.plugins) {
+                promise =
+                    promise && promise.then
+                        ? promise.then(() => {
+                            return plugin.beforeInit(adaptableOptions, agGridOptions);
+                        })
+                        : plugin.beforeInit(adaptableOptions, agGridOptions);
+            }
+            // if gridOptions changed, we need to update the runtimeConfig
+            if (agGridOptions.gridOptions !== runtimeConfig.gridOptions) {
+                // This allows plugins to modify
+                runtimeConfig.gridOptions = agGridOptions.gridOptions;
+            }
+            // instead of
+            // if (Array.isArray(adaptableOptions.plugins)) {
+            //   for await (let plugin of adaptableOptions.plugins) {
+            //     await plugin.beforeInit(adaptableOptions);
+            //   }
+            // }
+            // because this await for of introduces too much delay
+        }
+        const doInit = (ab) => {
+            return ab.init(adaptableOptions, runtimeConfig, true).then((api) => {
+                if (Array.isArray(adaptableOptions.plugins)) {
+                    adaptableOptions.plugins.forEach((plugin) => {
+                        plugin.afterInit(ab);
+                    });
+                }
+                return api;
+            });
+        };
+        if (promise && promise.then) {
+            return promise.then(() => {
+                const ab = new Adaptable();
+                return doInit(ab);
+            });
+        }
+        else {
+            const ab = new Adaptable();
+            return doInit(ab);
+        }
+    }
+    static collectInstance(adaptable) {
+        adaptable._id = adaptable.adaptableOptions.adaptableId || createUuid();
+        adaptableInstances[adaptable._id] = adaptable;
+    }
+    static forEachAdaptable(fn) {
+        Object.keys(adaptableInstances).forEach((key) => {
+            fn(adaptableInstances[key]);
+        });
+    }
+    static dismissInstance(adaptable) {
+        delete adaptableInstances[adaptable._id];
+    }
     constructor() {
         this.variant = 'vanilla';
         this.colDefPropertyCache = new Map();
@@ -180,8 +264,7 @@ export class Adaptable {
         };
         this._adaptableReady = false;
         this.isDestroyed = false;
-        this.supressReact18RenderWarning = false;
-        this.renderReactRoot = (node, container) => defaultRenderReactRoot(node, container, this.supressReact18RenderWarning);
+        this.renderReactRoot = (node, container) => defaultRenderReactRoot(node, container);
         this.isPluginLoaded = (pluginId) => {
             const plugins = this.adaptableOptions.plugins || [];
             for (let i = 0, len = plugins.length; i < len; i++) {
@@ -226,7 +309,7 @@ export class Adaptable {
             if (this.isDestroyed || !this.gridOptions.api) {
                 return;
             }
-            this.applyGridFiltering();
+            this.applyColumnFiltering();
             if (callback) {
                 callback();
             }
@@ -269,97 +352,11 @@ export class Adaptable {
         };
         // (global as any).adaptable = this;
     }
-    get isLive() {
-        return this.isInitialised && !this.isDestroyed;
-    }
-    /**
-     * Initializer for Adaptable
-     *
-     * @param adaptableOptions the AdaptableOptions
-     * @param agGridConfig AG Grid
-     * @returns a Promise containing the AdaptableAPI object in order to enable run-time access to Adaptable's properties and functions
-     */
-    static init(adaptableOptions, agGridConfig) {
-        var _a;
-        if (!((_a = agGridConfig === null || agGridConfig === void 0 ? void 0 : agGridConfig.modules) === null || _a === void 0 ? void 0 : _a.length)) {
-            AdaptableLogger.consoleErrorBase(`No AG Grid modules were provided, thus limiting AdapTables features significantly!\n\nRead further info here:${AgGridModulesDocsLink}`);
-        }
-        return Adaptable.initInternal(adaptableOptions, Object.assign(Object.assign({}, agGridConfig), { supressReact18RenderWarning: true }));
-    }
-    /**
-     * Lazy static constructor for Adaptable
-     * Receives an AdaptableOptions object
-     * Returns a Promise containing the AdaptableAPI object in order to enable run-time access to Adaptable's properties and functions
-     * @param adaptableOptions an instance of AdaptableOptions
-     */
-    static async initInternal(adaptableOptions, runtimeConfig) {
-        let promise = null;
-        if (Array.isArray(adaptableOptions.plugins)) {
-            const agGridOptions = {
-                gridOptions: runtimeConfig.gridOptions,
-                modules: runtimeConfig.modules,
-            };
-            // do this
-            for (let plugin of adaptableOptions.plugins) {
-                promise =
-                    promise && promise.then
-                        ? promise.then(() => {
-                            return plugin.beforeInit(adaptableOptions, agGridOptions);
-                        })
-                        : plugin.beforeInit(adaptableOptions, agGridOptions);
-            }
-            // if gridOptions changed, we need to update the runtimeConfig
-            if (agGridOptions.gridOptions !== runtimeConfig.gridOptions) {
-                // This allows plugins to modify
-                runtimeConfig.gridOptions = agGridOptions.gridOptions;
-            }
-            // instead of
-            // if (Array.isArray(adaptableOptions.plugins)) {
-            //   for await (let plugin of adaptableOptions.plugins) {
-            //     await plugin.beforeInit(adaptableOptions);
-            //   }
-            // }
-            // because this await for of introduces too much delay
-        }
-        const doInit = (ab) => {
-            return ab.init(adaptableOptions, runtimeConfig, true).then((api) => {
-                if (Array.isArray(adaptableOptions.plugins)) {
-                    adaptableOptions.plugins.forEach((plugin) => {
-                        plugin.afterInit(ab);
-                    });
-                }
-                return api;
-            });
-        };
-        if (promise && promise.then) {
-            return promise.then(() => {
-                const ab = new Adaptable();
-                return doInit(ab);
-            });
-        }
-        else {
-            const ab = new Adaptable();
-            return doInit(ab);
-        }
-    }
-    static collectInstance(adaptable) {
-        adaptable._id = adaptable.adaptableOptions.adaptableId || createUuid();
-        adaptableInstances[adaptable._id] = adaptable;
-    }
-    static forEachAdaptable(fn) {
-        Object.keys(adaptableInstances).forEach((key) => {
-            fn(adaptableInstances[key]);
-        });
-    }
-    static dismissInstance(adaptable) {
-        delete adaptableInstances[adaptable._id];
-    }
     // the 'old' constructor which takes an Adaptable adaptable object
     // this is still used internally but should not be used externally as a preference
     async init(adaptableOptions, runtimeConfig, _staticInit) {
         this.logger = new AdaptableLogger(adaptableOptions.adaptableId || String(Date.now()));
         const perfAdaptableInit = this.logger.beginPerf(`Adaptable init()`);
-        this.supressReact18RenderWarning = !!runtimeConfig.supressReact18RenderWarning;
         if (runtimeConfig.renderReactRoot) {
             this.renderReactRoot = (el, container) => {
                 const unmount = runtimeConfig.renderReactRoot(el, container);
@@ -841,7 +838,7 @@ export class Adaptable {
             this.throttleFilterOnTickingDataChange();
         }
     }
-    applyGridFiltering() {
+    applyColumnFiltering() {
         if (this.api.columnFilterApi.isQuickFilterAvailable()) {
             if (this.api.columnFilterApi.isQuickFilterVisible()) {
                 this.showQuickFilter();
@@ -850,11 +847,14 @@ export class Adaptable {
                 this.hideQuickFilter();
             }
         }
+        this.applyGridFiltering();
+        this.updateColumnFilterActiveState();
+    }
+    applyGridFiltering() {
         this.gridOptions.api.onFilterChanged();
-        this._emit('GridFiltered');
+        this._emit('AdapTableFiltersApplied');
         this.setSelectedCells();
         this.setSelectedRows();
-        this.updateColumnFilterActiveState();
     }
     isGroupRowNode(rowNode) {
         if (!rowNode) {
@@ -886,12 +886,12 @@ export class Adaptable {
         }
         return false;
     }
-    clearGridFiltering() {
+    clearColumnFiltering() {
         this.gridOptions.columnApi.getColumns().forEach((c) => {
             this.gridOptions.api.destroyFilter(c);
         });
     }
-    clearColumnFiltering(columnIds) {
+    clearColumnFilteringForColumns(columnIds) {
         columnIds.forEach((c) => {
             const column = this.gridOptions.columnApi
                 .getColumns()
@@ -901,7 +901,7 @@ export class Adaptable {
             }
         });
     }
-    hideFilterForm() {
+    hideColumnFilterForm() {
         if (this.hideFilterFormPopup) {
             this.hideFilterFormPopup();
         }
@@ -1285,16 +1285,16 @@ export class Adaptable {
             gridCell.displayValue = params.value;
         }
         const ignoreCase = !this.adaptableOptions.quickSearchOptions.runQuickSearchWithCaseSensitivity;
-        const v = ignoreCase
+        const displayValue = ignoreCase
             ? String(gridCell.displayValue).toLocaleLowerCase()
             : String(gridCell.displayValue);
         const i = ignoreCase ? String(quickSearchValue).toLocaleLowerCase() : String(quickSearchValue);
-        const applyQuickSearchFunction = this.adaptableOptions.quickSearchOptions.shouldApplyQuickSearch;
+        const applyQuickSearchFunction = this.adaptableOptions.quickSearchOptions.runBespokeQuickSearch;
         if (applyQuickSearchFunction) {
             const quickSearchContext = Object.assign(Object.assign({}, createBaseContext(this.api)), { gridCell, quickSearchValue: quickSearchValue });
             return applyQuickSearchFunction(quickSearchContext);
         }
-        return v.indexOf(i) !== -1;
+        return displayValue.indexOf(i) !== -1;
     }
     getPrimaryKeyValueFromRowNode(rowNode) {
         var _a;
@@ -1541,12 +1541,6 @@ export class Adaptable {
             shouldUpdateHeaders = this.setupColumnHeader(colSetupInfo) || shouldUpdateHeaders;
         });
         isChanged = isChanged || shouldUpdateHeaders;
-        // this is NOT really needed?!
-        // without it everything seem to still work as expected
-        // and the setLayout() execution time is shorter, so a double win
-        // if (ArrayExtensions.IsNotNullOrEmpty(layout.ColumnFilters)) {
-        //   this.gridOptions.api!.onFilterChanged();
-        // }
         if (isChanged) {
             // it's important we set pivot mode
             // before we set column state
@@ -1891,51 +1885,36 @@ export class Adaptable {
         });
         return returnValues;
     }
-    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)
-        permittedValues =
-            permittedValues !== null && permittedValues !== void 0 ? permittedValues : this.api.userInterfaceApi.getPermittedValuesForColumn(column);
-        if (ArrayExtensions.IsNotNull(permittedValues)) {
-            returnValues = permittedValues.map((pv) => {
-                return {
-                    rawValue: pv,
-                    displayValue: pv,
-                    normalisedValue: pv,
-                    columnId: column.columnId,
-                    column: column,
-                    rowNode: undefined,
-                    isPivotCell: false,
-                    isRowGroupCell: false,
-                };
+    getDistinctGridCellsForColumn(column, distinctValuesParams) {
+        let gridCells = [];
+        if (distinctValuesParams.visibleRowsOnly) {
+            this.gridOptions.api.forEachNodeAfterFilter((rowNode) => {
+                const gridCell = this.addDistinctColumnValue(rowNode, column.columnId);
+                if (gridCell &&
+                    gridCell.rawValue != undefined &&
+                    gridCell.rowNode !== distinctValuesParams.skipRowNode) {
+                    gridCells.push(gridCell);
+                }
             });
         }
         else {
-            if (visibleRowsOnly) {
-                this.gridOptions.api.forEachNodeAfterFilter((rowNode) => {
-                    const gridCell = this.addDistinctColumnValue(rowNode, column.columnId);
-                    if (gridCell && gridCell.rawValue != undefined && gridCell.rowNode !== skipRowNode) {
-                        returnValues.push(gridCell);
-                    }
-                });
-            }
-            else {
-                this.gridOptions.api.forEachNode((rowNode) => {
-                    const gridCell = this.addDistinctColumnValue(rowNode, column.columnId);
-                    if (gridCell && gridCell.rowNode !== skipRowNode) {
-                        if (gridCell.rawValue == undefined &&
-                            this.adaptableOptions.columnFilterOptions.includeBlankFilterValues) {
-                            gridCell.rawValue = BLANK_DISTINCT_COLUMN_VALUE;
-                            gridCell.displayValue = BLANK_DISTINCT_COLUMN_VALUE;
-                            gridCell.normalisedValue = BLANK_DISTINCT_COLUMN_VALUE;
-                        }
-                        returnValues.push(gridCell);
+            this.gridOptions.api.forEachNode((rowNode) => {
+                const gridCell = this.addDistinctColumnValue(rowNode, column.columnId);
+                if (gridCell && gridCell.rowNode !== distinctValuesParams.skipRowNode) {
+                    if (gridCell.rawValue == undefined &&
+                        this.adaptableOptions.columnFilterOptions.valuesFilterOptions.includeBlankFilterValues) {
+                        gridCell.rawValue = BLANK_DISTINCT_COLUMN_VALUE;
+                        gridCell.displayValue = BLANK_DISTINCT_COLUMN_VALUE;
+                        gridCell.normalisedValue = BLANK_DISTINCT_COLUMN_VALUE;
                     }
-                });
-            }
+                    gridCells.push(gridCell);
+                }
+            });
         }
-        let uniqueVals = uniqBy(returnValues, (dataItem) => {
+        return gridCells;
+    }
+    getUniqueGridCells(column, gridCells) {
+        let uniqueVals = uniqBy(gridCells, (dataItem) => {
             const value = dataItem.rawValue;
             if (value instanceof Date) {
                 return value.toISOString();
@@ -1945,11 +1924,38 @@ export class Adaptable {
         if (column.dataType == 'String' && this.api.predicateApi.useCaseSensitivity()) {
             uniqueVals = uniqBy(uniqueVals, (d) => d.displayValue.toLowerCase());
         }
-        return uniqueVals.slice(0, this.adaptableOptions.columnFilterOptions.maxFilterValuesToDisplay);
+        return uniqueVals.slice(0, this.adaptableOptions.columnFilterOptions.valuesFilterOptions.maxFilterValuesToDisplay);
     }
-    async getDistinctFilterValuesForColumn(column, visibleRowsOnly, filter, skipRowNode) {
+    getGridCellsForPermittedValues(column, distinctValuesParams) {
         var _a;
-        const permittedValues = (_a = this.api.userInterfaceApi.getFilterPermittedValuesForColumn(column)) !== null && _a !== void 0 ? _a : {
+        let gridCells = [];
+        const permittedValues = (_a = distinctValuesParams.permittedValues) !== null && _a !== void 0 ? _a : this.api.userInterfaceApi.getPermittedValuesForColumn(column);
+        if (ArrayExtensions.IsNotNullOrEmpty(permittedValues)) {
+            gridCells = permittedValues.map((pv) => {
+                return {
+                    rawValue: pv,
+                    displayValue: pv,
+                    normalisedValue: pv,
+                    columnId: column.columnId,
+                    column: column,
+                    rowNode: undefined,
+                    isPivotCell: false,
+                    isRowGroupCell: false,
+                };
+            });
+            return gridCells;
+        }
+    }
+    getDistinctValuesForColumn(column, distinctValuesParams) {
+        let gridCells = this.getGridCellsForPermittedValues(column, distinctValuesParams);
+        if (ArrayExtensions.IsNullOrEmpty(gridCells)) {
+            gridCells = this.getDistinctGridCellsForColumn(column, distinctValuesParams);
+        }
+        return this.getUniqueGridCells(column, gridCells);
+    }
+    async getDistinctFilterListValuesForColumn(column, filter, distinctValuesParams) {
+        var _a;
+        const filterPermittedValues = (_a = this.api.userInterfaceApi.getFilterPermittedValuesForColumn(column)) !== null && _a !== void 0 ? _a : {
             suppressFilterSearchBar: false,
             values: () => undefined,
         };
@@ -1962,18 +1968,19 @@ export class Adaptable {
                 column: column,
                 searchFilter: filter,
             };
-            preparedPermittedValues = await (permittedValues === null || permittedValues === void 0 ? void 0 : permittedValues.values(filterPermittedValuesParams));
+            preparedPermittedValues = await (filterPermittedValues === null || filterPermittedValues === void 0 ? void 0 : filterPermittedValues.values(filterPermittedValuesParams));
         }
         catch (error) {
             this.logger.consoleError(`Failed to load filter permitted values`, column, filter, error);
         }
+        distinctValuesParams.permittedValues = preparedPermittedValues;
         return {
-            suppressClientSideFilter: permittedValues.suppressFilterSearchBar,
-            gridCells: this.getDistinctValuesForColumn(column, visibleRowsOnly, skipRowNode, preparedPermittedValues),
+            suppressClientSideFilter: filterPermittedValues.suppressFilterSearchBar,
+            gridCells: this.getDistinctValuesForColumn(column, distinctValuesParams),
         };
     }
-    async getDistinctCustomSortValuesForColumn(column, visibleRowsOnly, skipRowNode) {
-        const permittedValues = await this.api.userInterfaceApi.getCustomSortPermittedValuesForColumn(column);
+    async getDistinctCustomSortValuesForColumn(column, distinctValuesParams) {
+        const customSortPermittedValues = await this.api.userInterfaceApi.getCustomSortPermittedValuesForColumn(column);
         let preparedPermittedValues = undefined;
         try {
             const permittedValuesParams = {
@@ -1982,15 +1989,16 @@ export class Adaptable {
                 adaptableId: this.adaptableOptions.adaptableId,
                 column: column,
             };
-            preparedPermittedValues = await (permittedValues === null || permittedValues === void 0 ? void 0 : permittedValues.values(permittedValuesParams));
+            preparedPermittedValues = await (customSortPermittedValues === null || customSortPermittedValues === void 0 ? void 0 : customSortPermittedValues.values(permittedValuesParams));
         }
         catch (error) {
             this.logger.consoleError(`Failed to load custom sort permitted values`, column, error);
         }
-        return this.getDistinctValuesForColumn(column, visibleRowsOnly, skipRowNode, preparedPermittedValues);
+        distinctValuesParams.permittedValues = preparedPermittedValues;
+        return this.getDistinctValuesForColumn(column, distinctValuesParams);
     }
-    async getDistinctBulkUpdateValuesForColumn(column, visibleRowsOnly, selectedGridCells, skipRowNode) {
-        const permittedValues = await this.api.userInterfaceApi.getBulkUpdatePermittedValuesForColumn(column);
+    async getDistinctBulkUpdateValuesForColumn(column, selectedGridCells, distinctValuesParams) {
+        const bulkUpdatePermittedValues = await this.api.userInterfaceApi.getBulkUpdatePermittedValuesForColumn(column);
         let preparedPermittedValues = undefined;
         try {
             const bulkUpdatePermittedValuesParams = {
@@ -2000,12 +2008,13 @@ export class Adaptable {
                 userName: this.adaptableOptions.userName,
                 adaptableId: this.adaptableOptions.adaptableId,
             };
-            preparedPermittedValues = await (permittedValues === null || permittedValues === void 0 ? void 0 : permittedValues.values(bulkUpdatePermittedValuesParams));
+            preparedPermittedValues = await (bulkUpdatePermittedValues === null || bulkUpdatePermittedValues === void 0 ? void 0 : bulkUpdatePermittedValues.values(bulkUpdatePermittedValuesParams));
         }
         catch (error) {
             this.logger.consoleError(`Failed to load bulk permitted values`, error, column, selectedGridCells);
         }
-        return this.getDistinctValuesForColumn(column, visibleRowsOnly, skipRowNode, preparedPermittedValues);
+        distinctValuesParams.permittedValues = preparedPermittedValues;
+        return this.getDistinctValuesForColumn(column, distinctValuesParams);
     }
     getColumnValueDisplayValuePairList(columnId, visibleRowsOnly, onlyIncludeIds) {
         const returnArray = [];
@@ -2053,7 +2062,7 @@ export class Adaptable {
                 eachFn(rowNode, columnId);
             });
         }
-        return returnArray.slice(0, this.adaptableOptions.columnFilterOptions.maxFilterValuesToDisplay);
+        return returnArray.slice(0, this.adaptableOptions.columnFilterOptions.valuesFilterOptions.maxFilterValuesToDisplay);
     }
     addDistinctColumnValue(rowNode, columnId) {
         // we do not return the values of the aggregates when in grouping mode
@@ -2429,8 +2438,9 @@ export class Adaptable {
                 valueSetter: (params) => {
                     return (params.data[freeTextColumn.ColumnId] = params.newValue);
                 },
-                cellRenderer: freeTextColumnSettings.DataType && freeTextColumnSettings.DataType == 'Boolean'
-                    ? this.agGridHelper.createCheckboxRendererComp(freeTextColumn.ColumnId, false)
+                // use a Boolean Cell Data Type if the Free Text Column is boolean
+                cellDataType: freeTextColumnSettings.DataType && freeTextColumnSettings.DataType == 'Boolean'
+                    ? 'boolean'
                     : undefined,
                 valueGetter: (params) => this.api.freeTextColumnApi.getFreeTextColumnValueForRowNode(freeTextColumn, params.node),
             };
@@ -3193,10 +3203,10 @@ export class Adaptable {
                     return true;
                 }
                 const columnFilters = this.api.columnFilterApi.getActiveColumnFilters();
-                const isFilterActive = ArrayExtensions.IsNotNullOrEmpty(columnFilters);
-                const isQueryActive = StringExtensions.IsNotNullOrEmpty(this.api.gridFilterApi.getCurrentGridFilterExpression());
-                return (isFilterActive ||
-                    isQueryActive ||
+                const isColumnFiltersActive = ArrayExtensions.IsNotNullOrEmpty(columnFilters);
+                const isGridFilterActive = StringExtensions.IsNotNullOrEmpty(this.api.gridFilterApi.getCurrentGridFilterExpression());
+                return (isColumnFiltersActive ||
+                    isGridFilterActive ||
                     // it means that originalIsExternalFilterPresent will be called so we reinit that collection
                     (originalIsExternalFilterPresent ? originalIsExternalFilterPresent(params) : false));
             };
@@ -3210,13 +3220,13 @@ export class Adaptable {
                 if (!this.isGroupRowNode(node)) {
                     const currentGridFilter = this.api.gridFilterApi.getCurrentGridFilterExpression();
                     if (currentGridFilter) {
-                        const evaluateQueryOnClient = this.api.expressionApi.internalApi.evaluateExpressionInAdaptableQL('NamedQuery', undefined, currentGridFilter);
-                        if (evaluateQueryOnClient) {
-                            const isCurrentQueryValid = this.api.expressionApi.isValidBooleanExpression(currentGridFilter, NamedQueryModuleId, `Invalid Grid Filter '${currentGridFilter}'`);
-                            if (!isCurrentQueryValid ||
+                        const evaluateGridFilterOnClient = this.api.expressionApi.internalApi.evaluateExpressionInAdaptableQL('GridFilter', undefined, currentGridFilter);
+                        if (evaluateGridFilterOnClient) {
+                            const isCurrentGridFilterValid = this.api.expressionApi.isValidBooleanExpression(currentGridFilter, GridFilterModuleId, `Invalid Grid Filter '${currentGridFilter}'`);
+                            if (!isCurrentGridFilterValid ||
                                 !this.api.internalApi
                                     .getQueryLanguageService()
-                                    .evaluateBooleanExpression(currentGridFilter, NamedQueryModuleId, node)) {
+                                    .evaluateBooleanExpression(currentGridFilter, GridFilterModuleId, node)) {
                                 return false;
                             }
                         }
@@ -3226,7 +3236,7 @@ export class Adaptable {
                 try {
                     if (columnFilters.length > 0) {
                         for (const columnFilter of columnFilters) {
-                            const evaluateFilterOnClient = this.api.expressionApi.internalApi.evaluatePredicatesInAdaptableQL('Filter', columnFilter, [columnFilter.Predicate]);
+                            const evaluateFilterOnClient = this.api.expressionApi.internalApi.evaluatePredicatesInAdaptableQL('ColumnFilter', columnFilter, [columnFilter.Predicate]);
                             if (evaluateFilterOnClient) {
                                 // we then assess filters (if running locally)
                                 if (!this.api.columnFilterApi.internalApi.evaluateColumnFilter(columnFilter, node)) {
@@ -3259,7 +3269,7 @@ export class Adaptable {
     updateColumnFilterActiveState() {
         var _a;
         const columnFilters = this.api.columnFilterApi.getActiveColumnFilters();
-        const activeFilters = (_a = columnFilters === null || columnFilters === void 0 ? void 0 : columnFilters.filter) === null || _a === void 0 ? void 0 : _a.call(columnFilters, (columnFilter) => this.api.columnFilterApi.isFilterActive(columnFilter));
+        const activeFilters = (_a = columnFilters === null || columnFilters === void 0 ? void 0 : columnFilters.filter) === null || _a === void 0 ? void 0 : _a.call(columnFilters, (columnFilter) => this.api.columnFilterApi.isColumnFilterActive(columnFilter));
         const isFilterActive = ArrayExtensions.IsNotNullOrEmpty(activeFilters);
         const columnsWithActiveFilters = {};
         if (isFilterActive) {
@@ -3299,7 +3309,7 @@ export class Adaptable {
             this.updateColDefsForSpecialColumns();
             this.applyCurrentTheme();
             this.applyFinalRendering();
-            this.applyGridFiltering();
+            this.applyColumnFiltering();
         }
         catch (ex) {
             this.logger.consoleError('AgGrid setup failed');
@@ -3504,10 +3514,6 @@ export class Adaptable {
         const editLookUpItem = this.api.userInterfaceApi.getEditLookUpItemForColumn(adaptableColumn);
         const hasRichSelectCellEditor = this.isAgGridModulePresent(ModuleNames.RichSelectModule);
         this.setColDefProperty(col, 'cellEditor', () => {
-            const styledColumn = this.api.styledColumnApi.getActiveStyledColumnForColumn(adaptableColumn);
-            if (styledColumn && !(styledColumn === null || styledColumn === void 0 ? void 0 : styledColumn.IsSuspended) && styledColumn.CheckBoxStyle) {
-                return CheckboxEditor;
-            }
             if (editLookUpItem) {
                 return hasRichSelectCellEditor ? 'agRichSelectCellEditor' : 'agSelectCellEditor';
             }
@@ -3537,9 +3543,6 @@ export class Adaptable {
                 if (styledColumn.PercentBarStyle) {
                     return this.agGridHelper.createPercentBarRendererComp(styledColumn, abColumn);
                 }
-                if (styledColumn.CheckBoxStyle) {
-                    return this.agGridHelper.createCheckboxRendererComp(abColumn.columnId, abColumn.readOnly);
-                }
                 if (styledColumn.BadgeStyle) {
                     return this.agGridHelper.createBadgeRendererComp(styledColumn, abColumn);
                 }
@@ -3680,7 +3683,7 @@ export class Adaptable {
             if (!colDef.filter) {
                 return;
             }
-            if (!this.api.columnApi.internalApi.usesAdaptableFilterForm(col.getColId())) {
+            if (!this.adaptableOptions.columnFilterOptions.useAdaptableColumnFiltering) {
                 return;
             }
             this.gridOptions.api.destroyFilter(col);
@@ -3689,7 +3692,7 @@ export class Adaptable {
     }
     setupColumnFloatingFilter({ col, colDef }) {
         const isFloatingFilterDisabled = !colDef.floatingFilter ||
-            !this.api.columnApi.internalApi.usesAdaptableQuickFilter(col.getColId());
+            !this.adaptableOptions.columnFilterOptions.useAdaptableColumnFiltering;
         this.setColDefProperty(col, 'floatingFilterComponent', () => {
             if (isFloatingFilterDisabled) {
                 return;
@@ -4534,8 +4537,8 @@ export class Adaptable {
     isQuickFilterAvailable() {
         return this.hasFloatingFilterOnAtLeastOneColumn() === true;
     }
-    setAgQuickSearch(query) {
-        this.gridOptions.api.setQuickFilter(query);
+    setAgGridQuickSearch(searchText) {
+        this.gridOptions.api.setQuickFilter(searchText);
     }
     hasFloatingFilterOnAtLeastOneColumn(defs = this.gridOptions.columnDefs) {
         if (this.gridOptions.defaultColDef && this.gridOptions.defaultColDef.floatingFilter) {
@@ -4555,7 +4558,7 @@ export class Adaptable {
         return false;
     }
     showQuickFilter() {
-        const height = this.api.optionsApi.getColumnFilterOptions().quickFilterHeight;
+        const height = this.api.optionsApi.getColumnFilterOptions().quickFilterOptions.quickFilterHeight;
         this.gridOptions.api.setFloatingFiltersHeight(height);
     }
     hideQuickFilter() {
@@ -5332,6 +5335,6 @@ export class AdaptableNoCodeWizard {
                     gridOptions: gridOptions,
                     agGridModules: [...this.agGridModules],
                 });
-            } })), container, true);
+            } })), container);
     }
 }