@adaptabletools/adaptable 18.0.0-canary.4 → 18.0.0-canary.5

package/src/AdaptableInterfaces/IAdaptable.d.ts

@@ -1,4 +1,4 @@
-import { ChartModel, ChartRef, Column, GridOptions, IRowNode, Module, ModuleNames, RowModelType, StatusPanelDef } from '@ag-grid-community/core';
+import { ChartModel, ChartRef, Column, GridApi, GridOptions, IRowNode, Module, RowModelType, StatusPanelDef } from '@ag-grid-community/core';
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
 import { ColumnSort } from '../PredefinedConfig/Common/ColumnSort';
@@ -10,8 +10,7 @@ import { SelectedCellInfo } from '../PredefinedConfig/Selection/SelectedCellInfo
 import { AdaptableTheme } from '../PredefinedConfig/ThemeState';
 import { IAdaptableStore } from '../Redux/Store/Interface/IAdaptableStore';
 import { IModuleCollection } from '../Strategy/Interface/IModule';
-import { ActionColumnContext, AdaptableButton, AdaptableMenuItem, AdaptableOptions, AdaptablePlugin, ChartDefinition, CustomSort, SelectedRowInfo } from '../types';
-import { IPPStyle } from '../Utilities/Interface/IPPStyle';
+import { AdaptableMenuItem, AdaptableOptions, AdaptablePlugin, ChartDefinition, SelectedRowInfo } from '../types';
 import { ICalculatedColumnExpressionService } from '../Utilities/Services/Interface/ICalculatedColumnExpressionService';
 import { IDataService } from '../Utilities/Services/Interface/IDataService';
 import { CellPopupService } from '../Utilities/Services/CellPopupService';
@@ -25,11 +24,13 @@ import { IAlertService } from '../Utilities/Services/Interface/IAlertService';
 import { ITeamSharingService } from '../Utilities/Services/Interface/ITeamSharingService';
 import { AdaptableFrameworkComponent } from '../AdaptableOptions/AdaptableFrameworkComponent';
 import { IMetamodelService } from '../Utilities/Services/Interface/IMetamodelService';
-import { ColumnValuesComparer } from '../AdaptableOptions/CustomSortOptions';
-import { IRowEditService } from '../Utilities/Services/Interface/IRowEditService';
 import { RenderReactRootFn } from '../renderReactRoot';
 import { AdaptableLogger } from '../agGrid/AdaptableLogger';
 import { Fdc3Service } from '../Utilities/Services/Fdc3Service';
+import { AgGridAdapter } from '../agGrid/AgGridAdapter';
+import { AgGridColumnAdapter } from '../agGrid/AgGridColumnAdapter';
+import { AgGridMenuAdapter } from '../agGrid/AgGridMenuAdapter';
+import { RowEditService } from '../Utilities/Services/RowEditService';
 /**
  * Contains AG Grid Options and Modules - used when instantiating AdapTable vanilla
  */
@@ -59,37 +60,18 @@ export type AdaptableVariant = 'vanilla' | 'react' | 'angular';
 export interface IAdaptable {
     logger: AdaptableLogger;
     variant: AdaptableVariant;
-    renderReactRoot: RenderReactRootFn;
+    isReady: boolean;
+    isDestroyed: boolean;
     api: AdaptableApi;
     adaptableOptions: AdaptableOptions;
-    _rawAdaptableOptions: AdaptableOptions;
     adaptableStore: IAdaptableStore;
     adaptableModules: IModuleCollection;
-    gridOptions: GridOptions;
-    /**
-     * If using AG Grid community (which has no menu)
-     */
+    agGridAdapter: AgGridAdapter;
+    agGridMenuAdapter: AgGridMenuAdapter;
+    agGridColumnAdapter: AgGridColumnAdapter;
     embedColumnMenu: boolean;
-    /**
-     * Set when Adaptable is fully initialised
-     *
-     * Avoid unnecessary store calls and rendering
-     */
-    isInitialised: boolean;
-    /**
-     * Set to true when adaptable is destroyed.
-     */
-    isDestroyed: boolean;
-    /**
-     * TRUE iff:
-     *  1. isInitialised = TRUE
-     *  2. isDestroyed = FALSE
-     */
-    isLive: boolean;
-    /**
-     * TRUE if the Adaptable custom tool panel (side-bar) is displayed
-     */
     hasAdaptableToolPanel: boolean;
+    renderReactRoot: RenderReactRootFn;
     /**
      * Adaptable contains a number of 'Services' which are created at Startup
      *
@@ -105,7 +87,7 @@ export interface IAdaptable {
     AlertService: IAlertService;
     TeamSharingService: ITeamSharingService;
     MetamodelService: IMetamodelService;
-    RowEditService: IRowEditService;
+    RowEditService: RowEditService;
     Fdc3Service: Fdc3Service;
     CellPopupService: CellPopupService;
     /**
@@ -149,20 +131,34 @@ export interface IAdaptable {
         componentType: string;
     }): Promise<any>;
     _emitSync(eventName: 'CreateAdaptableContextMenuItems', data?: any): Promise<any>;
-    prepareGrid(): void;
+    /**
+     *
+     */
+    getAgGridContainerElement(): HTMLElement | null;
     redrawBody(): void;
-    redrawRenderedRows(): void;
-    redrawHeader(): void;
+    refreshHeader(): void;
     redrawRow(rowNode: IRowNode): void;
-    redrawRows(rowNodes: IRowNode[]): void;
+    redrawRows(rowNodes?: IRowNode[]): void;
     refreshCells(rowNodes: IRowNode[], columns: (string | any)[], forceUpdate: boolean, suppressFlash?: boolean): void;
     refreshColumns(columns: (string | Column)[], forceUpdate: boolean, suppressFlash?: boolean): void;
-    setSelectedCells(): SelectedCellInfo | undefined;
-    setSelectedRows(): SelectedRowInfo | undefined;
+    refreshSelectedCellsState(): SelectedCellInfo | undefined;
+    refreshSelectedRowsState(): SelectedRowInfo | undefined;
+    selectColumn(columnId: string, config?: {
+        keepExistingSelection?: boolean;
+    }): void;
+    selectColumns(columnIds: string[], config?: {
+        keepExistingSelection?: boolean;
+    }): void;
+    selectAll(): void;
+    deselectAll(): void;
+    selectNodes(rowNodes: IRowNode[], clearSelection: boolean): void;
+    deSelectNodes(rowNodes: IRowNode[], clearSelection: boolean): void;
+    selectNode(rowNode: IRowNode, clearSelection: boolean): void;
+    deSelectNode(rowNode: IRowNode, clearSelection: boolean): void;
+    selectCells(columnIds: string[], startNode: IRowNode, endNode: IRowNode, clearSelection?: boolean): void;
     jumpToRow(rowNode: IRowNode): void;
     jumpToColumn(columnId: string): void;
     jumpToCell(columnId: string, rowNode: IRowNode): void;
-    getAgGridContainerElement(): HTMLElement | null;
     setGridData(dataSource: any): void;
     getGridData(): any[];
     getFilteredData(): any[];
@@ -173,50 +169,22 @@ export interface IAdaptable {
         updated: IRowNode[];
     }>;
     deleteRows(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): Promise<IRowNode[]>;
-    selectColumn(columnId: string, config?: {
-        keepExistingSelection?: boolean;
-    }): void;
-    selectColumns(columnIds: string[], config?: {
-        keepExistingSelection?: boolean;
-    }): void;
-    selectAll(): void;
-    deselectAll(): void;
-    hideColumn(columnId: string): void;
-    showColumn(columnId: string): void;
-    autoSizeColumn(columnId: string): void;
-    autoSizeColumns(columnIds: string[]): void;
-    autoSizeAllColumns(): void;
-    updateColumnsIntoStore(): void;
-    setColumnOrder(visibleColumnList: string[]): void;
-    getPrimaryKeyValueFromRowNode(rowNode: IRowNode): any;
-    getColumnValueDisplayValuePairList(columnId: string, visibleRowsOnly: boolean, onlyIncludeIds?: {
-        [key: string]: boolean;
-    }): any[];
+    getPrimaryKeyValueFromRowNode(rowNode: IRowNode, gridApi?: GridApi): any;
     getDistinctValuesForColumn(column: AdaptableColumn, distinctValuesParams: DistinctValuesParams): GridCell[];
-    getDistinctFilterListValuesForColumn(column: AdaptableColumn, filter: string, distinctValuesParams: DistinctValuesParams): Promise<{
-        gridCells: GridCell[];
-        suppressClientSideFilter?: boolean;
-    }>;
-    getDistinctCustomSortValuesForColumn(column: AdaptableColumn, distinctValuesParams: DistinctValuesParams): Promise<GridCell[]>;
-    getDistinctBulkUpdateValuesForColumn(column: AdaptableColumn, selectedGridCells: GridCell[], distinctValuesParams: DistinctValuesParams): Promise<GridCell[]>;
-    getDisplayValue(id: any, columnId: string): string | undefined;
     getGridCellFromRowNode(rowNode: IRowNode, columnId: string): GridCell | undefined;
     getRawValueFromRowNode(rowNode: IRowNode, columnId: string): any;
     getDisplayValueFromRowNode(rowNode: IRowNode, columnId: string): string | undefined;
     getDisplayValueFromRawValue(rowNode: IRowNode, columnId: string, rawValue: any): string | undefined;
     getNormalisedValueFromRawValue(rawValue: any, column: AdaptableColumn): string | number | boolean | Date | unknown;
     getGridCellsForColumn(columnId: string): GridCell[] | undefined;
-    getDataRowFromRowNode(rowNode: IRowNode): any;
     getRowNodesForPrimaryKeys(primaryKeyValues: any[]): IRowNode[];
     getRowNodeForPrimaryKey(primaryKeyValue: any): IRowNode;
     getRowNodeByIndex(index: number): IRowNode;
     getAgGridStatusPanels(): StatusPanelDef[];
     forPlugins(callback: (plugin: AdaptablePlugin) => any): void;
-    lookupPlugins(propertyName: string, ...args: any): any;
     getPluginProperty(pluginId: string, propertyName: string, ...args: any): any;
     getPlugin(pluginId: string): AdaptablePlugin;
     setDataValue(value: any, column: AdaptableColumn, primaryKeyValue: any, rowNode?: IRowNode): void;
-    cancelEdit(): any;
     isCellEditable(rowNode: IRowNode, column: Column): boolean;
     getFirstRowNode(): IRowNode | undefined;
     getFirstDisplayedRowNode(): IRowNode | undefined;
@@ -228,10 +196,6 @@ export interface IAdaptable {
         includeGroupRows?: boolean;
         filterFn?: (rowNode: IRowNode) => boolean;
     }): void;
-    getVisibleRowNodes(config?: {
-        includeGroupRows?: boolean;
-        filterFn?: (rowNode: IRowNode) => boolean;
-    }): IRowNode[];
     getAllRowNodes(config?: {
         includeGroupRows?: boolean;
         filterFn?: (rowNode: IRowNode) => boolean;
@@ -242,26 +206,25 @@ export interface IAdaptable {
     updateRowGroupsExpandedState(layout?: Layout): void;
     getRowsInViewport(): IRowNode[];
     isGroupRowNode(rowNode: IRowNode): boolean;
-    isVisibleNode(rowNode: IRowNode): boolean;
-    selectNodes(rowNodes: IRowNode[], clearSelection: boolean): void;
-    deSelectNodes(rowNodes: IRowNode[], clearSelection: boolean): void;
-    selectNode(rowNode: IRowNode, clearSelection: boolean): void;
-    deSelectNode(rowNode: IRowNode, clearSelection: boolean): void;
-    selectCells(columnIds: string[], startNode: IRowNode, endNode: IRowNode, clearSelection?: boolean): void;
-    getFirstGroupedColumn(): AdaptableColumn | undefined;
     isRowNodeVisible(rowNode: IRowNode): boolean;
     getAgGridColumnType(columnId: string): string | string[];
-    getActiveColumnComparator(columnId: string, customSort?: CustomSort, customSortComparer?: ColumnValuesComparer): (valueA: any, valueB: any, nodeA?: IRowNode, nodeB?: IRowNode, isInverted?: boolean) => number | undefined;
+    hideColumn(columnId: string): void;
+    showColumn(columnId: string): void;
+    autoSizeColumn(columnId: string): void;
+    autoSizeColumns(columnIds: string[]): void;
+    autoSizeAllColumns(): void;
+    setColumnOrder(visibleColumnList: string[]): void;
     setColumnSort(columnSorts: ColumnSort[]): void;
     clearColumnSort(): void;
     hideColumnFilterForm(): void;
-    applyColumnFiltering(): void;
     clearColumnFiltering(): void;
     clearColumnFilteringForColumns(columnIds: string[]): void;
+    applyColumnFiltering(): void;
     applyGridFiltering(): void;
-    canExportToExcel(): boolean;
-    exportToExcel(reportData: ReportData, fileName: string): void;
-    exportVisualDataToExcel(): void;
+    showQuickFilter(): void;
+    hideQuickFilter(): void;
+    isQuickFilterAvailable(): boolean;
+    setAgGridQuickSearch(query: string): void;
     canGenerateCharts(): boolean;
     canDisplaySparklines(): boolean;
     showCharts(charts: ChartDefinition[]): ChartRef[];
@@ -270,32 +233,13 @@ export interface IAdaptable {
     updateChart(chart: ChartDefinition): void;
     getChartModels(): ChartModel[];
     getAgGridRowModelType(): RowModelType;
-    getCurrentIPPStyle(): IPPStyle;
-    getDefaultIPPStyle(): IPPStyle;
     getRowCount(): number;
     getColumnCount(): number;
-    getVisibleRowCount(): number;
     getVisibleColumnCount(): number;
-    setLayout(layout: Layout): void;
     isGridSelectable(): boolean;
-    isGridRangeSelectable(): boolean;
-    isGridGroupable(): boolean;
-    isGridPivotable(): boolean;
     isGridGroupingActive(): boolean;
-    showQuickFilter(): void;
-    hideQuickFilter(): void;
-    isQuickFilterAvailable(): boolean;
-    setAgGridQuickSearch(query: string): void;
-    getAgGridLightThemeName(): string;
     getAgGridCurrentThemeName(): string;
     applyAdaptableTheme(theme: AdaptableTheme | string): void;
-    /**
-     * called when you want to destroy the instance & cleanup resources
-     */
-    destroy(config?: {
-        unmount: boolean;
-        destroyApi?: boolean;
-    }): void;
     setRowGroupColumns(columnIds: string[]): void;
     getAgGridAllGridColumns(): Column<any>[];
     clearRowGroupColumns(): void;
@@ -305,14 +249,16 @@ export interface IAdaptable {
     getExpandRowGroupsKeys(): any[];
     getAdaptableContainerElement(): HTMLElement | null;
     getAgGridContainerElement(): HTMLElement | null;
-    buildStandaloneColumnHeader(adaptableColumn: AdaptableColumn): AdaptableMenuItem[];
-    setupColumns(): void;
-    updateColDefsForSpecialColumns({ skipSetupColumns }?: {
-        skipSetupColumns?: boolean;
-    }): void;
+    updateColumnModelAndRefreshGrid(): void;
     getAgGridColumnForColumnId(columnId: string): Column;
-    isAgGridModulePresent(moduleName: ModuleNames): boolean;
     getMinMaxCachedValueForColumn(column: AdaptableColumn, minMax: 'min' | 'max'): number | undefined;
     getAgGridRegisteredModules(): Module[];
-    getActionRowButtonDefs: () => AdaptableButton<ActionColumnContext<any>>[];
+    destroy(config?: {
+        unmount: boolean;
+        destroyApi?: boolean;
+    }): void;
+    setLayout(layout?: Layout): void;
+    canExportToExcel(): boolean;
+    exportToExcel(reportData: ReportData, fileName: string): void;
+    exportVisualDataToExcel(): void;
 }

package/src/AdaptableOptions/AdaptableOptions.d.ts

@@ -65,6 +65,12 @@ export interface AdaptableOptions<TData = any> {
      * Commercial license key. If the license is not provided or is expired, various visual information notes will be displayed and some functionality may be limited.
      */
     licenseKey?: string;
+    /**
+     * Automatically migrate the state from the previous version of Adaptable to the current version.
+     *
+     * @defaultValue true
+     */
+    autoMigrateState?: boolean;
     /**
      * User State set at design-time and shipped with AdapTable for first use; can be `PredefinedConfig` object or url to file containing config
      *

package/src/AdaptableOptions/UserInterfaceOptions.d.ts

@@ -111,6 +111,23 @@ export interface UserInterfaceOptions<TData = any> {
      * @noCodeItem
      */
     showLoadingScreen?: boolean;
+    /**
+     * Delay in milliseconds before Loading Screen appears. `showLoadingScreen` must be true for this to take effect
+     *
+     * @defaultValue 200
+     */
+    loadingScreenDelay?: number;
+    /**
+     * Title to display in Loading Screen.
+     * @defaultValue 'Initialising Grid'
+     */
+    loadingScreenTitle?: string;
+    /**
+     * Text to display in Loading Screen.
+     *
+     * @defaultValue 'Retrieving your settings and setting up the grid...'
+     */
+    loadingScreenText?: string;
 }
 /**
  * Base class for all Permitted Values related objects

package/src/Api/AdaptableApi.d.ts

@@ -1,3 +1,4 @@
+import { GridApi as AgGridApi } from '@ag-grid-community/core';
 import { AlertApi } from './AlertApi';
 import { PluginsApi } from './PluginsApi';
 import { BulkUpdateApi } from './BulkUpdateApi';
@@ -53,6 +54,10 @@ import { CommentApi } from './CommentApi';
  * Has a huge number of classes each dedicated to a specific AdapTable Module or functionality
  */
 export interface AdaptableApi {
+    /**
+     * AG Grid API; try to use the API methods provided by Adaptable instead of using this directly
+     */
+    agGridApi: AgGridApi;
     /**
      * Provides access to Action Columns
      */

package/src/Api/ColumnFilterApi.d.ts

@@ -122,9 +122,4 @@ export interface ColumnFilterApi {
      * @param columnFilterConfig - Column Filter to set
      */
     setColumnFilterForColumn(columnId: string, columnFilterConfig: ColumnFilterConfig): void;
-    /**
-     * Gets the maximum Filter Values to show for a Column
-     * @param column Column to Filter
-     */
-    getMaxFilterValue(column: AdaptableColumn): number | undefined;
 }

package/src/Api/Events/AdaptableReady.d.ts

@@ -1,11 +1,11 @@
-import { GridOptions } from '@ag-grid-community/core';
+import { GridApi } from '@ag-grid-community/core';
 import { BaseEventInfo } from './BaseEventInfo';
 /**
  * Object returned by `AdaptableReady` event - fired when AdapTable has loaded
  */
 export interface AdaptableReadyInfo<TData = any> extends BaseEventInfo {
     /**
-     * Underlying AG Grid GridOptions object
+     * Underlying AG Grid API
      */
-    gridOptions: GridOptions<TData>;
+    agGridApi: GridApi<TData>;
 }

package/src/Api/Events/GridDataChanged.d.ts

@@ -1,9 +1,9 @@
 import { IRowNode } from '@ag-grid-community/core';
 import { BaseEventInfo } from './BaseEventInfo';
+export type GridDataChangeTrigger = 'Add' | 'Edit' | 'Delete' | 'Load';
 /**
  * EventInfo returned by GridDataChanged event
- */
-export interface GridDataChangedInfo<TData = any> extends BaseEventInfo {
+ */ export interface GridDataChangedInfo<TData = any> extends BaseEventInfo {
     /**
      * Timestamp of change occurrence (in milliseconds)
      */
@@ -13,9 +13,9 @@ export interface GridDataChangedInfo<TData = any> extends BaseEventInfo {
      */
     dataRows: TData[];
     /**
-     * Trigger for row change: 'Add', 'Edit' or 'Delete'
+     * Trigger for row change: 'Add', 'Edit', 'Delete', 'Load'
      */
-    rowTrigger: 'Add' | 'Edit' | 'Delete';
+    rowTrigger: GridDataChangeTrigger;
     /**
      * Row Nodes that were affected by this change
      */

package/src/Api/GridApi.d.ts

@@ -7,7 +7,7 @@ import { DataUpdateConfig } from '../PredefinedConfig/Common/DataUpdateConfig';
 import { CellDataChangedInfo } from '../PredefinedConfig/Common/CellDataChangedInfo';
 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 { RowsHighlightInfo } from '../PredefinedConfig/Common/RowsHighlightInfo';
 /**
@@ -27,15 +27,18 @@ export interface GridApi {
      */
     getFilteredData(): any[];
     /**
-     * Repopulates Grid with given data; fires `GridDataChanged` Event
-     * @param data any data suitable as AG Grid data source
+     * @deprecated use `loadGridData()` instead
      */
     resetGridData(data: any[]): void;
     /**
-     * Sets grid with given data for FIRST use; doesn't fire 'GridDataChanged' Event
-     * @param dataany data suitable as AG Grid data source
+     * @deprecated use `loadGridData()` instead
      */
     setInitialGridData(data: any): void;
+    /**
+     * Loads data into grid and fire a `GridDataChanged.trigger='Load'` event
+     * @param data data to load
+     */
+    loadGridData(data: any): void;
     /**
      * Updates AdapTable (and AG Grid) with rows that have changed
      * @param dataRows rows which have been updated - send whole row and AdapTable take cares of the rest
@@ -86,10 +89,6 @@ export interface GridApi {
      * Returns all current Selected Rows in AdapTable
      */
     getSelectedRowInfo(): SelectedRowInfo;
-    /**
-     * Returns Ag Grid instance (passed into Adaptable Options at start-up)
-     */
-    getAgGridInstance(): GridOptions;
     /**
      * Returns Column Sort information in AdapTable
      */
@@ -469,10 +468,6 @@ export interface GridApi {
      * Returns number of rows in Data Source
      */
     getRowCount(): number;
-    /**
-     * Returns number of visible rows in Data Source
-     */
-    getVisibleRowCount(): number;
     /**
      * Returns number of columns in Data Source
      */
@@ -515,4 +510,10 @@ export interface GridApi {
      * Returns AG Grid Row Model Type
      */
     getAgGridRowModelType(): RowModelType;
+    /**
+     * Returns number of visible rows in Data Source
+     *
+     * @deprecated use `getRowCount()` instead
+     */
+    getVisibleRowCount(): number;
 }

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

@@ -1,7 +1,9 @@
 import { ActionColumn, ActionColumnApi } from '../../../types';
 import { ApiBase } from './ApiBase';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
+import { ColDef } from '@ag-grid-community/core';
 export declare class ActionColumnApiImpl extends ApiBase implements ActionColumnApi {
     constructor(adaptable: IAdaptable);
     getActionColumns(): ActionColumn[];
+    getColDefsForActionColumns(): ColDef[];
 }

package/src/Api/Implementation/ActionColumnApiImpl.js

@@ -1,4 +1,6 @@
 import { ApiBase } from './ApiBase';
+import { ActionColumnRenderer, ReactActionColumnRenderer } from '../../agGrid/ActionColumnRenderer';
+import { AB_SPECIAL_COLUMN } from '../../Utilities/Constants/GeneralConstants';
 export class ActionColumnApiImpl extends ApiBase {
     constructor(adaptable) {
         super(adaptable);
@@ -7,4 +9,35 @@ export class ActionColumnApiImpl extends ApiBase {
         var _a;
         return (_a = this.getActionColumnOptions().actionColumns) !== null && _a !== void 0 ? _a : [];
     }
+    getColDefsForActionColumns() {
+        const defaultActionColumnSettings = {
+            resizable: true,
+            suppressMenu: false,
+            suppressMovable: false,
+        };
+        return this.getActionColumnApi()
+            .getActionColumns()
+            .map((actionColumn) => {
+            const actionColumnSettings = Object.assign(Object.assign({}, defaultActionColumnSettings), actionColumn.actionColumnSettings);
+            const newColDef = {
+                headerName: actionColumn.friendlyName ? actionColumn.friendlyName : actionColumn.columnId,
+                colId: actionColumn.columnId,
+                hide: false,
+                editable: false,
+                width: actionColumnSettings.width,
+                resizable: actionColumnSettings.resizable,
+                suppressMenu: actionColumnSettings.suppressMenu,
+                suppressMovable: actionColumnSettings.suppressMovable,
+                filter: false,
+                sortable: false,
+                enableRowGroup: false,
+                cellRenderer: this.getAdaptableApi().internalApi.getAdaptableInstance().variant === 'react'
+                    ? ReactActionColumnRenderer
+                    : ActionColumnRenderer,
+                type: [AB_SPECIAL_COLUMN, 'abColDefObject'],
+            };
+            this.getAdaptableApi().logInfo('Setting up Action Column: ' + actionColumn.columnId);
+            return newColDef;
+        });
+    }
 }

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

@@ -98,6 +98,7 @@ export declare class AdaptableApiImpl implements AdaptableApi {
     commentApi: CommentApi;
     private destroyed;
     constructor(adaptable: IAdaptable);
+    get agGridApi(): import("@ag-grid-community/core/dist/esm/es6/gridApi").GridApi<any>;
     /**
      * This is only meant to be called by the Adaptable instance.
      */

package/src/Api/Implementation/AdaptableApiImpl.js

@@ -103,6 +103,9 @@ export class AdaptableApiImpl {
         // adaptable internal api
         this.internalApi = new AdaptableInternalApi(adaptable);
     }
+    get agGridApi() {
+        return this.adaptable.agGridAdapter.getAgGridApi();
+    }
     /**
      * This is only meant to be called by the Adaptable instance.
      */

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

@@ -1,5 +1,5 @@
 import { Action } from 'redux';
-import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
+import { AdaptableVariant, IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { AdaptableState } from '../../PredefinedConfig/AdaptableState';
 import { AdaptableModule } from '../../PredefinedConfig/Common/Types';
 import { AdaptableObject } from '../../PredefinedConfig/Common/AdaptableObject';
@@ -20,6 +20,7 @@ export declare abstract class ApiBase {
     protected logSuccess(message: string, ...optionalParams: any[]): void;
     protected logWarn(message: string, ...optionalParams: any[]): void;
     protected logError(message: string, ...optionalParams: any[]): void;
+    protected getAdaptableVariant(): AdaptableVariant;
     /**
      * Base api helper method which ensure that Adaptable Object being used in the function is not null or undefined
      *

package/src/Api/Implementation/ApiBase.js

@@ -21,6 +21,9 @@ export class ApiBase {
     logError(message, ...optionalParams) {
         this.adaptable.logger.error(message, ...optionalParams);
     }
+    getAdaptableVariant() {
+        return this.adaptable.variant;
+    }
     /**
      * Base api helper method which ensure that Adaptable Object being used in the function is not null or undefined
      *

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

@@ -41,5 +41,4 @@ export declare class ColumnFilterApiImpl extends ApiBase implements ColumnFilter
     unSuspendAllColumnFilters(): void;
     getColumnFilterForColumn(columnId: string): ColumnFilter | undefined;
     clearColumnFilterForColumn(columnId: string): void;
-    getMaxFilterValue(column: AdaptableColumn): number | undefined;
 }

package/src/Api/Implementation/ColumnFilterApiImpl.js

@@ -169,14 +169,4 @@ export class ColumnFilterApiImpl extends ApiBase {
             this.adaptable.clearColumnFilteringForColumns([columnId]);
         }
     }
-    getMaxFilterValue(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;
-        }
-    }
 }

package/src/Api/Implementation/CommentsApiImpl.js

@@ -10,7 +10,8 @@ export class CommentsApiImpl extends ApiBase {
         return CommentRedux.GetCellCommentSelector(this.getAdaptableState().Comment, address);
     }
     getCommentThreads() {
-        return this.getAdaptableState().Comment.CommentThreads;
+        var _a;
+        return (_a = this.getAdaptableState().Comment.CommentThreads) !== null && _a !== void 0 ? _a : [];
     }
     editComment(comment, address) {
         this.dispatchAction(CommentRedux.CommentsEdit({ comment, cellAddress: address }));

package/src/Api/Implementation/ConfigApiImpl.js

@@ -117,7 +117,6 @@ export class ConfigApiImpl extends ApiBase {
     setAdaptableStateKey(adaptableStateKey, config) {
         return new Promise((resolve, reject) => {
             this.adaptable.api.internalApi.executeWithProgressIndicator(`Initialising...`, () => {
-                this.adaptable.adaptableOptions.adaptableStateKey = adaptableStateKey;
                 const flushCurrentState = !config || config.flushCurrentState !== false;
                 // make sure we persist any "pending" changes to state - since stateOptions.debounceStateDelay can cause
                 // the state to be persisted with a delay, which we dont want in this case
@@ -125,14 +124,20 @@ export class ConfigApiImpl extends ApiBase {
                     ? this.adaptable.adaptableStore.saveStateNow(this.adaptable)
                     : Promise.resolve(true);
                 flushStatePromise.then(() => {
+                    this.adaptable.adaptableOptions.adaptableStateKey = adaptableStateKey;
                     let predefinedConfig = config === null || config === void 0 ? void 0 : config.predefinedConfig;
                     if (predefinedConfig) {
                         predefinedConfig = initPredefinedConfigWithUuids(predefinedConfig);
                     }
-                    const promise = this.adaptable.adaptableStore.loadStore(this.adaptable, adaptableStateKey, predefinedConfig);
+                    const promise = this.adaptable.adaptableStore.loadStore({
+                        adaptable: this.adaptable,
+                        adaptableStateKey,
+                        predefinedConfig,
+                    });
                     promise
                         .then(() => {
-                        this.adaptable.prepareGrid();
+                        this.adaptable.updateColumnModelAndRefreshGrid();
+                        this.adaptable.setLayout();
                         this.adaptable.api.userInterfaceApi.hideLoadingScreen();
                     })
                         .then(() => {

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;
 }