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

package/src/Api/Internal/DataSetInternalApi.js

@@ -1,5 +1,8 @@
-import { ApiBase } from '../Implementation/ApiBase';
-export class DataSetInternalApi extends ApiBase {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DataSetInternalApi = void 0;
+const ApiBase_1 = require("../Implementation/ApiBase");
+class DataSetInternalApi extends ApiBase_1.ApiBase {
     /**
      * Fires the DataSet Selected Event
      * @param dataSet Data Set which has been selected
@@ -15,3 +18,4 @@ export class DataSetInternalApi extends ApiBase {
         }
     }
 }
+exports.DataSetInternalApi = DataSetInternalApi;

package/src/Api/Internal/ExportInternalApi.js

@@ -1,5 +1,8 @@
-import { ApiBase } from '../Implementation/ApiBase';
-export class ExportInternalApi extends ApiBase {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ExportInternalApi = void 0;
+const ApiBase_1 = require("../Implementation/ApiBase");
+class ExportInternalApi extends ApiBase_1.ApiBase {
     /**
      * Whether given data change affects given report
      * @param cellDataChangedInfo data change to check
@@ -124,3 +127,4 @@ export class ExportInternalApi extends ApiBase {
         return true;
     }
 }
+exports.ExportInternalApi = ExportInternalApi;

package/src/Api/Internal/ExpressionnternalApi.js

@@ -1,5 +1,8 @@
-import { ApiBase } from '../Implementation/ApiBase';
-export class ExpressionInternalApi extends ApiBase {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ExpressionInternalApi = void 0;
+const ApiBase_1 = require("../Implementation/ApiBase");
+class ExpressionInternalApi extends ApiBase_1.ApiBase {
     /**
      * Checks if a column is referenced in a given Expression
      * @param columnId Column to Check
@@ -56,3 +59,4 @@ export class ExpressionInternalApi extends ApiBase {
         return !evaluateExpressionExternallyFn(context);
     }
 }
+exports.ExpressionInternalApi = ExpressionInternalApi;

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

@@ -7,10 +7,10 @@ import { Fdc3IntentType, Fdc3StandardIntentType } from '../../PredefinedConfig/C
 import { AdaptableButton } from '../../PredefinedConfig/Common/AdaptableButton';
 import { ActionColumnContext } from '../../AdaptableOptions/ActionColumnOptions';
 import { AdaptableIcon } from '../../PredefinedConfig/Common/AdaptableIcon';
-export declare type WithContext<K> = K & {
+export type WithContext<K> = K & {
     contextType: Fdc3ContextType;
 };
-export declare type WithIntent<K> = K & {
+export type WithIntent<K> = K & {
     intentType: Fdc3IntentType;
 };
 export declare class Fdc3InternalApi extends ApiBase {

package/src/Api/Internal/Fdc3InternalApi.js

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

package/src/Api/Internal/FlashingCellInternalApi.js

@@ -1,8 +1,12 @@
-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 {
+"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 {
     /**
      * Merges a Flashing Cell Definition with default values
      * @param flashingCellDefinition Flashing Cell Definition to Merge
@@ -13,7 +17,7 @@ export class FlashingCellInternalApi extends ApiBase {
             return flashingCellDefinition;
         }
         // deep clone it, otherwise we will mutate&share(!!) the global flashingCellOptions object
-        flashingDefaults = cloneObject(flashingDefaults);
+        flashingDefaults = (0, Helper_1.cloneObject)(flashingDefaults);
         if (!flashingCellDefinition.DownChangeStyle && flashingDefaults.defaultDownChangeStyle) {
             flashingCellDefinition.DownChangeStyle = flashingDefaults.defaultDownChangeStyle;
         }
@@ -38,7 +42,7 @@ export class FlashingCellInternalApi extends 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[FLASHING_CELL_ROW_KEY]);
+            : toFlashingAlert(forPrimaryKey[SystemRedux_1.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;
@@ -49,3 +53,4 @@ export class FlashingCellInternalApi extends ApiBase {
         this.dispatchAction(AlertRedux.AlertClearFlashingCells());
     }
 }
+exports.FlashingCellInternalApi = FlashingCellInternalApi;

package/src/Api/Internal/FormatColumnInternalApi.js

@@ -1,9 +1,13 @@
-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 {
+"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 {
     /**
      * Retrieves all Format Columns in Adaptable State with the `Style` property set
      * @returns format columns
@@ -56,7 +60,7 @@ export class FormatColumnInternalApi extends ApiBase {
      * @returns format columns
      */
     getFormatColumnWithStyleClassNameForColumn(column, config) {
-        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); });
+        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); });
     }
     getFormatColumnWithColumnInScope(formatColumns, column) {
         return this.getFormatColumnInColumnScope(formatColumns).filter((scopedFormatColumn) => this.adaptable.api.scopeApi.isColumnInScope(column, scopedFormatColumn.Scope));
@@ -92,7 +96,7 @@ export class FormatColumnInternalApi extends ApiBase {
      */
     getNumberFormattedValue(value, node, abColumn, options) {
         const preparedValue = this.applyCustomFormatters(value, node, abColumn, options);
-        return FormatHelper.NumberFormatter(preparedValue, options);
+        return FormatHelper_1.default.NumberFormatter(preparedValue, options);
     }
     /**
      * Format value according to format options.
@@ -102,7 +106,7 @@ export class FormatColumnInternalApi extends ApiBase {
      */
     getStringFormattedValue(value, node, abColumn, options) {
         const preparedValue = this.applyCustomFormatters(value, node, abColumn, options);
-        return FormatHelper.StringFormatter(preparedValue, options);
+        return FormatHelper_1.default.StringFormatter(preparedValue, options);
     }
     /**
      * Format value according to format options.
@@ -115,7 +119,7 @@ export class FormatColumnInternalApi extends ApiBase {
         const dateFormatterOptions = options;
         // only use DateFormatter if we have a pattern
         return dateFormatterOptions.Pattern
-            ? FormatHelper.DateFormatter(preparedValue, options)
+            ? FormatHelper_1.default.DateFormatter(preparedValue, options)
             : preparedValue;
     }
     applyCustomFormatters(value, node, abColumn, options) {
@@ -128,7 +132,7 @@ export class FormatColumnInternalApi extends 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.CreateCustomDisplayFormatterContext(value, node, abColumn, this.getAdaptableApi());
+        const customDisplayFormatterContext = ObjectFactory_1.default.CreateCustomDisplayFormatterContext(value, node, abColumn, this.getAdaptableApi());
         return customFormatters.reduce((context, formatter) => {
             if (formatter && formatter.handler) {
                 return formatter.handler(context);
@@ -250,3 +254,4 @@ export class FormatColumnInternalApi extends ApiBase {
         return [...columnsThatNeedRefresh];
     }
 }
+exports.FormatColumnInternalApi = FormatColumnInternalApi;

package/src/Api/Internal/FreeTextColumnInternalApi.js

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

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

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

package/src/Api/Internal/GridFilterInternalApi.js

@@ -1,13 +1,16 @@
-import { ApiBase } from '../Implementation/ApiBase';
-export class GridFilterInternalApi extends ApiBase {
-    fireGridFilterApplied() {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GridFilterInternalApi = void 0;
+const ApiBase_1 = require("../Implementation/ApiBase");
+class GridFilterInternalApi extends ApiBase_1.ApiBase {
+    fireGridFilterAppliedEvent() {
         if (this.adaptable.isLive) {
-            const currentQuery = this.getGridFilterApi().getCurrentGridFilterExpression();
+            const currentGridFilter = this.getGridFilterApi().getCurrentGridFilter();
             const adaptableApi = this.getAdaptableApi();
             const gridFilterAppliedInfo = {
-                gridFilter: currentQuery,
-                gridFilterExpressionAST: currentQuery
-                    ? adaptableApi.expressionApi.getASTForExpression(currentQuery)
+                gridFilter: currentGridFilter,
+                gridFilterExpressionAST: currentGridFilter
+                    ? adaptableApi.expressionApi.getASTForExpression(currentGridFilter === null || currentGridFilter === void 0 ? void 0 : currentGridFilter.Expression)
                     : null,
                 adaptableApi: adaptableApi,
                 userName: adaptableApi.optionsApi.getUserName(),
@@ -17,3 +20,4 @@ export class GridFilterInternalApi extends ApiBase {
         }
     }
 }
+exports.GridFilterInternalApi = GridFilterInternalApi;

package/src/Api/Internal/GridInternalApi.js

@@ -1,9 +1,13 @@
-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 {
+"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 {
     /**
      * Fires Grid Sorted Event
      */
@@ -61,7 +65,10 @@ export class GridInternalApi extends 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;
         });
@@ -79,9 +86,12 @@ export class GridInternalApi extends 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.getColumnFilterOptions().showValuesCount;
+        const showValuesCountFunction = this.getColumnFilterOptions().valuesFilterOptions.showValuesCount;
         if (showValuesCountFunction) {
             showValuesCount = showValuesCountFunction(abColumn);
         }
@@ -89,7 +99,7 @@ export class GridInternalApi extends ApiBase {
             values: this.sortDistinctValues(gridCells, abColumn).map((cv) => {
                 const label = showValuesCount
                     ? cv.displayValue +
-                        NumberExtensions.WrapInParentheses(this.getGridApi().getCellDisplayValueCount(abColumn.columnId, cv.displayValue))
+                        NumberExtensions_1.default.WrapInParentheses(this.getGridApi().getCellDisplayValueCount(abColumn.columnId, cv.displayValue))
                     : cv.displayValue;
                 return {
                     label: label,
@@ -108,7 +118,10 @@ export class GridInternalApi extends 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;
         });
@@ -123,7 +136,10 @@ export class GridInternalApi extends 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;
         });
@@ -137,7 +153,10 @@ export class GridInternalApi extends 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;
         });
@@ -166,7 +185,11 @@ export class GridInternalApi extends 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
@@ -177,28 +200,31 @@ export class GridInternalApi extends 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 = SortOrder.Asc;
-        if (this.getColumnFilterOptions().sortColumnValuesInFilter) {
+        let sortOrder = Enums_1.SortOrder.Asc;
+        if (this.getColumnFilterOptions().valuesFilterOptions.sortValuesFilter) {
             let columnSort = this.adaptable.api.gridApi.getColumnSortForColumn(column.columnId);
             if (columnSort && columnSort.SortOrder == 'Desc') {
-                sortOrder = SortOrder.Desc;
+                sortOrder = Enums_1.SortOrder.Desc;
             }
         }
         if (this.getColumnApi().hasNumberDataType(column === null || column === void 0 ? void 0 : column.columnId)) {
-            returnValues = ArrayExtensions.sortCellValueArrayNumeric(returnValues, sortOrder);
+            returnValues = ArrayExtensions_1.default.sortCellValueArrayNumeric(returnValues, sortOrder);
         }
         else if (this.getColumnApi().hasDateDataType(column === null || column === void 0 ? void 0 : column.columnId)) {
-            returnValues = ArrayExtensions.sortCellValueArrayDates(returnValues, sortOrder);
+            returnValues = ArrayExtensions_1.default.sortCellValueArrayDates(returnValues, sortOrder);
         }
         else {
-            returnValues = ArrayExtensions.sortCellValueArray(returnValues, sortOrder);
+            returnValues = ArrayExtensions_1.default.sortCellValueArray(returnValues, sortOrder);
         }
         return returnValues;
     }
@@ -232,7 +258,7 @@ export class GridInternalApi extends ApiBase {
         }
         else {
             let arr = editLookUpValues;
-            if (arr && ArrayExtensions.IsNotNullOrEmpty(arr)) {
+            if (arr && ArrayExtensions_1.default.IsNotNullOrEmpty(arr)) {
                 return arr;
             }
         }
@@ -241,3 +267,4 @@ export class GridInternalApi extends ApiBase {
         return this.getDistinctDisplayValuesForColumn(column.columnId);
     }
 }
+exports.GridInternalApi = GridInternalApi;

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

@@ -1,7 +1,7 @@
-import { ApiBase } from '../Implementation/ApiBase';
-import { Layout, LayoutState } from '../../PredefinedConfig/LayoutState';
 import { LayoutAssociatedObject } from '../../AdaptableOptions/LayoutOptions';
 import { AdaptableModule } from '../../PredefinedConfig/Common/Types';
+import { Layout, LayoutState } from '../../PredefinedConfig/LayoutState';
+import { ApiBase } from '../Implementation/ApiBase';
 export declare class LayoutInternalApi extends ApiBase {
     /**
      * Fires the `LayoutChanged` event

package/src/Api/Internal/LayoutInternalApi.js

@@ -1,10 +1,15 @@
-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';
-export class LayoutInternalApi extends ApiBase {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LayoutInternalApi = void 0;
+const tslib_1 = require("tslib");
+const isEqual_1 = tslib_1.__importDefault(require("lodash/isEqual"));
+const GridRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/GridRedux"));
+const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
+const ModuleConstants_1 = require("../../Utilities/Constants/ModuleConstants");
+const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/ArrayExtensions"));
+const ObjectFactory_1 = tslib_1.__importDefault(require("../../Utilities/ObjectFactory"));
+const ApiBase_1 = require("../Implementation/ApiBase");
+class LayoutInternalApi extends ApiBase_1.ApiBase {
     /**
      * Fires the `LayoutChanged` event
      * @param trigger what caused event to fire
@@ -21,7 +26,7 @@ export class LayoutInternalApi extends ApiBase {
             userName: adaptableApi.optionsApi.getUserName(),
             adaptableId: adaptableApi.optionsApi.getAdaptableId(),
         };
-        if (!skipEqualityCheck && isEqual(oldSate, newState)) {
+        if (!skipEqualityCheck && (0, isEqual_1.default)(oldSate, newState)) {
             return;
         }
         this.adaptable.api.eventApi.emit('LayoutChanged', layoutChangedInfo);
@@ -46,7 +51,7 @@ export class LayoutInternalApi extends ApiBase {
         };
         layout1 = Object.assign(Object.assign({}, defaults), layout1);
         layout2 = Object.assign(Object.assign({}, defaults), layout2);
-        return isEqual(layout1, layout2);
+        return (0, isEqual_1.default)(layout1, layout2);
     }
     /**
      * Creates a Default Layout (when none provided in Config)
@@ -57,18 +62,17 @@ export class LayoutInternalApi extends ApiBase {
         let layoutState = this.getLayoutApi().getLayoutState();
         const isLayoutDefined = (layoutName) => !!layoutState.Layouts.filter((layout) => layout.Name === layoutName)[0];
         let defaultLayoutColumns = gridState.Columns.filter((column) => column.visible);
-        const columnsMap = gridState.Columns.reduce((acc, col) => {
-            acc[col.columnId] = col;
-            return acc;
-        }, {});
         let shouldCreateDefaultLayout = this.getLayoutOptions().createDefaultLayout;
         if (!layoutState.Layouts || !layoutState.Layouts.length) {
             shouldCreateDefaultLayout = true;
         }
         if (shouldCreateDefaultLayout) {
-            if (!layoutState.Layouts || !isLayoutDefined(DEFAULT_LAYOUT)) {
-                let defaultLayout = ObjectFactory.CreateEmptyLayout({
-                    Name: DEFAULT_LAYOUT,
+            if (!layoutState.Layouts || !isLayoutDefined(GeneralConstants_1.DEFAULT_LAYOUT)) {
+                // augogroup columns are not in columns list
+                // the code that adds column ok grid state explicitly ignores autoColumns
+                const allGridColumns = this.adaptable.getAgGridAllGridColumns();
+                let defaultLayout = ObjectFactory_1.default.CreateEmptyLayout({
+                    Name: GeneralConstants_1.DEFAULT_LAYOUT,
                     Columns: defaultLayoutColumns.map((c) => c.columnId),
                     AggregationColumns: defaultLayoutColumns.reduce((acc, col) => {
                         if (col.aggregationFunction) {
@@ -76,9 +80,10 @@ export class LayoutInternalApi extends ApiBase {
                         }
                         return acc;
                     }, {}),
-                    PinnedColumnsMap: defaultLayoutColumns.reduce((acc, col) => {
-                        if (col.pinned) {
-                            acc[col.columnId] = col.pinned;
+                    PinnedColumnsMap: allGridColumns.reduce((acc, col) => {
+                        const pinned = col.getPinned();
+                        if (pinned) {
+                            acc[col.getColId()] = pinned === true ? 'left' : pinned;
                         }
                         return acc;
                     }, {}),
@@ -122,6 +127,13 @@ export class LayoutInternalApi extends ApiBase {
             layoutSupportedFeatures.AggregationColumns = false;
             layoutSupportedFeatures.PivotColumns = false;
         }
+        if (!this.getColumnFilterOptions().useAdaptableColumnFiltering ||
+            this.getEntitlementApi().getEntitlementAccessLevelForModule(ModuleConstants_1.ColumnFilterModuleId) == 'Hidden') {
+            layoutSupportedFeatures.ColumnFilters = false;
+        }
+        if (this.getEntitlementApi().getEntitlementAccessLevelForModule(ModuleConstants_1.GridFilterModuleId) == 'Hidden') {
+            layoutSupportedFeatures.GridFilter = false;
+        }
         return layoutSupportedFeatures;
     }
     updateCurrentDraftLayout(layout) {
@@ -145,7 +157,7 @@ export class LayoutInternalApi extends ApiBase {
         }
         const layoutTagOptions = this.getLayoutOptions().layoutTagOptions;
         if ((layoutTagOptions === null || layoutTagOptions === void 0 ? void 0 : layoutTagOptions.autoCheckTagsForLayouts) == true) {
-            return ArrayExtensions.IsNullOrEmpty(object.Tags) ? true : (_a = object.Tags) === null || _a === void 0 ? void 0 : _a.includes(layout.Name);
+            return ArrayExtensions_1.default.IsNullOrEmpty(object.Tags) ? true : (_a = object.Tags) === null || _a === void 0 ? void 0 : _a.includes(layout.Name);
         }
         const context = {
             adaptableObject: object,
@@ -168,3 +180,4 @@ export class LayoutInternalApi extends 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/NamedQueryInternalApi.js

@@ -1,6 +1,10 @@
-import { ApiBase } from '../Implementation/ApiBase';
-import * as QueryRedux from '../../Redux/ActionsReducers/QueryRedux';
-export class NamedQueryInternalApi extends ApiBase {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NamedQueryInternalApi = void 0;
+const tslib_1 = require("tslib");
+const ApiBase_1 = require("../Implementation/ApiBase");
+const QueryRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/QueryRedux"));
+class NamedQueryInternalApi extends ApiBase_1.ApiBase {
     /**
      * Returns the name of all the referenced Named Queries as an array of strings
      * @param expression query string
@@ -37,3 +41,4 @@ export class NamedQueryInternalApi extends ApiBase {
         this.dispatchAction(QueryRedux.QueryCleanup());
     }
 }
+exports.NamedQueryInternalApi = NamedQueryInternalApi;