@adaptabletools/adaptable 11.3.0 → 12.0.0-canary.0

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,5 +1,5 @@
 import { ApiBase } from './ApiBase';
-import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
+import { AdaptableColumn, AdaptableColumnDataType } from '../../PredefinedConfig/Common/AdaptableColumn';
 import { DataType } from '../../PredefinedConfig/Common/Enums';
 import { ColumnApi } from '../ColumnApi';
 import { GridCell } from '../../PredefinedConfig/Selection/GridCell';
@@ -27,7 +27,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[];

package/src/Api/Implementation/ColumnApiImpl.js

@@ -268,8 +268,8 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         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) &&

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.layoutApi.getAllColumnFilter(),
         };
         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/FilterApiImpl.d.ts

@@ -1,29 +1,14 @@
 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 { RowNode } from '@ag-grid-community/all-modules';
+import { SystemFilterPredicateIds } from '../../types';
 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;
-    setColumnFilter(columnFilters: ColumnFilter[]): ColumnFilter[] | null;
-    clearAndSetColumnFilter(columnFilters: ColumnFilter[]): void;
-    clearColumnFilter(columnFilter: ColumnFilter): void;
-    clearColumnFilterByColumns(columns: string[]): void;
-    clearColumnFilterByColumn(column: string): void;
-    clearAllColumnFilter(): void;
-    getAllColumnFilterForColumn(column: string): ColumnFilter[];
-    createColumnFilterForCell(columnId: string, primarykeyValues: any[]): ColumnFilter | null;
-    columnFilterToString(columnFilter: ColumnFilter): string;
-    columnFiltersToString(columnFilters: ColumnFilter[]): string;
-    evaluateColumnFilter(columnFilter: ColumnFilter, node: RowNode): boolean;
     showQuickFilterBar(): void;
     hideQuickFilterBar(): void;
     isQuickFilterAvailable(): boolean;

package/src/Api/Implementation/FilterApiImpl.js

@@ -2,14 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FilterApiImpl = void 0;
 const tslib_1 = require("tslib");
-const FilterRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/FilterRedux"));
+const SystemRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/SystemRedux"));
 const ApiBase_1 = require("./ApiBase");
-const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
-const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
 class FilterApiImpl extends ApiBase_1.ApiBase {
-    getFilterState() {
-        return this.getAdaptableState().Filter;
-    }
     getAllSystemFilterIds() {
         return this.getFilterOptions().systemFilters;
     }
@@ -30,167 +25,18 @@ class FilterApiImpl extends ApiBase_1.ApiBase {
             ...this.adaptable.api.predicateApi.getCustomPredicateDefs(),
         ].filter((predicateDef) => predicateDef.moduleScope.includes('filter'));
     }
-    getAllColumnFilter() {
-        return this.getFilterState().ColumnFilters;
-    }
-    getColumnFilterById(id) {
-        var _a;
-        return (_a = this.getAllColumnFilter()) === null || _a === void 0 ? void 0 : _a.find((columnFilter) => columnFilter.Uuid === id);
-    }
-    setColumnFilter(columnFilters) {
-        columnFilters.forEach((columnFilter) => {
-            if (!columnFilter.Predicate) {
-                LoggingHelper_1.LogAdaptableWarning('Column Filter has no Predicate', columnFilter);
-            }
-            else {
-                const isValidPredicate = this.adaptable.api.predicateApi.isValidPredicate(columnFilter.Predicate);
-                if (!isValidPredicate) {
-                    LoggingHelper_1.LogAdaptableWarning('Column Filter Predicate is not valid', columnFilter);
-                }
-                else {
-                    this.addUidToAdaptableObject(columnFilter);
-                    if (this.getAllColumnFilter().find((cf) => cf.ColumnId == columnFilter.ColumnId)) {
-                        this.dispatchAction(FilterRedux.ColumnFilterSet(columnFilter));
-                    }
-                    else {
-                        this.dispatchAction(FilterRedux.ColumnFilterAdd(columnFilter));
-                    }
-                }
-                return columnFilters === null || columnFilters === void 0 ? void 0 : columnFilters.map((columnFilter) => this.getColumnFilterById(columnFilter.Uuid));
-            }
-        });
-        return null;
-    }
-    clearAndSetColumnFilter(columnFilters) {
-        this.clearAllColumnFilter();
-        columnFilters.forEach((columnFilter) => {
-            if (this.getAllColumnFilter().find((cf) => cf.ColumnId == columnFilter.ColumnId)) {
-                this.dispatchAction(FilterRedux.ColumnFilterSet(columnFilter));
-            }
-            else {
-                this.dispatchAction(FilterRedux.ColumnFilterAdd(columnFilter));
-            }
-        });
-    }
-    clearColumnFilter(columnFilter) {
-        this.dispatchAction(FilterRedux.ColumnFilterClear(columnFilter));
-    }
-    clearColumnFilterByColumns(columns) {
-        columns.forEach((c) => {
-            this.clearColumnFilterByColumn(c);
-        });
-    }
-    clearColumnFilterByColumn(column) {
-        let columnFiltersForColumn = this.getAllColumnFilterForColumn(column);
-        if (columnFiltersForColumn) {
-            columnFiltersForColumn.forEach((cf) => {
-                this.dispatchAction(FilterRedux.ColumnFilterClear(cf));
-            });
-            this.adaptable.clearColumnFiltering([column]);
-        }
-    }
-    clearAllColumnFilter() {
-        this.dispatchAction(FilterRedux.ColumnFilterClearAll());
-        this.adaptable.clearGridFiltering();
-    }
-    getAllColumnFilterForColumn(column) {
-        let columnFilters = this.getAllColumnFilter();
-        if (columnFilters) {
-            return columnFilters.filter((cf) => cf.ColumnId == column);
-        }
-        else {
-            return [];
-        }
-    }
-    createColumnFilterForCell(columnId, primarykeyValues) {
-        let cellValues = [];
-        let predicateId;
-        if (primarykeyValues.length == 1) {
-            const normalisedValue = this.adaptable.api.gridApi.getCellNormalisedValue(primarykeyValues[0], columnId);
-            if (normalisedValue) {
-                cellValues.push(normalisedValue);
-                const dataType = this.adaptable.api.columnApi.getColumnDataTypeFromColumnId(columnId);
-                if (dataType) {
-                    if (dataType == 'Number') {
-                        predicateId = 'Equals';
-                    }
-                    else if (dataType == 'Date') {
-                        predicateId = 'On';
-                    }
-                    else if (dataType == 'String') {
-                        predicateId = 'Is';
-                    }
-                    else {
-                        predicateId = 'Equals';
-                    }
-                }
-            }
-        }
-        else {
-            primarykeyValues.forEach((pk) => {
-                const displayValue = this.adaptable.api.gridApi.getCellDisplayValue(pk, columnId);
-                if (displayValue && !cellValues.includes(displayValue)) {
-                    cellValues.push(displayValue);
-                }
-            });
-            predicateId = 'Values';
-        }
-        const filter = {
-            ColumnId: columnId,
-            Predicate: {
-                PredicateId: predicateId,
-                Inputs: [...new Set(cellValues)],
-            },
-        };
-        const [savedFilter] = this.setColumnFilter([filter]) || [null];
-        return savedFilter;
-    }
-    columnFilterToString(columnFilter) {
-        const friendlyName = this.adaptable.api.columnApi.getFriendlyNameFromColumnId(columnFilter.ColumnId);
-        return ('[' +
-            friendlyName +
-            '] ' +
-            this.adaptable.api.predicateApi.predicateToString(columnFilter.Predicate));
-    }
-    columnFiltersToString(columnFilters) {
-        return columnFilters.map((cf) => this.columnFilterToString(cf)).join(', ');
-    }
-    evaluateColumnFilter(columnFilter, node) {
-        var _a;
-        if (!columnFilter.Predicate) {
-            return true;
-        }
-        if ((_a = columnFilter.Predicate.Inputs) === null || _a === void 0 ? void 0 : _a.some((input) => StringExtensions_1.default.IsNullOrEmpty(input))) {
-            return true;
-        }
-        const column = this.adaptable.api.columnApi.getColumnFromId(columnFilter.ColumnId);
-        if (!column) {
-            return true;
-        }
-        const gridCell = this.adaptable.api.gridApi.getGridCellFromRowNode(node, columnFilter.ColumnId);
-        if (!gridCell) {
-            return true;
-        }
-        let value = gridCell.normalisedValue;
-        return this.adaptable.api.predicateApi.handlePredicate(columnFilter.Predicate, {
-            value: value,
-            oldValue: null,
-            displayValue: gridCell.displayValue,
-            node,
-            column,
-        }, true);
-    }
     showQuickFilterBar() {
-        this.dispatchAction(FilterRedux.QuickFilterBarShow());
+        this.dispatchAction(SystemRedux.SystemQuickFilterBarShow());
     }
     hideQuickFilterBar() {
-        this.dispatchAction(FilterRedux.QuickFilterBarHide());
+        this.dispatchAction(SystemRedux.SystemQuickFilterBarHide());
     }
     isQuickFilterAvailable() {
         return this.adaptable.isQuickFilterAvailable();
     }
     isQuickFilterVisible() {
-        return this.isQuickFilterAvailable() && this.getFilterState().IsQuickFilterVisible;
+        return (this.isQuickFilterAvailable() &&
+            this.adaptable.api.internalApi.getSystemState().IsQuickFilterVisible);
     }
 }
 exports.FilterApiImpl = FilterApiImpl;

package/src/Api/Implementation/FormatColumnApiImpl.js

@@ -281,7 +281,7 @@ class FormatColumnApiImpl extends ApiBase_1.ApiBase {
             return value;
         }
         const adaptableOptions = this.adaptable.adaptableOptions;
-        const customFormattersFromOptions = (_b = adaptableOptions === null || adaptableOptions === void 0 ? void 0 : adaptableOptions.formatColumnOptions) === null || _b === void 0 ? void 0 : _b.customDisplayFormatters;
+        const customFormattersFromOptions = (_b = adaptableOptions === null || adaptableOptions === void 0 ? void 0 : adaptableOptions.userInterfaceOptions) === null || _b === void 0 ? void 0 : _b.customDisplayFormatters;
         // formatters are applied in the order they are defined in the options
         const customFormatters = customFormattersFromOptions.filter((customFormatterOption) => columnCustomFormatters.includes(customFormatterOption.id));
         return customFormatters.reduce((acc, formatter) => {

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

@@ -84,7 +84,7 @@ export declare class GridApiImpl extends ApiBase implements GridApi {
     isGroupRowNode(rowNode: RowNode): boolean;
     isQuickFilterAvailable(): boolean;
     redrawGrid(): void;
-    fireSearchChangedEvent(searchChangedTrigger: 'DataSource' | 'CurrentQuery' | 'Filter' | 'DataChange' | 'Sort'): void;
+    fireSearchChangedEvent(searchChangedTrigger: 'CurrentQuery' | 'Filter' | 'DataChange' | 'Sort'): void;
     fireCellChangedEvent(cellDataChangedInfo: CellDataChangedInfo): void;
     fireGridDataChangedEvent(dataRows: any[], rowNodes: RowNode[], rowTrigger: 'Add' | 'Edit' | 'Delete'): void;
     jumpToRow(primaryKeyValue: any): void;

package/src/Api/Implementation/GridApiImpl.js

@@ -90,7 +90,7 @@ class GridApiImpl extends ApiBase_1.ApiBase {
     }
     clearGridFiltering() {
         // slightly round the houses but we have to call FilterAPI as it does it properly
-        this.adaptable.api.filterApi.clearAllColumnFilter();
+        this.adaptable.api.layoutApi.clearAllColumnFilter();
     }
     getAgGridInstance() {
         return this.adaptable.adaptableOptions.gridOptions;

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

@@ -11,7 +11,7 @@ import { SelectedRowInfo } from '../../PredefinedConfig/Selection/SelectedRowInf
 import { AdaptableModule, AdaptableQLModule } from '../../PredefinedConfig/Common/Types';
 import { GridCell } from '../../PredefinedConfig/Selection/GridCell';
 import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
-import { AdaptableCellChangedAlert, AdaptableOptions, AdaptableRowChangedAlert, AdaptableState, AlertButtonContext, BaseContext, Layout, LayoutAssociatedObject, SystemStatusMessageInfo } from '../../types';
+import { AdaptableCellChangedAlert, AdaptableOptions, AdaptableRowChangedAlert, AdaptableState, AlertButtonContext, BaseContext, Layout, LayoutAssociatedObject, SystemStatusMessageInfo, SharedEntity, AdaptableIcon } from '../../types';
 import { IValidationService } from '../../Utilities/Services/Interface/IValidationService';
 import { IModuleService } from '../../Utilities/Services/Interface/IModuleService';
 import { IReportService } from '../../Utilities/Services/Interface/IReportService';
@@ -114,10 +114,11 @@ export declare class InternalApiImpl extends ApiBase implements InternalApi {
     getLabelForButton(button: AdaptableButton<BaseContext>, context: BaseContext): string | undefined;
     getTooltipForButton(button: AdaptableButton<BaseContext>, context: BaseContext): string | undefined;
     getStyleForButton(button: AdaptableButton<BaseContext>, context: BaseContext): ButtonStyle | undefined;
+    getIconForButton(button: AdaptableButton<BaseContext>, context: BaseContext): AdaptableIcon | undefined;
     isDocumentationLinksDisplayed(): boolean;
     getQueryPreviewData(): any;
+    getLocalTeamSharingEntities(): SharedEntity[];
     waitForTeamSharingImportEnd(): Promise<boolean>;
-    getUserDefinedHeaderName(columnId: string): string;
     createFrameworkComponent(containerDomNode: HTMLElement, frameworkComponent: AdaptableFrameworkComponent, componentType: 'toolPanel' | 'toolbar'): void;
     destroyFrameworkComponent(containerDomNode: HTMLElement, frameworkComponent: AdaptableFrameworkComponent, componentType: 'toolPanel' | 'toolbar'): void;
     initializeDataChangeHistory(): void;

package/src/Api/Implementation/InternalApiImpl.js

@@ -360,6 +360,17 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
             return button.buttonStyle;
         }
     }
+    getIconForButton(button, context) {
+        if (!button.icon) {
+            return;
+        }
+        if (button.icon != null && typeof button.icon === 'function') {
+            return button.icon(button, context);
+        }
+        else {
+            return button.icon;
+        }
+    }
     isDocumentationLinksDisplayed() {
         return this.adaptable.adaptableOptions.userInterfaceOptions.showDocumentationLinks;
     }
@@ -380,6 +391,9 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
         });
         return firstRowData;
     }
+    getLocalTeamSharingEntities() {
+        return this.getAdaptableState().TeamSharing.SharedEntities;
+    }
     waitForTeamSharingImportEnd() {
         // we have no deterministic means to ensure the teamsharing import is finished (because the import actions are opaque and may have side-effects)
         // therefore we will listen for state changes and
@@ -406,9 +420,6 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
             });
         });
     }
-    getUserDefinedHeaderName(columnId) {
-        return this.adaptable.getUserDefinedHeaderName(columnId);
-    }
     createFrameworkComponent(containerDomNode, frameworkComponent, componentType) {
         const createComponentFn = () => 
         // delegate the logic to framework wrapper