@adaptabletools/adaptable-cjs 18.0.0-canary.4 → 18.0.0-canary.6

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

@@ -8,7 +8,7 @@ import { ColumnSort } from '../../PredefinedConfig/Common/ColumnSort';
 import { DataUpdateConfig } from '../../PredefinedConfig/Common/DataUpdateConfig';
 import { CellHighlightInfo } from '../../PredefinedConfig/Common/CellHighlightInfo';
 import { RowHighlightInfo } from '../../PredefinedConfig/Common/RowHighlightInfo';
-import { GridOptions, IRowNode, RowModelType } from '@ag-grid-community/core';
+import { IRowNode, RowModelType } from '@ag-grid-community/core';
 import { GridCellRange } from '../../PredefinedConfig/Selection/GridCellRange';
 import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
 import { RowsHighlightInfo } from '../../PredefinedConfig/Common/RowsHighlightInfo';
@@ -18,6 +18,7 @@ export declare class GridApiImpl extends ApiBase implements GridApi {
     internalApi: GridInternalApi;
     constructor(adaptable: IAdaptable);
     getGridState(): GridState;
+    loadGridData(dataSource: any): void;
     resetGridData(dataSource: any[]): void;
     setInitialGridData(data: any): void;
     getGridData(): any[];
@@ -40,7 +41,6 @@ export declare class GridApiImpl extends ApiBase implements GridApi {
     hideFilterForm(): void;
     applyGridFiltering(): void;
     clearGridFiltering(): void;
-    getAgGridInstance(): GridOptions;
     getColumnSorts(): ColumnSort[];
     getColumnSortForColumn(columnId: string): ColumnSort | undefined;
     setAdaptableSorting(columnSorts: ColumnSort[]): void;
@@ -120,7 +120,6 @@ export declare class GridApiImpl extends ApiBase implements GridApi {
     isCellEditable(gridCell: GridCell): boolean;
     isEveryCellEditable(gridCells: GridCell[]): boolean;
     getRowCount(): number;
-    getVisibleRowCount(): number;
     getRowsInViewport(): IRowNode[];
     getColumnCount(): number;
     getVisibleColumnCount(): number;
@@ -130,4 +129,5 @@ export declare class GridApiImpl extends ApiBase implements GridApi {
     getGridContainerElement(): HTMLElement | null;
     openGridInfoSettingsPanel(): void;
     getAgGridRowModelType(): RowModelType;
+    getVisibleRowCount(): number;
 }

package/src/Api/Implementation/GridApiImpl.js

@@ -8,6 +8,7 @@ const SystemRedux_1 = require("../../Redux/ActionsReducers/SystemRedux");
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 const GridInternalApi_1 = require("../Internal/GridInternalApi");
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/ArrayExtensions"));
+const logDeprecation_1 = require("../../Utilities/logDeprecation");
 class GridApiImpl extends ApiBase_1.ApiBase {
     constructor(adaptable) {
         super(adaptable);
@@ -16,13 +17,18 @@ class GridApiImpl extends ApiBase_1.ApiBase {
     getGridState() {
         return this.getAdaptableState().Grid;
     }
-    resetGridData(dataSource) {
+    loadGridData(dataSource) {
         this.adaptable.setGridData(dataSource);
         const allRowNodes = this.getAllRowNodes();
-        this.internalApi.fireGridDataChangedEvent(dataSource, allRowNodes, 'Add');
+        this.internalApi.fireGridDataChangedEvent(dataSource, allRowNodes, 'Load');
+    }
+    resetGridData(dataSource) {
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'GridApi', 'resetGridData', 'loadGridData');
+        this.loadGridData(dataSource);
     }
     setInitialGridData(data) {
-        this.adaptable.setGridData(data);
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'GridApi', 'setInitialGridData', 'loadGridData');
+        this.loadGridData(data);
     }
     getGridData() {
         return this.adaptable.getGridData();
@@ -118,9 +124,6 @@ class GridApiImpl extends ApiBase_1.ApiBase {
         // slightly round the houses but we have to call ColumnFilterAPI as it does it properly
         this.adaptable.api.columnFilterApi.clearColumnFilters();
     }
-    getAgGridInstance() {
-        return this.adaptable.gridOptions;
-    }
     getColumnSorts() {
         return this.getAdaptableState().Grid.ColumnSorts;
     }
@@ -275,7 +278,9 @@ class GridApiImpl extends ApiBase_1.ApiBase {
         return this.adaptable.getFirstDisplayedRowNode();
     }
     getVisibleRowNodes(config) {
-        return this.adaptable.getVisibleRowNodes();
+        const rowNodes = [];
+        this.adaptable.forAllVisibleRowNodesDo((rowNode) => rowNodes.push(rowNode), config);
+        return rowNodes;
     }
     getAllRowNodes(config) {
         return this.adaptable.getAllRowNodes(config);
@@ -334,10 +339,10 @@ class GridApiImpl extends ApiBase_1.ApiBase {
         this.adaptable.expandRowGroupsForValues(columnValues);
     }
     isGridPivotable() {
-        return this.adaptable.isGridPivotable();
+        return !this.getAdaptableApi().internalApi.isGridInTreeMode();
     }
     isGridGroupable() {
-        return this.adaptable.isGridGroupable();
+        return !this.getAdaptableApi().internalApi.isGridInTreeMode();
     }
     isGridSelectable() {
         return this.adaptable.isGridSelectable();
@@ -353,7 +358,7 @@ class GridApiImpl extends ApiBase_1.ApiBase {
     }
     redrawGrid() {
         this.adaptable.redrawBody();
-        this.adaptable.redrawHeader();
+        this.adaptable.refreshHeader();
     }
     getGridCellsForRawValue(columnId, rawValue) {
         const gridCells = this.adaptable.getGridCellsForColumn(columnId);
@@ -456,7 +461,7 @@ class GridApiImpl extends ApiBase_1.ApiBase {
     }
     refreshGroupRowNodes() {
         // see https://www.ag-grid.com/javascript-data-grid/client-side-row-stages/#refreshing-the-client-side-model
-        this.getAgGridInstance().api.refreshClientSideRowModel('group');
+        this.getAdaptableApi().agGridApi.refreshClientSideRowModel('group');
         this.adaptable.updateRowGroupsExpandedState();
     }
     isCellEditable(gridCell) {
@@ -483,9 +488,6 @@ class GridApiImpl extends ApiBase_1.ApiBase {
     getRowCount() {
         return this.adaptable.getRowCount();
     }
-    getVisibleRowCount() {
-        return this.adaptable.getVisibleRowCount();
-    }
     getRowsInViewport() {
         return this.adaptable.getRowsInViewport();
     }
@@ -513,5 +515,9 @@ class GridApiImpl extends ApiBase_1.ApiBase {
     getAgGridRowModelType() {
         return this.adaptable.getAgGridRowModelType();
     }
+    getVisibleRowCount() {
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'GridApi', 'getVisibleRowCount', 'getRowCount');
+        return this.getRowCount();
+    }
 }
 exports.GridApiImpl = GridApiImpl;

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

@@ -5,6 +5,5 @@ import { StatusPanelDef } from '@ag-grid-community/core';
 export declare class StatusBarApiImpl extends ApiBase implements StatusBarApi {
     getAdaptableStatusBars(): AdaptableStatusBar[];
     getAgGridStatusPanels(): StatusPanelDef[];
-    getAgGridStatusBar(): StatusPanelDef[];
     setStatusBarPanels(statusPanels: AdaptableStatusBar[]): void;
 }

package/src/Api/Implementation/StatusBarApiImpl.js

@@ -10,9 +10,6 @@ class StatusBarApiImpl extends ApiBase_1.ApiBase {
     getAgGridStatusPanels() {
         return this.adaptable.getAgGridStatusPanels();
     }
-    getAgGridStatusBar() {
-        return this.adaptable.getAgGridStatusPanels();
-    }
     setStatusBarPanels(statusPanels) {
         this.dispatchAction((0, StatusBarRedux_1.StatusBarSetPanels)(statusPanels));
     }

package/src/Api/Implementation/ToolPanelApiImpl.js

@@ -14,15 +14,15 @@ class ToolPanelApiImpl extends ApiBase_1.ApiBase {
         this.showModulePopup(ModuleConstants.ToolPanelModuleId);
     }
     openAdapTableToolPanel() {
-        let gridOptions = this.getGridApi().getAgGridInstance();
-        if (gridOptions) {
-            gridOptions.api.openToolPanel('adaptable');
+        const agGridApi = this.getAdaptableApi().agGridApi;
+        if (agGridApi) {
+            agGridApi.openToolPanel('adaptable');
         }
     }
     closeAdapTableToolPanel() {
-        let gridOptions = this.getGridApi().getAgGridInstance();
-        if (gridOptions) {
-            gridOptions.api.closeToolPanel();
+        const agGridApi = this.getAdaptableApi().agGridApi;
+        if (agGridApi) {
+            agGridApi.closeToolPanel();
         }
     }
     getCustomToolPanels() {

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

@@ -1,7 +1,9 @@
-import { IRowNode } from '@ag-grid-community/core';
+import { ColDef, IRowNode } from '@ag-grid-community/core';
 import { AdaptableForm } from '../../PredefinedConfig/Common/AdaptableForm';
 import { CreateActionRowFormContext, EditActionRowFormContext } from '../../AdaptableOptions/ActionRowOptions';
+import { AdaptableButton } from '../../PredefinedConfig/Common/AdaptableButton';
 import { ApiBase } from '../Implementation/ApiBase';
+import { ActionColumnContext } from '../../AdaptableOptions/ActionColumnOptions';
 export declare class ActionRowInternalApi extends ApiBase {
     buildRowEditForm(rowNode: IRowNode): AdaptableForm<EditActionRowFormContext>;
     buildRowCreateForm(clonedRowNode?: IRowNode): AdaptableForm<CreateActionRowFormContext>;
@@ -21,4 +23,6 @@ export declare class ActionRowInternalApi extends ApiBase {
     private buildFormFieldLabelContext;
     private getFieldTypeFromColumnType;
     private getFieldValueOptions;
+    getColDefsForActionRowColumns(): ColDef[];
+    getActionRowButtonDefs(): AdaptableButton<ActionColumnContext<any>>[];
 }

package/src/Api/Internal/ActionRowInternalApi.js

@@ -1,7 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ActionRowInternalApi = void 0;
+const tslib_1 = require("tslib");
 const ApiBase_1 = require("../Implementation/ApiBase");
+const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
+const UIHelper_1 = tslib_1.__importDefault(require("../../View/UIHelper"));
+const ActionColumnRenderer_1 = require("../../agGrid/ActionColumnRenderer");
 class ActionRowInternalApi extends ApiBase_1.ApiBase {
     buildRowEditForm(rowNode) {
         return this.buildActionRow('rowEdited', rowNode);
@@ -200,5 +204,108 @@ class ActionRowInternalApi extends ApiBase_1.ApiBase {
             label: value,
         }));
     }
+    getColDefsForActionRowColumns() {
+        const actionButtons = this.getActionRowButtonDefs();
+        if (!actionButtons.length) {
+            return [];
+        }
+        return [
+            {
+                headerName: '',
+                colId: GeneralConstants_1.ADAPTABLE_ROW_ACTION_BUTTONS,
+                hide: false,
+                editable: false,
+                // 15px is the icon width + left&right padding + left&right border
+                width: Math.max(actionButtons.length * (UIHelper_1.default.getSimpleButtonPaddingWidth() * 2 + 15) + 2, 
+                // If the width of the column is to small, the width will not be applied
+                // this triggers the setLayout an infinite loop because the width read from the grid is always different
+                40),
+                resizable: false,
+                lockVisible: true,
+                suppressColumnsToolPanel: true,
+                suppressFiltersToolPanel: true,
+                suppressMenu: true,
+                suppressMovable: true,
+                filter: false,
+                sortable: false,
+                enableRowGroup: false,
+                pinned: this.getActionRowOptions().actionRowButtonOptions.position === 'pinnedRight'
+                    ? 'right'
+                    : 'left',
+                cellRenderer: this.getAdaptableVariant() === 'react' ? ActionColumnRenderer_1.ReactActionColumnRenderer : ActionColumnRenderer_1.ActionColumnRenderer,
+                cellClass: GeneralConstants_1.ADAPTABLE_ROW_ACTION_BUTTONS,
+                type: [GeneralConstants_1.AB_SPECIAL_COLUMN, 'abColDefObject'],
+            },
+        ];
+    }
+    getActionRowButtonDefs() {
+        const actionRowButtons = this.getActionRowApi().getActionRowButtons();
+        if (!(actionRowButtons === null || actionRowButtons === void 0 ? void 0 : actionRowButtons.length)) {
+            return [];
+        }
+        const defaultActionRowButtonConfiguration = {
+            create: {
+                icon: {
+                    name: 'add',
+                },
+                tooltip: 'Create',
+                onClick: () => {
+                    this.getActionRowApi().displayCreateActionRow();
+                },
+            },
+            edit: {
+                icon: {
+                    name: 'edit',
+                },
+                tooltip: 'Edit',
+                onClick: (button, context) => {
+                    this.getActionRowApi().displayEditActionRow(context.primaryKeyValue);
+                },
+            },
+            clone: {
+                icon: {
+                    name: 'clone',
+                },
+                tooltip: 'Clone',
+                onClick: (button, context) => {
+                    this.getActionRowApi().displayCloneActionRow(context.primaryKeyValue);
+                },
+            },
+            delete: {
+                icon: {
+                    name: 'delete',
+                },
+                tooltip: 'Delete',
+                onClick: (button, context) => {
+                    var _a, _b;
+                    const eventInfo = {
+                        type: 'rowDeleted',
+                        rowNode: context.rowNode,
+                        adaptableApi: context.adaptableApi,
+                        userName: context.userName,
+                        adaptableId: context.adaptableId,
+                    };
+                    this.getEventApi().emit('ActionRowSubmitted', eventInfo);
+                    (_b = (_a = this.getActionRowOptions().actionRowFormOptions).onFormSubmit) === null || _b === void 0 ? void 0 : _b.call(_a, eventInfo);
+                },
+            },
+        };
+        const actionButtons = actionRowButtons
+            .map((actionRowButtonType) => {
+            var _a, _b;
+            const defaultButtonConfig = defaultActionRowButtonConfiguration[actionRowButtonType];
+            if (!defaultButtonConfig) {
+                // should NOT happen unless the user sent some invalid button type in the predefined config
+                return;
+            }
+            const customButtonConfig = (_b = (_a = this.getActionRowOptions().actionRowButtonOptions).customConfiguration) === null || _b === void 0 ? void 0 : _b.call(_a, Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { actionRowButtonType }));
+            if (!customButtonConfig) {
+                return defaultButtonConfig;
+            }
+            return Object.assign(Object.assign({}, defaultButtonConfig), customButtonConfig);
+        })
+            .filter(Boolean);
+        return actionButtons;
+    }
 }
 exports.ActionRowInternalApi = ActionRowInternalApi;

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

@@ -24,9 +24,9 @@ import { AdaptableFrameworkComponent } from '../../AdaptableOptions/AdaptableFra
 import { IMetamodelService } from '../../Utilities/Services/Interface/IMetamodelService';
 import { IModuleCollection } from '../../Strategy/Interface/IModule';
 import { AdaptableObjectTag, AdaptableObjectWithScope } from '../../PredefinedConfig/Common/AdaptableObject';
-import { IRowEditService } from '../../Utilities/Services/Interface/IRowEditService';
 import { Fdc3Service } from '../../Utilities/Services/Fdc3Service';
 import { CellPopupService } from '../../Utilities/Services/CellPopupService';
+import { RowEditService } from '../../Utilities/Services/RowEditService';
 export declare class AdaptableInternalApi extends ApiBase {
     getSystemState(): SystemState;
     showPopupConfirmation(confirmation: UIConfirmation): void;
@@ -46,8 +46,7 @@ export declare class AdaptableInternalApi extends ApiBase {
     setPivotModeOn(): void;
     setPivotModeOff(): void;
     isGridInPivotMode(): boolean;
-    setTreeModeOn(): void;
-    setTreeModeOff(): void;
+    setTreeMode(mode: boolean): void;
     isGridInTreeMode(): boolean;
     getToolbarTitle(): string;
     buildDataChangedInfo(config: Pick<CellDataChangedInfo, 'newValue' | 'oldValue' | 'column' | 'primaryKeyValue' | 'rowNode' | 'trigger'>): CellDataChangedInfo;
@@ -65,7 +64,7 @@ export declare class AdaptableInternalApi extends ApiBase {
     getAlertService(): IAlertService;
     getTeamSharingService(): ITeamSharingService;
     getMetamodelService(): IMetamodelService;
-    getRowEditService(): IRowEditService;
+    getRowEditService(): RowEditService;
     getFdc3Service(): Fdc3Service;
     getModules(): IModuleCollection;
     getModuleFriendlyName(adaptableModule: AdaptableModule): string;

package/src/Api/Internal/AdaptableInternalApi.js

@@ -51,11 +51,13 @@ class AdaptableInternalApi extends ApiBase_1.ApiBase {
     isGridInPivotMode() {
         return this.getAdaptableState().Grid.IsGridInPivotMode;
     }
-    setTreeModeOn() {
-        this.dispatchAction(GridRedux.SetTreeModeOn());
-    }
-    setTreeModeOff() {
-        this.dispatchAction(GridRedux.SetTreeModeOff());
+    setTreeMode(mode) {
+        if (!!mode) {
+            this.dispatchAction(GridRedux.SetTreeModeOn());
+        }
+        else {
+            this.dispatchAction(GridRedux.SetTreeModeOff());
+        }
     }
     isGridInTreeMode() {
         return this.getAdaptableState().Grid.IsGridInTreeMode;
@@ -223,13 +225,13 @@ class AdaptableInternalApi extends ApiBase_1.ApiBase {
             frameworkComponent,
             componentType,
         });
-        if (this.adaptable.isInitialised) {
+        if (this.adaptable.isReady) {
             createComponentFn();
         }
         else {
             // adaptable may not be initialized yet if the framework component is part of the initial render
             // AFL 2021.10.14 - not really sure if this is necessary anymore?! (see the other changes in this commit)
-            (0, waitForCondition_1.waitForCondition)(() => this.adaptable.isInitialised).then(() => {
+            (0, waitForCondition_1.waitForCondition)(() => this.adaptable.isReady).then(() => {
                 createComponentFn();
             });
         }
@@ -452,7 +454,7 @@ class AdaptableInternalApi extends ApiBase_1.ApiBase {
         var _a;
         let actionColumn;
         if (colDef.colId == GeneralConstants_1.ADAPTABLE_ROW_ACTION_BUTTONS) {
-            const actionButtons = this.adaptable.getActionRowButtonDefs();
+            const actionButtons = this.getActionRowApi().internalApi.getActionRowButtonDefs();
             actionColumn = {
                 columnId: GeneralConstants_1.ADAPTABLE_ROW_ACTION_BUTTONS,
                 actionColumnButton: actionButtons,

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

@@ -1,6 +1,7 @@
 import { ApiBase } from '../Implementation/ApiBase';
 import { CalculatedColumn } from '../../PredefinedConfig/CalculatedColumnState';
 import { AdaptableColumn } from '../../types';
+import { ColDef } from '@ag-grid-community/core';
 export declare class CalculatedColumnInternalApi extends ApiBase {
     /**
      * Returns all the references in the AdaptableState of the given CalculatedColumn
@@ -27,4 +28,5 @@ export declare class CalculatedColumnInternalApi extends ApiBase {
     isQuantileAggregatedExpression(input: string): boolean;
     getExpressionFromCalculatedColumn(calculatedColumn: CalculatedColumn): string;
     fireCalculatedColumnChangedEvent(trigger: string, calculatedColumn: CalculatedColumn): void;
+    getColDefsForCalculatedColumns(): ColDef[];
 }

package/src/Api/Internal/CalculatedColumnInternalApi.js

@@ -1,7 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CalculatedColumnInternalApi = void 0;
+const tslib_1 = require("tslib");
 const ApiBase_1 = require("../Implementation/ApiBase");
+const ObjectFactory_1 = require("../../Utilities/ObjectFactory");
+const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
+const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/ArrayExtensions"));
+const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
 class CalculatedColumnInternalApi extends ApiBase_1.ApiBase {
     /**
      * Returns all the references in the AdaptableState of the given CalculatedColumn
@@ -90,5 +95,71 @@ class CalculatedColumnInternalApi extends ApiBase_1.ApiBase {
         };
         this.adaptable.api.eventApi.emit('CalculatedColumnChanged', calculatedColumnChangedInfo);
     }
+    getColDefsForCalculatedColumns() {
+        const defaultCalculatedColumnSettings = (0, ObjectFactory_1.CreateEmptyCalculatedColumn)().CalculatedColumnSettings;
+        return this.getCalculatedColumnApi()
+            .getCalculatedColumns()
+            .map((calculatedColumn) => {
+            const calculatedColumnSettings = Object.assign(Object.assign({}, defaultCalculatedColumnSettings), calculatedColumn.CalculatedColumnSettings);
+            if (!calculatedColumnSettings.DataType) {
+                calculatedColumnSettings.DataType = this.getAdaptableApi()
+                    .internalApi.getAdaptableInstance()
+                    .CalculatedColumnExpressionService.getCalculatedColumnDataType(calculatedColumn.Query);
+            }
+            const columnTypes = [
+                GeneralConstants_1.AB_SPECIAL_COLUMN,
+                this.getGridApi().internalApi.getAgGridDataType(calculatedColumnSettings.DataType),
+            ];
+            if (ArrayExtensions_1.default.IsNotNullOrEmpty(calculatedColumnSettings.ColumnTypes)) {
+                columnTypes.push(...calculatedColumnSettings.ColumnTypes);
+            }
+            const isExternalEvaluation = !this.getExpressionApi().internalApi.evaluateExpressionInAdaptableQL('CalculatedColumn', calculatedColumn, this.getExpressionApi().getAdaptableQueryExpression(calculatedColumn.Query));
+            const valueGetter = (params) => {
+                var _a, _b;
+                if (isExternalEvaluation) {
+                    return (_a = params.data) === null || _a === void 0 ? void 0 : _a[calculatedColumn.ColumnId];
+                }
+                // if the grid data is NOT client side, we can aggregate only simple scalar expression (which depend on row data, not on other rows)
+                if (this.getGridApi().getAgGridRowModelType() !== 'clientSide' &&
+                    StringExtensions_1.default.IsNotNullOrEmpty(calculatedColumn.Query.AggregatedScalarExpression)) {
+                    return (_b = params.data) === null || _b === void 0 ? void 0 : _b[calculatedColumn.ColumnId];
+                }
+                return this.getAdaptableApi()
+                    .internalApi.getAdaptableInstance()
+                    .CalculatedColumnExpressionService.evaluateCalculatedColumnQuery(calculatedColumn, params.node);
+            };
+            const newColDef = {
+                headerName: calculatedColumn.FriendlyName
+                    ? calculatedColumn.FriendlyName
+                    : calculatedColumn.ColumnId,
+                colId: calculatedColumn.ColumnId,
+                hide: true,
+                editable: false,
+                width: calculatedColumnSettings.Width,
+                enableValue: calculatedColumnSettings.Aggregatable,
+                filter: calculatedColumnSettings.Filterable,
+                floatingFilter: calculatedColumnSettings.Filterable,
+                resizable: calculatedColumnSettings.Resizable,
+                enableRowGroup: calculatedColumnSettings.Groupable,
+                sortable: calculatedColumnSettings.Sortable,
+                enablePivot: calculatedColumnSettings.Pivotable,
+                suppressMenu: calculatedColumnSettings.SuppressMenu,
+                suppressMovable: calculatedColumnSettings.SuppressMovable,
+                type: columnTypes,
+                valueGetter,
+            };
+            if (calculatedColumnSettings.ShowToolTip != null &&
+                calculatedColumnSettings.ShowToolTip == true) {
+                newColDef.tooltipValueGetter = () => {
+                    return this.getAdaptableApi().internalApi.getAdaptableQueryExpressionText(calculatedColumn.Query);
+                };
+            }
+            if (calculatedColumnSettings.HeaderToolTip) {
+                newColDef.headerTooltip = calculatedColumnSettings.HeaderToolTip;
+            }
+            this.getAdaptableApi().logInfo('Setting up Calculated Column: ' + calculatedColumn.ColumnId);
+            return newColDef;
+        });
+    }
 }
 exports.CalculatedColumnInternalApi = CalculatedColumnInternalApi;

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

@@ -56,4 +56,5 @@ export declare class ColumnFilterInternalApi extends ApiBase {
      */
     areColumnFiltersDifferent(oldFilters: ColumnFilter[], newFilters: ColumnFilter[]): boolean;
     getPredicateDefShortcuts(predicateDef: AdaptablePredicateDef): string[];
+    getFilterValuesMaxNumberOfItems(column: AdaptableColumn): number | undefined;
 }

package/src/Api/Internal/ColumnFilterInternalApi.js

@@ -175,7 +175,7 @@ class ColumnFilterInternalApi extends ApiBase_1.ApiBase {
      * Fires Column Filter Applied Event - typically used to enable filtering on the server
      */
     fireColumnFilterAppliedEvent() {
-        if (this.adaptable.isLive) {
+        if (this.adaptable.isReady) {
             const adaptableApi = this.getAdaptableApi();
             const columnFilterAppliedInfo = {
                 columnFilters: this.getColumnFilterApi().getColumnFilters(),
@@ -206,5 +206,15 @@ class ColumnFilterInternalApi extends ApiBase_1.ApiBase {
         }
         return predicateShortcuts;
     }
+    getFilterValuesMaxNumberOfItems(column) {
+        const maxFilterValues = this.getColumnFilterOptions().valuesFilterOptions.maxFilterValuesToDisplay;
+        if (typeof maxFilterValues === 'function') {
+            const columnFilterContext = Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { column: column });
+            return maxFilterValues(columnFilterContext);
+        }
+        else {
+            return maxFilterValues;
+        }
+    }
 }
 exports.ColumnFilterInternalApi = ColumnFilterInternalApi;

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

@@ -1,5 +1,7 @@
 import { ApiBase } from '../Implementation/ApiBase';
-import { Column } from '@ag-grid-community/core';
+import { Column, IRowNode } from '@ag-grid-community/core';
+import { CustomSort } from '../../PredefinedConfig/CustomSortState';
+import { ColumnValuesComparer } from '../../AdaptableOptions/CustomSortOptions';
 export declare class ColumnInternalApi extends ApiBase {
     /**
      * Retrieves 'ColumnType' property for a given Column
@@ -24,4 +26,5 @@ export declare class ColumnInternalApi extends ApiBase {
      */
     getAgGridColumnForAdaptableColumn(columnId: string): Column;
     isActionRowButtonColumn(columnId: string): boolean;
+    getActiveColumnComparator(columnId: string, customSort?: CustomSort, customSortComparer?: ColumnValuesComparer): (valueA: any, valueB: any, nodeA?: IRowNode, nodeB?: IRowNode, isInverted?: boolean) => number | undefined;
 }

package/src/Api/Internal/ColumnInternalApi.js

@@ -42,5 +42,17 @@ class ColumnInternalApi extends ApiBase_1.ApiBase {
     isActionRowButtonColumn(columnId) {
         return columnId === GeneralConstants_1.ADAPTABLE_ROW_ACTION_BUTTONS;
     }
+    getActiveColumnComparator(columnId, customSort, customSortComparer) {
+        if ((!customSort || (customSort === null || customSort === void 0 ? void 0 : customSort.IsSuspended)) && !customSortComparer) {
+            // defaults to AG-Grid column definition comparator if no CustomSort is defined&active
+            const colDefComparator = this.adaptable.agGridColumnAdapter.getUserColDefProperty(columnId, 'comparator');
+            return colDefComparator;
+        }
+        // CustomSort Comparer function takes precedence over CustomSort SortedValues
+        const comparerFunction = customSortComparer
+            ? customSortComparer.comparer
+            : this.getCustomSortApi().internalApi.getDefaultCustomSortComparer(customSort.ColumnId, customSort.SortedValues);
+        return comparerFunction;
+    }
 }
 exports.ColumnInternalApi = ColumnInternalApi;

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

@@ -1,6 +1,7 @@
 import { ApiBase } from '../Implementation/ApiBase';
-import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
 import { ColumnValuesComparer } from '../../AdaptableOptions/CustomSortOptions';
+import { AdaptableComparerFunction } from '../../PredefinedConfig/Common/AdaptableComparerFunction';
 export declare class CustomSortInternalApi extends ApiBase {
-    getCustomSortComparer(column: AdaptableColumn): ColumnValuesComparer | undefined;
+    getCustomSortComparer(columnId: string): ColumnValuesComparer | undefined;
+    getDefaultCustomSortComparer(columnId: string, columnValues: any[]): AdaptableComparerFunction;
 }

package/src/Api/Internal/CustomSortInternalApi.js

@@ -3,9 +3,40 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CustomSortInternalApi = void 0;
 const ApiBase_1 = require("../Implementation/ApiBase");
 class CustomSortInternalApi extends ApiBase_1.ApiBase {
-    getCustomSortComparer(column) {
+    getCustomSortComparer(columnId) {
         var _a;
+        const column = this.getColumnApi().getColumnWithColumnId(columnId);
         return (_a = this.getCustomSortOptions().customSortComparers) === null || _a === void 0 ? void 0 : _a.find((csc) => this.adaptable.api.scopeApi.isColumnInScope(column, csc.scope));
     }
+    getDefaultCustomSortComparer(columnId, columnValues) {
+        // have to return a function that may not have access to this
+        const adaptable = this.adaptable;
+        return function compareItemsOfCustomSort(valueA, valueB, nodeA, nodeB) {
+            var _a, _b;
+            let firstElementValueString = (_a = (nodeA && adaptable.getDisplayValueFromRowNode(nodeA, columnId))) !== null && _a !== void 0 ? _a : valueA;
+            let secondElementValueString = (_b = (nodeB && adaptable.getDisplayValueFromRowNode(nodeB, columnId))) !== null && _b !== void 0 ? _b : valueB;
+            let indexFirstElement = columnValues.indexOf(firstElementValueString);
+            let containsFirstElement = indexFirstElement >= 0;
+            let indexSecondElement = columnValues.indexOf(secondElementValueString);
+            let containsSecondElement = indexSecondElement >= 0;
+            //if none of the element are in the list we jsut return normal compare
+            if (!containsFirstElement && !containsSecondElement) {
+                if (valueA == valueB) {
+                    return 0;
+                }
+                return valueA < valueB ? -1 : 1;
+            }
+            //if first item not in the list make sure we put it after the second item
+            if (!containsFirstElement) {
+                return 1;
+            }
+            //if second item not in the list make sure we put it after the first item
+            if (!containsSecondElement) {
+                return -1;
+            }
+            //return the comparison from the list if the two items are in the list
+            return indexFirstElement - indexSecondElement;
+        };
+    }
 }
 exports.CustomSortInternalApi = CustomSortInternalApi;

package/src/Api/Internal/DataSetInternalApi.js

@@ -8,7 +8,7 @@ class DataSetInternalApi extends ApiBase_1.ApiBase {
      * @param dataSet Data Set which has been selected
      */
     fireDataSetSelectedEvent(dataSet) {
-        if (this.adaptable.isLive) {
+        if (this.adaptable.isReady) {
             const dataSetSelectedInfo = {
                 adaptableApi: this.adaptable.api,
                 dataSet,

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

@@ -1,6 +1,7 @@
 import { ApiBase } from '../Implementation/ApiBase';
 import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
 import { FreeTextColumn } from '../../PredefinedConfig/FreeTextColumnState';
+import { ColDef } from '@ag-grid-community/core';
 export declare class FreeTextColumnInternalApi extends ApiBase {
     /**
      * Checks if a User Edit was in a Free Text Column
@@ -12,4 +13,5 @@ export declare class FreeTextColumnInternalApi extends ApiBase {
      * @param freeTextColumn FreeTextColumn to be checked
      */
     getFreeTextColumnModuleReferences(freeTextColumn: FreeTextColumn): string[];
+    getColDefsForFreeTextColumns(): ColDef<any, any>[];
 }