@adaptabletools/adaptable 11.2.4 → 12.0.0-canary.1

package/src/Redux/Store/AdaptableStore.js

@@ -22,8 +22,6 @@ const PlusMinusRedux = tslib_1.__importStar(require("../ActionsReducers/PlusMinu
 const ExportRedux = tslib_1.__importStar(require("../ActionsReducers/ExportRedux"));
 const ConditionalStyleRedux = tslib_1.__importStar(require("../ActionsReducers/ConditionalStyleRedux"));
 const QuickSearchRedux = tslib_1.__importStar(require("../ActionsReducers/QuickSearchRedux"));
-const DataSourceRedux = tslib_1.__importStar(require("../ActionsReducers/DataSourceRedux"));
-const FilterRedux = tslib_1.__importStar(require("../ActionsReducers/FilterRedux"));
 const ThemeRedux = tslib_1.__importStar(require("../ActionsReducers/ThemeRedux"));
 const FormatColumnRedux = tslib_1.__importStar(require("../ActionsReducers/FormatColumnRedux"));
 const ApplicationRedux = tslib_1.__importStar(require("../ActionsReducers/ApplicationRedux"));
@@ -46,6 +44,7 @@ const Emitter_1 = tslib_1.__importDefault(require("../../Utilities/Emitter"));
 const AdaptableAlert_1 = require("../../PredefinedConfig/Common/AdaptableAlert");
 const AdaptableToaster_1 = require("../../View/Components/Popups/AdaptableToaster");
 const SystemRedux_1 = require("../ActionsReducers/SystemRedux");
+const PopupRedux_1 = require("../ActionsReducers/PopupRedux");
 exports.INIT_STATE = 'INIT_STATE';
 exports.LOAD_STATE = 'LOAD_STATE';
 const NON_PERSIST_ACTIONS = {
@@ -132,9 +131,7 @@ class AdaptableStore {
             ConditionalStyle: ConditionalStyleRedux.ConditionalStyleReducer,
             CustomSort: CustomSortRedux.CustomSortReducer,
             Dashboard: DashboardRedux.DashboardReducer,
-            DataSource: DataSourceRedux.DataSourceReducer,
             Export: ExportRedux.ExportReducer,
-            Filter: FilterRedux.FilterReducer,
             FormatColumn: FormatColumnRedux.FormatColumnReducer,
             FreeTextColumn: FreeTextColumnRedux.FreeTextColumnReducer,
             Layout: LayoutRedux.LayoutReducer,
@@ -689,17 +686,17 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     return returnAction;
                 }
                 /*******************
-                 * FILTER ACTIONS
+                 * System FILTER ACTIONS
                  *******************/
-                case FilterRedux.QUICK_FILTER_BAR_SHOW: {
+                case SystemRedux.SYSTEM_QUICK_FILTER_BAR_SHOW: {
                     adaptable.showQuickFilter();
                     return next(action);
                 }
-                case FilterRedux.QUICK_FILTER_BAR_HIDE: {
+                case SystemRedux.SYSTEM_QUICK_FILTER_BAR_HIDE: {
                     adaptable.hideQuickFilter();
                     return next(action);
                 }
-                case FilterRedux.FILTER_FORM_HIDE: {
+                case SystemRedux.SYSTEM_FILTER_FORM_HIDE: {
                     adaptable.api.gridApi.hideFilterForm();
                     return next(action);
                 }
@@ -707,11 +704,11 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                  * Use Case: Column Filters have changed
                  * Action: Apply grid filtering and fire search changed event
                  */
-                case FilterRedux.COLUMN_FILTER_ADD:
-                case FilterRedux.COLUMN_FILTER_EDIT:
-                case FilterRedux.COLUMN_FILTER_SET:
-                case FilterRedux.COLUMN_FILTER_CLEAR_ALL:
-                case FilterRedux.COLUMN_FILTER_CLEAR: {
+                case LayoutRedux.LAYOUT_COLUMN_FILTER_ADD:
+                case LayoutRedux.LAYOUT_COLUMN_FILTER_EDIT:
+                case LayoutRedux.LAYOUT_COLUMN_FILTER_SET:
+                case LayoutRedux.LAYOUT_COLUMN_FILTER_CLEAR_ALL:
+                case LayoutRedux.LAYOUT_COLUMN_FILTER_CLEAR: {
                     let returnAction = next(action);
                     setTimeout(() => adaptable.applyGridFiltering(), 5);
                     adaptable.api.gridApi.fireSearchChangedEvent('Filter');
@@ -722,14 +719,20 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                  *******************/
                 /**
                  * Use Case: Data Sources have been amended
-                 * Action: Fire search changed event
+                 * Action: Fire Data Source Changed event
                  */
-                case DataSourceRedux.DATA_SOURCE_SELECT:
-                case DataSourceRedux.DATA_SOURCE_ADD:
-                case DataSourceRedux.DATA_SOURCE_EDIT:
-                case DataSourceRedux.DATA_SOURCE_DELETE: {
+                case SystemRedux.SYSTEM_DATA_SET_SELECT: {
                     let returnAction = next(action);
-                    adaptable.api.gridApi.fireSearchChangedEvent('DataSource');
+                    const dataSet = adaptable.api.dataSetApi.getCurrentDataSet();
+                    adaptable.api.dataSetApi.fireDataSetChangeEvent(dataSet);
+                    requestAnimationFrame(() => {
+                        if (dataSet.form) {
+                            middlewareAPI.dispatch(PopupRedux_1.PopupShowForm({
+                                Id: 'data-set-form',
+                                Form: dataSet.form,
+                            }));
+                        }
+                    });
                     return returnAction;
                 }
                 /*******************
@@ -1054,9 +1057,8 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                  *******************/
                 case TeamSharingRedux.TEAMSHARING_GET: {
                     let returnAction = next(action);
-                    const { adaptableId, teamSharingOptions } = adaptable.adaptableOptions;
-                    teamSharingOptions
-                        .getSharedEntities(adaptableId)
+                    adaptable.api.teamSharingApi
+                        .getSharedEntities()
                         .then((sharedEntities) => {
                         middlewareAPI.dispatch(TeamSharingRedux.TeamSharingSet(sharedEntities));
                     })
@@ -1079,15 +1081,14 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     const actionTyped = action;
                     let returnAction = next(action);
                     const { Entity, Configuration, Module } = actionTyped;
-                    const { adaptableId, teamSharingOptions } = adaptable.adaptableOptions;
                     let shareSuccessful;
                     // load latest state from TeamSharing server
-                    teamSharingOptions
-                        .getSharedEntities(adaptableId)
+                    adaptable.api.teamSharingApi
+                        .getSharedEntities()
                         .then((sharedEntities) => {
                         // check if there is not already one active SharedEntity for this object
                         const existingActiveSharedEntity = Configuration.type === 'Active' &&
-                            adaptable.api.teamSharingApi.getTeamSharingState().ActiveSharedEntityMap[Entity.Uuid];
+                            middlewareAPI.getState().TeamSharing.ActiveSharedEntityMap[Entity.Uuid];
                         if (existingActiveSharedEntity) {
                             middlewareAPI.dispatch(PopupRedux.PopupShowAlert({
                                 alertType: 'generic',
@@ -1108,7 +1109,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         middlewareAPI.dispatch(TeamSharingRedux.TeamSharingSet(sharedEntities));
                         // update the server state
                         shareSuccessful = true;
-                        return teamSharingOptions.setSharedEntities(adaptableId, sharedEntities);
+                        return adaptable.api.teamSharingApi.setSharedEntities(sharedEntities);
                     })
                         .then(() => {
                         if (shareSuccessful) {
@@ -1136,10 +1137,9 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 case TeamSharingRedux.TEAMSHARING_REMOVE_ITEM: {
                     let returnAction = next(action);
                     const actionTyped = action;
-                    const { adaptableId, teamSharingOptions } = adaptable.adaptableOptions;
                     // load latest state from TeamSharing server
-                    teamSharingOptions
-                        .getSharedEntities(adaptableId)
+                    adaptable.api.teamSharingApi
+                        .getSharedEntities()
                         .then((sharedEntities) => {
                         // ensure that no other SharedDependencies reference the to-be-deleted entity
                         const sharedEntityDependants = adaptable.api.internalApi
@@ -1160,7 +1160,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         const newSharedEntities = sharedEntities.filter((s) => s.Uuid !== actionTyped.Uuid);
                         middlewareAPI.dispatch(TeamSharingRedux.TeamSharingSet(newSharedEntities));
                         // update TeamSharing server
-                        return teamSharingOptions.setSharedEntities(adaptableId, newSharedEntities);
+                        return adaptable.api.teamSharingApi.setSharedEntities(newSharedEntities);
                     })
                         .catch((error) => {
                         LoggingHelper_1.LogAdaptableError('TeamSharing remove error : ' + error.message);
@@ -1176,7 +1176,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 // Import 1. step
                 // prepare import of the given shared entity (the actual import is done in 'TEAMSHARING_PROCESS_IMPORT'):
                 // - all dependencies will be also included in the import bundle
-                // - if there is at least one local AdaptableObject which will be overwritten, display an confirmation pop
+                // - if there is at least one local AdaptableObject which will be overwritten, display a confirmation pop
                 case TeamSharingRedux.TEAMSHARING_IMPORT_ITEM: {
                     let returnAction = next(action);
                     const actionTyped = action;
@@ -1248,10 +1248,9 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         // we are in the middle of an import process, we don't have to react to these object changes
                         return returnAction;
                     }
-                    const { adaptableId, teamSharingOptions } = adaptable.adaptableOptions;
                     const { ChangedAdaptableObject, UserName } = actionTyped;
-                    teamSharingOptions
-                        .getSharedEntities(adaptableId)
+                    adaptable.api.teamSharingApi
+                        .getSharedEntities()
                         .then((sharedEntities) => {
                         // check if remote server has a newer revision
                         const [localRevision, remoteRevision] = adaptable.api.internalApi
@@ -1266,7 +1265,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                             .updateActiveSharedEntity(ChangedAdaptableObject, UserName, sharedEntities);
                         middlewareAPI.dispatch(TeamSharingRedux.TeamSharingLinkItem(...newActiveEntities));
                         middlewareAPI.dispatch(TeamSharingRedux.TeamSharingSet(updatedSharedEntities));
-                        return teamSharingOptions.setSharedEntities(adaptableId, updatedSharedEntities);
+                        return adaptable.api.teamSharingApi.setSharedEntities(updatedSharedEntities);
                     })
                         .catch((error) => {
                         LoggingHelper_1.LogAdaptableError('TeamSharing update active item error : ' + error.message);
@@ -1281,9 +1280,8 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 }
                 case TeamSharingRedux.TEAMSHARING_CHECK_FOR_UPDATES: {
                     const returnAction = next(action);
-                    const { adaptableId, teamSharingOptions } = adaptable.adaptableOptions;
-                    teamSharingOptions
-                        .getSharedEntities(adaptableId)
+                    adaptable.api.teamSharingApi
+                        .getSharedEntities()
                         .then((sharedEntities) => {
                         // update local state
                         middlewareAPI.dispatch(TeamSharingRedux.TeamSharingSet(sharedEntities));

package/src/Strategy/AdaptableModuleBase.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AdaptableModuleBase = void 0;
 const tslib_1 = require("tslib");
-const Enums_1 = require("../PredefinedConfig/Common/Enums");
 const StringExtensions_1 = require("../Utilities/Extensions/StringExtensions");
 const MenuItem_1 = require("../Utilities/MenuItem");
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/ArrayExtensions"));
@@ -128,7 +127,7 @@ class AdaptableModuleBase {
                 return !column.isSparkline;
             }
             else if (functionType == 'numeric') {
-                return column.dataType == Enums_1.DataType.Number;
+                return column.dataType == 'Number';
             }
             else if (functionType == 'filter') {
                 return column.filterable;

package/src/Strategy/AlertModule.d.ts

@@ -1,9 +1,11 @@
 /// <reference types="react" />
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { AlertDefinition } from '../PredefinedConfig/AlertState';
+import { AdaptableAlert } from '../PredefinedConfig/Common/AdaptableAlert';
 import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
 import { TeamSharingImportInfo } from '../PredefinedConfig/TeamSharingState';
 import * as AlertRedux from '../Redux/ActionsReducers/AlertRedux';
+import * as SystemRedux from '../Redux/ActionsReducers/SystemRedux';
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { AdaptableObjectView, IModule } from './Interface/IModule';
 import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
@@ -26,12 +28,21 @@ export declare class AlertModule extends AdaptableModuleBase implements IModule
     private isAlertPredicateTriggered;
     private isAlertDefinitionForRowChangeEvent;
     getTeamSharingAction(): TeamSharingImportInfo<AlertDefinition>;
+    toViewCompact(alert: AdaptableAlert): {
+        item: {
+            name: string;
+            values: string[];
+        };
+        abObject: AdaptableAlert;
+    };
     toView(alert: AlertDefinition): AdaptableObjectView;
     toViewAll(): AdaptableObjectView[];
     getViewProperties(): {
         getDeleteAction: (alertDefinition: AlertDefinition) => AlertRedux.AlertDefinitionDeleteAction;
         getSuspendAction: (alertDefinition: AlertDefinition) => AlertRedux.AlertDefinitionSuspendAction;
         getUnSuspendAction: (alertDefinition: AlertDefinition) => AlertRedux.AlertDefinitionUnSuspendAction;
+        getCompactDeleteAction: (alert: AdaptableAlert) => SystemRedux.SystemAlertDeleteAction;
+        getDeleteAllAction: () => SystemRedux.SystemAlertDeleteAllAction;
         emptyView: import("react").FunctionComponent<{
             module: IModule;
         }>;

package/src/Strategy/AlertModule.js

@@ -244,6 +244,15 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             EditAction: AlertRedux.AlertDefinitionEdit,
         };
     }
+    toViewCompact(alert) {
+        return {
+            item: {
+                name: alert.header,
+                values: [alert.message],
+            },
+            abObject: alert,
+        };
+    }
     toView(alert) {
         return {
             items: [
@@ -266,6 +275,11 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             getDeleteAction: AlertRedux.AlertDefinitionDelete,
             getSuspendAction: AlertRedux.AlertDefinitionSuspend,
             getUnSuspendAction: AlertRedux.AlertDefinitionUnSuspend,
+            getCompactDeleteAction: SystemRedux.SystemAlertDelete,
+            getDeleteAllAction: () => {
+                const alerts = this.api.internalApi.getState().System.AdaptableAlerts;
+                return SystemRedux.SystemAlertDeleteAll(alerts);
+            },
             emptyView: AlertEmptyView_1.AlertEmptyView,
             getEditWizard: () => AlertWizard_1.AlertWizard,
             getStatusBarPanelProps: () => {

package/src/Strategy/BulkUpdateModule.js

@@ -4,7 +4,6 @@ exports.BulkUpdateModule = void 0;
 const tslib_1 = require("tslib");
 const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
 const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
-const Enums_1 = require("../PredefinedConfig/Common/Enums");
 const PreviewHelper_1 = require("../Utilities/Helpers/PreviewHelper");
 const StringExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/StringExtensions"));
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/ArrayExtensions"));
@@ -110,13 +109,13 @@ class BulkUpdateModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 column = this.api.columnApi.getColumnFromId(selectedCellInfo.columns[0].columnId);
                 let typedBulkUpdateValue;
                 switch (column.dataType) {
-                    case Enums_1.DataType.Number:
+                    case 'Number':
                         typedBulkUpdateValue = Number(bulkUpdateValue);
                         break;
-                    case Enums_1.DataType.String:
+                    case 'String':
                         typedBulkUpdateValue = bulkUpdateValue;
                         break;
-                    case Enums_1.DataType.Date:
+                    case 'Date':
                         typedBulkUpdateValue = new Date(bulkUpdateValue);
                         break;
                 }

package/src/Strategy/CellSummaryModule.d.ts

@@ -6,10 +6,13 @@ import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Commo
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { AccessLevel } from '../PredefinedConfig/Common/Entitlement';
 import { CellSummmary } from '../PredefinedConfig/Common/CellSummary';
+import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
 export declare class CellSummaryModule extends AdaptableModuleBase implements ICellSummaryModule {
     constructor(api: AdaptableApi);
     getViewAccessLevel(): AccessLevel;
+    addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
     addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
+    private createCellSummaryMenuItem;
     createCellSummary(selectedCellInfo: SelectedCellInfo): CellSummmary;
     getViewProperties(): {
         getStatusBarPanelProps(): {

package/src/Strategy/CellSummaryModule.js

@@ -4,7 +4,6 @@ exports.CellSummaryModule = void 0;
 const tslib_1 = require("tslib");
 const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
 const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
-const Enums_1 = require("../PredefinedConfig/Common/Enums");
 const ArrayExtensions_1 = require("../Utilities/Extensions/ArrayExtensions");
 const Helper_1 = require("../Utilities/Helpers/Helper");
 const CellSummaryStatusPanel_1 = require("../View/CellSummary/CellSummaryStatusPanel");
@@ -15,22 +14,36 @@ class CellSummaryModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     getViewAccessLevel() {
         return 'Full';
     }
+    addColumnMenuItems(column) {
+        if (!this.isModuleAvailable()) {
+            return;
+        }
+        return [
+            this.createCellSummaryMenuItem({
+                source: 'ColumnMenu',
+                column,
+            }),
+        ];
+    }
     addContextMenuItems(menuContext) {
-        let menuItemShowPopup = undefined;
-        if (this.isModuleAvailable()) {
-            let popUpParams = {
-                source: 'ContextMenu',
-            };
-            if (menuContext.adaptableColumn && menuContext.isSelectedCell) {
-                menuItemShowPopup = this.createMainMenuItemShowPopup({
-                    Label: 'See Cell Summary',
-                    ComponentName: this.moduleInfo.Popup,
-                    Icon: this.moduleInfo.Glyph,
-                    PopupParams: popUpParams,
-                });
-            }
+        if (!this.isModuleAvailable()) {
+            return;
         }
-        return [menuItemShowPopup];
+        if (menuContext.adaptableColumn && menuContext.isSelectedCell) {
+            return [
+                this.createCellSummaryMenuItem({
+                    source: 'ContextMenu',
+                }),
+            ];
+        }
+    }
+    createCellSummaryMenuItem(popUpParams) {
+        return this.createMainMenuItemShowPopup({
+            Label: 'See Cell Summary',
+            ComponentName: this.moduleInfo.Popup,
+            Icon: this.moduleInfo.Glyph,
+            PopupParams: popUpParams,
+        });
     }
     createCellSummary(selectedCellInfo) {
         let selectedCellSummary;
@@ -39,7 +52,7 @@ class CellSummaryModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             let allValues = [];
             let numericColumns = [];
             selectedCellInfo.columns.map((c) => {
-                if (c && c.dataType == Enums_1.DataType.Number) {
+                if (c && c.dataType == 'Number') {
                     numericColumns.push(c.columnId);
                 }
             });

package/src/Strategy/DataSetModule.d.ts

@@ -0,0 +1,25 @@
+/// <reference types="react" />
+import { AdaptableModuleBase } from './AdaptableModuleBase';
+import { AdaptableObjectView, IModule } from './Interface/IModule';
+import { AdaptableApi } from '../Api/AdaptableApi';
+import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
+import { DataSet } from '../AdaptableOptions/GeneralOptions';
+export declare class DataSetModule extends AdaptableModuleBase implements IModule {
+    constructor(api: AdaptableApi);
+    handleAdaptableReady(): void;
+    getModuleAdaptableObjects(): AdaptableObject[];
+    hasNamedQueryReferences(): boolean;
+    toView(dataSet: DataSet): AdaptableObjectView;
+    toViewAll(): AdaptableObjectView[];
+    getViewProperties(): {
+        actions: import("react").FunctionComponent<{
+            data: DataSet;
+            id?: string;
+            accessLevel: import("../types").AccessLevel;
+        }>[];
+        getStatusBarPanelProps: () => {
+            content: string;
+            popover: import("react").FunctionComponent<{}>;
+        };
+    };
+}

package/src/Strategy/DataSetModule.js

@@ -0,0 +1,65 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DataSetModule = void 0;
+const tslib_1 = require("tslib");
+const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
+const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
+const getObjectTagsViewItems_1 = require("./Utilities/getObjectTagsViewItems");
+const DataSetStatusPanelPopover_1 = require("../View/DataSet/DataSetStatusPanelPopover");
+const Uuid_1 = require("../PredefinedConfig/Uuid");
+const DataSetSelector_1 = require("../View/DataSet/DataSetSelector");
+class DataSetModule extends AdaptableModuleBase_1.AdaptableModuleBase {
+    constructor(api) {
+        super(ModuleConstants.DataSetModuleId, 'Data Set', 'data-set', 'DataSetPopup', 'Update the entire data source in AdapTable using pre-populated data sets', api);
+    }
+    handleAdaptableReady() {
+        this.api.dataSetApi.getAllDataSets().forEach((ds) => {
+            if (!ds.Uuid) {
+                ds.Uuid = Uuid_1.createUuid();
+            }
+        });
+    }
+    getModuleAdaptableObjects() {
+        var _a, _b;
+        return (_b = (_a = this.api.internalApi.getAdaptableOptions().generalOptions) === null || _a === void 0 ? void 0 : _a.dataSets) !== null && _b !== void 0 ? _b : [];
+    }
+    hasNamedQueryReferences() {
+        return false;
+    }
+    toView(dataSet) {
+        var _a;
+        return {
+            items: [
+                {
+                    name: 'Settings',
+                    label: 'Name',
+                    values: [dataSet.name],
+                },
+                {
+                    name: 'Settings',
+                    label: 'Description',
+                    values: [(_a = dataSet.description) !== null && _a !== void 0 ? _a : 'Not Specified'],
+                },
+                getObjectTagsViewItems_1.getObjectTagsViewItems(dataSet, this.api),
+            ],
+            abObject: dataSet,
+        };
+    }
+    toViewAll() {
+        return this.getModuleAdaptableObjects().map((dataSet) => this.toView(dataSet));
+    }
+    getViewProperties() {
+        return {
+            actions: [DataSetSelector_1.DataSetSelector],
+            getStatusBarPanelProps: () => {
+                var _a, _b;
+                const content = (_b = (_a = this.api.dataSetApi.getCurrentDataSet()) === null || _a === void 0 ? void 0 : _a.name) !== null && _b !== void 0 ? _b : this.moduleInfo.FriendlyName;
+                return {
+                    content: content,
+                    popover: DataSetStatusPanelPopover_1.DataSetStatusPanelPopover,
+                };
+            },
+        };
+    }
+}
+exports.DataSetModule = DataSetModule;

package/src/Strategy/ExportModule.js

@@ -107,7 +107,12 @@ class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     }));
                 }
                 else if (customDestination) {
-                    customDestination.onExport(report, this.api.internalApi.getReportService().getReportData(report));
+                    const reportContext = {
+                        report: report,
+                        reportData: this.api.internalApi.getReportService().getReportData(report),
+                        adaptableApi: this.api,
+                    };
+                    customDestination.onExport(reportContext);
                 }
             }
             else {

package/src/Strategy/FilterModule.d.ts

@@ -2,12 +2,12 @@
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
 import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
-import * as FilterRedux from '../Redux/ActionsReducers/FilterRedux';
+import * as LayoutRedux from '../Redux/ActionsReducers/LayoutRedux';
 import { TeamSharingImportInfo } from '../PredefinedConfig/TeamSharingState';
-import { ColumnFilter } from '../PredefinedConfig/FilterState';
-import { AdaptableObjectView, IModule } from './Interface/IModule';
+import { AdaptableObjectCompactView, AdaptableObjectView, IModule } from './Interface/IModule';
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
+import { ColumnFilter } from '../types';
 export declare class FilterModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
     getModuleAdaptableObjects(): AdaptableObject[];
@@ -17,17 +17,13 @@ export declare class FilterModule extends AdaptableModuleBase implements IModule
     addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
     getTeamSharingAction(): TeamSharingImportInfo<ColumnFilter>;
-    toViewCompact(filter: ColumnFilter): {
-        item: {
-            name: string;
-            values: string[];
-        };
-        abObject: ColumnFilter;
-    };
+    toViewCompact(filter: ColumnFilter): AdaptableObjectCompactView;
     toView(filter: ColumnFilter): AdaptableObjectView;
     toViewAll(): AdaptableObjectView[];
     getViewProperties(): {
-        getDeleteAction: (columnFilter: ColumnFilter) => FilterRedux.ColumnFilterClearAction;
+        getDeleteAction: (columnFilter: ColumnFilter) => LayoutRedux.LayoutFilterClearAction;
+        getCompactDeleteAction: (columnFilter: ColumnFilter) => LayoutRedux.LayoutFilterClearAction;
+        getDeleteAllAction: () => LayoutRedux.LayoutFilterClearAllAction;
         emptyView: string;
         getStatusBarPanelProps(): {
             content: string;

package/src/Strategy/FilterModule.js

@@ -5,7 +5,8 @@ const tslib_1 = require("tslib");
 const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
 const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/ArrayExtensions"));
-const FilterRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/FilterRedux"));
+const LayoutRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/LayoutRedux"));
+const SystemRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/SystemRedux"));
 const LoggingHelper_1 = require("../Utilities/Helpers/LoggingHelper");
 const FilterStatusBarSubPanelPopover_1 = require("../View/Filter/FilterStatusBarSubPanelPopover");
 class FilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
@@ -13,7 +14,7 @@ class FilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         super(ModuleConstants.FilterModuleId, 'Filter', 'column-filter', 'FilterPopup', 'Advanced filtering capability allows users to see precisely the data they want', api);
     }
     getModuleAdaptableObjects() {
-        return this.api.filterApi.getAllColumnFilter();
+        return this.api.filterApi.getColumnFilters();
     }
     getExplicitlyReferencedColumnIds(columnFilter) {
         return [columnFilter.ColumnId];
@@ -22,7 +23,10 @@ class FilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return false;
     }
     handleAdaptableReady() {
-        const columnFilters = this.api.filterApi.getAllColumnFilter();
+        if (this.api.internalApi.getAdaptableOptions().filterOptions.showQuickFilter == false) {
+            this.api.filterApi.hideQuickFilterBar();
+        }
+        const columnFilters = this.api.filterApi.getColumnFilters();
         columnFilters.forEach((cf) => {
             if (!this.api.columnApi.doesColumnExist(cf.ColumnId)) {
                 LoggingHelper_1.LogAdaptableError('Column Filter contains missing column: ' + cf.ColumnId);
@@ -37,14 +41,13 @@ class FilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 menuContext.isSingleSelectedColumn &&
                 menuContext.gridCell != null) {
                 let isMultiple = menuContext.selectedCellInfo.gridCells.length > 1;
-                let pkValues = isMultiple
-                    ? this.api.gridApi.getSelectedCellInfo().gridCells.map((gc) => {
-                        return gc.primaryKeyValue;
-                    })
-                    : [menuContext.gridCell.primaryKeyValue];
-                let clickFunction = () => {
-                    this.api.filterApi.createColumnFilterForCell(menuContext.adaptableColumn.columnId, pkValues);
-                };
+                let clickFunction = isMultiple
+                    ? () => {
+                        this.api.filterApi.createValuesColumnFilterForCells(menuContext.selectedCellInfo.gridCells);
+                    }
+                    : () => {
+                        this.api.filterApi.createEqualityColumnFilterForCell(menuContext.selectedCellInfo.gridCells[0]);
+                    };
                 menuItemClickFunction = this.createColumnMenuItemClickFunction(isMultiple ? 'Filter on Cell Values' : 'Filter on Cell Value', this.moduleInfo.Glyph, clickFunction);
             }
         }
@@ -55,15 +58,17 @@ class FilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (column && this.api.gridApi.isQuickFilterAvailable()) {
             const isFilterVisible = this.api.filterApi.isQuickFilterVisible();
             if (this.isModuleEditable() && this.api.columnApi.usesAdaptableQuickFilter(column.columnId)) {
-                baseMenuItems.push(this.createColumnMenuItemReduxAction(isFilterVisible ? 'Hide Quick Filter Bar' : 'Show Quick Filter Bar', isFilterVisible ? 'unchecked' : 'check', isFilterVisible ? FilterRedux.QuickFilterBarHide() : FilterRedux.QuickFilterBarShow()));
+                baseMenuItems.push(this.createColumnMenuItemReduxAction(isFilterVisible ? 'Hide Quick Filter Bar' : 'Show Quick Filter Bar', isFilterVisible ? 'unchecked' : 'check', isFilterVisible
+                    ? SystemRedux.SystemQuickFilterBarHide()
+                    : SystemRedux.SystemQuickFilterBarShow()));
             }
         }
         if (column && this.canCreateColumnMenuItem(column, 'ReadOnly', 'filter')) {
             let existingColumnFilter = this.api.filterApi
-                .getAllColumnFilter()
+                .getColumnFilters()
                 .find((x) => x.ColumnId == column.columnId);
             if (existingColumnFilter) {
-                baseMenuItems.push(this.createColumnMenuItemReduxAction('Clear Filter', this.moduleInfo.Glyph, FilterRedux.ColumnFilterClear(existingColumnFilter)));
+                baseMenuItems.push(this.createColumnMenuItemReduxAction('Clear Filter', this.moduleInfo.Glyph, LayoutRedux.LayoutColumnFilterClear(existingColumnFilter)));
             }
         }
         if (ArrayExtensions_1.default.IsNotNullOrEmpty(baseMenuItems)) {
@@ -72,15 +77,14 @@ class FilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     getTeamSharingAction() {
         return {
-            ModuleEntities: this.api.filterApi.getAllColumnFilter(),
-            AddAction: FilterRedux.ColumnFilterAdd,
-            EditAction: FilterRedux.ColumnFilterEdit,
+            ModuleEntities: this.api.filterApi.getColumnFilters(),
+            AddAction: LayoutRedux.LayoutColumnFilterAdd,
+            EditAction: LayoutRedux.LayoutColumnFilterEdit,
         };
     }
     toViewCompact(filter) {
         return {
             item: {
-                name: this.api.columnApi.getFriendlyNameFromColumnId(filter.ColumnId),
                 values: [this.api.filterApi.columnFilterToString(filter)],
             },
             abObject: filter,
@@ -107,7 +111,9 @@ class FilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     getViewProperties() {
         const api = this.api;
         return {
-            getDeleteAction: FilterRedux.ColumnFilterClear,
+            getDeleteAction: LayoutRedux.LayoutColumnFilterClear,
+            getCompactDeleteAction: LayoutRedux.LayoutColumnFilterClear,
+            getDeleteAllAction: LayoutRedux.LayoutColumnFilterClearAll,
             emptyView: `
         There are currently no column filters applied. \n
 
@@ -115,7 +121,7 @@ class FilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
       `,
             getStatusBarPanelProps() {
                 let text;
-                const filters = api.filterApi.getAllColumnFilter();
+                const filters = api.filterApi.getColumnFilters();
                 if (filters.length === 0) {
                     text = '0 Filters';
                 }