@adaptabletools/adaptable 11.2.4 → 12.0.0-canary.1

package/src/Api/FormatColumnApi.d.ts

@@ -104,6 +104,12 @@ export interface FormatColumnApi {
      * Opens Settings Panel with Format Column section selected and visible
      */
     showFormatColumnPopup(): void;
+    /**
+     * Gets an active Format Column, if any, for given Column
+     * @param column The Column for which to retrieve the Format Column
+     * @returns format column
+     */
+    getActiveFormatColumnForColumn(column: AdaptableColumn): FormatColumn | undefined;
     /**
      * Gets Format Column, if any, for given Column
      * @param column The Column for which to retrieve the Format Column

package/src/Api/GridApi.d.ts

@@ -333,7 +333,7 @@ export interface GridApi {
     /**
      * Fires Search Changed Event - typically used to enable server searching and filtering
      */
-    fireSearchChangedEvent(searchChangedTrigger: 'DataSource' | 'CurrentQuery' | 'Filter' | 'DataChange' | 'Sort', searchAtDate?: Date): void;
+    fireSearchChangedEvent(searchChangedTrigger: 'CurrentQuery' | 'Filter' | 'DataChange' | 'Sort', searchAtDate?: Date): void;
     /**
      * Fires Cell Changed Changed Event - when any data in AG Grid's dataset has changed
      */
@@ -464,4 +464,18 @@ export interface GridApi {
      * Opens Settings Panel with Grid Info section selected and visible
      */
     showGridInfoPopup(): void;
+    /**
+     * Open edit dialog for row with the given primary key value
+     * @param primaryKey - the primary key of the edited row
+     */
+    openEditRowForm(primaryKey: any): void;
+    /**
+     * Open create dialog for a new row
+     */
+    openCreateRowForm(): void;
+    /**
+     * Open create dialog for cloning an existing row
+     * @param clonedRowNodePrimaryKey - the primary key of the duplicated row
+     */
+    openCloneRowForm(clonedRowNodePrimaryKey?: any): void;
 }

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

@@ -9,7 +9,7 @@ import { ConfigApi } from '../ConfigApi';
 import { CustomSortApi } from '../CustomSortApi';
 import { DashboardApi } from '../DashboardApi';
 import { ToolPanelApi } from '../ToolPanelApi';
-import { DataSourceApi } from '../DataSourceApi';
+import { DataSetApi } from '../DataSetApi';
 import { EventApi } from '../EventApi';
 import { PluginsApi } from '../PluginsApi';
 import { ExportApi } from '../ExportApi';
@@ -52,7 +52,7 @@ export declare class AdaptableApiImpl implements AdaptableApi {
     configApi: ConfigApi;
     customSortApi: CustomSortApi;
     dashboardApi: DashboardApi;
-    dataSourceApi: DataSourceApi;
+    dataSetApi: DataSetApi;
     eventApi: EventApi;
     exportApi: ExportApi;
     formatColumnApi: FormatColumnApi;

package/src/Api/Implementation/AdaptableApiImpl.js

@@ -13,7 +13,7 @@ const ConfigApiImpl_1 = require("./ConfigApiImpl");
 const CustomSortApiImpl_1 = require("./CustomSortApiImpl");
 const DashboardApiImpl_1 = require("./DashboardApiImpl");
 const ToolPanelApiImpl_1 = require("./ToolPanelApiImpl");
-const DataSourceApiImpl_1 = require("./DataSourceApiImpl");
+const DataSetApiImpl_1 = require("./DataSetApiImpl");
 const EventApiImpl_1 = require("./EventApiImpl");
 const ExportApiImpl_1 = require("./ExportApiImpl");
 const FormatColumnApiImpl_1 = require("./FormatColumnApiImpl");
@@ -58,7 +58,7 @@ class AdaptableApiImpl {
         this.configApi = new ConfigApiImpl_1.ConfigApiImpl(adaptable);
         this.customSortApi = new CustomSortApiImpl_1.CustomSortApiImpl(adaptable);
         this.dashboardApi = new DashboardApiImpl_1.DashboardApiImpl(adaptable);
-        this.dataSourceApi = new DataSourceApiImpl_1.DataSourceApiImpl(adaptable);
+        this.dataSetApi = new DataSetApiImpl_1.DataSetApiImpl(adaptable);
         this.eventApi = new EventApiImpl_1.EventApiImpl(adaptable);
         this.exportApi = new ExportApiImpl_1.ExportApiImpl(adaptable);
         this.formatColumnApi = new FormatColumnApiImpl_1.FormatColumnApiImpl(adaptable);
@@ -106,7 +106,7 @@ class AdaptableApiImpl {
         this.customSortApi = null;
         this.dashboardApi = null;
         this.dataChangeHistoryApi = null;
-        this.dataSourceApi = null;
+        this.dataSetApi = null;
         this.eventApi = null;
         this.exportApi = null;
         this.filterApi = null;

package/src/Api/Implementation/AlertApiImpl.js

@@ -297,7 +297,11 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
         var _a;
         const alertMessageFunction = (_a = this.adaptable.adaptableOptions.alertOptions) === null || _a === void 0 ? void 0 : _a.alertMessageText;
         if (alertMessageFunction) {
-            const returnText = alertMessageFunction(alertDefinition, cellDataChangedInfo);
+            const alertMessageContext = {
+                alertDefinition: alertDefinition,
+                cellDataChangedInfo: cellDataChangedInfo,
+            };
+            const returnText = alertMessageFunction(alertMessageContext);
             if (returnText) {
                 return returnText;
             }

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

@@ -13,6 +13,7 @@ import { ToolPanelOptions } from '../../AdaptableOptions/ToolPanelOptions';
 import { ModuleParams } from '../../View/Components/SharedProps/ModuleViewPopupProps';
 import { AdaptableQLOptions, ExpressionOptions } from '../../AdaptableOptions/AdaptableQLOptions';
 import { AlertOptions } from '../../AdaptableOptions/AlertOptions';
+import { ColumnOptions } from '../../AdaptableOptions/ColumnOptions';
 export declare abstract class ApiBase {
     protected adaptable: IAdaptable;
     /**
@@ -45,6 +46,7 @@ export declare abstract class ApiBase {
     protected getModuleInfoByModuleId(module: AdaptableModule): ModuleInfo;
     protected showModulePopup(module: AdaptableModule, moduleParams?: ModuleParams): void;
     protected getOptions(): AdaptableOptions;
+    protected getColumnOptions(): ColumnOptions;
     protected getContainerOptions(): ContainerOptions;
     protected getNotificationsOptions(): NotificationsOptions;
     protected getAlertOptions(): AlertOptions;
@@ -63,4 +65,5 @@ export declare abstract class ApiBase {
     protected getToolPanelOptions(): ToolPanelOptions;
     protected getExpressionOptions(): ExpressionOptions;
     protected getAdaptableApi(): AdaptableApi;
+    destroy(): void;
 }

package/src/Api/Implementation/ApiBase.js

@@ -74,6 +74,9 @@ class ApiBase {
     getOptions() {
         return this.adaptable.adaptableOptions;
     }
+    getColumnOptions() {
+        return this.getOptions().columnOptions;
+    }
     getContainerOptions() {
         return this.getOptions().containerOptions;
     }
@@ -128,5 +131,8 @@ class ApiBase {
     getAdaptableApi() {
         return this.adaptable.api;
     }
+    destroy() {
+        delete this.adaptable;
+    }
 }
 exports.ApiBase = ApiBase;

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

@@ -1,6 +1,5 @@
 import { ApiBase } from './ApiBase';
-import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
-import { DataType } from '../../PredefinedConfig/Common/Enums';
+import { AdaptableColumn, AdaptableColumnDataType } from '../../PredefinedConfig/Common/AdaptableColumn';
 import { ColumnApi } from '../ColumnApi';
 import { GridCell } from '../../PredefinedConfig/Selection/GridCell';
 import { Column, RowNode } from '@ag-grid-community/all-modules';
@@ -27,7 +26,7 @@ export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
     isNumericColumn(column: AdaptableColumn): boolean;
     isBooleanColumn(column: AdaptableColumn): boolean;
     isDateColumn(column: AdaptableColumn): boolean;
-    getColumnDataTypeFromColumnId(columnId: string): 'String' | 'Number' | 'NumberArray' | 'Boolean' | 'Date' | 'Object' | 'Unknown' | undefined;
+    getColumnDataTypeFromColumnId(columnId: string): AdaptableColumnDataType | undefined;
     getFriendlyNameFromColumn(columnId: string, column: AdaptableColumn): string;
     getFriendlyNameFromColumnId(columnId: string): string;
     getFriendlyNamesFromColumnIds(columnIds: string[]): string[];
@@ -41,7 +40,7 @@ export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
     getAgGridColumnFieldForAdaptableColumn(colId: string): string;
     getAgGridColumnForAdaptableColumn(columnId: string): Column;
     getColumnFromFriendlyName(columnName: string, logWarning?: boolean): AdaptableColumn;
-    getColumnsOfType(dataType: DataType): AdaptableColumn[];
+    getColumnsOfType(dataType: AdaptableColumnDataType): AdaptableColumn[];
     getNumericColumns(): AdaptableColumn[];
     getStringColumns(): AdaptableColumn[];
     getDateColumns(): AdaptableColumn[];
@@ -68,4 +67,5 @@ export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
     usesAdaptableFilterForm(columnId: string): boolean;
     usesAdaptableQuickFilter(columnId: string): boolean;
     isColumnReferencedInExpression(columnId: string, expression: string): boolean;
+    isActionRowButtonColumn(columnId: string): boolean;
 }

package/src/Api/Implementation/ColumnApiImpl.js

@@ -89,13 +89,13 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         return false;
     }
     isNumericColumn(column) {
-        return column.dataType == Enums_1.DataType.Number;
+        return column.dataType == 'Number';
     }
     isBooleanColumn(column) {
-        return column.dataType == Enums_1.DataType.Boolean;
+        return column.dataType == 'Boolean';
     }
     isDateColumn(column) {
-        return column.dataType == Enums_1.DataType.Date;
+        return column.dataType == 'Date';
     }
     getColumnDataTypeFromColumnId(columnId) {
         const column = this.getColumnFromId(columnId); // this.getColumns().find(c => c.ColumnId == columnId);
@@ -224,31 +224,29 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
     }
     getColumnsOfType(dataType) {
         switch (dataType) {
-            case Enums_1.DataType.All:
-                return this.getColumns();
-            case Enums_1.DataType.Boolean:
+            case 'Boolean':
                 return this.getBooleanColumns();
-            case Enums_1.DataType.Date:
+            case 'Date':
                 return this.getDateColumns();
-            case Enums_1.DataType.Number:
+            case 'Number':
                 return this.getNumericColumns();
-            case Enums_1.DataType.String:
+            case 'String':
                 return this.getStringColumns();
             default:
                 return this.getColumns();
         }
     }
     getNumericColumns() {
-        return this.getColumns().filter((c) => c.dataType == Enums_1.DataType.Number);
+        return this.getColumns().filter((c) => c.dataType == 'Number');
     }
     getStringColumns() {
-        return this.getColumns().filter((c) => c.dataType == Enums_1.DataType.String);
+        return this.getColumns().filter((c) => c.dataType == 'String');
     }
     getDateColumns() {
-        return this.getColumns().filter((c) => c.dataType == Enums_1.DataType.Date);
+        return this.getColumns().filter((c) => c.dataType == 'Date');
     }
     getBooleanColumns() {
-        return this.getColumns().filter((c) => c.dataType == Enums_1.DataType.Boolean);
+        return this.getColumns().filter((c) => c.dataType == 'Boolean');
     }
     getSortableColumns() {
         return this.getColumns().filter((c) => c.sortable);
@@ -262,14 +260,14 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
     getAggregetableColumns() {
         return this.getColumns()
             .filter((c) => c.aggregatable)
-            .filter((c) => c.dataType == Enums_1.DataType.Number);
+            .filter((c) => c.dataType == 'Number');
     }
     getQueryableColumns() {
         return this.getColumns().filter((c) => c.queryable);
     }
     LogMissingColumnWarning(columnId) {
-        if (this.adaptable.adaptableOptions.generalOptions.showMissingColumnsWarning &&
-            this.adaptable.adaptableOptions.generalOptions.showMissingColumnsWarning === true) {
+        if (this.adaptable.adaptableOptions.columnOptions.showMissingColumnsWarning &&
+            this.adaptable.adaptableOptions.columnOptions.showMissingColumnsWarning === true) {
             if (!this.isAutoRowGroupColumn(columnId) &&
                 !this.isCalculatedColumn(columnId) &&
                 !this.isFreeTextColumn(columnId) &&
@@ -409,5 +407,8 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         const colIds = this.adaptable.api.queryLanguageApi.getColumnsFromExpression(expression);
         return colIds.some((c) => c === columnId);
     }
+    isActionRowButtonColumn(columnId) {
+        return columnId === GeneralConstants_1.ADAPTABLE_ROW_ACTION_BUTTONS;
+    }
 }
 exports.ColumnApiImpl = ColumnApiImpl;

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

@@ -13,6 +13,8 @@ export declare class ConditionalStyleApiImpl extends ApiBase implements Conditio
     getAllSuspendedConditionalStyle(): ConditionalStyle[];
     editConditionalStyle(conditionalStyle: ConditionalStyle): ConditionalStyle;
     editConditionalStyles(conditionalStyles: ConditionalStyle[]): ConditionalStyle[];
+    deleteConditionalStyles(conditionalStyles: ConditionalStyle[]): void;
+    deleteConditionalStyle(conditionalStyle: ConditionalStyle): void;
     addConditionalStyle(conditionalStyle: ConditionalStyle): ConditionalStyle;
     showConditionalStylePopup(): void;
     getRowConditionalStyles(): ConditionalStyle[] | undefined;

package/src/Api/Implementation/ConditionalStyleApiImpl.js

@@ -33,6 +33,14 @@ class ConditionalStyleApiImpl extends ApiBase_1.ApiBase {
         });
         return conditionalStyles === null || conditionalStyles === void 0 ? void 0 : conditionalStyles.map((conditionalStyle) => this.getConditionalStyleById(conditionalStyle.Uuid));
     }
+    deleteConditionalStyles(conditionalStyles) {
+        conditionalStyles.forEach((cs) => {
+            this.deleteConditionalStyle(cs);
+        });
+    }
+    deleteConditionalStyle(conditionalStyle) {
+        this.dispatchAction(ConditionalStyleRedux.ConditionalStyleDelete(conditionalStyle));
+    }
     addConditionalStyle(conditionalStyle) {
         this.addUidToAdaptableObject(conditionalStyle);
         this.dispatchAction(ConditionalStyleRedux.ConditionalStyleAdd(conditionalStyle));

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

@@ -5,7 +5,6 @@ import { PlusMinusState } from '../../PredefinedConfig/PlusMinusState';
 import { LayoutState } from '../../PredefinedConfig/LayoutState';
 import { FormatColumnState } from '../../PredefinedConfig/FormatColumnState';
 import { ExportState } from '../../PredefinedConfig/ExportState';
-import { DataSourceState } from '../../PredefinedConfig/DataSourceState';
 import { DashboardState } from '../../PredefinedConfig/DashboardState';
 import { CustomSortState } from '../../PredefinedConfig/CustomSortState';
 import { ConditionalStyleState } from '../../PredefinedConfig/ConditionalStyleState';
@@ -16,7 +15,6 @@ import { AdaptablePersistentState, AdaptableState } from '../../PredefinedConfig
 import { ApiBase } from './ApiBase';
 import { ApplicationState } from '../../PredefinedConfig/ApplicationState';
 import { FreeTextColumnState } from '../../PredefinedConfig/FreeTextColumnState';
-import { FilterState } from '../../PredefinedConfig/FilterState';
 import { ToolPanelState } from '../../PredefinedConfig/ToolPanelState';
 import { ConfigApi } from '../ConfigApi';
 import { AdaptableStateKey, AdaptableModule } from '../../PredefinedConfig/Common/Types';
@@ -52,9 +50,7 @@ export declare class ConfigApiImpl extends ApiBase implements ConfigApi {
     getConditionalStyleState(returnJson?: boolean): ConditionalStyleState;
     getCustomSortState(returnJson?: boolean): CustomSortState;
     getDashboardState(returnJson?: boolean): DashboardState;
-    getDataSourceState(returnJson?: boolean): DataSourceState;
     getExportState(returnJson?: boolean): ExportState;
-    getFilterState(returnJson?: boolean): FilterState;
     getFreeTextColumnState(returnJson?: boolean): FreeTextColumnState;
     getFormatColumnState(returnJson?: boolean): FormatColumnState;
     getLayoutState(returnJson?: boolean): LayoutState;

package/src/Api/Implementation/ConfigApiImpl.js

@@ -13,9 +13,7 @@ const BulkUpdateRedux = tslib_1.__importStar(require("../../Redux/ActionsReducer
 const CalculatedColumnRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/CalculatedColumnRedux"));
 const ConditionalStyleRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/ConditionalStyleRedux"));
 const CustomSortRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/CustomSortRedux"));
-const DataSourceRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/DataSourceRedux"));
 const ExportRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/ExportRedux"));
-const FilterRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/FilterRedux"));
 const FormatColumnRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/FormatColumnRedux"));
 const FreeTextColumnRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/FreeTextColumnRedux"));
 const PlusMinusRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/PlusMinusRedux"));
@@ -88,12 +86,12 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
     getAdaptableSearchState() {
         const currentQuery = this.adaptable.api.queryApi.getCurrentQuery();
         const adaptableSearchState = {
-            dataSource: this.adaptable.api.dataSourceApi.getCurrentDataSource(),
+            dataSet: this.adaptable.api.dataSetApi.getCurrentDataSet(),
             currentQuery,
             queryAST: currentQuery
                 ? this.adaptable.api.queryLanguageApi.getASTForExpression(currentQuery)
                 : null,
-            columnFilters: this.adaptable.api.filterApi.getAllColumnFilter(),
+            columnFilters: this.adaptable.api.filterApi.getColumnFilters(),
         };
         return adaptableSearchState;
     }
@@ -168,18 +166,10 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
                 return returnJson
                     ? JSON.stringify(this.getAdaptableState().Dashboard)
                     : this.getAdaptableState().Dashboard;
-            case 'DataSource':
-                return returnJson
-                    ? JSON.stringify(this.getAdaptableState().DataSource)
-                    : this.getAdaptableState().DataSource;
             case 'Export':
                 return returnJson
                     ? JSON.stringify(this.getAdaptableState().Export)
                     : this.getAdaptableState().Export;
-            case 'Filter':
-                return returnJson
-                    ? JSON.stringify(this.getAdaptableState().Filter)
-                    : this.getAdaptableState().Filter;
             case 'FormatColumn':
                 return returnJson
                     ? JSON.stringify(this.getAdaptableState().FormatColumn)
@@ -250,15 +240,9 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
     getDashboardState(returnJson = false) {
         return this.getUserStateByStateKey('Dashboard', returnJson);
     }
-    getDataSourceState(returnJson = false) {
-        return this.getUserStateByStateKey('DataSource', returnJson);
-    }
     getExportState(returnJson = false) {
         return this.getUserStateByStateKey('Export', returnJson);
     }
-    getFilterState(returnJson = false) {
-        return this.getUserStateByStateKey('Filter', returnJson);
-    }
     getFreeTextColumnState(returnJson = false) {
         return this.getUserStateByStateKey('FreeTextColumn', returnJson);
     }
@@ -309,15 +293,9 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
             case 'Dashboard':
                 this.dispatchAction(DashboardRedux.DashboardReady(this.getDashboardState()));
                 break;
-            case 'DataSource':
-                this.dispatchAction(DataSourceRedux.DataSourceReady(this.getDataSourceState()));
-                break;
             case 'Export':
                 this.dispatchAction(ExportRedux.ExportReady(this.getExportState()));
                 break;
-            case 'Filter':
-                this.dispatchAction(FilterRedux.FilterReady(this.getFilterState()));
-                break;
             case 'FormatColumn':
                 this.dispatchAction(FormatColumnRedux.FormatColumnReady(this.getFormatColumnState()));
                 break;

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

@@ -4,25 +4,22 @@ import { DashboardState, DashboardTab } from '../../PredefinedConfig/DashboardSt
 import { AdaptableModuleButtons, AdaptableDashboardToolbars, AdaptableDashboardToolbar } from '../../PredefinedConfig/Common/Types';
 import { DashboardChangedInfo } from '../Events/DashboardChanged';
 import { AdaptableButton } from '../../PredefinedConfig/Common/AdaptableButton';
-import { CustomToolbarButtonContext, DashboardButtonContext } from '../../types';
+import { DashboardButtonContext } from '../../types';
 import { CustomToolbar } from '../../AdaptableOptions/DashboardOptions';
 export declare class DashboardApiImpl extends ApiBase implements DashboardApi {
     getDashboardState(): DashboardState;
     getCustomToolbars(): CustomToolbar[];
-    getCustomDashboardButtons(): AdaptableButton<DashboardButtonContext>[] | undefined;
+    getCustomDashboardButtons(): AdaptableButton<DashboardButtonContext>[];
     getCustomDashboardButtonByLabel(buttonLabel: string): AdaptableButton<DashboardButtonContext> | undefined;
     setModuleButtons(moduleButtons: AdaptableModuleButtons): void;
     setDashboardTitle(title: string): void;
     getCustomToolbarContentsDiv(customToolbarName: string): HTMLElement | null;
     setCustomToolbarContents(customToolbarName: string, contents: string): void;
     getCustomToolbarByName(customToolbarName: string): CustomToolbar;
-    setCustomToolbarButtons(customToolbarName: string, buttons: AdaptableButton<CustomToolbarButtonContext>[]): void;
-    addCustomToolbarButtons(customToolbarName: string, buttons: AdaptableButton<CustomToolbarButtonContext>[]): void;
-    clearCustomToolbarButtons(customToolbarName: string): void;
-    private updateCustomToolbarButtons;
     getTabByName(tabName: string): DashboardTab;
     collapseDashboard(): void;
     expandDashboard(): void;
+    refreshDashboard(): void;
     floatDashboard(): void;
     dockDashboard(): void;
     hideDashboard(): void;

package/src/Api/Implementation/DashboardApiImpl.js

@@ -6,10 +6,9 @@ const DashboardRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers
 const ApiBase_1 = require("./ApiBase");
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 const isEqual_1 = tslib_1.__importDefault(require("lodash/isEqual"));
-const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/ArrayExtensions"));
-const Helper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/Helper"));
 const react_dom_1 = tslib_1.__importDefault(require("react-dom"));
 const react_1 = tslib_1.__importDefault(require("react"));
+const SystemRedux_1 = require("../../Redux/ActionsReducers/SystemRedux");
 class DashboardApiImpl extends ApiBase_1.ApiBase {
     constructor() {
         super(...arguments);
@@ -35,7 +34,7 @@ class DashboardApiImpl extends ApiBase_1.ApiBase {
         return this.getDashboardOptions().customToolbars || [];
     }
     getCustomDashboardButtons() {
-        return this.getDashboardOptions().customDashboardButtons;
+        return this.getDashboardOptions().customDashboardButtons || [];
     }
     getCustomDashboardButtonByLabel(buttonLabel) {
         const api = this.getAdaptableApi();
@@ -70,32 +69,6 @@ class DashboardApiImpl extends ApiBase_1.ApiBase {
     getCustomToolbarByName(customToolbarName) {
         return this.getCustomToolbars().find((ct) => ct.name == customToolbarName);
     }
-    setCustomToolbarButtons(customToolbarName, buttons) {
-        this.updateCustomToolbarButtons(customToolbarName, buttons, 'override');
-    }
-    addCustomToolbarButtons(customToolbarName, buttons) {
-        this.updateCustomToolbarButtons(customToolbarName, buttons, 'add');
-    }
-    clearCustomToolbarButtons(customToolbarName) {
-        this.updateCustomToolbarButtons(customToolbarName, [], 'clear');
-    }
-    updateCustomToolbarButtons(customToolbarName, buttons, action) {
-        let customToolbars = this.getCustomToolbars();
-        if (ArrayExtensions_1.default.IsNotNullOrEmpty(customToolbars)) {
-            let customToolbar = customToolbars.find((c) => c.name == customToolbarName);
-            if (customToolbarName) {
-                let clonedCustomToolbar = Helper_1.default.cloneObject(customToolbar);
-                if (action == 'add') {
-                    clonedCustomToolbar.toolbarButtons.push(...buttons);
-                }
-                else if (action == 'override') {
-                }
-                else if (action == 'clear') {
-                    clonedCustomToolbar.toolbarButtons = [];
-                }
-            }
-        }
-    }
     getTabByName(tabName) {
         return (this.getDashboardState().Tabs || []).find((tab) => tab.Name == tabName);
     }
@@ -105,6 +78,9 @@ class DashboardApiImpl extends ApiBase_1.ApiBase {
     expandDashboard() {
         this.dispatchAction(DashboardRedux.DashboardSetIsCollapsed(false));
     }
+    refreshDashboard() {
+        this.dispatchAction(SystemRedux_1.SystemDashboardRefresh());
+    }
     floatDashboard() {
         this.dispatchAction(DashboardRedux.DashboardSetIsFloating(true));
     }

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

@@ -0,0 +1,12 @@
+import { ApiBase } from './ApiBase';
+import { DataSetApi } from '../DataSetApi';
+import { DataSet } from '../../AdaptableOptions/GeneralOptions';
+export declare class DataSetApiImpl extends ApiBase implements DataSetApi {
+    getAllDataSets(): DataSet[];
+    getCurrentDataSet(): DataSet | undefined;
+    getDataSetByName(dataSetName: string): DataSet | undefined;
+    setDataSet(dataSetName: string): void;
+    clearCurrentDataSet(): void;
+    showDataSetPopup(): void;
+    fireDataSetChangeEvent(dataSet: DataSet): void;
+}

package/src/Api/Implementation/DataSetApiImpl.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DataSetApiImpl = void 0;
+const tslib_1 = require("tslib");
+const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
+const SystemRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/SystemRedux"));
+const ApiBase_1 = require("./ApiBase");
+class DataSetApiImpl extends ApiBase_1.ApiBase {
+    getAllDataSets() {
+        var _a, _b, _c;
+        return (_c = (_b = (_a = this.adaptable.adaptableOptions) === null || _a === void 0 ? void 0 : _a.generalOptions) === null || _b === void 0 ? void 0 : _b.dataSets) !== null && _c !== void 0 ? _c : [];
+    }
+    getCurrentDataSet() {
+        let currentDataSetName = this.getAdaptableState().System.CurrentDataSet;
+        return this.getDataSetByName(currentDataSetName);
+    }
+    getDataSetByName(dataSetName) {
+        return this.getAllDataSets().find((a) => a.name == dataSetName);
+    }
+    setDataSet(dataSetName) {
+        const dataSet = this.getDataSetByName(dataSetName);
+        if (this.checkItemExists(dataSet, dataSetName, 'Data Source')) {
+            this.dispatchAction(SystemRedux.SystemDataSetSelect(dataSet));
+        }
+    }
+    clearCurrentDataSet() {
+        this.dispatchAction(SystemRedux.SystemDataSetSelect(null));
+    }
+    showDataSetPopup() {
+        this.showModulePopup(ModuleConstants.DataSetModuleId);
+    }
+    fireDataSetChangeEvent(dataSet) {
+        if (this.adaptable.isInitialised) {
+            const dataSetChangedInfo = {
+                adaptableApi: this.adaptable.api,
+                dataSet,
+            };
+            this.adaptable.api.eventApi.emit('DataSetChanged', dataSetChangedInfo);
+        }
+    }
+}
+exports.DataSetApiImpl = DataSetApiImpl;

package/src/Api/Implementation/EventApiImpl.js

@@ -24,6 +24,7 @@ class EventApiImpl extends ApiBase_1.ApiBase {
         this.emitter = new Emitter_1.default();
     }
     destroy() {
+        super.destroy();
         this.emitSync('AdaptableDestroy');
         this.emitter.destroy();
     }

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

@@ -3,7 +3,7 @@ import { ExportState, Report, ReportData, ReportSchedule, SystemReportNames } fr
 import { ApiBase } from './ApiBase';
 import { AdaptableForm } from '../../PredefinedConfig/Common/AdaptableForm';
 import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
-import { CustomDestination, ExportButtonContext } from '../../AdaptableOptions/ExportOptions';
+import { CustomDestination, ExportFormContext } from '../../AdaptableOptions/ExportOptions';
 import { ExportDestination } from '../../PredefinedConfig/Common/Enums';
 export declare class ExportApiImpl extends ApiBase implements ExportApi {
     getExportState(): ExportState;
@@ -22,7 +22,7 @@ export declare class ExportApiImpl extends ApiBase implements ExportApi {
     selectDestination(destinationName: string): void;
     getAllCustomDestination(): CustomDestination[];
     isExportDestinationCustom(destinationName: string): boolean;
-    getExportDestinationForm(destinationName: string): AdaptableForm<ExportButtonContext> | undefined;
+    getExportDestinationForm(destinationName: string): AdaptableForm<ExportFormContext> | undefined;
     canExportToExcel(): boolean;
     exportDataToExcel(reportData: ReportData, fileName: string): void;
     showExportPopup(): void;

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

@@ -1,31 +1,31 @@
 import { ApiBase } from './ApiBase';
 import { FilterApi } from '../FilterApi';
-import { FilterState, ColumnFilter, SystemFilterPredicateIds } from '../../PredefinedConfig/FilterState';
 import { AdaptablePredicateDef } from '../../PredefinedConfig/Common/AdaptablePredicate';
 import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
+import { ColumnFilter, GridCell, SystemFilterPredicateIds } from '../../types';
 import { RowNode } from '@ag-grid-community/all-modules';
 export declare class FilterApiImpl extends ApiBase implements FilterApi {
-    getFilterState(): FilterState;
     getAllSystemFilterIds(): SystemFilterPredicateIds;
     findPredicateDefByShortcut(shortcut: string, column: AdaptableColumn): AdaptablePredicateDef;
     getFilterPredicateDefsForColumn(column: AdaptableColumn): AdaptablePredicateDef[];
     getFilterPredicateDefsForColumnId(columnId: string): AdaptablePredicateDef[] | undefined;
     private getAllFilterPredicates;
-    getAllColumnFilter(): ColumnFilter[];
-    getColumnFilterById(id: ColumnFilter['Uuid']): ColumnFilter;
+    showQuickFilterBar(): void;
+    hideQuickFilterBar(): void;
+    isQuickFilterAvailable(): boolean;
+    isQuickFilterVisible(): boolean;
+    getColumnFilters(): ColumnFilter[];
     setColumnFilter(columnFilters: ColumnFilter[]): ColumnFilter[] | null;
-    clearAndSetColumnFilter(columnFilters: ColumnFilter[]): void;
     clearColumnFilter(columnFilter: ColumnFilter): void;
     clearColumnFilterByColumns(columns: string[]): void;
     clearColumnFilterByColumn(column: string): void;
-    clearAllColumnFilter(): void;
+    clearColumnFilters(): void;
+    clearAndSetColumnFilter(columnFilters: ColumnFilter[]): void;
     getAllColumnFilterForColumn(column: string): ColumnFilter[];
-    createColumnFilterForCell(columnId: string, primarykeyValues: any[]): ColumnFilter | null;
+    createValuesColumnFilterForCells(gridCells: GridCell[]): ColumnFilter | null;
+    createEqualityColumnFilterForCell(gridCell: GridCell): ColumnFilter | null;
     columnFilterToString(columnFilter: ColumnFilter): string;
     columnFiltersToString(columnFilters: ColumnFilter[]): string;
     evaluateColumnFilter(columnFilter: ColumnFilter, node: RowNode): boolean;
-    showQuickFilterBar(): void;
-    hideQuickFilterBar(): void;
-    isQuickFilterAvailable(): boolean;
-    isQuickFilterVisible(): boolean;
+    private getColumnFilterById;
 }