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

package/src/Redux/ActionsReducers/SystemRedux.d.ts

@@ -13,7 +13,8 @@ import { AdaptableFlashingCell } from '../../PredefinedConfig/Common/AdaptableFl
 import { SummaryOperation } from '../../PredefinedConfig/Common/Enums';
 import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
 import { RowsHighlightInfo } from '../../PredefinedConfig/Common/RowsHighlightInfo';
-import { SmartEditOperation } from '../../AdaptableOptions/SmartEdit';
+import { SmartEditOperation } from '../../AdaptableOptions/EditOptions';
+import { DataSet } from '../../types';
 export declare const FLASHING_CELL_ROW_KEY = "__ROW";
 export declare const SYSTEM_ALERT_ADD = "SYSTEM_ALERT_ADD";
 export declare const SYSTEM_ALERT_DELETE = "SYSTEM_ALERT_DELETE";
@@ -59,7 +60,12 @@ export declare const SYSTEM_DATA_CHANGE_HISTORY_DISABLE = "SYSTEM_DATA_CHANGE_HI
 export declare const SYSTEM_DATA_CHANGE_HISTORY_SUSPEND = "SYSTEM_DATA_CHANGE_HISTORY_SUSPEND";
 export declare const SYSTEM_DATA_CHANGE_HISTORY_RESUME = "SYSTEM_DATA_CHANGE_HISTORY_RESUME";
 export declare const SYSTEM_SETTINGS_PANEL_SET = "SYSTEM_SETTINGS_PANEL_SET";
+export declare const SYSTEM_QUICK_FILTER_BAR_SHOW = "SYSTEM_QUICK_FILTER_BAR_SHOW";
+export declare const SYSTEM_QUICK_FILTER_BAR_HIDE = "SYSTEM_QUICK_FILTER_BAR_HIDE";
+export declare const SYSTEM_FILTER_FORM_HIDE = "SYSTEM_FILTER_FORM_HIDE";
 export declare const SYSTEM_LAYOUT_SHOW_NOT_ASSOCIATED_OBJECTS = "SYSTEM_LAYOUT_SHOW_NOT_ASSOCIATED_OBJECTS";
+export declare const DASHBOARD_REFRESH = "DASHBOARD_REFRESH";
+export declare const SYSTEM_DATA_SET_SELECT = "SYSTEM_DATA_SET_SELECT";
 export interface SystemHighlightCellAddAction extends Redux.Action {
     cellHighlightInfo: CellHighlightInfo;
 }
@@ -202,13 +208,24 @@ export interface SystemDataChangeHistorySuspendAction extends Redux.Action {
 }
 export interface SystemDataChangeHistoryResumeAction extends Redux.Action {
 }
+export interface SystemDashboardRefreshAction extends Redux.Action {
+}
 export interface SystemSettingsPanelSetAction extends Redux.Action {
     name: string;
     settings: SystemState['SettingsPanel']['0'];
 }
+export interface SystemQuickFilterBarShowAction extends Redux.Action {
+}
+export interface SystemQuickFilterBarHideAction extends Redux.Action {
+}
+export interface SystemFilterFormHideAction extends Redux.Action {
+}
 export interface SystemLayoutShowNotAssociatedObjectsAction extends Redux.Action {
     showNotAssociatedObjects: boolean;
 }
+export interface SystemDataSetSelectAction extends Redux.Action {
+    dataSet: DataSet;
+}
 export declare const SystemHighlightCellAdd: (cellHighlightInfo: CellHighlightInfo) => SystemHighlightCellAddAction;
 export declare const SystemHighlightCellDelete: (primaryKeyValue: CellHighlightInfo['primaryKeyValue'], columnId: CellHighlightInfo['columnId']) => SystemHighlightCellDeleteAction;
 export declare const SystemHighlightCellDeleteAll: () => SystemHighlightCellDeleteAllAction;
@@ -252,5 +269,10 @@ export declare const SystemDataChangeHistoryDisable: () => SystemDataChangeHisto
 export declare const SystemDataChangeHistorySuspend: () => SystemDataChangeHistorySuspendAction;
 export declare const SystemDataChangeHistoryResume: () => SystemDataChangeHistoryResumeAction;
 export declare const SystemSettingsPanelSet: (name: string, settings: SystemState['SettingsPanel']['0']) => SystemSettingsPanelSetAction;
+export declare const SystemQuickFilterBarShow: () => SystemQuickFilterBarShowAction;
+export declare const SystemQuickFilterBarHide: () => SystemQuickFilterBarHideAction;
+export declare const SystemFilterFormHide: () => SystemFilterFormHideAction;
 export declare const SystemLayoutShowNotAssociatedObjects: (showNotAssociatedObjects: boolean) => SystemLayoutShowNotAssociatedObjectsAction;
+export declare const SystemDashboardRefresh: () => SystemDashboardRefreshAction;
+export declare const SystemDataSetSelect: (dataSet: DataSet) => SystemDataSetSelectAction;
 export declare const SystemReducer: Redux.Reducer<SystemState>;

package/src/Redux/ActionsReducers/SystemRedux.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SystemReducer = exports.SystemLayoutShowNotAssociatedObjects = exports.SystemSettingsPanelSet = exports.SystemDataChangeHistoryResume = exports.SystemDataChangeHistorySuspend = exports.SystemDataChangeHistoryDisable = exports.SystemDataChangeHistoryEnable = exports.SystemDataChangeHistoryUndo = exports.SystemDataChangeHistoryAdd = exports.SystemLicenseDisablePersistence = exports.SystemLicenseShowWatermark = exports.SystemProgressIndicatorHide = exports.SystemProgressIndicatorShow = exports.SystemCellSummaryChangeOperation = exports.SystemCachedQueryAdd = exports.SetLastAppliedShortcut = exports.SetNewColumnListOrder = exports.BulkUpdateChangeValue = exports.BulkUpdateSetPreview = exports.BulkUpdateSetValidSelection = exports.BulkUpdateCheckCellSelection = exports.SmartEditSetPreview = exports.SmartEditSetValidSelection = exports.SmartEditCheckCellSelection = exports.SmartEditChangeOperation = exports.SmartEditChangeValue = exports.SystemStatusMessageInfoDeleteAll = exports.SystemStatusMessageInfoDelete = exports.SystemStatusMessageInfoAdd = exports.SystemFlashingCellDeleteAll = exports.SystemFlashingCellDelete = exports.SystemFlashingCellAdd = exports.SystemAlertRemoveRowHighlight = exports.SystemAlertRemoveCellHighlight = exports.SystemAlertDeleteAll = exports.SystemAlertDelete = exports.SystemAlertAdd = exports.SystemHighlightRowDeleteAll = exports.SystemHighlightRowsDelete = exports.SystemHighlightRowDelete = exports.SystemHighlightRowsAdd = exports.SystemHighlightRowAdd = exports.SystemHighlightCellDeleteAll = exports.SystemHighlightCellDelete = exports.SystemHighlightCellAdd = exports.SYSTEM_LAYOUT_SHOW_NOT_ASSOCIATED_OBJECTS = exports.SYSTEM_SETTINGS_PANEL_SET = exports.SYSTEM_DATA_CHANGE_HISTORY_RESUME = exports.SYSTEM_DATA_CHANGE_HISTORY_SUSPEND = exports.SYSTEM_DATA_CHANGE_HISTORY_DISABLE = exports.SYSTEM_DATA_CHANGE_HISTORY_ENABLE = exports.SYSTEM_DATA_CHANGE_HISTORY_UNDO = exports.SYSTEM_DATA_CHANGE_HISTORY_ADD = exports.SYSTEM_LICENSE_DISABLE_PERSISTENCE = exports.SYSTEM_LICENSE_SHOW_WATERMARK = exports.SYSTEM_PROGRESS_INDICATOR_HIDE = exports.SYSTEM_PROGRESS_INDICATOR_SHOW = exports.SYSTEM_CELL_SUMMARY_CHANGE_OPERATION = exports.SYSTEM_CACHED_QUERY_ADD = exports.SYSTEM_SET_LAST_APPLIED_SHORTCUT = exports.SYSTEM_SET_NEW_COLUMN_LIST_ORDER = exports.SYSTEM_HIGHLIGHT_ROW_DELETE_ALL = exports.SYSTEM_HIGHLIGHT_ROWS_DELETE = exports.SYSTEM_HIGHLIGHT_ROW_DELETE = exports.SYSTEM_HIGHLIGHT_ROWS_ADD = exports.SYSTEM_HIGHLIGHT_ROW_ADD = exports.SYSTEM_HIGHLIGHT_CELL_DELETE_ALL = exports.SYSTEM_HIGHLIGHT_CELL_DELETE = exports.SYSTEM_HIGHLIGHT_CELL_ADD = exports.SYSTEM_BULK_UPDATE_CHANGE_VALUE = exports.SYSTEM_BULK_UPDATE_SET_PREVIEW = exports.SYSTEM_BULK_UPDATE_SET_VALID_SELECTION = exports.SYSTEM_BULK_UPDATE_CHECK_CELL_SELECTION = exports.SYSTEM_SMART_EDIT_CHANGE_OPERATION = exports.SYSTEM_SMART_EDIT_CHANGE_VALUE = exports.SYSTEM_SMARTEDIT_SET_PREVIEW = exports.SYSTEM_SMARTEDIT_SET_VALID_SELECTION = exports.SYSTEM_SMARTEDIT_FETCH_PREVIEW = exports.SYSTEM_SMARTEDIT_CHECK_CELL_SELECTION = exports.SYSTEM_STATUS_MESSAGE_INFO_DELETE_ALL = exports.SYSTEM_STATUS_MESSAGE_INFO_DELETE = exports.SYSTEM_STATUS_MESSAGE_INFO_ADD = exports.SYSTEM_FLASHING_CELL_DELETE_ALL = exports.SYSTEM_FLASHING_CELL_DELETE = exports.SYSTEM_FLASHING_CELL_ADD = exports.SYSTEM_ALERT_REMOVE_ROW_HIGHLIGHT = exports.SYSTEM_ALERT_REMOVE_CELL_HIGHLIGHT = exports.SYSTEM_ALERT_DELETE_ALL = exports.SYSTEM_ALERT_DELETE = exports.SYSTEM_ALERT_ADD = exports.FLASHING_CELL_ROW_KEY = void 0;
+exports.SystemReducer = exports.SystemDataSetSelect = exports.SystemDashboardRefresh = exports.SystemLayoutShowNotAssociatedObjects = exports.SystemFilterFormHide = exports.SystemQuickFilterBarHide = exports.SystemQuickFilterBarShow = exports.SystemSettingsPanelSet = exports.SystemDataChangeHistoryResume = exports.SystemDataChangeHistorySuspend = exports.SystemDataChangeHistoryDisable = exports.SystemDataChangeHistoryEnable = exports.SystemDataChangeHistoryUndo = exports.SystemDataChangeHistoryAdd = exports.SystemLicenseDisablePersistence = exports.SystemLicenseShowWatermark = exports.SystemProgressIndicatorHide = exports.SystemProgressIndicatorShow = exports.SystemCellSummaryChangeOperation = exports.SystemCachedQueryAdd = exports.SetLastAppliedShortcut = exports.SetNewColumnListOrder = exports.BulkUpdateChangeValue = exports.BulkUpdateSetPreview = exports.BulkUpdateSetValidSelection = exports.BulkUpdateCheckCellSelection = exports.SmartEditSetPreview = exports.SmartEditSetValidSelection = exports.SmartEditCheckCellSelection = exports.SmartEditChangeOperation = exports.SmartEditChangeValue = exports.SystemStatusMessageInfoDeleteAll = exports.SystemStatusMessageInfoDelete = exports.SystemStatusMessageInfoAdd = exports.SystemFlashingCellDeleteAll = exports.SystemFlashingCellDelete = exports.SystemFlashingCellAdd = exports.SystemAlertRemoveRowHighlight = exports.SystemAlertRemoveCellHighlight = exports.SystemAlertDeleteAll = exports.SystemAlertDelete = exports.SystemAlertAdd = exports.SystemHighlightRowDeleteAll = exports.SystemHighlightRowsDelete = exports.SystemHighlightRowDelete = exports.SystemHighlightRowsAdd = exports.SystemHighlightRowAdd = exports.SystemHighlightCellDeleteAll = exports.SystemHighlightCellDelete = exports.SystemHighlightCellAdd = exports.SYSTEM_DATA_SET_SELECT = exports.DASHBOARD_REFRESH = exports.SYSTEM_LAYOUT_SHOW_NOT_ASSOCIATED_OBJECTS = exports.SYSTEM_FILTER_FORM_HIDE = exports.SYSTEM_QUICK_FILTER_BAR_HIDE = exports.SYSTEM_QUICK_FILTER_BAR_SHOW = exports.SYSTEM_SETTINGS_PANEL_SET = exports.SYSTEM_DATA_CHANGE_HISTORY_RESUME = exports.SYSTEM_DATA_CHANGE_HISTORY_SUSPEND = exports.SYSTEM_DATA_CHANGE_HISTORY_DISABLE = exports.SYSTEM_DATA_CHANGE_HISTORY_ENABLE = exports.SYSTEM_DATA_CHANGE_HISTORY_UNDO = exports.SYSTEM_DATA_CHANGE_HISTORY_ADD = exports.SYSTEM_LICENSE_DISABLE_PERSISTENCE = exports.SYSTEM_LICENSE_SHOW_WATERMARK = exports.SYSTEM_PROGRESS_INDICATOR_HIDE = exports.SYSTEM_PROGRESS_INDICATOR_SHOW = exports.SYSTEM_CELL_SUMMARY_CHANGE_OPERATION = exports.SYSTEM_CACHED_QUERY_ADD = exports.SYSTEM_SET_LAST_APPLIED_SHORTCUT = exports.SYSTEM_SET_NEW_COLUMN_LIST_ORDER = exports.SYSTEM_HIGHLIGHT_ROW_DELETE_ALL = exports.SYSTEM_HIGHLIGHT_ROWS_DELETE = exports.SYSTEM_HIGHLIGHT_ROW_DELETE = exports.SYSTEM_HIGHLIGHT_ROWS_ADD = exports.SYSTEM_HIGHLIGHT_ROW_ADD = exports.SYSTEM_HIGHLIGHT_CELL_DELETE_ALL = exports.SYSTEM_HIGHLIGHT_CELL_DELETE = exports.SYSTEM_HIGHLIGHT_CELL_ADD = exports.SYSTEM_BULK_UPDATE_CHANGE_VALUE = exports.SYSTEM_BULK_UPDATE_SET_PREVIEW = exports.SYSTEM_BULK_UPDATE_SET_VALID_SELECTION = exports.SYSTEM_BULK_UPDATE_CHECK_CELL_SELECTION = exports.SYSTEM_SMART_EDIT_CHANGE_OPERATION = exports.SYSTEM_SMART_EDIT_CHANGE_VALUE = exports.SYSTEM_SMARTEDIT_SET_PREVIEW = exports.SYSTEM_SMARTEDIT_SET_VALID_SELECTION = exports.SYSTEM_SMARTEDIT_FETCH_PREVIEW = exports.SYSTEM_SMARTEDIT_CHECK_CELL_SELECTION = exports.SYSTEM_STATUS_MESSAGE_INFO_DELETE_ALL = exports.SYSTEM_STATUS_MESSAGE_INFO_DELETE = exports.SYSTEM_STATUS_MESSAGE_INFO_ADD = exports.SYSTEM_FLASHING_CELL_DELETE_ALL = exports.SYSTEM_FLASHING_CELL_DELETE = exports.SYSTEM_FLASHING_CELL_ADD = exports.SYSTEM_ALERT_REMOVE_ROW_HIGHLIGHT = exports.SYSTEM_ALERT_REMOVE_CELL_HIGHLIGHT = exports.SYSTEM_ALERT_DELETE_ALL = exports.SYSTEM_ALERT_DELETE = exports.SYSTEM_ALERT_ADD = exports.FLASHING_CELL_ROW_KEY = void 0;
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 const Enums_1 = require("../../PredefinedConfig/Common/Enums");
 const Helper_1 = require("../../Utilities/Helpers/Helper");
@@ -68,7 +68,15 @@ exports.SYSTEM_DATA_CHANGE_HISTORY_SUSPEND = 'SYSTEM_DATA_CHANGE_HISTORY_SUSPEND
 exports.SYSTEM_DATA_CHANGE_HISTORY_RESUME = 'SYSTEM_DATA_CHANGE_HISTORY_RESUME';
 // Settings panel
 exports.SYSTEM_SETTINGS_PANEL_SET = 'SYSTEM_SETTINGS_PANEL_SET';
+// Quick Filter
+exports.SYSTEM_QUICK_FILTER_BAR_SHOW = 'SYSTEM_QUICK_FILTER_BAR_SHOW';
+exports.SYSTEM_QUICK_FILTER_BAR_HIDE = 'SYSTEM_QUICK_FILTER_BAR_HIDE';
+exports.SYSTEM_FILTER_FORM_HIDE = 'SYSTEM_FILTER_FORM_HIDE';
+// Layout
 exports.SYSTEM_LAYOUT_SHOW_NOT_ASSOCIATED_OBJECTS = 'SYSTEM_LAYOUT_SHOW_NOT_ASSOCIATED_OBJECTS';
+exports.DASHBOARD_REFRESH = 'DASHBOARD_REFRESH';
+// DataSet
+exports.SYSTEM_DATA_SET_SELECT = 'SYSTEM_DATA_SET_SELECT';
 exports.SystemHighlightCellAdd = (cellHighlightInfo) => ({
     type: exports.SYSTEM_HIGHLIGHT_CELL_ADD,
     cellHighlightInfo: cellHighlightInfo,
@@ -234,10 +242,26 @@ exports.SystemSettingsPanelSet = (name, settings) => ({
     name,
     settings,
 });
+exports.SystemQuickFilterBarShow = () => ({
+    type: exports.SYSTEM_QUICK_FILTER_BAR_SHOW,
+});
+exports.SystemQuickFilterBarHide = () => ({
+    type: exports.SYSTEM_QUICK_FILTER_BAR_HIDE,
+});
+exports.SystemFilterFormHide = () => ({
+    type: exports.SYSTEM_FILTER_FORM_HIDE,
+});
 exports.SystemLayoutShowNotAssociatedObjects = (showNotAssociatedObjects) => ({
     type: exports.SYSTEM_LAYOUT_SHOW_NOT_ASSOCIATED_OBJECTS,
     showNotAssociatedObjects,
 });
+exports.SystemDashboardRefresh = () => ({
+    type: exports.DASHBOARD_REFRESH,
+});
+exports.SystemDataSetSelect = (dataSet) => ({
+    type: exports.SYSTEM_DATA_SET_SELECT,
+    dataSet: dataSet,
+});
 const initialState = {
     AdaptableAlerts: GeneralConstants_1.EMPTY_ARRAY,
     AdaptableFlashingCells: {},
@@ -270,6 +294,9 @@ const initialState = {
     },
     SettingsPanel: {},
     ShowLayoutNotAssociatedObjects: false,
+    DashboardRevision: 1,
+    IsQuickFilterVisible: true,
+    CurrentDataSet: GeneralConstants_1.EMPTY_STRING,
 };
 exports.SystemReducer = (state = initialState, action) => {
     let alerts;
@@ -554,10 +581,21 @@ exports.SystemReducer = (state = initialState, action) => {
             const setSettingsAction = action;
             return Object.assign(Object.assign({}, state), { SettingsPanel: Object.assign(Object.assign({}, state === null || state === void 0 ? void 0 : state.SettingsPanel), { [setSettingsAction.name]: setSettingsAction.settings }) });
         }
+        case exports.SYSTEM_QUICK_FILTER_BAR_SHOW:
+            return Object.assign({}, state, { IsQuickFilterVisible: true });
+        case exports.SYSTEM_QUICK_FILTER_BAR_HIDE:
+            return Object.assign({}, state, { IsQuickFilterVisible: false });
         case exports.SYSTEM_LAYOUT_SHOW_NOT_ASSOCIATED_OBJECTS: {
             const typedAction = action;
             return Object.assign(Object.assign({}, state), { ShowLayoutNotAssociatedObjects: typedAction.showNotAssociatedObjects });
         }
+        case exports.SYSTEM_DATA_SET_SELECT:
+            return Object.assign({}, state, {
+                CurrentDataSet: action.dataSet.name,
+            });
+        case exports.DASHBOARD_REFRESH: {
+            return Object.assign(Object.assign({}, state), { DashboardRevision: state.DashboardRevision + 1 });
+        }
         default:
             return state;
     }

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/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/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

@@ -15,22 +15,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;

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;