@adaptabletools/adaptable 11.2.4-canary.0 → 12.0.0-canary.0

package/src/AdaptableOptions/ToolPanelOptions.d.ts

@@ -1,55 +1,12 @@
 import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
-import { AdaptableApi } from '../Api/AdaptableApi';
 import { AdaptableFrameworkComponent } from './AdaptableFrameworkComponent';
 import { AdaptableButton } from '../PredefinedConfig/Common/AdaptableButton';
 import { ToolPanelState } from '../PredefinedConfig/ToolPanelState';
-import { BaseContext } from '../types';
+import { BaseContext, CustomRenderContext } from '../types';
 /**
  * Options related to managing the AdapTable ToolPanel Component
  */
 export interface ToolPanelOptions {
-    /**
-     * Displays Adaptable ToolPanel Component (only if AG Grid Sidebar is provided)
-     *
-     * @defaultValue true
-     * @gridInfoItem
-     */
-    showAdaptableToolPanel?: boolean;
-    /**
-     * Title for AdapTable ToolPanel Component - appears vertically at side
-     *
-     * @defaultValue 'AdapTable'
-     * @gridInfoItem
-     */
-    adaptableToolPanelTitle?: string;
-    /**
-     * Key of icon to be used (beside the label) for Adaptable ToolPanel Component
-     *
-     * @defaultValue 'menu'
-     * @gridInfoItem
-     */
-    iconKey?: string;
-    /**
-     * The initial width of AdapTable ToolPanel
-     * @defaultValue var(--ab-cmp-toolpanel__width)
-     */
-    width?: number;
-    /**
-     * The min width of AdapTable ToolPanel
-     * @defaultValue var(--ab-cmp-toolpanel__width)
-     */
-    minWidth?: number;
-    /**
-     * The max width of AdapTable ToolPanel
-     * @defaultValue undefined
-     */
-    maxWidth?: number;
-    /**
-     * Order of displayed ToolPanels in Sidebar
-     *
-     * @defaultValue ['filters', 'columns', 'adaptable']
-     */
-    toolPanelOrder?: ('adaptable' | 'columns' | 'filters')[];
     /**
      * Display the Tool Panels dropdown
      *
@@ -85,11 +42,7 @@ export interface CustomToolPanel extends AdaptableObject {
     /**
      * Function to provide bespoke content when NOT using a Framework wrapper
      */
-    render?: ({ visible, node, adaptableApi, }: {
-        visible: boolean;
-        node: HTMLDivElement;
-        adaptableApi: AdaptableApi;
-    }) => string | null;
+    render?: (customRenderContext: CustomRenderContext) => string | null;
     /**
      * Framework-specific (Angular or React) component to be rendered
      */

package/src/AdaptableOptions/UserInterfaceOptions.d.ts

@@ -2,11 +2,10 @@ import { AdaptableIcon } from '../PredefinedConfig/Common/AdaptableIcon';
 import { DateInputOptions } from './DateInputOptions';
 import { AdaptableScope } from '../PredefinedConfig/Common/AdaptableScope';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
-import { AdaptableButton } from '../PredefinedConfig/Common/AdaptableButton';
-import { RowNode } from '@ag-grid-community/all-modules';
 import { AdaptableObject, AdaptableObjectTag } from '../PredefinedConfig/Common/AdaptableObject';
 import { AdaptableStyle } from '../PredefinedConfig/Common/AdaptableStyle';
-import { AdaptableApi, BaseContext, GridCell } from '../../types';
+import { AdaptableButton, BaseContext, GridCell } from '../../types';
+import { RowNode } from '@ag-grid-community/all-modules';
 /**
  * Options for managing the User Interface of AdapTable
  */
@@ -52,10 +51,6 @@ export interface UserInterfaceOptions {
      * Colours to display in Colour Picker (in place of AdapTable's default set); can be hardcoded list or function
      */
     colorPalette?: string[] | ((currentTheme: string) => string[]);
-    /**
-     * Columns which contain an AdapTable Button - used for performing Actions
-     */
-    actionColumns?: ActionColumn[];
     /**
      * Style to set for editable cells
      */
@@ -73,12 +68,7 @@ export interface UserInterfaceOptions {
     /**
      * Optional list of AdaptableObjectTags that can be associated with AdaptableObjects
      */
-    objectTags?: AdaptableObjectTag[] | ((adaptableApi: AdaptableApi) => AdaptableObjectTag[]);
-    /**
-     * Optional list of Column Types - used primarily for special columns
-     *
-     */
-    columnTypes?: string[];
+    objectTags?: AdaptableObjectTag[] | ((context: ObjectTagsContext) => AdaptableObjectTag[]);
     /**
      * Provide links to AdapTable documentation (in Module popups and Expression Editor)
      *
@@ -99,56 +89,36 @@ export interface UserInterfaceOptions {
      * @gridInfoItem
      */
     showAdapTableVersion?: boolean;
-}
-export interface BasePermittedValues {
     /**
-     * Scope where Values will appear (Mandatory property)
+     * Custom Formatters to use in the Format Column Module
      */
-    scope: AdaptableScope;
-}
-/**
- * Permitted/possible values, when column values can be selected (e.g. sort, bulk-update)
- */
-export interface PermittedValues extends BasePermittedValues {
+    customDisplayFormatters?: CustomDisplayFormatter[];
     /**
-     * Values to display: either hardcoded list or a function
+     * Options for creating Action Columns and Buttons
      */
-    values?: any[] | ((context: PermittedValuesContext) => any[]);
+    actionOptions?: ActionOptions;
 }
 /**
- * Used to define permitted values for inline column editor
- */
-export interface EditLookUpPermittedValues extends BasePermittedValues {
-    values?: any[] | ((context: EditLookUpContext) => any[]);
-}
-/**
- * Used to define values inside the floating filter and floating filter (quick filter)
+ * Options related to Action Columns and Buttons in Adaptable.
  */
-export interface FilterPermittedValues extends BasePermittedValues {
+export interface ActionOptions {
     /**
-     * Prevents AdapTable from filtering the list of values client-side; When true, values is called each time the search bar is changed
-     * @defaultValue false
+     * Columns which contain an AdapTable Button - used for performing Actions
      */
-    suppressFilterSearchBar?: boolean;
-    values: (context: FilterPermittedValuesContext) => any[] | Promise<any[]>;
-}
-/**
- * Custom column values for custom sort.
- */
-export interface CustomSortPermittedValues extends BasePermittedValues {
-    values: (context: PermittedValuesContext) => any[] | Promise<any[]>;
-}
-/**
- * User to define permitted values when updating cells via bulk update
- */
-export interface BulkUpdatePermittedValues extends BasePermittedValues {
-    values: (context: BulkUpdatePermittedValuesContext) => any[] | Promise<any[]>;
+    actionColumns?: ActionColumn[];
+    /**
+     * Action buttons to display for each row.
+     *
+     * @defaultValue undefined
+     */
+    actionRowButtons?: ('clone' | 'edit' | 'delete')[];
+    /**
+     * Position of supplied Action Buttons
+     *
+     * @defaultValue 'pinnedLeft'
+     */
+    actionRowButtonsPosition?: 'pinnedLeft' | 'pinnedRight';
 }
-/**
- * Use PermittedValues instead
- * @deprecated use PermittedValues instead
- */
-export declare type CellValuesList = PermittedValues;
 /**
  * A Special Column that wraps an AdapTable Button
  */
@@ -215,6 +185,55 @@ export interface ActionColumnSettings {
      */
     suppressMovable?: boolean;
 }
+export interface BasePermittedValues {
+    /**
+     * Scope where Values will appear (Mandatory property)
+     */
+    scope: AdaptableScope;
+}
+/**
+ * Permitted/possible values, when column values can be selected (e.g. sort, bulk-update)
+ */
+export interface PermittedValues extends BasePermittedValues {
+    /**
+     * Values to display: either hardcoded list or a function
+     */
+    values?: any[] | ((context: PermittedValuesContext) => any[]);
+}
+/**
+ * Used to define permitted values for inline column editor
+ */
+export interface EditLookUpPermittedValues extends BasePermittedValues {
+    values?: any[] | ((context: EditLookUpContext) => any[]);
+}
+/**
+ * Used to define values inside the floating filter and floating filter (quick filter)
+ */
+export interface FilterPermittedValues extends BasePermittedValues {
+    /**
+     * Prevents AdapTable from filtering the list of values client-side; When true, values is called each time the search bar is changed
+     * @defaultValue false
+     */
+    suppressFilterSearchBar?: boolean;
+    values: (context: FilterPermittedValuesContext) => any[] | Promise<any[]>;
+}
+/**
+ * Custom column values for custom sort.
+ */
+export interface CustomSortPermittedValues extends BasePermittedValues {
+    values: (context: PermittedValuesContext) => any[] | Promise<any[]>;
+}
+/**
+ * User to define permitted values when updating cells via bulk update
+ */
+export interface BulkUpdatePermittedValues extends BasePermittedValues {
+    values: (context: BulkUpdatePermittedValuesContext) => any[] | Promise<any[]>;
+}
+/**
+ * Use PermittedValues instead
+ * @deprecated use PermittedValues instead
+ */
+export declare type CellValuesList = PermittedValues;
 export interface EditLookUpContext extends BaseContext {
     /**
      * Column displaying the Edit LookUp
@@ -223,7 +242,7 @@ export interface EditLookUpContext extends BaseContext {
     /**
      * Cell being edited
      */
-    gridCell: GridCell;
+    gridCell?: GridCell;
 }
 export interface PermittedValuesContext extends BaseContext {
     /**
@@ -253,3 +272,11 @@ export interface BulkUpdatePermittedValuesContext extends BaseContext {
 }
 export declare type GridInfoSections = GridInfoSection[];
 export declare type GridInfoSection = 'GridSummary' | 'AdaptableOptions' | 'ColumnInfo' | 'AdaptableObjectsSummary';
+export interface ObjectTagsContext extends BaseContext {
+}
+export declare type CustomDisplayFormatter = {
+    id: string;
+    label?: string;
+    handler: (value: any) => any;
+    scope: AdaptableScope;
+};

package/src/Api/AdaptableApi.d.ts

@@ -8,7 +8,7 @@ import { ConditionalStyleApi } from './ConditionalStyleApi';
 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 { ExportApi } from './ExportApi';
 import { FormatColumnApi } from './FormatColumnApi';
@@ -89,9 +89,9 @@ export interface AdaptableApi {
      **/
     dataChangeHistoryApi: DataChangeHistoryApi;
     /**
-     * Provides access to the Data Source Module
+     * Provides access to Data Sets
      */
-    dataSourceApi: DataSourceApi;
+    dataSetApi: DataSetApi;
     /**
      * Used for listenning / subscribing to the various Events published by AdapTable
      */
@@ -209,6 +209,9 @@ export interface AdaptableApi {
         unmount: boolean;
         destroyApi?: boolean;
     }) => void;
+    /**
+     * Whether the Adaptable instance has been destroyed
+     */
     isDestroyed: () => boolean;
     /**
      * Cleanup method that only cleans up this api instance (clears event listeners and sets every property to null), but does not destroy the Adaptable instance.

package/src/Api/ColumnApi.d.ts

@@ -1,4 +1,4 @@
-import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
+import { AdaptableColumn, AdaptableColumnDataType } from '../PredefinedConfig/Common/AdaptableColumn';
 import { DataType } from '../PredefinedConfig/Common/Enums';
 import { Column, RowNode } from '@ag-grid-community/all-modules';
 import { GridCell } from '../../types';
@@ -157,7 +157,7 @@ export interface ColumnApi {
      * Returns Data Type for a Column
      * @param columnId Column to check
      */
-    getColumnDataTypeFromColumnId(columnId: string): 'String' | 'Number' | 'NumberArray' | 'Boolean' | 'Date' | 'Object' | 'Unknown' | undefined;
+    getColumnDataTypeFromColumnId(columnId: string): AdaptableColumnDataType | undefined;
     /**
      * Retrieves Friendly Name for a given Column
      * @param columnId ColumnId to check
@@ -227,7 +227,10 @@ export interface ColumnApi {
      * @param columnFilter Current applied filter
      */
     getDistinctFilterDisplayValuesForColumn(columnId: string, filter: string): Promise<{
-        values: any[];
+        values: {
+            value: any;
+            label: string;
+        }[];
         suppressClientSideFilter: boolean;
     }>;
     /**

package/src/Api/ConditionalStyleApi.d.ts

@@ -77,6 +77,16 @@ export interface ConditionalStyleApi {
      * @returns conditional styles
      */
     editConditionalStyles(conditionalStyles: ConditionalStyle[]): ConditionalStyle[];
+    /**
+     * Deletes a Conditional Style
+     * @param conditionalStyle Conditional Style to delete
+     */
+    deleteConditionalStyle(conditionalStyle: ConditionalStyle): void;
+    /**
+     * Deletes Conditional Styles
+     * @param conditionalStyles Conditional Styles to delete
+     */
+    deleteConditionalStyles(conditionalStyles: ConditionalStyle[]): void;
     /**
      * Adds new Conditional Style to State
      * @param conditionalStyle Conditional Style to add

package/src/Api/ConfigApi.d.ts

@@ -4,7 +4,6 @@ import { QuickSearchState } from '../PredefinedConfig/QuickSearchState';
 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';
@@ -15,7 +14,6 @@ import { PlusMinusState } from '../PredefinedConfig/PlusMinusState';
 import { ApplicationState } from '../PredefinedConfig/ApplicationState';
 import { AdaptablePersistentState, AdaptableState } from '../PredefinedConfig/AdaptableState';
 import { FreeTextColumnState } from '../PredefinedConfig/FreeTextColumnState';
-import { FilterState } from '../PredefinedConfig/FilterState';
 import { ToolPanelState } from '../PredefinedConfig/ToolPanelState';
 import { AdaptableStateKey, AdaptableModule } from '../PredefinedConfig/Common/Types';
 import { AdaptableSearchState, PredefinedConfig, ScheduleState } from '../types';
@@ -133,21 +131,11 @@ export interface ConfigApi {
      * @param returnJson return as JSON rather than object
      */
     getDashboardState(returnJson: boolean): DashboardState;
-    /**
-     * Returns Data Source section of Adaptable State
-     * @param returnJson return as JSON rather than object
-     */
-    getDataSourceState(returnJson: boolean): DataSourceState;
     /**
      * Returns Export section of Adaptable State
      * @param returnJson return as JSON rather than object
      */
     getExportState(returnJson: boolean): ExportState;
-    /**
-     * Returns Filter section of Adaptable State
-     * @param returnJson return as JSON rather than object
-     */
-    getFilterState(returnJson: boolean): FilterState;
     /**
      * Returns Formt Column section of Adaptable State
      * @param returnJson return as JSON rather than object

package/src/Api/DashboardApi.d.ts

@@ -2,7 +2,7 @@ import { DashboardState, DashboardTab } from '../PredefinedConfig/DashboardState
 import { AdaptableModuleButtons, AdaptableDashboardToolbars, AdaptableDashboardToolbar } from '../PredefinedConfig/Common/Types';
 import { DashboardChangedInfo } from './Events/DashboardChanged';
 import { AdaptableButton } from '../PredefinedConfig/Common/AdaptableButton';
-import { CustomToolbar, CustomToolbarButtonContext, DashboardButtonContext } from '../AdaptableOptions/DashboardOptions';
+import { CustomToolbar, DashboardButtonContext } from '../AdaptableOptions/DashboardOptions';
 /**
  * Functions relating to the AdapTable Dashboard.
  */
@@ -18,7 +18,7 @@ export interface DashboardApi {
     /**
      * Retrieves all Custom Buttons
      */
-    getCustomDashboardButtons(): AdaptableButton<DashboardButtonContext>[] | undefined;
+    getCustomDashboardButtons(): AdaptableButton<DashboardButtonContext>[];
     /**
      * Retrieves first Custom Button with given Label
      * @param buttonLabel the label of the Custom Button to retrieve
@@ -49,23 +49,6 @@ export interface DashboardApi {
      * @param customToolbarName the name of the Custom Toolbar
      */
     getCustomToolbarByName(customToolbarName: string): CustomToolbar;
-    /**
-     * Replaces Toolbar Buttons in Custom Toolbar with the new set
-     * @param customToolbarName name of the Custom Toolbar
-     * @param buttons Toolbar Buttons to add
-     */
-    setCustomToolbarButtons(customToolbarName: string, buttons: AdaptableButton<CustomToolbarButtonContext>[]): void;
-    /**
-     * Adds Toolbar Buttons to current collection in Custom Toolbar
-     * @param customToolbarName name of the Custom Toolbar
-     * @param buttons Toolbar Buttons to add
-     */
-    addCustomToolbarButtons(customToolbarName: string, buttons: AdaptableButton<CustomToolbarButtonContext>[]): void;
-    /**
-     * Clears all Toolbar Buttons from Custom Toolbar
-     * @param customToolbarName the name of the Custom Toolbar
-     */
-    clearCustomToolbarButtons(customToolbarName: string): void;
     /**
      * Collapses Dashboard so only Dashboard Header is visible (and not Toolbars' contents)
      */
@@ -74,6 +57,10 @@ export interface DashboardApi {
      * Expands Dashboard so Toolbars in Active Tab are fully visible
      */
     expandDashboard(): void;
+    /**
+     * Refreshes the entire Dashboard section, including Toolbars and Buttons; this is particularly relevant for AdapTable built-in elements, as framework components are dependent on the framework specific change detection mechanisms
+     */
+    refreshDashboard(): void;
     /**
      * Floats Dashboard so only Dashboard Header is visible (in reduced size); can be dragged to a new location
      */

package/src/Api/DataSetApi.d.ts

@@ -0,0 +1,40 @@
+import { DataSet } from '../types';
+/**
+ *  Provides run-time access to Data Sets
+ */
+export interface DataSetApi {
+    /**
+     * Retrieves the Data Sets from General Options
+     * @returns data Sets
+     */
+    getAllDataSets(): DataSet[];
+    /**
+     * Retrieves the currently applied Data Set
+     * @returns data Set
+     */
+    getCurrentDataSet(): DataSet | undefined;
+    /**
+     * Retreives Data Set from State with given name
+     * @param dataSetName name of Data Set to retrieve
+     * @returns data Set
+     */
+    getDataSetByName(dataSetName: string): DataSet;
+    /**
+     * Makes given Data Set current
+     * @param dataSetName Name of Data Set to apply
+     */
+    setDataSet(dataSetName: string): void;
+    /**
+     * Clears currently selected Data Set
+     */
+    clearCurrentDataSet(): void;
+    /**
+     * Opens Settings Panel with Data Set section selected and visible
+     */
+    showDataSetPopup(): void;
+    /**
+     * Fire the DataSet Changed Event
+     * @param dataSet Data Set which has changed
+     */
+    fireDataSetChangeEvent(dataSet: DataSet): void;
+}

package/src/Api/EventApi.d.ts

@@ -14,6 +14,8 @@ import { AdaptableStateChangedInfo } from './Events/AdaptableStateChanged';
 import { FlashingCellDisplayedInfo } from './Events/FlashingCellDisplayed';
 import { GridDataChangedInfo } from './Events/GridDataChanged';
 import { TeamSharingEntityChangedInfo } from './Events/TeamSharingEntityChanged';
+import { RowFormSubmittedInfo } from './Events/RowFormSubmitted';
+import { DataSetChangedInfo } from './Events/DataSetChanged';
 /**
  * Responsible for publishing the many Events that AdapTable fires
  */
@@ -193,6 +195,21 @@ export interface EventApi {
      * Unsubscribe from LiveDataChanged
      */
     off(eventName: 'LiveDataChanged', callback: (liveDataChangedInfo: LiveDataChangedInfo) => void): void;
+    on(eventName: 'RowFormSubmitted', callback: (rowEditedFormInfo: RowFormSubmittedInfo) => void): () => void;
+    off(eventName: 'RowFormSubmitted', callback: (rowEditedFormInfo: RowFormSubmittedInfo) => void): void;
+    /**
+     * Event fired when a DataSet is changed
+     *
+     * @param eventName DataSetChanged
+     * @param callback DataSetChangedInfo
+     */
+    on(eventName: 'DataSetChanged', callback: (dataSetChangedInfo: DataSetChangedInfo) => void): () => void;
+    /**
+     * Unsubscribe from DataSetChanged
+     * @param eventName DataSetChanged
+     * @param callback
+     */
+    off(eventName: 'DataSetChanged', callback: (dataSetChangedInfo: DataSetChangedInfo) => void): void;
     /**
      * Fired when Adaptable is up and running - has no arguments.
      * @param eventName - AdaptableReady
@@ -224,6 +241,6 @@ export interface EventApi {
     emitSync(eventName: 'DashboardChanged', data?: any): any[];
     emitSync(eventName: 'FlashingCellDisplayed', data?: any): any[];
     emitSync(eventName: 'AdaptableDestroy'): any[];
-    emit(eventName: 'AdaptableReady' | 'AlertFired' | 'CheckboxColumnClicked' | 'CustomToolbarConfigured' | 'AdaptableStateChanged' | 'DashboardChanged' | 'CellChanged' | 'GridDataChanged' | 'LayoutChanged' | 'LiveDataChanged' | 'SearchChanged' | 'SelectionChanged' | 'SystemStatusMessageDisplayed' | 'TeamSharingEntityChanged' | 'ThemeChanged' | 'FDC3MessageSent', data?: any): Promise<any>;
+    emit(eventName: 'AdaptableReady' | 'AlertFired' | 'CheckboxColumnClicked' | 'CustomToolbarConfigured' | 'AdaptableStateChanged' | 'DashboardChanged' | 'CellChanged' | 'GridDataChanged' | 'LayoutChanged' | 'LiveDataChanged' | 'SearchChanged' | 'SelectionChanged' | 'SystemStatusMessageDisplayed' | 'TeamSharingEntityChanged' | 'ThemeChanged' | 'FDC3MessageSent' | 'RowFormSubmitted' | 'DataSetChanged', data?: any): Promise<any>;
     destroy(): void;
 }

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

@@ -0,0 +1,5 @@
+import { DataSet } from '../../types';
+import { BaseEventInfo } from './BaseEventInfo';
+export interface DataSetChangedInfo extends BaseEventInfo {
+    dataSet: DataSet;
+}

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

@@ -0,0 +1,19 @@
+import { BaseEventInfo } from './BaseEventInfo';
+import { AdaptableFormData } from '../../PredefinedConfig/Common/AdaptableForm';
+import { RowNode } from '@ag-grid-community/all-modules';
+export declare type RowFormSubmittedInfo = CreatedRowFormInfo | EditedRowFormInfo | DeletedRowFormInfo;
+export declare type RowFormType = 'rowCreated' | 'rowEdited' | 'rowDeleted';
+export interface CreatedRowFormInfo extends BaseEventInfo {
+    type: 'rowCreated';
+    formData: AdaptableFormData;
+    clonedRowNode?: RowNode;
+}
+export interface EditedRowFormInfo extends BaseEventInfo {
+    type: 'rowEdited';
+    formData: AdaptableFormData;
+    rowNode: RowNode;
+}
+export interface DeletedRowFormInfo extends BaseEventInfo {
+    type: 'rowDeleted';
+    rowNode: RowNode;
+}

package/src/Api/Events/RowFormSubmitted.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -1,8 +1,7 @@
-import { DataSource } from '../../PredefinedConfig/DataSourceState';
 import { CustomSort } from '../../PredefinedConfig/CustomSortState';
 import { ColumnSort } from '../../PredefinedConfig/Common/ColumnSort';
-import { ColumnFilter } from '../../PredefinedConfig/FilterState';
 import { BaseEventInfo } from './BaseEventInfo';
+import { ColumnFilter, DataSet } from '../../types';
 /**
  * EventInfo returned by SearchChanged event; includes full AdapTable search and sort info plus the event's trigger
  */
@@ -10,7 +9,7 @@ export interface SearchChangedInfo extends BaseEventInfo {
     /**
      * What search-related change caused the event to fire
      */
-    searchChangedTrigger: 'DataSource' | 'CurrentQuery' | 'Filter' | 'DataChange' | 'Sort';
+    searchChangedTrigger: 'CurrentQuery' | 'Filter' | 'DataChange' | 'Sort';
     /**
      * Current searches and filters in the Grid
      */
@@ -27,7 +26,7 @@ export interface AdaptableSearchState {
     /**
      * Current Data Source (if one selected)
      */
-    dataSource: DataSource | undefined;
+    dataSet: DataSet | undefined;
     /**
      * Current Query
      */

package/src/Api/FilterApi.d.ts

@@ -1,15 +1,9 @@
-import { FilterState, ColumnFilter, SystemFilterPredicateIds } from '../PredefinedConfig/FilterState';
-import { AdaptableColumn } from '../types';
+import { AdaptableColumn, SystemFilterPredicateIds } from '../types';
 import { AdaptablePredicateDef } from '../PredefinedConfig/Common/AdaptablePredicate';
-import { RowNode } from '@ag-grid-community/all-modules';
 /**
  * Provides run-time access to Filter section of Adaptable State.
  */
 export interface FilterApi {
-    /**
-     * Retrieves Filter section from Adaptable State
-     */
-    getFilterState(): FilterState;
     /**
      * Returns Predicate Definition for given Column and Quick Filter shortcut
      * @param shortcut Quick Filter shortcut to lookup
@@ -30,76 +24,6 @@ export interface FilterApi {
      * Retrieves Ids for all System Filters
      */
     getAllSystemFilterIds(): SystemFilterPredicateIds;
-    /**
-     * Retrieves all the Column Filters in the Column Filter State (of Predefined Config)
-     * @returns column filters
-     */
-    getAllColumnFilter(): ColumnFilter[];
-    /**
-     * Retrieves ColumnFilter by Id
-     * @param id column filter id
-     * @returns column filter
-     */
-    getColumnFilterById(id: ColumnFilter['Uuid']): ColumnFilter;
-    /**
-     * Sets Column Filters - will replace filters for existing column and leave other column filters in place
-     * @param columnFilters Column Filters to set
-     * @returns column filters
-     */
-    setColumnFilter(columnFilters: ColumnFilter[]): ColumnFilter[] | null;
-    /**
-     * Clears given Column Filter
-     * @param columnFilter Column Filter to clear
-     */
-    clearColumnFilter(columnFilter: ColumnFilter): void;
-    /**
-     * Clears Column Filter for given Column
-     * @param columnId Column for which Column Filter should be cleared
-     */
-    clearColumnFilterByColumn(columnId: string): void;
-    /**
-     * Clears Column Filters for given set of Columns
-     * @param columns Columns for which Column Filte should be cleared
-     */
-    clearColumnFilterByColumns(columns: string[]): void;
-    /**
-     * Clears all Column Filters in State
-     */
-    clearAllColumnFilter(): void;
-    /**
-     * Clears existing Column Filters and then sets the new ones
-     * @param columnFilters Column Filters to set
-     */
-    clearAndSetColumnFilter(columnFilters: ColumnFilter[]): void;
-    /**
-     * Retrieves all Column Filters for given Column
-     * @param columnId column to retrieve Column Filters for
-     * @returns column filters
-     */
-    getAllColumnFilterForColumn(columnId: string): ColumnFilter[];
-    /**
-     * Creates new Column Filter on given Column using Primary Key values
-     * @param columnId ColumnId to use
-     * @param primarykeyValues Primary Key Values to use
-     * @returns column filter
-     */
-    createColumnFilterForCell(columnId: string, primarykeyValues: any[]): ColumnFilter | null;
-    /**
-     * Retrieves description of given Column Filter
-     * @param columnFilter Column Filter to use
-     */
-    columnFilterToString(columnFilter: ColumnFilter): string;
-    /**
-     * Retrieves descriptions of given Column Filters
-     * @param columnFilters Column Filters to use
-     */
-    columnFiltersToString(columnFilters: ColumnFilter[]): string;
-    /**
-     * Calls AdapTableQL to evaluate Filter for given Row
-     * @param columnFilter Column Filter to use
-     * @param node Row Node to evaluate
-     */
-    evaluateColumnFilter(columnFilter: ColumnFilter, node: RowNode): boolean;
     /**
      * Makes Quick Filter Bar appear
      */