@adaptabletools/adaptable 16.2.4 → 17.0.0-canary.1

package/src/Api/Internal/Fdc3InternalApi.js

@@ -1,20 +1,17 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Fdc3InternalApi = void 0;
-const ApiBase_1 = require("../Implementation/ApiBase");
-const Fdc3Context_1 = require("../../PredefinedConfig/Common/Fdc3Context");
-const fdc3_1 = require("@finos/fdc3");
-const Fdc3Options_1 = require("../../AdaptableOptions/Fdc3Options");
-const Fdc3Intent_1 = require("../../PredefinedConfig/Common/Fdc3Intent");
-const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
-const ActionColumnRenderer_1 = require("../../agGrid/ActionColumnRenderer");
-class Fdc3InternalApi extends ApiBase_1.ApiBase {
+import { ApiBase } from '../Implementation/ApiBase';
+import { StandardContextTypes, } from '../../PredefinedConfig/Common/Fdc3Context';
+import { ContextTypes } from '@finos/fdc3';
+import { ColumnRefTypePrefix, FieldRefTypePrefix, } from '../../AdaptableOptions/Fdc3Options';
+import { Fdc3StandardIntents, } from '../../PredefinedConfig/Common/Fdc3Intent';
+import { AB_FDC3_COLUMN, AB_SPECIAL_COLUMN } from '../../Utilities/Constants/GeneralConstants';
+import { ActionColumnRenderer, ReactActionColumnRenderer } from '../../agGrid/ActionColumnRenderer';
+export class Fdc3InternalApi extends ApiBase {
     mapRowToContextData(contextType, rowNode) {
         var _a, _b, _c;
-        if (contextType === fdc3_1.ContextTypes.Nothing) {
-            return { type: fdc3_1.ContextTypes.Nothing };
+        if (contextType === ContextTypes.Nothing) {
+            return { type: ContextTypes.Nothing };
         }
-        const mappedContextData = this.mapRowValueToContextData(rowNode, this.isStandardContextType(contextType) && contextType !== fdc3_1.ContextTypes.Nothing
+        const mappedContextData = this.mapRowValueToContextData(rowNode, this.isStandardContextType(contextType) && contextType !== ContextTypes.Nothing
             ? (_a = this.getFdc3Options().gridDataContextMapping) === null || _a === void 0 ? void 0 : _a[contextType]
             : (_c = (_b = this.getFdc3Options().gridDataContextMapping) === null || _b === void 0 ? void 0 : _b.custom) === null || _c === void 0 ? void 0 : _c[contextType]);
         const contextMappedFromGridData = Object.assign({ type: contextType }, mappedContextData);
@@ -47,8 +44,8 @@ class Fdc3InternalApi extends ApiBase_1.ApiBase {
                 filter: false,
                 sortable: false,
                 enableRowGroup: false,
-                cellRenderer: this.adaptable.variant === 'react' ? ActionColumnRenderer_1.ReactActionColumnRenderer : ActionColumnRenderer_1.ActionColumnRenderer,
-                type: [GeneralConstants_1.AB_SPECIAL_COLUMN, GeneralConstants_1.AB_FDC3_COLUMN, 'abColDefObject'],
+                cellRenderer: this.adaptable.variant === 'react' ? ReactActionColumnRenderer : ActionColumnRenderer,
+                type: [AB_SPECIAL_COLUMN, AB_FDC3_COLUMN, 'abColDefObject'],
             });
         }
         const buildColDef = (actionColumnConfig) => {
@@ -67,8 +64,8 @@ class Fdc3InternalApi extends ApiBase_1.ApiBase {
                 filter: false,
                 sortable: false,
                 enableRowGroup: false,
-                cellRenderer: this.adaptable.variant === 'react' ? ActionColumnRenderer_1.ReactActionColumnRenderer : ActionColumnRenderer_1.ActionColumnRenderer,
-                type: [GeneralConstants_1.AB_SPECIAL_COLUMN, GeneralConstants_1.AB_FDC3_COLUMN, 'abColDefObject'],
+                cellRenderer: this.adaptable.variant === 'react' ? ReactActionColumnRenderer : ActionColumnRenderer,
+                type: [AB_SPECIAL_COLUMN, AB_FDC3_COLUMN, 'abColDefObject'],
             };
         };
         this.getAllRaiseIntentConfigs().forEach((intentConfig) => {
@@ -142,7 +139,7 @@ class Fdc3InternalApi extends ApiBase_1.ApiBase {
     }
     isFdc3StandaloneActionColumn(columnId, columnType) {
         const types = typeof columnType === 'string' ? [columnType] : columnType;
-        return types.includes(GeneralConstants_1.AB_FDC3_COLUMN) && !this.isFdc3MainActionColumn(columnId);
+        return types.includes(AB_FDC3_COLUMN) && !this.isFdc3MainActionColumn(columnId);
     }
     handleIntentResolution(intentResolution, context, raisedIntent, app) {
         var _a, _b;
@@ -158,11 +155,11 @@ class Fdc3InternalApi extends ApiBase_1.ApiBase {
     }
     isStandardContextType(contextType) {
         // @ts-ignore
-        return Fdc3Context_1.StandardContextTypes.includes(contextType);
+        return StandardContextTypes.includes(contextType);
     }
     isStandardIntentType(intentType) {
         // @ts-ignore
-        return Fdc3Intent_1.Fdc3StandardIntents.includes(intentType);
+        return Fdc3StandardIntents.includes(intentType);
     }
     getAllRaiseIntentConfigs() {
         var _a;
@@ -235,19 +232,19 @@ class Fdc3InternalApi extends ApiBase_1.ApiBase {
                     // map value from row node
                     // first validate refs
                     if (typeof valueReference !== 'string' ||
-                        (!valueReference.startsWith(Fdc3Options_1.ColumnRefTypePrefix) &&
-                            !valueReference.startsWith(Fdc3Options_1.FieldRefTypePrefix))) {
+                        (!valueReference.startsWith(ColumnRefTypePrefix) &&
+                            !valueReference.startsWith(FieldRefTypePrefix))) {
                         this.logError(`Invalid FDC3 value reference for '${contextKey}': ${valueReference}`);
                         return mappedData;
                     }
                     // '_coldId.columnId'
-                    if (valueReference.startsWith(Fdc3Options_1.ColumnRefTypePrefix)) {
-                        const columnId = valueReference.replace(Fdc3Options_1.ColumnRefTypePrefix, '');
+                    if (valueReference.startsWith(ColumnRefTypePrefix)) {
+                        const columnId = valueReference.replace(ColumnRefTypePrefix, '');
                         mappedData[contextKey] = this.getGridApi().getRawValueFromRowNode(rowNode, columnId);
                     }
                     // '_field.fieldName'
-                    if (valueReference.startsWith(Fdc3Options_1.FieldRefTypePrefix)) {
-                        const fieldId = valueReference.replace(Fdc3Options_1.FieldRefTypePrefix, '');
+                    if (valueReference.startsWith(FieldRefTypePrefix)) {
+                        const fieldId = valueReference.replace(FieldRefTypePrefix, '');
                         mappedData[contextKey] = this.getAdaptableApi().internalApi.getValueUsingField(rowNode.data, fieldId);
                     }
                 }
@@ -371,4 +368,3 @@ class Fdc3InternalApi extends ApiBase_1.ApiBase {
         return this.adaptable.Fdc3Service;
     }
 }
-exports.Fdc3InternalApi = Fdc3InternalApi;

package/src/Api/Internal/FlashingCellInternalApi.js

@@ -1,12 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.FlashingCellInternalApi = void 0;
-const tslib_1 = require("tslib");
-const ApiBase_1 = require("../Implementation/ApiBase");
-const Helper_1 = require("../../Utilities/Helpers/Helper");
-const SystemRedux_1 = require("../../Redux/ActionsReducers/SystemRedux");
-const AlertRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/AlertRedux"));
-class FlashingCellInternalApi extends ApiBase_1.ApiBase {
+import { ApiBase } from '../Implementation/ApiBase';
+import { cloneObject } from '../../Utilities/Helpers/Helper';
+import { FLASHING_CELL_ROW_KEY } from '../../Redux/ActionsReducers/SystemRedux';
+import * as AlertRedux from '../../Redux/ActionsReducers/AlertRedux';
+export class FlashingCellInternalApi extends ApiBase {
     /**
      * Merges a Flashing Cell Definition with default values
      * @param flashingCellDefinition Flashing Cell Definition to Merge
@@ -17,7 +13,7 @@ class FlashingCellInternalApi extends ApiBase_1.ApiBase {
             return flashingCellDefinition;
         }
         // deep clone it, otherwise we will mutate&share(!!) the global flashingCellOptions object
-        flashingDefaults = (0, Helper_1.cloneObject)(flashingDefaults);
+        flashingDefaults = cloneObject(flashingDefaults);
         if (!flashingCellDefinition.DownChangeStyle && flashingDefaults.defaultDownChangeStyle) {
             flashingCellDefinition.DownChangeStyle = flashingDefaults.defaultDownChangeStyle;
         }
@@ -42,7 +38,7 @@ class FlashingCellInternalApi extends ApiBase_1.ApiBase {
         const toFlashingAlert = (uuid) => { var _a; return uuid ? (_a = AdaptableFlashingAlertsMap[uuid]) !== null && _a !== void 0 ? _a : null : null; };
         const adaptableFlashingCell = columnId
             ? toFlashingAlert(forPrimaryKey[columnId])
-            : toFlashingAlert(forPrimaryKey[SystemRedux_1.FLASHING_CELL_ROW_KEY]);
+            : toFlashingAlert(forPrimaryKey[FLASHING_CELL_ROW_KEY]);
         if ((adaptableFlashingCell === null || adaptableFlashingCell === void 0 ? void 0 : adaptableFlashingCell.flashingCellDefinition) &&
             !this.getAdaptableApi().layoutApi.internalApi.isObjectAvailableInLayout(adaptableFlashingCell.flashingCellDefinition, 'FlashingCell', this.getAdaptableApi().layoutApi.getCurrentLayout())) {
             return;
@@ -53,4 +49,3 @@ class FlashingCellInternalApi extends ApiBase_1.ApiBase {
         this.dispatchAction(AlertRedux.AlertClearFlashingCells());
     }
 }
-exports.FlashingCellInternalApi = FlashingCellInternalApi;

package/src/Api/Internal/FormatColumnInternalApi.js

@@ -1,13 +1,9 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.FormatColumnInternalApi = void 0;
-const tslib_1 = require("tslib");
-const ApiBase_1 = require("../Implementation/ApiBase");
-const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
-const FormatHelper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/FormatHelper"));
-const ObjectFactory_1 = tslib_1.__importDefault(require("../../Utilities/ObjectFactory"));
-const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
-class FormatColumnInternalApi extends ApiBase_1.ApiBase {
+import { ApiBase } from '../Implementation/ApiBase';
+import StringExtensions from '../../Utilities/Extensions/StringExtensions';
+import FormatHelper from '../../Utilities/Helpers/FormatHelper';
+import ObjectFactory from '../../Utilities/ObjectFactory';
+import * as ModuleConstants from '../../Utilities/Constants/ModuleConstants';
+export class FormatColumnInternalApi extends ApiBase {
     /**
      * Retrieves all Format Columns in Adaptable State with the `Style` property set
      * @returns format columns
@@ -60,7 +56,7 @@ class FormatColumnInternalApi extends ApiBase_1.ApiBase {
      * @returns format columns
      */
     getFormatColumnWithStyleClassNameForColumn(column, config) {
-        return this.getFormatColumnsWithStyleForColumn(column, config).filter((formatColumn) => { var _a; return StringExtensions_1.default.IsNotNullOrEmpty((_a = formatColumn === null || formatColumn === void 0 ? void 0 : formatColumn.Style) === null || _a === void 0 ? void 0 : _a.ClassName); });
+        return this.getFormatColumnsWithStyleForColumn(column, config).filter((formatColumn) => { var _a; return StringExtensions.IsNotNullOrEmpty((_a = formatColumn === null || formatColumn === void 0 ? void 0 : formatColumn.Style) === null || _a === void 0 ? void 0 : _a.ClassName); });
     }
     getFormatColumnWithColumnInScope(formatColumns, column) {
         return this.getFormatColumnInColumnScope(formatColumns).filter((scopedFormatColumn) => this.adaptable.api.scopeApi.isColumnInScope(column, scopedFormatColumn.Scope));
@@ -70,12 +66,12 @@ class FormatColumnInternalApi extends ApiBase_1.ApiBase {
         // we need to maintain the format columns order, therefore we will extract all 3 scope types in a single iteration
         return formatColumns.filter((fc) => {
             return (
-            // this.getFormatColumnsWithColumnScope(formatColumns)
-            this.adaptable.api.scopeApi.scopeHasColumns(fc.Scope) ||
-                // this.getFormatColumnsWithDataTypeScope(formatColumns)
-                this.adaptable.api.scopeApi.scopeHasDataType(fc.Scope) ||
-                // this.getFormatColumnsWithAllScope(formatColumns)
-                this.adaptable.api.scopeApi.scopeIsAll(fc.Scope));
+                // this.getFormatColumnsWithColumnScope(formatColumns)
+                (this.adaptable.api.scopeApi.scopeHasColumns(fc.Scope) ||
+                    // this.getFormatColumnsWithDataTypeScope(formatColumns)
+                    this.adaptable.api.scopeApi.scopeHasDataType(fc.Scope) || // this.getFormatColumnsWithAllScope(formatColumns)
+                this.adaptable.api.scopeApi.scopeIsAll(fc.Scope))
+            );
         });
     }
     /**
@@ -96,7 +92,7 @@ class FormatColumnInternalApi extends ApiBase_1.ApiBase {
      */
     getNumberFormattedValue(value, node, abColumn, options) {
         const preparedValue = this.applyCustomFormatters(value, node, abColumn, options);
-        return FormatHelper_1.default.NumberFormatter(preparedValue, options);
+        return FormatHelper.NumberFormatter(preparedValue, options);
     }
     /**
      * Format value according to format options.
@@ -106,7 +102,7 @@ class FormatColumnInternalApi extends ApiBase_1.ApiBase {
      */
     getStringFormattedValue(value, node, abColumn, options) {
         const preparedValue = this.applyCustomFormatters(value, node, abColumn, options);
-        return FormatHelper_1.default.StringFormatter(preparedValue, options);
+        return FormatHelper.StringFormatter(preparedValue, options);
     }
     /**
      * Format value according to format options.
@@ -119,7 +115,7 @@ class FormatColumnInternalApi extends ApiBase_1.ApiBase {
         const dateFormatterOptions = options;
         // only use DateFormatter if we have a pattern
         return dateFormatterOptions.Pattern
-            ? FormatHelper_1.default.DateFormatter(preparedValue, options)
+            ? FormatHelper.DateFormatter(preparedValue, options)
             : preparedValue;
     }
     applyCustomFormatters(value, node, abColumn, options) {
@@ -132,7 +128,7 @@ class FormatColumnInternalApi extends ApiBase_1.ApiBase {
         const customFormattersFromOptions = (_c = (_b = adaptableOptions === null || adaptableOptions === void 0 ? void 0 : adaptableOptions.formatColumnOptions) === null || _b === void 0 ? void 0 : _b.customDisplayFormatters) !== null && _c !== void 0 ? _c : [];
         // formatters are applied in the order they are defined in the options
         const customFormatters = customFormattersFromOptions.filter((customFormatterOption) => columnCustomFormatters.includes(customFormatterOption.id));
-        const customDisplayFormatterContext = ObjectFactory_1.default.CreateCustomDisplayFormatterContext(value, node, abColumn, this.getAdaptableApi());
+        const customDisplayFormatterContext = ObjectFactory.CreateCustomDisplayFormatterContext(value, node, abColumn, this.getAdaptableApi());
         return customFormatters.reduce((context, formatter) => {
             if (formatter && formatter.handler) {
                 return formatter.handler(context);
@@ -254,4 +250,3 @@ class FormatColumnInternalApi extends ApiBase_1.ApiBase {
         return [...columnsThatNeedRefresh];
     }
 }
-exports.FormatColumnInternalApi = FormatColumnInternalApi;

package/src/Api/Internal/FreeTextColumnInternalApi.js

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.FreeTextColumnInternalApi = void 0;
-const ApiBase_1 = require("../Implementation/ApiBase");
-class FreeTextColumnInternalApi extends ApiBase_1.ApiBase {
+import { ApiBase } from '../Implementation/ApiBase';
+export class FreeTextColumnInternalApi extends ApiBase {
     /**
      * Checks if a User Edit was in a Free Text Column
      * @param cellDataChangedInfo change to check
@@ -41,4 +38,3 @@ class FreeTextColumnInternalApi extends ApiBase_1.ApiBase {
         return references;
     }
 }
-exports.FreeTextColumnInternalApi = FreeTextColumnInternalApi;

package/src/Api/Internal/GridFilterInternalApi.d.ts

@@ -0,0 +1,4 @@
+import { ApiBase } from '../Implementation/ApiBase';
+export declare class GridFilterInternalApi extends ApiBase {
+    fireGridFilterAppliedEvent(): void;
+}

package/src/Api/Internal/GridFilterInternalApi.js

@@ -0,0 +1,19 @@
+import { ApiBase } from '../Implementation/ApiBase';
+export class GridFilterInternalApi extends ApiBase {
+    fireGridFilterAppliedEvent() {
+        if (this.adaptable.isLive) {
+            const currentGridFilter = this.getGridFilterApi().getCurrentGridFilter();
+            const adaptableApi = this.getAdaptableApi();
+            const gridFilterAppliedInfo = {
+                gridFilter: currentGridFilter,
+                gridFilterExpressionAST: currentGridFilter
+                    ? adaptableApi.expressionApi.getASTForExpression(currentGridFilter === null || currentGridFilter === void 0 ? void 0 : currentGridFilter.Expression)
+                    : null,
+                adaptableApi: adaptableApi,
+                userName: adaptableApi.optionsApi.getUserName(),
+                adaptableId: adaptableApi.optionsApi.getAdaptableId(),
+            };
+            adaptableApi.eventApi.emit('GridFilterApplied', gridFilterAppliedInfo);
+        }
+    }
+}

package/src/Api/Internal/GridInternalApi.js

@@ -1,13 +1,9 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GridInternalApi = void 0;
-const tslib_1 = require("tslib");
-const ApiBase_1 = require("../Implementation/ApiBase");
-const Enums_1 = require("../../PredefinedConfig/Common/Enums");
-const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/ArrayExtensions"));
-const GridRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/GridRedux"));
-const NumberExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/NumberExtensions"));
-class GridInternalApi extends ApiBase_1.ApiBase {
+import { ApiBase } from '../Implementation/ApiBase';
+import { SortOrder } from '../../PredefinedConfig/Common/Enums';
+import ArrayExtensions from '../../Utilities/Extensions/ArrayExtensions';
+import * as GridRedux from '../../Redux/ActionsReducers/GridRedux';
+import NumberExtensions from '../../Utilities/Extensions/NumberExtensions';
+export class GridInternalApi extends ApiBase {
     /**
      * Fires Grid Sorted Event
      */
@@ -65,7 +61,10 @@ class GridInternalApi extends ApiBase_1.ApiBase {
         if (abColumn == undefined) {
             return [];
         }
-        const returnValues = this.adaptable.getDistinctValuesForColumn(abColumn, false);
+        const distinctValuesParams = {
+            visibleRowsOnly: false,
+        };
+        const returnValues = this.adaptable.getDistinctValuesForColumn(abColumn, distinctValuesParams);
         return this.sortDistinctValues(returnValues, abColumn).map((cv) => {
             return cv.normalisedValue;
         });
@@ -83,9 +82,12 @@ class GridInternalApi extends ApiBase_1.ApiBase {
                 suppressClientSideFilter: false,
             };
         }
-        const { gridCells, suppressClientSideFilter } = await this.adaptable.getDistinctFilterValuesForColumn(abColumn, showFilteredRowsOnly, filter);
+        const distinctValuesParams = {
+            visibleRowsOnly: showFilteredRowsOnly,
+        };
+        const { gridCells, suppressClientSideFilter } = await this.adaptable.getDistinctFilterListValuesForColumn(abColumn, filter, distinctValuesParams);
         let showValuesCount = false;
-        const showValuesCountFunction = this.getFilterOptions().showValuesCount;
+        const showValuesCountFunction = this.getColumnFilterOptions().valuesFilterOptions.showValuesCount;
         if (showValuesCountFunction) {
             showValuesCount = showValuesCountFunction(abColumn);
         }
@@ -93,7 +95,7 @@ class GridInternalApi extends ApiBase_1.ApiBase {
             values: this.sortDistinctValues(gridCells, abColumn).map((cv) => {
                 const label = showValuesCount
                     ? cv.displayValue +
-                        NumberExtensions_1.default.WrapInParentheses(this.getGridApi().getCellDisplayValueCount(abColumn.columnId, cv.displayValue))
+                        NumberExtensions.WrapInParentheses(this.getGridApi().getCellDisplayValueCount(abColumn.columnId, cv.displayValue))
                     : cv.displayValue;
                 return {
                     label: label,
@@ -112,7 +114,10 @@ class GridInternalApi extends ApiBase_1.ApiBase {
         if (abColumn == undefined) {
             return [];
         }
-        const gridCells = await this.adaptable.getDistinctCustomSortValuesForColumn(abColumn, false);
+        const distinctValuesParams = {
+            visibleRowsOnly: false,
+        };
+        const gridCells = await this.adaptable.getDistinctCustomSortValuesForColumn(abColumn, distinctValuesParams);
         return this.sortDistinctValues(gridCells, abColumn).map((cv) => {
             return cv.normalisedValue;
         });
@@ -127,7 +132,10 @@ class GridInternalApi extends ApiBase_1.ApiBase {
         if (abColumn == undefined) {
             return [];
         }
-        const gridCells = await this.adaptable.getDistinctBulkUpdateValuesForColumn(abColumn, false, selectedGridCells);
+        const distinctValuesParams = {
+            visibleRowsOnly: false,
+        };
+        const gridCells = await this.adaptable.getDistinctBulkUpdateValuesForColumn(abColumn, selectedGridCells, distinctValuesParams);
         return this.sortDistinctValues(gridCells, abColumn).map((cv) => {
             return cv.normalisedValue;
         });
@@ -141,7 +149,10 @@ class GridInternalApi extends ApiBase_1.ApiBase {
         if (abColumn == undefined) {
             return [];
         }
-        const returnValues = this.adaptable.getDistinctValuesForColumn(abColumn, true);
+        const distinctValuesParams = {
+            visibleRowsOnly: true,
+        };
+        const returnValues = this.adaptable.getDistinctValuesForColumn(abColumn, distinctValuesParams);
         return this.sortDistinctValues(returnValues, abColumn).map((cv) => {
             return cv.normalisedValue;
         });
@@ -170,7 +181,11 @@ class GridInternalApi extends ApiBase_1.ApiBase {
         if (abColumn == undefined) {
             return [];
         }
-        return this.adaptable.getDistinctValuesForColumn(abColumn, false, skipRowNode);
+        const distinctValuesParams = {
+            visibleRowsOnly: false,
+            skipRowNode: skipRowNode,
+        };
+        return this.adaptable.getDistinctValuesForColumn(abColumn, distinctValuesParams);
     }
     /**
      * Gets all distinct visible raw values in the Column
@@ -181,28 +196,31 @@ class GridInternalApi extends ApiBase_1.ApiBase {
         if (abColumn == undefined) {
             return [];
         }
-        const returnValues = this.adaptable.getDistinctValuesForColumn(abColumn, true);
+        const distinctValuesParams = {
+            visibleRowsOnly: true,
+        };
+        const returnValues = this.adaptable.getDistinctValuesForColumn(abColumn, distinctValuesParams);
         return this.sortDistinctValues(returnValues, abColumn).map((cv) => {
             return cv.rawValue;
         });
     }
     sortDistinctValues(returnValues, column) {
         // this does NOT into account Custom Sort - far too hard for now...
-        let sortOrder = Enums_1.SortOrder.Asc;
-        if (this.getFilterOptions().sortColumnValuesInFilter) {
+        let sortOrder = SortOrder.Asc;
+        if (this.getColumnFilterOptions().valuesFilterOptions.sortValuesFilter) {
             let columnSort = this.adaptable.api.gridApi.getColumnSortForColumn(column.columnId);
             if (columnSort && columnSort.SortOrder == 'Desc') {
-                sortOrder = Enums_1.SortOrder.Desc;
+                sortOrder = SortOrder.Desc;
             }
         }
         if (this.getColumnApi().hasNumberDataType(column === null || column === void 0 ? void 0 : column.columnId)) {
-            returnValues = ArrayExtensions_1.default.sortCellValueArrayNumeric(returnValues, sortOrder);
+            returnValues = ArrayExtensions.sortCellValueArrayNumeric(returnValues, sortOrder);
         }
         else if (this.getColumnApi().hasDateDataType(column === null || column === void 0 ? void 0 : column.columnId)) {
-            returnValues = ArrayExtensions_1.default.sortCellValueArrayDates(returnValues, sortOrder);
+            returnValues = ArrayExtensions.sortCellValueArrayDates(returnValues, sortOrder);
         }
         else {
-            returnValues = ArrayExtensions_1.default.sortCellValueArray(returnValues, sortOrder);
+            returnValues = ArrayExtensions.sortCellValueArray(returnValues, sortOrder);
         }
         return returnValues;
     }
@@ -236,7 +254,7 @@ class GridInternalApi extends ApiBase_1.ApiBase {
         }
         else {
             let arr = editLookUpValues;
-            if (arr && ArrayExtensions_1.default.IsNotNullOrEmpty(arr)) {
+            if (arr && ArrayExtensions.IsNotNullOrEmpty(arr)) {
                 return arr;
             }
         }
@@ -245,4 +263,3 @@ class GridInternalApi extends ApiBase_1.ApiBase {
         return this.getDistinctDisplayValuesForColumn(column.columnId);
     }
 }
-exports.GridInternalApi = GridInternalApi;

package/src/Api/Internal/LayoutInternalApi.d.ts

@@ -39,6 +39,7 @@ export declare class LayoutInternalApi extends ApiBase {
         AggregationColumns: boolean;
         PivotColumns: boolean;
         ColumnFilters: boolean;
+        GridFilter: boolean;
         ColumnSorts: boolean;
     };
     updateCurrentDraftLayout(layout: Layout): void;

package/src/Api/Internal/LayoutInternalApi.js

@@ -1,14 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.LayoutInternalApi = void 0;
-const tslib_1 = require("tslib");
-const ApiBase_1 = require("../Implementation/ApiBase");
-const isEqual_1 = tslib_1.__importDefault(require("lodash/isEqual"));
-const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
-const ObjectFactory_1 = tslib_1.__importDefault(require("../../Utilities/ObjectFactory"));
-const GridRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/GridRedux"));
-const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/ArrayExtensions"));
-class LayoutInternalApi extends ApiBase_1.ApiBase {
+import { ApiBase } from '../Implementation/ApiBase';
+import isEqual from 'lodash/isEqual';
+import { DEFAULT_LAYOUT } from '../../Utilities/Constants/GeneralConstants';
+import ObjectFactory from '../../Utilities/ObjectFactory';
+import * as GridRedux from '../../Redux/ActionsReducers/GridRedux';
+import ArrayExtensions from '../../Utilities/Extensions/ArrayExtensions';
+import { ColumnFilterModuleId, GridFilterModuleId, } from '../../Utilities/Constants/ModuleConstants';
+export class LayoutInternalApi extends ApiBase {
     /**
      * Fires the `LayoutChanged` event
      * @param trigger what caused event to fire
@@ -25,7 +22,7 @@ class LayoutInternalApi extends ApiBase_1.ApiBase {
             userName: adaptableApi.optionsApi.getUserName(),
             adaptableId: adaptableApi.optionsApi.getAdaptableId(),
         };
-        if (!skipEqualityCheck && (0, isEqual_1.default)(oldSate, newState)) {
+        if (!skipEqualityCheck && isEqual(oldSate, newState)) {
             return;
         }
         this.adaptable.api.eventApi.emit('LayoutChanged', layoutChangedInfo);
@@ -50,7 +47,7 @@ class LayoutInternalApi extends ApiBase_1.ApiBase {
         };
         layout1 = Object.assign(Object.assign({}, defaults), layout1);
         layout2 = Object.assign(Object.assign({}, defaults), layout2);
-        return (0, isEqual_1.default)(layout1, layout2);
+        return isEqual(layout1, layout2);
     }
     /**
      * Creates a Default Layout (when none provided in Config)
@@ -70,9 +67,9 @@ class LayoutInternalApi extends ApiBase_1.ApiBase {
             shouldCreateDefaultLayout = true;
         }
         if (shouldCreateDefaultLayout) {
-            if (!layoutState.Layouts || !isLayoutDefined(GeneralConstants_1.DEFAULT_LAYOUT)) {
-                let defaultLayout = ObjectFactory_1.default.CreateEmptyLayout({
-                    Name: GeneralConstants_1.DEFAULT_LAYOUT,
+            if (!layoutState.Layouts || !isLayoutDefined(DEFAULT_LAYOUT)) {
+                let defaultLayout = ObjectFactory.CreateEmptyLayout({
+                    Name: DEFAULT_LAYOUT,
                     Columns: defaultLayoutColumns.map((c) => c.columnId),
                     AggregationColumns: defaultLayoutColumns.reduce((acc, col) => {
                         if (col.aggregationFunction) {
@@ -119,12 +116,20 @@ class LayoutInternalApi extends ApiBase_1.ApiBase {
             PivotColumns: true,
             ColumnFilters: true,
             ColumnSorts: true,
+            GridFilter: true,
         };
         if (this.getGridApi().getAgGridRowModelType() === 'viewport') {
             layoutSupportedFeatures.RowGroupedColumns = false;
             layoutSupportedFeatures.AggregationColumns = false;
             layoutSupportedFeatures.PivotColumns = false;
         }
+        if (!this.getColumnFilterOptions().useAdaptableColumnFiltering ||
+            this.getEntitlementApi().getEntitlementAccessLevelForModule(ColumnFilterModuleId) == 'Hidden') {
+            layoutSupportedFeatures.ColumnFilters = false;
+        }
+        if (this.getEntitlementApi().getEntitlementAccessLevelForModule(GridFilterModuleId) == 'Hidden') {
+            layoutSupportedFeatures.GridFilter = false;
+        }
         return layoutSupportedFeatures;
     }
     updateCurrentDraftLayout(layout) {
@@ -148,7 +153,7 @@ class LayoutInternalApi extends ApiBase_1.ApiBase {
         }
         const layoutTagOptions = this.getLayoutOptions().layoutTagOptions;
         if ((layoutTagOptions === null || layoutTagOptions === void 0 ? void 0 : layoutTagOptions.autoCheckTagsForLayouts) == true) {
-            return ArrayExtensions_1.default.IsNullOrEmpty(object.Tags) ? true : (_a = object.Tags) === null || _a === void 0 ? void 0 : _a.includes(layout.Name);
+            return ArrayExtensions.IsNullOrEmpty(object.Tags) ? true : (_a = object.Tags) === null || _a === void 0 ? void 0 : _a.includes(layout.Name);
         }
         const context = {
             adaptableObject: object,
@@ -171,4 +176,3 @@ class LayoutInternalApi extends ApiBase_1.ApiBase {
         return ((_a = layout === null || layout === void 0 ? void 0 : layout.RowGroupedColumns) === null || _a === void 0 ? void 0 : _a.length) > 0;
     }
 }
-exports.LayoutInternalApi = LayoutInternalApi;

package/src/Api/Internal/{QueryInternalApi.d.ts → NamedQueryInternalApi.d.ts}

@@ -1,5 +1,5 @@
 import { ApiBase } from '../Implementation/ApiBase';
-export declare class QueryInternalApi extends ApiBase {
+export declare class NamedQueryInternalApi extends ApiBase {
     /**
      * Returns the name of all the referenced Named Queries as an array of strings
      * @param expression query string
@@ -10,8 +10,5 @@ export declare class QueryInternalApi extends ApiBase {
      * @param namedQueryName namedQuery name
      */
     getNamedQueryModuleReferences(namedQueryName: string): string[];
-    /**
-     * Fires Query Run Event - typically used to enable querying on the server
-     */
-    fireQueryRunEvent(): void;
+    cleanupQueryRedux(): void;
 }

package/src/Api/Internal/{QueryInternalApi.js → NamedQueryInternalApi.js}

@@ -1,8 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.QueryInternalApi = void 0;
-const ApiBase_1 = require("../Implementation/ApiBase");
-class QueryInternalApi extends ApiBase_1.ApiBase {
+import { ApiBase } from '../Implementation/ApiBase';
+import * as QueryRedux from '../../Redux/ActionsReducers/QueryRedux';
+export class NamedQueryInternalApi extends ApiBase {
     /**
      * Returns the name of all the referenced Named Queries as an array of strings
      * @param expression query string
@@ -35,24 +33,7 @@ class QueryInternalApi extends ApiBase_1.ApiBase {
         });
         return references;
     }
-    /**
-     * Fires Query Run Event - typically used to enable querying on the server
-     */
-    fireQueryRunEvent() {
-        if (this.adaptable.isLive) {
-            const currentQuery = this.getQueryApi().getCurrentQuery();
-            const adaptableApi = this.getAdaptableApi();
-            const queryRunInfo = {
-                currentQuery,
-                queryAST: currentQuery
-                    ? adaptableApi.expressionApi.getASTForExpression(currentQuery)
-                    : null,
-                adaptableApi: adaptableApi,
-                userName: adaptableApi.optionsApi.getUserName(),
-                adaptableId: adaptableApi.optionsApi.getAdaptableId(),
-            };
-            adaptableApi.eventApi.emit('QueryRun', queryRunInfo);
-        }
+    cleanupQueryRedux() {
+        this.dispatchAction(QueryRedux.QueryCleanup());
     }
 }
-exports.QueryInternalApi = QueryInternalApi;

package/src/Api/Internal/PredicateInternalApi.js

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PredicateInternalApi = void 0;
-const ApiBase_1 = require("../Implementation/ApiBase");
-class PredicateInternalApi extends ApiBase_1.ApiBase {
+import { ApiBase } from '../Implementation/ApiBase';
+export class PredicateInternalApi extends ApiBase {
     /**
      * Returns true if the predicate has a dropdown.
      *
@@ -16,7 +13,7 @@ class PredicateInternalApi extends ApiBase_1.ApiBase {
      */
     getFilterPredicateDefs(scope) {
         var _a;
-        return this.mergeSystemAndCustomPredicates((_a = this.getSystemFilterPredicateIds(scope)) === null || _a === void 0 ? void 0 : _a.map((predicateId) => this.getPredicateApi().getPredicateDefById(predicateId)), this.getPredicateApi().getCustomPredicateDefs()).filter((predicateDef) => predicateDef.moduleScope.includes('filter'));
+        return this.mergeSystemAndCustomPredicates((_a = this.getSystemFilterPredicateIds(scope)) === null || _a === void 0 ? void 0 : _a.map((predicateId) => this.getPredicateApi().getPredicateDefById(predicateId)), this.getPredicateApi().getCustomPredicateDefs()).filter((predicateDef) => predicateDef.moduleScope.includes('columnFilter'));
     }
     getSystemFilterPredicateIds(scope) {
         const systemFilterPredicates = this.getPredicateOptions().systemFilterPredicates;
@@ -25,8 +22,8 @@ class PredicateInternalApi extends ApiBase_1.ApiBase {
                 adaptableApi: this.adaptable.api,
                 userName: this.getOptions().userName,
                 adaptableId: this.getOptions().adaptableId,
-                systemPredicateDefs: this.getPredicateApi().getSystemPredicateDefsByModuleScope('filter'),
-                moduleScope: 'filter',
+                systemPredicateDefs: this.getPredicateApi().getSystemPredicateDefsByModuleScope('columnFilter'),
+                moduleScope: 'columnFilter',
                 columnScope: scope,
             };
             return systemFilterPredicates(systemPredicateContext);
@@ -156,4 +153,3 @@ class PredicateInternalApi extends ApiBase_1.ApiBase {
         return [...systemDefsToUse, ...customDefsToUse];
     }
 }
-exports.PredicateInternalApi = PredicateInternalApi;