@adaptabletools/adaptable 19.2.3 → 20.0.0-canary.0

package/src/Redux/Store/AdaptableStore.js

@@ -1,13 +1,11 @@
 import * as Redux from 'redux';
-import { ExportDestination } from '../../PredefinedConfig/Common/Enums';
 import * as PluginsRedux from '../ActionsReducers/PluginsRedux';
 import * as PopupRedux from '../ActionsReducers/PopupRedux';
-import { PopupShowForm } from '../ActionsReducers/PopupRedux';
+import { PROGRESS_INDICATOR_HIDE, PROGRESS_INDICATOR_SHOW, } from '../ActionsReducers/PopupRedux';
 import { createEngine as createEngineLocal } from './AdaptableReduxLocalStorageEngine';
 import { mergeReducer } from './AdaptableReduxMerger';
 import { isAdaptableCellChangedAlert, isAdaptableRowChangedAlert, } from '../../PredefinedConfig/Common/AdaptableAlert';
-import * as ConfigConstants from '../../Utilities/Constants/ConfigConstants';
-import { EMPTY_STRING, VISUAL_DATA_REPORT } from '../../Utilities/Constants/GeneralConstants';
+import { ERROR_LAYOUT } from '../../Utilities/Constants/GeneralConstants';
 import * as ModuleConstants from '../../Utilities/Constants/ModuleConstants';
 import Emitter from '../../Utilities/Emitter';
 import { StringExtensions } from '../../Utilities/Extensions/StringExtensions';
@@ -26,7 +24,6 @@ import * as ExportRedux from '../ActionsReducers/ExportRedux';
 import * as FlashingCellRedux from '../ActionsReducers/FlashingCellRedux';
 import * as FormatColumnRedux from '../ActionsReducers/FormatColumnRedux';
 import * as FreeTextColumnRedux from '../ActionsReducers/FreeTextColumnRedux';
-import * as GridRedux from '../ActionsReducers/GridRedux';
 import * as LayoutRedux from '../ActionsReducers/LayoutRedux';
 import * as NamedQueryRedux from '../ActionsReducers/NamedQueryRedux';
 import * as NoteRedux from '../ActionsReducers/NoteRedux';
@@ -37,8 +34,7 @@ import * as ShortcutRedux from '../ActionsReducers/ShortcutRedux';
 import * as SmartEditRedux from '../ActionsReducers/SmartEditRedux';
 import * as StatusBarRedux from '../ActionsReducers/StatusBarRedux';
 import * as StyledColumnRedux from '../ActionsReducers/StyledColumnRedux';
-import * as SystemRedux from '../ActionsReducers/SystemRedux';
-import { SYSTEM_PROGRESS_INDICATOR_HIDE, SYSTEM_PROGRESS_INDICATOR_SHOW, } from '../ActionsReducers/SystemRedux';
+import * as InternalRedux from '../ActionsReducers/InternalRedux';
 import * as TeamSharingRedux from '../ActionsReducers/TeamSharingRedux';
 import * as ThemeRedux from '../ActionsReducers/ThemeRedux';
 import * as ToolPanelRedux from '../ActionsReducers/ToolPanelRedux';
@@ -51,9 +47,15 @@ const NON_PERSIST_ACTIONS = {
     [LOAD_STATE]: true,
     [INIT_STATE]: true,
     // progress indicators should NOT interfere with state management as it may lead to race conditions due to load/persist state being async
-    [SYSTEM_PROGRESS_INDICATOR_SHOW]: true,
-    [SYSTEM_PROGRESS_INDICATOR_HIDE]: true,
+    [PROGRESS_INDICATOR_SHOW]: true,
+    [PROGRESS_INDICATOR_HIDE]: true,
 };
+const NON_PERSISTENT_STORE_KEYS = [
+    'Internal',
+    'Popup',
+    'Comment',
+    'Plugins',
+];
 export const InitState = () => ({
     type: INIT_STATE,
 });
@@ -84,7 +86,7 @@ export class AdaptableStore {
         };
         this.loadStore = (config) => {
             const { adaptable, adaptableStateKey, predefinedConfig, postLoadHook } = config;
-            const postProcessState = postLoadHook !== null && postLoadHook !== void 0 ? postLoadHook : ((state) => state);
+            const postProcessState = postLoadHook ?? ((state) => state);
             this.storageEngine.setStateKey(adaptableStateKey);
             // START STATE LOAD
             this.loadStorageInProgress = true;
@@ -100,7 +102,7 @@ export class AdaptableStore {
                 // END STATE LOAD
                 this.loadStorageInProgress = false;
             }, (e) => {
-                adaptable.logger.consoleError('Failed to load previous Adaptable State : ', e);
+                adaptable.api.consoleError('Failed to load previous Adaptable State : ', e);
                 //for now i'm still initializing Adaptable even if loading state has failed....
                 //we may revisit that later
                 this.TheStore.dispatch(InitState());
@@ -116,9 +118,8 @@ export class AdaptableStore {
         };
         let rootReducerObject = {
             //  Reducers for Non-Persisted State
-            Grid: GridRedux.GridReducer,
             Popup: PopupRedux.PopupReducer,
-            System: SystemRedux.SystemReducer,
+            Internal: InternalRedux.InternalReducer,
             Plugins: PluginsRedux.PluginsReducer,
             Comment: CommentsRedux.CommentsReducer,
             // Reducers for Persisted State
@@ -148,10 +149,15 @@ export class AdaptableStore {
         // allow plugins to participate in the root reducer
         adaptable.forPlugins((plugin) => {
             if (plugin.rootReducer) {
-                rootReducerObject = Object.assign(Object.assign({}, rootReducerObject), plugin.rootReducer(rootReducerObject));
+                rootReducerObject = {
+                    ...rootReducerObject,
+                    ...plugin.rootReducer(rootReducerObject),
+                };
             }
         });
-        const initialRootReducer = Redux.combineReducers(rootReducerObject);
+        const initialRootReducer = 
+        // @ts-ignore
+        Redux.combineReducers(rootReducerObject);
         const rootReducerWithResetManagement = (state, action) => {
             switch (action.type) {
                 case LOAD_STATE:
@@ -177,27 +183,18 @@ export class AdaptableStore {
             persistState: adaptable.adaptableOptions.stateOptions.persistState,
             debounceStateDelay: adaptable.adaptableOptions.stateOptions.debounceStateDelay,
         });
-        const nonPersistentReduxKeys = [
-            // Non Persisted State
-            ConfigConstants.SYSTEM,
-            ConfigConstants.GRID,
-            ConfigConstants.POPUP,
-            ConfigConstants.PLUGINS,
-            ConfigConstants.COMMENT,
-        ];
         const didPersistentStateChange = (state, newState) => {
             return Object.keys(newState).some((key) => {
-                if (nonPersistentReduxKeys.includes(key)) {
+                if (NON_PERSISTENT_STORE_KEYS.includes(key)) {
                     return false;
                 }
-                return (state === null || state === void 0 ? void 0 : state[key]) !== (newState === null || newState === void 0 ? void 0 : newState[key]);
+                return state?.[key] !== newState?.[key];
             });
         };
         // this is now VERY BADLY NAMED!
         let rootReducer = mergeReducer(rootReducerWithResetManagement, LOAD_STATE);
         const composeEnhancers = (x) => x;
         const persistedReducer = (state, action) => {
-            var _a, _b;
             if (adaptable.isDestroyed) {
                 return state;
             }
@@ -211,13 +208,13 @@ export class AdaptableStore {
             const finalState = emitterArg.newState;
             const shouldPersist = state !== finalState &&
                 didPersistentStateChange(state, finalState) &&
-                !((_b = (_a = state === null || state === void 0 ? void 0 : state.System) === null || _a === void 0 ? void 0 : _a.License) === null || _b === void 0 ? void 0 : _b.disablePersistence) &&
+                !state?.Internal?.License?.disablePersistence &&
                 !NON_PERSIST_ACTIONS[action.type] &&
                 !init &&
                 !this.loadStorageInProgress;
             if (shouldPersist) {
-                const storageState = Object.assign({}, finalState);
-                nonPersistentReduxKeys.forEach((key) => {
+                const storageState = { ...finalState };
+                NON_PERSISTENT_STORE_KEYS.forEach((key) => {
                     delete storageState[key];
                 });
                 this.currentStorageState = storageState;
@@ -239,8 +236,7 @@ export class AdaptableStore {
         this.storageEngine = storageEngine;
     }
     destroy() {
-        var _a;
-        (_a = this.emitter) === null || _a === void 0 ? void 0 : _a.clearListeners();
+        this.emitter?.clearListeners();
         this.emitter = null;
     }
     getCurrentStorageState() {
@@ -260,7 +256,6 @@ export class AdaptableStore {
 const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
     return function (next) {
         return function (action) {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
             switch (action.type) {
                 /*******************
                  * NAMED QUERY ACTIONS
@@ -270,38 +265,26 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                  * Action: Check whether it is referenced elsewhere before deleting
                  */
                 case NamedQueryRedux.NAMED_QUERY_DELETE: {
-                    const actionTyped = action;
                     // check if Named Query is not referenced elsewhere
-                    const namedQueryReferences = adaptable.api.namedQueryApi.internalApi.getNamedQueryModuleReferences(actionTyped.namedQuery.Name);
-                    if (namedQueryReferences.length) {
-                        middlewareAPI.dispatch(PopupRedux.PopupShowAlert({
-                            alertType: 'generic',
-                            header: 'Named Query could not be deleted',
-                            message: `It is still referenced in the following modules: ${namedQueryReferences.join(', ')}`,
-                            alertDefinition: ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
-                        }));
+                    const actionTyped = action;
+                    if (!adaptable.api.namedQueryApi.internalApi.validateDeletedNamedQuery(actionTyped.namedQuery.Name)) {
                         return;
                     }
                     const ret = next(action);
                     return ret;
                 }
+                /**
+                 * Use Case: User has renamed a Named Query
+                 * Action: Check whether it is referenced elsewhere before allowing rename
+                 */
                 case NamedQueryRedux.NAMED_QUERY_EDIT: {
                     const actionTyped = action;
-                    // check if name was changed, in which case we have to check if it's referenced
                     const editedNamedQuery = actionTyped.namedQuery;
-                    const previousNamedQueryName = (_b = (_a = middlewareAPI
+                    const previousNamedQueryName = middlewareAPI
                         .getState()
-                        .NamedQuery.NamedQueries.find((namedQuery) => namedQuery.Uuid === editedNamedQuery.Uuid)) === null || _a === void 0 ? void 0 : _a.Name) !== null && _b !== void 0 ? _b : '';
+                        .NamedQuery.NamedQueries.find((namedQuery) => namedQuery.Uuid === editedNamedQuery.Uuid)?.Name ?? '';
                     if (editedNamedQuery.Name !== previousNamedQueryName) {
-                        // if query is referenced elsewhere we cannot allow the name change, as it would turn the referents invalid
-                        const namedQueryReferences = adaptable.api.namedQueryApi.internalApi.getNamedQueryModuleReferences(previousNamedQueryName);
-                        if (namedQueryReferences.length) {
-                            middlewareAPI.dispatch(PopupRedux.PopupShowAlert({
-                                alertType: 'generic',
-                                header: 'Named Query could not be renamed',
-                                message: `It is currently referenced in the following modules: ${namedQueryReferences.join(', ')}`,
-                                alertDefinition: ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
-                            }));
+                        if (!adaptable.api.namedQueryApi.internalApi.validateRenamedNamedQuery(previousNamedQueryName)) {
                             return;
                         }
                     }
@@ -311,22 +294,27 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                 /*******************
                  * System Row Summary ACTIONS
                  *******************/
-                case SystemRedux.SYSTEM_SUMMARY_ROW_SET: {
+                case InternalRedux.SUMMARY_ROW_SET: {
                     let nextAction = next(action);
                     adaptable.api.layoutApi.internalApi.setupRowSummaries();
                     return nextAction;
                 }
                 /*******************
-                 * ALERT ACTIONS
+                 * System Quick Filter ACTIONS
                  *******************/
-                case AlertRedux.ALERT_READY: {
-                    // create observable alerts at grid startup
-                    const reactiveAlertDefinitions = adaptable.api.alertApi.internalApi.getActiveReactiveAlertDefinitions();
-                    reactiveAlertDefinitions.forEach((reactiveAlertDefinition) => adaptable.api.internalApi
-                        .getAlertService()
-                        .createReactiveAlert(reactiveAlertDefinition));
-                    return;
+                case InternalRedux.QUICK_FILTER_BAR_SHOW: {
+                    let nextAction = next(action);
+                    adaptable.showQuickFilter();
+                    return nextAction;
                 }
+                case InternalRedux.QUICK_FILTER_BAR_HIDE: {
+                    let nextAction = next(action);
+                    adaptable.hideQuickFilter();
+                    return nextAction;
+                }
+                /*******************
+                 * ALERT DEFINITION ACTIONS
+                 *******************/
                 case AlertRedux.ALERT_DEFINITION_ADD:
                 case AlertRedux.ALERT_DEFINITION_EDIT:
                 case AlertRedux.ALERT_DEFINITION_DELETE:
@@ -370,6 +358,11 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                     }
                     // called also for rendered column actions, see RENDERED COLUMN ACTIONS block
                     adaptable.updateColumnModelAndRefreshGrid();
+                    // tell Alert Module to check if need to listen to Cell Change
+                    let module = (adaptable.adaptableModules.get(ModuleConstants.AlertModuleId));
+                    if (module) {
+                        module.checkListenToCellDataChanged();
+                    }
                     return returnAction;
                 }
                 /*******************
@@ -385,29 +378,161 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                     const returnAction = next(action);
                     // called also for rendered column actions, see RENDERED COLUMN ACTIONS block
                     adaptable.updateColumnModelAndRefreshGrid();
+                    // check if cell data change listening needs to be activated
+                    let module = (adaptable.adaptableModules.get(ModuleConstants.FlashingCellModuleId));
+                    if (module) {
+                        module.checkListenToCellDataChanged();
+                    }
                     return returnAction;
                 }
                 /*******************
-                 * Alert ACTIONS
+                 * FREE TEXT COLUMN ACTIONS
                  *******************/
                 /**
-                 * Use Case: User has deleted a System Alert which has a Highlight Cell
-                 * Action: Refresh the cell (to clear the style)
+                 * Use Case: We have added / edited / deleted a Free Text Column
+                 * Actions: We check if a deleted Column has references and return if so
+                 * Actions: We update the Special ColumnDefs and refresh the Layout
+                 */
+                case FreeTextColumnRedux.FREE_TEXT_COLUMN_ADD:
+                case FreeTextColumnRedux.FREE_TEXT_COLUMN_EDIT:
+                case FreeTextColumnRedux.FREE_TEXT_COLUMN_DELETE: {
+                    // First check to see Deleted Free Text Column is referenced elsewhwere and return if so
+                    if (action.type === FreeTextColumnRedux.FREE_TEXT_COLUMN_DELETE) {
+                        const actionTyped = action;
+                        if (!adaptable.api.freeTextColumnApi.internalApi.validateDeletedFreeTextColumn(actionTyped.freeTextColumn)) {
+                            return;
+                        }
+                    }
+                    const returnAction = next(action);
+                    // Check listen to Cell Data Changes and refresh the layout
+                    let module = (adaptable.adaptableModules.get(ModuleConstants.FreeTextColumnModuleId));
+                    if (module) {
+                        module.checkListenToCellDataChanged();
+                    }
+                    adaptable.api.layoutApi.internalApi.refreshLayout();
+                    return returnAction;
+                }
+                /*******************
+                 * CALCULATED COLUMN ACTIONS
+                 *******************/
+                /**
+                 * Use Case: We have added / edited / deleted a Calculated Column
+                 * Action: We update the Special ColumnDefs and refresh the Layout
+                 */
+                case CalculatedColumnRedux.CALCULATED_COLUMN_ADD:
+                case CalculatedColumnRedux.CALCULATED_COLUMN_EDIT:
+                case CalculatedColumnRedux.CALCULATED_COLUMN_DELETE: {
+                    const actionTypedCC = action;
+                    const calculatedColumn = actionTypedCC.calculatedColumn;
+                    // First check for Deleted Calculated Columns with references and return if found
+                    if (action.type === CalculatedColumnRedux.CALCULATED_COLUMN_DELETE) {
+                        if (!adaptable.api.calculatedColumnApi.internalApi.validateDeletedCalculatedColumn(calculatedColumn)) {
+                            return;
+                        }
+                    }
+                    const returnAction = next(action);
+                    // Manage Aggregations, fire Event, set up listener and refresh Layout
+                    if (action.type === CalculatedColumnRedux.CALCULATED_COLUMN_ADD ||
+                        action.type === CalculatedColumnRedux.CALCULATED_COLUMN_EDIT) {
+                        adaptable.api.internalApi
+                            .getCalculatedColumnExpressionService()
+                            .createAggregatedScalarLiveValue(calculatedColumn);
+                    }
+                    else {
+                        adaptable.api.internalApi
+                            .getCalculatedColumnExpressionService()
+                            .destroyAggregatedScalarLiveValue(calculatedColumn);
+                    }
+                    adaptable.api.eventApi.internalApi.fireCalculatedColumnChangedEvent(action.type, calculatedColumn);
+                    let module = (adaptable.adaptableModules.get(ModuleConstants.CalculatedColumnModuleId));
+                    if (module) {
+                        module.checkListenToCellDataChanged();
+                    }
+                    adaptable.api.layoutApi.internalApi.refreshLayout();
+                    return returnAction;
+                }
+                /*******************
+                 * RENDERED COLUMN ACTIONS
+                 *******************/
+                /**
+                 * Use Case: We have updated an AdapTable Module that affects rendering
+                 * Action: We set up all columns again
+                 */
+                case QuickSearchRedux.QUICK_SEARCH_SET_STYLE:
+                case FormatColumnRedux.FORMAT_COLUMN_ADD:
+                case FormatColumnRedux.FORMAT_COLUMN_EDIT:
+                case FormatColumnRedux.FORMAT_COLUMN_DELETE:
+                case FormatColumnRedux.FORMAT_COLUMN_DELETE_ALL:
+                case FormatColumnRedux.FORMAT_COLUMN_MOVE_DOWN:
+                case FormatColumnRedux.FORMAT_COLUMN_MOVE_UP:
+                case FormatColumnRedux.FORMAT_COLUMN_SUSPEND:
+                case FormatColumnRedux.FORMAT_COLUMN_UNSUSPEND:
+                case FormatColumnRedux.FORMAT_COLUMN_SUSPEND_ALL:
+                case FormatColumnRedux.FORMAT_COLUMN_UNSUSPEND_ALL:
+                case StyledColumnRedux.STYLED_COLUMN_ADD:
+                case StyledColumnRedux.STYLED_COLUMN_EDIT:
+                case StyledColumnRedux.STYLED_COLUMN_DELETE:
+                case StyledColumnRedux.STYLED_COLUMN_SUSPEND:
+                case StyledColumnRedux.STYLED_COLUMN_UNSUSPEND:
+                case StyledColumnRedux.STYLED_COLUMN_SUSPEND_ALL:
+                case StyledColumnRedux.STYLED_COLUMN_UNSUSPEND_ALL:
+                case CustomSortRedux.CUSTOM_SORT_ADD:
+                case CustomSortRedux.CUSTOM_SORT_EDIT:
+                case CustomSortRedux.CUSTOM_SORT_DELETE:
+                case CustomSortRedux.CUSTOM_SORT_SUSPEND:
+                case CustomSortRedux.CUSTOM_SORT_UNSUSPEND:
+                case CustomSortRedux.CUSTOM_SORT_SUSPEND_ALL:
+                case CustomSortRedux.CUSTOM_SORT_UNSUSPEND_ALL: {
+                    const returnAction = next(action);
+                    // called also for alert actions, see ALERT ACTIONS block
+                    adaptable.updateColumnModelAndRefreshGrid();
+                    return returnAction;
+                }
+                /*******************
+                 * QUICK SEARCH ACTIONS
+                 *******************/
+                /**
+                 * Use Case: User has run a Quick Search
+                 * Action1: Call Adaptable to redraw body so cells can be highlighted
+                 * Action2: Run Query using Quick Search text
+                 */
+                case QuickSearchRedux.QUICK_SEARCH_RUN: {
+                    let returnAction = next(action);
+                    adaptable.api.gridApi.refreshAllCells(true);
+                    // if set then return a query on the text
+                    if (adaptable.adaptableOptions.quickSearchOptions.filterResultsAfterQuickSearch) {
+                        const actionTyped = action;
+                        const searchText = actionTyped.quickSearchText;
+                        if (StringExtensions.IsNotNullOrEmpty(searchText)) {
+                            adaptable.setAgGridQuickSearch(searchText);
+                        }
+                        else {
+                            adaptable.clearAgGridQuickSearch();
+                        }
+                    }
+                    return returnAction;
+                }
+                /*******************
+                 * INTERNAL ACTIONS
+                 *******************/
+                /**
+                 * Use Case: User has deleted a System Alert which has a Highlight Cell or Highlight Row
+                 * Action: Refresh the cell / Row (to clear the Highlight)
                  */
-                case SystemRedux.SYSTEM_ALERT_DELETE: {
+                case InternalRedux.ALERT_DELETE: {
                     const actionTyped = action;
                     let ret = next(action);
                     const adaptableAlert = actionTyped.alert;
-                    if (((_c = adaptableAlert.alertDefinition.AlertProperties) === null || _c === void 0 ? void 0 : _c.HighlightCell) &&
+                    if (adaptableAlert.alertDefinition.AlertProperties?.HighlightCell &&
                         isAdaptableCellChangedAlert(adaptableAlert) &&
                         adaptableAlert.cellDataChangedInfo) {
                         const rowNode = adaptableAlert.cellDataChangedInfo.rowNode;
-                        adaptable.refreshCells([rowNode], [adaptableAlert.cellDataChangedInfo.column.columnId], true);
+                        adaptable.api.gridApi.refreshCell(rowNode, adaptableAlert.cellDataChangedInfo.column.columnId, true);
                     }
-                    if (((_d = adaptableAlert.alertDefinition.AlertProperties) === null || _d === void 0 ? void 0 : _d.HighlightRow) &&
+                    if (adaptableAlert.alertDefinition.AlertProperties?.HighlightRow &&
                         isAdaptableRowChangedAlert(adaptableAlert) &&
-                        adaptableAlert.gridDataChangedInfo) {
-                        adaptable.api.gridApi.refreshRowNodes(adaptableAlert.gridDataChangedInfo.rowNodes);
+                        adaptableAlert.rowDataChangedInfo) {
+                        adaptable.api.gridApi.refreshRowNodes(adaptableAlert.rowDataChangedInfo.rowNodes);
                     }
                     return ret;
                 }
@@ -415,22 +540,21 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                  * Use Case: User has deleted all System Alerts some of which have a Highlight Cell
                  * Action: Refresh the cell (to clear the style)
                  */
-                case SystemRedux.SYSTEM_ALERT_DELETE_ALL: {
+                case InternalRedux.ALERT_DELETE_ALL: {
                     const actionTyped = action;
                     let ret = next(action);
                     let alerts = actionTyped.alerts;
                     alerts.forEach((alert) => {
-                        var _a, _b;
-                        if (((_a = alert.alertDefinition.AlertProperties) === null || _a === void 0 ? void 0 : _a.HighlightCell) &&
+                        if (alert.alertDefinition.AlertProperties?.HighlightCell &&
                             isAdaptableCellChangedAlert(alert) &&
                             alert.cellDataChangedInfo) {
                             let rowNode = alert.cellDataChangedInfo.rowNode;
-                            adaptable.refreshCells([rowNode], [alert.cellDataChangedInfo.column.columnId], true);
+                            adaptable.api.gridApi.refreshCell(rowNode, alert.cellDataChangedInfo.column.columnId, true);
                         }
-                        if (((_b = alert.alertDefinition.AlertProperties) === null || _b === void 0 ? void 0 : _b.HighlightRow) &&
+                        if (alert.alertDefinition.AlertProperties?.HighlightRow &&
                             isAdaptableRowChangedAlert(alert) &&
-                            alert.gridDataChangedInfo) {
-                            adaptable.api.gridApi.refreshRowNodes(alert.gridDataChangedInfo.rowNodes);
+                            alert.rowDataChangedInfo) {
+                            adaptable.api.gridApi.refreshRowNodes(alert.rowDataChangedInfo.rowNodes);
                         }
                     });
                     return ret;
@@ -439,109 +563,108 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                  * Use Case: A System Alert had a Highlight Cell with a limited duration
                  * Action: Refresh the cell (to clear the style)
                  */
-                case SystemRedux.SYSTEM_ALERT_REMOVE_CELL_HIGHLIGHT: {
+                case InternalRedux.ALERT_REMOVE_CELL_HIGHLIGHT: {
                     let ret = next(action);
                     const actionTyped = action;
                     const adaptableAlert = actionTyped.alert;
-                    if ((_e = adaptableAlert.alertDefinition.AlertProperties) === null || _e === void 0 ? void 0 : _e.HighlightCell) {
+                    if (adaptableAlert.alertDefinition.AlertProperties?.HighlightCell) {
                         if (isAdaptableCellChangedAlert(adaptableAlert) &&
                             adaptableAlert.cellDataChangedInfo) {
                             const rowNode = adaptableAlert.cellDataChangedInfo.rowNode;
-                            adaptable.refreshCells([rowNode], [adaptableAlert.cellDataChangedInfo.column.columnId], true);
+                            adaptable.api.gridApi.refreshCell(rowNode, adaptableAlert.cellDataChangedInfo.column.columnId, true);
                         }
                     }
                     return ret;
                 }
-                case SystemRedux.SYSTEM_ALERT_REMOVE_ROW_HIGHLIGHT: {
+                case InternalRedux.ALERT_REMOVE_ROW_HIGHLIGHT: {
                     let ret = next(action);
                     const actionTyped = action;
                     const adaptableAlert = actionTyped.alert;
-                    if ((_f = adaptableAlert.alertDefinition.AlertProperties) === null || _f === void 0 ? void 0 : _f.HighlightRow) {
+                    if (adaptableAlert.alertDefinition.AlertProperties?.HighlightRow) {
                         if (isAdaptableCellChangedAlert(adaptableAlert) &&
                             adaptableAlert.cellDataChangedInfo) {
                             adaptable.api.gridApi.refreshRowNodes([adaptableAlert.cellDataChangedInfo.rowNode]);
                         }
-                        if (isAdaptableRowChangedAlert(adaptableAlert) &&
-                            adaptableAlert.gridDataChangedInfo) {
-                            adaptable.api.gridApi.refreshRowNodes(adaptableAlert.gridDataChangedInfo.rowNodes);
+                        if (isAdaptableRowChangedAlert(adaptableAlert) && adaptableAlert.rowDataChangedInfo) {
+                            adaptable.api.gridApi.refreshRowNodes(adaptableAlert.rowDataChangedInfo.rowNodes);
                         }
                     }
                     return ret;
                 }
-                case SystemRedux.SYSTEM_HIGHLIGHT_CELL_ADD: {
+                case InternalRedux.HIGHLIGHT_CELL_ADD: {
                     const actionTyped = action;
                     const ret = next(action);
                     const cellHighlightInfo = actionTyped.cellHighlightInfo;
-                    const rowNode = adaptable.getRowNodeForPrimaryKey(cellHighlightInfo.primaryKeyValue);
+                    const rowNode = adaptable.api.gridApi.getRowNodeForPrimaryKey(cellHighlightInfo.primaryKeyValue);
                     if (rowNode) {
-                        adaptable.refreshCells([rowNode], [cellHighlightInfo.columnId], true);
+                        adaptable.api.gridApi.refreshCell(rowNode, cellHighlightInfo.columnId, true);
                     }
                     return ret;
                 }
-                case SystemRedux.SYSTEM_HIGHLIGHT_CELL_DELETE: {
+                case InternalRedux.HIGHLIGHT_CELL_DELETE: {
                     const actionTyped = action;
                     const ret = next(action);
-                    const rowNode = adaptable.getRowNodeForPrimaryKey(actionTyped.primaryKeyValue);
+                    const rowNode = adaptable.api.gridApi.getRowNodeForPrimaryKey(actionTyped.primaryKeyValue);
                     if (rowNode) {
-                        adaptable.refreshCells([rowNode], [actionTyped.columnId], true);
+                        adaptable.api.gridApi.refreshCell(rowNode, actionTyped.columnId, true);
                     }
                     return ret;
                 }
-                case SystemRedux.SYSTEM_HIGHLIGHT_CELL_DELETE_ALL: {
-                    const cellHighlightInfos = middlewareAPI.getState().System.HighlightedCells;
+                case InternalRedux.HIGHLIGHT_CELL_DELETE_ALL: {
+                    const cellHighlightInfos = middlewareAPI.getState().Internal.CellHighlightInfo;
                     const ret = next(action);
                     cellHighlightInfos.forEach((cellHighlightInfo) => {
-                        const rowNode = adaptable.getRowNodeForPrimaryKey(cellHighlightInfo.primaryKeyValue);
+                        const rowNode = adaptable.api.gridApi.getRowNodeForPrimaryKey(cellHighlightInfo.primaryKeyValue);
                         if (!rowNode) {
                             return;
                         }
-                        adaptable.refreshCells([rowNode], [cellHighlightInfo.columnId], true);
+                        adaptable.api.gridApi.refreshCell(rowNode, cellHighlightInfo.columnId, true);
                     });
                     return ret;
                 }
-                case SystemRedux.SYSTEM_HIGHLIGHT_ROW_ADD: {
+                case InternalRedux.HIGHLIGHT_ROW_ADD: {
                     const actionTyped = action;
                     const ret = next(action);
                     const rowHighlightInfo = actionTyped.rowHighlightInfo;
-                    const rowNode = adaptable.getRowNodeForPrimaryKey(rowHighlightInfo.primaryKeyValue);
+                    const rowNode = adaptable.api.gridApi.getRowNodeForPrimaryKey(rowHighlightInfo.primaryKeyValue);
                     if (rowNode) {
                         adaptable.api.gridApi.refreshRowNode(rowNode);
                     }
                     return ret;
                 }
-                case SystemRedux.SYSTEM_HIGHLIGHT_ROW_DELETE: {
+                case InternalRedux.HIGHLIGHT_ROW_DELETE: {
                     const actionTyped = action;
                     const ret = next(action);
-                    const rowNode = adaptable.getRowNodeForPrimaryKey(actionTyped.primaryKeyValue);
+                    const rowNode = adaptable.api.gridApi.getRowNodeForPrimaryKey(actionTyped.primaryKeyValue);
                     if (rowNode) {
                         adaptable.api.gridApi.refreshRowNode(rowNode);
                     }
                     return ret;
                 }
-                case SystemRedux.SYSTEM_HIGHLIGHT_ROWS_ADD: {
+                case InternalRedux.HIGHLIGHT_ROWS_ADD: {
                     const actionTyped = action;
                     const ret = next(action);
                     const rowsHighlightInfo = actionTyped.rowsHighlightInfo;
-                    const rowNodes = adaptable.getRowNodesForPrimaryKeys(rowsHighlightInfo.primaryKeyValues);
+                    const rowNodes = adaptable.api.gridApi.getRowNodesForPrimaryKeys(rowsHighlightInfo.primaryKeyValues);
                     if (rowNodes.length) {
                         adaptable.api.gridApi.refreshRowNodes(rowNodes);
                     }
                     return ret;
                 }
-                case SystemRedux.SYSTEM_HIGHLIGHT_ROWS_DELETE: {
+                case InternalRedux.HIGHLIGHT_ROWS_DELETE: {
                     const actionTyped = action;
                     const ret = next(action);
-                    const rowNodes = adaptable.getRowNodesForPrimaryKeys(actionTyped.primaryKeyValues);
+                    const rowNodes = adaptable.api.gridApi.getRowNodesForPrimaryKeys(actionTyped.primaryKeyValues);
                     if (rowNodes.length) {
                         adaptable.api.gridApi.refreshRowNodes(rowNodes);
                     }
                     return ret;
                 }
-                case SystemRedux.SYSTEM_HIGHLIGHT_CELL_DELETE_ALL: {
-                    const rowHighlightInfos = middlewareAPI.getState().System.HighlightedRows;
+                case InternalRedux.HIGHLIGHT_CELL_DELETE_ALL: {
+                    const rowHighlightInfos = middlewareAPI.getState().Internal.RowHighlightInfo;
                     const ret = next(action);
                     rowHighlightInfos.forEach((rowHighlightInfo) => {
-                        const rowNode = adaptable.getRowNodeForPrimaryKey(rowHighlightInfo.primaryKeyValue);
+                        const rowNode = adaptable.api.gridApi.getRowNodeForPrimaryKey(rowHighlightInfo.primaryKeyValue);
                         if (!rowNode) {
                             return;
                         }
@@ -549,289 +672,43 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                     });
                     return ret;
                 }
-                /*******************
-                 * SPECIAL COLUMN ACTIONS
-                 *******************/
-                /**
-                 * Use Case: We have added / edited / deleted a Special Column (i.e. one not in initial ColumnDefs)
-                 * Action: We update the Special ColumnDefs
-                 */
-                case FreeTextColumnRedux.FREE_TEXT_COLUMN_ADD:
-                case FreeTextColumnRedux.FREE_TEXT_COLUMN_EDIT:
-                case CalculatedColumnRedux.CALCULATED_COLUMN_ADD:
-                case CalculatedColumnRedux.CALCULATED_COLUMN_EDIT: {
-                    const actionTyped = action;
-                    const returnAction = next(actionTyped);
-                    if (returnAction.type === CalculatedColumnRedux.CALCULATED_COLUMN_ADD ||
-                        returnAction.type === CalculatedColumnRedux.CALCULATED_COLUMN_EDIT) {
-                        adaptable.api.internalApi
-                            .getCalculatedColumnExpressionService()
-                            .createAggregatedScalarLiveValue(returnAction.calculatedColumn);
-                        adaptable.api.calculatedColumnApi.internalApi.fireCalculatedColumnChangedEvent(action.type, actionTyped.calculatedColumn);
-                    }
-                    adaptable.updateColumnModelAndRefreshGrid();
-                    return returnAction;
-                }
-                /**
-                 * Use Case: We have deleted a CalculatedColumn (i.e. one not in initial ColumnDefs)
-                 * Action: Check whether it is referenced elsewhere before deleting then update the Special ColumnDefs
-                 */
-                case CalculatedColumnRedux.CALCULATED_COLUMN_DELETE: {
-                    const actionTyped = action;
-                    // check if CalculatedColumn is not referenced elsewhere
-                    const calculatedColumnReferences = adaptable.api.calculatedColumnApi.internalApi.getCalculatedColumnModuleReferences(actionTyped.calculatedColumn);
-                    if (calculatedColumnReferences.length) {
-                        middlewareAPI.dispatch(PopupRedux.PopupShowAlert({
-                            alertType: 'generic',
-                            header: 'CalculatedColumn could not be deleted',
-                            message: `It is still referenced in the following modules: ${calculatedColumnReferences.join(', ')}`,
-                            alertDefinition: ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
-                        }));
-                        return;
-                    }
-                    const returnAction = next(actionTyped);
-                    adaptable.api.internalApi
-                        .getCalculatedColumnExpressionService()
-                        .destroyAggregatedScalarLiveValue(returnAction.calculatedColumn);
-                    adaptable.api.calculatedColumnApi.internalApi.fireCalculatedColumnChangedEvent(action.type, actionTyped.calculatedColumn);
-                    adaptable.updateColumnModelAndRefreshGrid();
-                    return returnAction;
-                }
-                /**
-                 * Use Case: We have deleted a FreeText Column (i.e. one not in initial ColumnDefs)
-                 * Action: Check whether it is referenced elsewhere before deleting then update the Special ColumnDefs
-                 */
-                case FreeTextColumnRedux.FREE_TEXT_COLUMN_DELETE: {
-                    const actionTyped = action;
-                    // check if FreeTextColumn is not referenced elsewhere
-                    const freeTextColumnReferences = adaptable.api.freeTextColumnApi.internalApi.getFreeTextColumnModuleReferences(actionTyped.freeTextColumn);
-                    if (freeTextColumnReferences.length) {
-                        middlewareAPI.dispatch(PopupRedux.PopupShowAlert({
-                            alertType: 'generic',
-                            header: 'FreeTextColumn could not be deleted',
-                            message: `It is still referenced in the following modules: ${freeTextColumnReferences.join(', ')}`,
-                            alertDefinition: ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
-                        }));
-                        return;
-                    }
-                    const returnAction = next(action);
-                    adaptable.updateColumnModelAndRefreshGrid();
-                    return returnAction;
-                }
-                /*******************
-                 * RENDERED COLUMN ACTIONS
-                 *******************/
-                /**
-                 * Use Case: We have updated an AdapTable Module that affects rendering
-                 * Action: We set up all columns again
-                 */
-                case QuickSearchRedux.QUICK_SEARCH_SET_STYLE:
-                case FormatColumnRedux.FORMAT_COLUMN_ADD:
-                case FormatColumnRedux.FORMAT_COLUMN_EDIT:
-                case FormatColumnRedux.FORMAT_COLUMN_DELETE:
-                case FormatColumnRedux.FORMAT_COLUMN_DELETE_ALL:
-                case FormatColumnRedux.FORMAT_COLUMN_MOVE_DOWN:
-                case FormatColumnRedux.FORMAT_COLUMN_MOVE_UP:
-                case FormatColumnRedux.FORMAT_COLUMN_SUSPEND:
-                case FormatColumnRedux.FORMAT_COLUMN_UNSUSPEND:
-                case FormatColumnRedux.FORMAT_COLUMN_SUSPEND_ALL:
-                case FormatColumnRedux.FORMAT_COLUMN_UNSUSPEND_ALL:
-                case StyledColumnRedux.STYLED_COLUMN_ADD:
-                case StyledColumnRedux.STYLED_COLUMN_EDIT:
-                case StyledColumnRedux.STYLED_COLUMN_DELETE:
-                case StyledColumnRedux.STYLED_COLUMN_SUSPEND:
-                case StyledColumnRedux.STYLED_COLUMN_UNSUSPEND:
-                case StyledColumnRedux.STYLED_COLUMN_SUSPEND_ALL:
-                case StyledColumnRedux.STYLED_COLUMN_UNSUSPEND_ALL:
-                case CustomSortRedux.CUSTOM_SORT_ADD:
-                case CustomSortRedux.CUSTOM_SORT_EDIT:
-                case CustomSortRedux.CUSTOM_SORT_DELETE:
-                case CustomSortRedux.CUSTOM_SORT_SUSPEND:
-                case CustomSortRedux.CUSTOM_SORT_UNSUSPEND:
-                case CustomSortRedux.CUSTOM_SORT_SUSPEND_ALL:
-                case CustomSortRedux.CUSTOM_SORT_UNSUSPEND_ALL: {
+                case InternalRedux.DATA_CHANGE_HISTORY_UNDO:
+                    const actionTypedUndo = action;
+                    const cellDataChangedInfo = actionTypedUndo.changeInfo;
+                    adaptable.api.gridApi.undoCellEdit(cellDataChangedInfo);
+                    return next(action);
+                case InternalRedux.DATA_CHANGE_HISTORY_ENABLE:
+                case InternalRedux.DATA_CHANGE_HISTORY_DISABLE:
+                case InternalRedux.DATA_CHANGE_HISTORY_SUSPEND:
+                case InternalRedux.DATA_CHANGE_HISTORY_RESUME:
                     const returnAction = next(action);
-                    // called also for alert actions, see ALERT ACTIONS block
-                    adaptable.updateColumnModelAndRefreshGrid();
+                    let module = (adaptable.adaptableModules.get(ModuleConstants.DataChangeHistoryModuleId));
+                    if (module) {
+                        module.checkListenToCellDataChanged();
+                    }
                     return returnAction;
-                }
-                /*******************
-                 * QUICK SEARCH ACTIONS
-                 *******************/
-                /**
-                 * Use Case: User has run a Quick Search
-                 * Action1: Call Adaptable to redraw body so cells can be highlighted
-                 * Action2: Run Query using Quick Search text
-                 */
-                case QuickSearchRedux.QUICK_SEARCH_RUN: {
+                case InternalRedux.CREATE_CELL_SUMMARY_INFO: {
+                    let module = (adaptable.adaptableModules.get(ModuleConstants.CellSummaryModuleId));
                     let returnAction = next(action);
-                    adaptable.refreshAllCells(true);
-                    // if set then return a query on the text
-                    if (adaptable.adaptableOptions.quickSearchOptions.filterResultsAfterQuickSearch) {
-                        const actionTyped = action;
-                        const searchText = actionTyped.quickSearchText;
-                        if (StringExtensions.IsNotNullOrEmpty(searchText)) {
-                            adaptable.setAgGridQuickSearch(searchText);
-                        }
-                        else {
-                            adaptable.setAgGridQuickSearch('');
-                        }
-                    }
+                    let selectedCellInfo = middlewareAPI.getState().Internal.SelectedCellInfo;
+                    let apiSummaryReturn = module.createCellSummaryInfo(selectedCellInfo);
+                    adaptable.api.internalApi.setCellSummaryInfo(apiSummaryReturn);
                     return returnAction;
                 }
-                /*******************
-                 * System FILTER ACTIONS
-                 *******************/
-                case SystemRedux.SYSTEM_QUICK_FILTER_BAR_SHOW: {
-                    adaptable.showQuickFilter();
-                    return next(action);
-                }
-                case SystemRedux.SYSTEM_QUICK_FILTER_BAR_HIDE: {
-                    adaptable.hideQuickFilter();
-                    return next(action);
-                }
-                case SystemRedux.SYSTEM_FILTER_FORM_HIDE: {
-                    adaptable.api.gridApi.hideFilterForm();
-                    return next(action);
-                }
-                /**
-                 * Use Case: Column Filters have changed
-                 * Action: Apply Column Filtering and fire associated events
-                 */
-                case LayoutRedux.LAYOUT_COLUMN_FILTER_ADD:
-                case LayoutRedux.LAYOUT_COLUMN_FILTER_EDIT:
-                case LayoutRedux.LAYOUT_COLUMN_FILTER_SET:
-                case LayoutRedux.LAYOUT_COLUMN_FILTER_CLEAR:
-                case LayoutRedux.LAYOUT_COLUMN_FILTER_CLEAR_ALL:
-                case LayoutRedux.LAYOUT_COLUMN_FILTER_SUSPEND:
-                case LayoutRedux.LAYOUT_COLUMN_FILTER_SUSPEND_ALL:
-                case LayoutRedux.LAYOUT_COLUMN_FILTER_UNSUSPEND:
-                case LayoutRedux.LAYOUT_COLUMN_FILTER_UNSUSPEND_ALL: {
-                    let returnAction;
-                    // needs to be called before 'next' so previous and next column filters are known
-                    const shouldTriggerColumnFiltering = adaptable.api.columnFilterApi.internalApi.shouldNewColumnFilterTriggerColumnFiltering(action);
-                    const currentLayout = adaptable.api.layoutApi.getCurrentLayout();
-                    if (((_g = adaptable.adaptableOptions.layoutOptions) === null || _g === void 0 ? void 0 : _g.autoSaveLayouts) &&
-                        !currentLayout.IsReadOnly) {
-                        returnAction = next(action);
-                    }
-                    else {
-                        if (!middlewareAPI.getState().Grid.CurrentLayout) {
-                            const currentLayout = adaptable.api.layoutApi.getCurrentLayout();
-                            middlewareAPI.dispatch(GridRedux.LayoutUpdateCurrentDraft(currentLayout));
-                        }
-                        // we have a layout draft, we have to update that state
-                        let draftLayoutAction;
-                        switch (action.type) {
-                            case LayoutRedux.LAYOUT_COLUMN_FILTER_ADD:
-                                draftLayoutAction = GridRedux.LayoutDraftColumnFilterAdd(action.columnFilter);
-                                break;
-                            case LayoutRedux.LAYOUT_COLUMN_FILTER_EDIT:
-                                draftLayoutAction = GridRedux.LayoutDraftColumnFilterEdit(action.columnFilter);
-                                break;
-                            case LayoutRedux.LAYOUT_COLUMN_FILTER_SET:
-                                draftLayoutAction = GridRedux.LayoutDraftColumnFilterSet(action.columnFilter);
-                                break;
-                            case LayoutRedux.LAYOUT_COLUMN_FILTER_CLEAR:
-                                draftLayoutAction = GridRedux.LayoutDraftColumnFilterClear(action.columnFilter);
-                                break;
-                            case LayoutRedux.LAYOUT_COLUMN_FILTER_CLEAR_ALL:
-                                draftLayoutAction = GridRedux.LayoutDraftColumnFilterClearAll();
-                                break;
-                            case LayoutRedux.LAYOUT_COLUMN_FILTER_SUSPEND:
-                                draftLayoutAction = GridRedux.LayoutDraftColumnFilterSuspend(action.columnFilter);
-                                break;
-                            case LayoutRedux.LAYOUT_COLUMN_FILTER_SUSPEND_ALL:
-                                draftLayoutAction = GridRedux.LayoutDraftColumnFilterSuspendAll();
-                                break;
-                            case LayoutRedux.LAYOUT_COLUMN_FILTER_UNSUSPEND:
-                                draftLayoutAction = GridRedux.LayoutDraftColumnFilterUnsuspend(action.columnFilter);
-                                break;
-                            case LayoutRedux.LAYOUT_COLUMN_FILTER_UNSUSPEND_ALL:
-                                draftLayoutAction = GridRedux.LayoutDraftColumnFilterUnsuspendAll();
-                                break;
-                        }
-                        returnAction = next(draftLayoutAction);
-                    }
-                    setTimeout(() => {
-                        if (shouldTriggerColumnFiltering) {
-                            adaptable.applyColumnFiltering();
-                        }
-                    }, 5);
-                    adaptable.api.columnFilterApi.internalApi.fireColumnFilterAppliedEvent();
-                    adaptable.api.layoutApi.internalApi.fireLayoutChangedEvent(action.type, null, middlewareAPI.getState().Layout);
-                    return returnAction;
-                }
-                /**
-                 * Use Case: Grid Filter has changed
-                 * Action: Apply Grid Filtering and fire associated events
-                 */
-                case LayoutRedux.LAYOUT_GRID_FILTER_SET:
-                case LayoutRedux.LAYOUT_GRID_FILTER_CLEAR:
-                case LayoutRedux.LAYOUT_GRID_FILTER_SUSPEND:
-                case LayoutRedux.LAYOUT_GRID_FILTER_UNSUSPEND: {
-                    const currentLayout = adaptable.api.layoutApi.getCurrentLayout();
-                    let returnAction;
-                    // - calls GridFilterApplied - examples
-                    adaptable.api.gridFilterApi.internalApi.fireGridFilterAppliedEvent();
-                    // - layout change event, row summary is triggered
-                    adaptable.api.layoutApi.internalApi.fireLayoutChangedEvent(action.type, null, middlewareAPI.getState().Layout);
-                    setTimeout(() => {
-                        // - agGridApi.onFilterChanged
-                        // - internal 'AdapTableFiltersApplied' event - evaluates row summary
-                        // - refresh selected cells and rows
-                        adaptable.applyGridFiltering();
-                    }, 5);
-                    if (((_h = adaptable.adaptableOptions.layoutOptions) === null || _h === void 0 ? void 0 : _h.autoSaveLayouts) &&
-                        !currentLayout.IsReadOnly) {
-                        return next(action);
-                    }
-                    else {
-                        if (!middlewareAPI.getState().Grid.CurrentLayout) {
-                            const currentLayout = adaptable.api.layoutApi.getCurrentLayout();
-                            middlewareAPI.dispatch(GridRedux.LayoutUpdateCurrentDraft(currentLayout));
-                        }
-                        switch (action.type) {
-                            case LayoutRedux.LAYOUT_GRID_FILTER_SET:
-                                returnAction = GridRedux.LayoutDraftGridFilterSet(Object.assign(Object.assign({}, currentLayout.GridFilter), { Expression: action.gridFilter }));
-                                break;
-                            case LayoutRedux.LAYOUT_GRID_FILTER_CLEAR:
-                                returnAction = GridRedux.LayoutDraftGridFilterSet(null);
-                                break;
-                            case LayoutRedux.LAYOUT_GRID_FILTER_SUSPEND:
-                                returnAction = GridRedux.LayoutDraftGridFilterSet(Object.assign(Object.assign({}, currentLayout.GridFilter), { IsSuspended: true }));
-                                break;
-                            case LayoutRedux.LAYOUT_GRID_FILTER_UNSUSPEND:
-                                returnAction = GridRedux.LayoutDraftGridFilterSet(Object.assign(Object.assign({}, currentLayout.GridFilter), { IsSuspended: false }));
-                                break;
-                        }
-                    }
-                    return next(returnAction);
-                }
                 /*******************
                  * DATA SOURCE ACTIONS
                  *******************/
                 /**
                  * Use Case: Data Sources have been amended
-                 * Action: Fire Data Source Changed event
+                 * Action1: Fire Data Source Changed event
+                 * Action2: Display a DataSet form if supplied
                  */
-                case SystemRedux.SYSTEM_DATA_SET_SELECT: {
+                case InternalRedux.DATA_SET_SELECT: {
                     let returnAction = next(action);
                     const dataSet = adaptable.api.dataSetApi.getCurrentDataSet();
-                    adaptable.api.dataSetApi.internalApi.fireDataSetSelectedEvent(dataSet);
+                    adaptable.api.eventApi.internalApi.fireDataSetSelectedEvent(dataSet);
                     requestAnimationFrame(() => {
-                        if (dataSet.form) {
-                            middlewareAPI.dispatch(PopupShowForm({
-                                Id: 'data-set-form',
-                                Form: dataSet.form,
-                                prepareContext: (context) => {
-                                    return new Promise((resolve) => {
-                                        const preparedContext = Object.assign(Object.assign({}, context), { dataSet });
-                                        resolve(preparedContext);
-                                    });
-                                },
-                            }));
-                        }
+                        adaptable.api.dataSetApi.internalApi.showDataSetForm(dataSet);
                     });
                     return returnAction;
                 }
@@ -858,8 +735,9 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                 case NoteRedux.NOTE_EDIT:
                 case NoteRedux.NOTE_DELETE: {
                     let returnAction = next(action);
-                    const node = adaptable.api.gridApi.getRowNodeForPrimaryKey(returnAction.adaptableNote.PrimaryKeyValue);
-                    adaptable.refreshCells([node], [returnAction.adaptableNote.ColumnId], true);
+                    adaptable.AnnotationsService.checkListenToEvents();
+                    const rowNode = adaptable.api.gridApi.getRowNodeForPrimaryKey(returnAction.adaptableNote.PrimaryKeyValue);
+                    adaptable.api.gridApi.refreshCell(rowNode, returnAction.adaptableNote.ColumnId, true);
                     return returnAction;
                 }
                 /*******************
@@ -875,37 +753,38 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                 case CommentsRedux.COMMENTS_CELL_DELETE:
                 case CommentsRedux.COMMENTS_CELL_ADD: {
                     let returnAction = next(action);
-                    let node = null;
+                    adaptable.AnnotationsService.checkListenToEvents();
+                    let rowNode = null;
                     let columnId = null;
                     if ('cellAddress' in returnAction) {
-                        node = adaptable.api.gridApi.getRowNodeForPrimaryKey(returnAction.cellAddress.PrimaryKeyValue);
+                        rowNode = adaptable.api.gridApi.getRowNodeForPrimaryKey(returnAction.cellAddress.PrimaryKeyValue);
                         columnId = returnAction.cellAddress.ColumnId;
                     }
                     else if ('cellComments' in returnAction) {
-                        node = adaptable.api.gridApi.getRowNodeForPrimaryKey(returnAction.cellComments.PrimaryKeyValue);
+                        rowNode = adaptable.api.gridApi.getRowNodeForPrimaryKey(returnAction.cellComments.PrimaryKeyValue);
                         columnId = returnAction.cellComments.ColumnId;
                     }
-                    if (node && columnId) {
-                        adaptable.refreshCells([node], [columnId], true);
+                    if (rowNode && columnId) {
+                        adaptable.api.gridApi.refreshCell(rowNode, columnId, true);
                         requestAnimationFrame(() => {
-                            var _a, _b;
-                            const commentThreads = adaptable.api.commentApi.getGridComments();
-                            adaptable.api.eventApi.emit('CommentChanged', adaptable.api.commentApi.getGridComments());
-                            (_b = (_a = adaptable.api.optionsApi
-                                .getCommentOptions()) === null || _a === void 0 ? void 0 : _a.persistCommentThreads) === null || _b === void 0 ? void 0 : _b.call(_a, commentThreads);
+                            const commentThreads = adaptable.api.commentApi.getAllComments();
+                            adaptable.api.eventApi.emit('CommentChanged', commentThreads);
+                            adaptable.api.optionsApi
+                                .getCommentOptions()
+                                ?.persistCommentThreads?.(commentThreads);
                         });
                     }
                     return returnAction;
                 }
                 case CommentsRedux.COMMENTS_LOAD: {
-                    const previousCommentThreads = adaptable.api.commentApi.getGridComments();
+                    const previousCommentThreads = adaptable.api.commentApi.getAllComments();
                     let returnAction = next(action);
-                    const newCommentThreads = (_j = adaptable.api.commentApi.getGridComments()) !== null && _j !== void 0 ? _j : [];
+                    const newCommentThreads = adaptable.api.commentApi.getAllComments() ?? [];
                     requestAnimationFrame(() => {
                         let addedCommentThreads = [];
                         let deletedCommentThreads = [];
-                        const prevCommentThreadsSet = new Set((previousCommentThreads !== null && previousCommentThreads !== void 0 ? previousCommentThreads : []).map((c) => c.Uuid));
-                        const newCommentThreadsSet = new Set((newCommentThreads !== null && newCommentThreads !== void 0 ? newCommentThreads : []).map((c) => c.Uuid));
+                        const prevCommentThreadsSet = new Set((previousCommentThreads ?? []).map((c) => c.Uuid));
+                        const newCommentThreadsSet = new Set((newCommentThreads ?? []).map((c) => c.Uuid));
                         for (const commentThread of newCommentThreads) {
                             if (!prevCommentThreadsSet.has(commentThread.Uuid)) {
                                 addedCommentThreads.push(commentThread);
@@ -922,7 +801,7 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                         [...addedCommentThreads, ...deletedCommentThreads].forEach((commentThread) => {
                             const node = adaptable.api.gridApi.getRowNodeForPrimaryKey(commentThread.PrimaryKeyValue);
                             if (node && commentThread.ColumnId) {
-                                adaptable.refreshCells([node], [commentThread.ColumnId], true);
+                                adaptable.api.gridApi.refreshCell(node, commentThread.ColumnId, true);
                             }
                         });
                     });
@@ -983,7 +862,7 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                     const oldDashboardState = middlewareAPI.getState().Dashboard;
                     let returnAction = next(action);
                     const newDashboardState = middlewareAPI.getState().Dashboard;
-                    adaptable.api.dashboardApi.internalApi.fireDashboardChangedEvent(action.type, oldDashboardState, newDashboardState);
+                    adaptable.api.eventApi.internalApi.fireDashboardChangedEvent(action.type, oldDashboardState, newDashboardState);
                     return returnAction;
                 }
                 /*******************
@@ -1000,44 +879,30 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                     const previousLayout = adaptable.api.layoutApi.getCurrentLayout();
                     let returnAction = next(action);
                     const newLayoutState = middlewareAPI.getState().Layout;
-                    adaptable.api.layoutApi.internalApi.fireLayoutChangedEvent(action.type, oldLayoutState, newLayoutState);
-                    // Tell Grid to apply column filtering if filters have been changed in a loaded Layout
-                    const oldFilters = (_k = oldLayoutState.Layouts.find((l) => l.Name == oldLayoutState.CurrentLayout)) === null || _k === void 0 ? void 0 : _k.ColumnFilters;
-                    const newFilters = (_l = newLayoutState.Layouts.find((l) => l.Name == newLayoutState.CurrentLayout)) === null || _l === void 0 ? void 0 : _l.ColumnFilters;
-                    if (adaptable.api.columnFilterApi.internalApi.areColumnFiltersDifferent(oldFilters, newFilters)) {
-                        adaptable.applyColumnFiltering();
+                    adaptable.api.eventApi.internalApi.fireLayoutChangedEvent(action.type, oldLayoutState, newLayoutState);
+                    const oldLayout = (oldLayoutState.Layouts || []).find((l) => l.Name == oldLayoutState.CurrentLayout) || ERROR_LAYOUT;
+                    const newLayout = (newLayoutState.Layouts || []).find((l) => l.Name == newLayoutState.CurrentLayout) ||
+                        newLayoutState.Layouts[0] ||
+                        ERROR_LAYOUT;
+                    // Apply filtering if Column or Grid filters have been changed
+                    let refreshFilters = false;
+                    if (adaptable.api.filterApi.columnFilterApi.internalApi.areColumnFiltersDifferent(oldLayout.ColumnFilters, newLayout.ColumnFilters)) {
+                        refreshFilters = true;
+                    }
+                    // Apply Grid filtering if Grid filter has been changed
+                    if (!refreshFilters &&
+                        adaptable.api.filterApi.gridFilterApi.internalApi.isGridFilterDifferent(oldLayout.GridFilter, newLayout.GridFilter)) {
+                        refreshFilters = true;
                     }
-                    // Tell Grid to apply filtering if filters have been changed in a loaded Layout
-                    const oldGridFilter = (_m = oldLayoutState.Layouts.find((l) => l.Name == oldLayoutState.CurrentLayout)) === null || _m === void 0 ? void 0 : _m.GridFilter;
-                    const newGridFilter = (_o = newLayoutState.Layouts.find((l) => l.Name == newLayoutState.CurrentLayout)) === null || _o === void 0 ? void 0 : _o.GridFilter;
-                    if (adaptable.api.gridFilterApi.internalApi.isGridFilterDifferent(oldGridFilter, newGridFilter)) {
-                        adaptable.applyGridFiltering();
+                    if (refreshFilters) {
+                        adaptable.applyFiltering();
                     }
                     if (returnAction.type == LayoutRedux.LAYOUT_SELECT ||
                         returnAction.type == LayoutRedux.LAYOUT_DELETE ||
                         returnAction.type == LayoutRedux.LAYOUT_COLUMN_SET_CAPTION) {
-                        let gridState = middlewareAPI.getState().Grid;
-                        let currentLayout = newLayoutState.Layouts.find((l) => l.Name == newLayoutState.CurrentLayout);
-                        if (gridState.CurrentLayout) {
-                            currentLayout = gridState.CurrentLayout;
-                        }
-                        if (currentLayout) {
-                            // tell grid the layout has been selected
-                            adaptable.setLayout(currentLayout);
-                        }
-                        if (!((_p = adaptable.adaptableOptions.layoutOptions) === null || _p === void 0 ? void 0 : _p.autoSaveLayouts)) {
-                            middlewareAPI.dispatch(GridRedux.LayoutUpdateCurrentDraft(currentLayout));
-                        }
-                    }
-                    if (returnAction.type == LayoutRedux.LAYOUT_ADD ||
-                        returnAction.type == LayoutRedux.LAYOUT_SAVE) {
-                        const actionTyped = action;
-                        // if autosave is false
-                        if (!((_q = adaptable.adaptableOptions.layoutOptions) === null || _q === void 0 ? void 0 : _q.autoSaveLayouts)) {
-                            // and the current layout is saved, make sure we also update the draft
-                            if (actionTyped.layout.Name === newLayoutState.CurrentLayout) {
-                                middlewareAPI.dispatch(GridRedux.LayoutUpdateCurrentDraft(actionTyped.layout));
-                            }
+                        // tell AdapTable the Layout has been selected
+                        if (newLayout) {
+                            adaptable.setLayout(newLayout);
                         }
                     }
                     // when changing current layout via the api, the layout should update
@@ -1051,9 +916,51 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                             adaptable.setLayout(savingLayout);
                         }
                     }
-                    adaptable.refreshQuickFilter();
                     return returnAction;
                 }
+                /**
+                 * Use Case: Column Filters have changed
+                 * Action: Apply Column Filtering and fire associated events
+                 */
+                case LayoutRedux.LAYOUT_COLUMN_FILTER_ADD:
+                case LayoutRedux.LAYOUT_COLUMN_FILTER_EDIT:
+                case LayoutRedux.LAYOUT_COLUMN_FILTER_SET:
+                case LayoutRedux.LAYOUT_COLUMN_FILTER_CLEAR:
+                case LayoutRedux.LAYOUT_COLUMN_FILTER_CLEAR_ALL:
+                case LayoutRedux.LAYOUT_COLUMN_FILTER_SUSPEND:
+                case LayoutRedux.LAYOUT_COLUMN_FILTER_SUSPEND_ALL:
+                case LayoutRedux.LAYOUT_COLUMN_FILTER_UNSUSPEND:
+                case LayoutRedux.LAYOUT_COLUMN_FILTER_UNSUSPEND_ALL: {
+                    let returnAction;
+                    // needs to be called before 'next' so previous and next column filters are known
+                    const shouldTriggerColumnFiltering = adaptable.api.filterApi.columnFilterApi.internalApi.shouldNewColumnFilterTriggerColumnFiltering(action);
+                    const oldLayoutState = middlewareAPI.getState().Layout;
+                    returnAction = next(action);
+                    setTimeout(() => {
+                        if (shouldTriggerColumnFiltering) {
+                            adaptable.applyFiltering();
+                        }
+                    }, 5);
+                    adaptable.api.eventApi.internalApi.fireColumnFilterAppliedEvent();
+                    adaptable.api.eventApi.internalApi.fireLayoutChangedEvent(action.type, oldLayoutState, middlewareAPI.getState().Layout);
+                    return returnAction;
+                }
+                /**
+                 * Use Case: Grid Filter has changed
+                 * Action: Apply Grid Filtering and fire associated events
+                 */
+                case LayoutRedux.LAYOUT_GRID_FILTER_SET:
+                case LayoutRedux.LAYOUT_GRID_FILTER_CLEAR:
+                case LayoutRedux.LAYOUT_GRID_FILTER_SUSPEND:
+                case LayoutRedux.LAYOUT_GRID_FILTER_UNSUSPEND: {
+                    let returnAction = next(action);
+                    adaptable.api.eventApi.internalApi.fireGridFilterAppliedEvent();
+                    adaptable.api.eventApi.internalApi.fireLayoutChangedEvent(action.type, null, middlewareAPI.getState().Layout);
+                    setTimeout(() => {
+                        adaptable.applyFiltering();
+                    }, 5);
+                    return next(returnAction);
+                }
                 /*******************
                  * SMART EDIT ACTIONS
                  *******************/
@@ -1067,7 +974,7 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                  * Action (3): Build the Preview Values (via Smart Edit module)
                  * Action (4): Set the Preview Values (this will populate the preview screen)
                  */
-                case SystemRedux.SYSTEM_SMARTEDIT_CHECK_CELL_SELECTION: {
+                case InternalRedux.SMARTEDIT_CHECK_CELL_SELECTION: {
                     let module = (adaptable.adaptableModules.get(ModuleConstants.SmartEditModuleId));
                     let state = middlewareAPI.getState();
                     let returnAction = next(action);
@@ -1081,16 +988,16 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                             // check if Smart Edit is showing as popup and then close and show error (dont want to do that if from toolbar)
                             if (popup.ComponentName == 'SmartEditPopup') {
                                 // We are in SmartEditPopup so let's close it
-                                middlewareAPI.dispatch(PopupRedux.PopupHideScreen());
+                                adaptable.api.internalApi.hidePopupScreen();
                                 // and now show the alert Popup
-                                middlewareAPI.dispatch(PopupRedux.PopupShowAlert(apiReturn.Alert));
+                                adaptable.api.alertApi.displayAdaptableAlertNotification(apiReturn.Alert);
                             }
-                            middlewareAPI.dispatch(SystemRedux.SmartEditSetValidSelection(false));
+                            middlewareAPI.dispatch(InternalRedux.SmartEditSetValidSelection(false));
                         }
                         else {
-                            middlewareAPI.dispatch(SystemRedux.SmartEditSetValidSelection(true));
-                            let apiPreviewReturn = module.BuildPreviewValues(state.System.SmartEditValue, state.System.SmartEditOperation);
-                            middlewareAPI.dispatch(SystemRedux.SmartEditSetPreview(apiPreviewReturn));
+                            middlewareAPI.dispatch(InternalRedux.SmartEditSetValidSelection(true));
+                            let apiPreviewReturn = module.BuildPreviewValues(state.Internal.SmartEdit.SmartEditValue, state.Internal.SmartEdit.SmartEditOperation);
+                            middlewareAPI.dispatch(InternalRedux.SmartEditSetPreview(apiPreviewReturn));
                         }
                     }
                     return returnAction;
@@ -1100,16 +1007,16 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                  * Action (1):  Get the new preview set from the Smart Edit module
                  * Action (2):  Set the Preview Values (this will populate the preview screen)
                  */
-                case SystemRedux.SYSTEM_SMART_EDIT_CHANGE_OPERATION:
-                case SystemRedux.SYSTEM_SMART_EDIT_CHANGE_VALUE:
-                case SystemRedux.SYSTEM_SMARTEDIT_FETCH_PREVIEW: {
+                case InternalRedux.SMART_EDIT_CHANGE_OPERATION:
+                case InternalRedux.SMART_EDIT_CHANGE_VALUE:
+                case InternalRedux.SMARTEDIT_FETCH_PREVIEW: {
                     //all our logic needs to be executed AFTER the main reducers
                     //so our state is up to date which allow us not to care about the data within each different action
                     let returnAction = next(action);
                     let module = (adaptable.adaptableModules.get(ModuleConstants.SmartEditModuleId));
                     let state = middlewareAPI.getState();
-                    let apiReturn = module.BuildPreviewValues(state.System.SmartEditValue, state.System.SmartEditOperation);
-                    middlewareAPI.dispatch(SystemRedux.SmartEditSetPreview(apiReturn));
+                    let apiReturn = module.BuildPreviewValues(state.Internal.SmartEdit.SmartEditValue, state.Internal.SmartEdit.SmartEditOperation);
+                    middlewareAPI.dispatch(InternalRedux.SmartEditSetPreview(apiReturn));
                     return returnAction;
                 }
                 /**
@@ -1119,16 +1026,16 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                  */
                 case SmartEditRedux.SMART_EDIT_APPLY: {
                     const actionTyped = action;
-                    let thePreview = middlewareAPI.getState().System.SmartEditPreviewInfo;
+                    let thePreview = middlewareAPI.getState().Internal.SmartEdit.SmartEditPreviewInfo;
                     let newValues = PreviewHelper.GetCellUpdateRequestsFromPreview(thePreview, actionTyped.bypassValidationWarnings);
                     adaptable.api.gridApi.setCellValues(newValues);
-                    middlewareAPI.dispatch(PopupRedux.PopupHideScreen());
+                    adaptable.api.internalApi.hidePopupScreen();
                     return next(action);
                 }
                 /*******************
                  * BULK UPDATE ACTIONS
                  *******************/
-                case SystemRedux.SYSTEM_BULK_UPDATE_CHECK_CELL_SELECTION: {
+                case InternalRedux.BULK_UPDATE_CHECK_CELL_SELECTION: {
                     let module = (adaptable.adaptableModules.get(ModuleConstants.BulkUpdateModuleId));
                     let state = middlewareAPI.getState();
                     let returnAction = next(action);
@@ -1142,32 +1049,32 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                             // check if BulkUpdate is showing as popup
                             if (popup.ComponentName == 'BulkUpdatePopup') {
                                 //We close the BulkUpdatePopup
-                                middlewareAPI.dispatch(PopupRedux.PopupHideScreen());
+                                adaptable.api.internalApi.hidePopupScreen();
                                 //We show the Error Popup -- assume that will alwasy be an Error
-                                middlewareAPI.dispatch(PopupRedux.PopupShowAlert(apiReturn.Alert));
+                                adaptable.api.alertApi.displayAdaptableAlertNotification(apiReturn.Alert);
                             }
                         }
-                        middlewareAPI.dispatch(SystemRedux.BulkUpdateSetValidSelection(apiReturn));
+                        middlewareAPI.dispatch(InternalRedux.BulkUpdateSetValidSelection(apiReturn));
                     }
                     return returnAction;
                 }
                 // Here we have all actions that triggers a refresh of the BulkUpdatePreview
-                case SystemRedux.SYSTEM_BULK_UPDATE_CHANGE_VALUE: {
+                case InternalRedux.BULK_UPDATE_CHANGE_VALUE: {
                     //all our logic needs to be executed AFTER the main reducers
                     //so our state is up to date which allow us not to care about the data within each different action
                     let returnAction = next(action);
                     let module = (adaptable.adaptableModules.get(ModuleConstants.BulkUpdateModuleId));
                     let state = middlewareAPI.getState();
-                    let apiReturn = module.buildPreviewValues(state.System.BulkUpdateValue);
-                    middlewareAPI.dispatch(SystemRedux.BulkUpdateSetPreview(apiReturn));
+                    let apiReturn = module.buildPreviewValues(state.Internal.BulkUpdate.BulkUpdateValue);
+                    middlewareAPI.dispatch(InternalRedux.BulkUpdateSetPreview(apiReturn));
                     return returnAction;
                 }
                 case BulkUpdateRedux.BULK_UPDATE_APPLY: {
                     const actionTyped = action;
-                    let thePreview = middlewareAPI.getState().System.BulkUpdatePreviewInfo;
+                    let thePreview = middlewareAPI.getState().Internal.BulkUpdate.BulkUpdatePreviewInfo;
                     let newValues = PreviewHelper.GetCellUpdateRequestsFromPreview(thePreview, actionTyped.bypassValidationWarnings);
                     adaptable.api.gridApi.setCellValues(newValues);
-                    middlewareAPI.dispatch(PopupRedux.PopupHideScreen());
+                    adaptable.api.internalApi.hidePopupScreen();
                     return next(action);
                 }
                 /*******************
@@ -1217,31 +1124,23 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                 /*******************
                  * EXPORT ACTIONS
                  *******************/
+                // When selected report is undefined, clear the format
                 case ExportRedux.REPORT_SELECT: {
                     const actionTyped = action;
                     let returnAction = next(action);
                     const selectedReport = actionTyped.SelectedReport;
-                    if (!selectedReport ||
-                        (selectedReport === VISUAL_DATA_REPORT &&
-                            middlewareAPI.getState().Export.CurrentDestination !== ExportDestination.Excel)) {
-                        middlewareAPI.dispatch(ExportRedux.DestinationSelect(null));
+                    if (selectedReport == undefined) {
+                        adaptable.api.exportApi.clearFormat();
                     }
                     return returnAction;
                 }
-                case ExportRedux.EXPORT_APPLY: {
-                    let module = (adaptable.adaptableModules.get(ModuleConstants.ExportModuleId));
-                    const actionTyped = action;
-                    module.export(actionTyped.Report, actionTyped.ExportDestination);
-                    return next(action);
-                }
-                // When deleting a report check if its the currently selected one
-                // if it is then clear
+                // When deleting a report, if it is currently selected clear it
                 case ExportRedux.REPORT_DELETE: {
                     const actionTyped = action;
                     let report = actionTyped.report;
                     let currentReport = middlewareAPI.getState().Export.CurrentReport;
                     if (report && report.Name == currentReport) {
-                        middlewareAPI.dispatch(ExportRedux.ReportSelect(EMPTY_STRING));
+                        adaptable.api.exportApi.clearReport();
                     }
                     return next(action);
                 }
@@ -1264,13 +1163,14 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                         middlewareAPI.dispatch(TeamSharingRedux.TeamSharingSet(sharedEntities));
                     })
                         .catch((error) => {
-                        adaptable.logger.error('TeamSharing get error : ' + error.message);
-                        middlewareAPI.dispatch(PopupRedux.PopupShowAlert({
+                        adaptable.api.logError('TeamSharing get error : ' + error.message);
+                        const alert = {
                             alertType: 'generic',
                             header: 'Team Sharing',
                             message: "Couldn't get shared items: " + error.message,
                             alertDefinition: ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
-                        }));
+                        };
+                        adaptable.api.alertApi.displayAdaptableAlertNotification(alert);
                     });
                     return returnAction;
                 }
@@ -1291,7 +1191,11 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                             // if it has the same UUID, override it
                             if (isCustomSharedEntity(entity) && entity.Uuid === customSharedEntity.Uuid) {
                                 newCustomShare = false;
-                                return Object.assign(Object.assign({}, customSharedEntity), { ChangedAt: Date.now(), ChangedBy: adaptable.api.optionsApi.getUserName() });
+                                return {
+                                    ...customSharedEntity,
+                                    ChangedAt: Date.now(),
+                                    ChangedBy: adaptable.api.optionsApi.getUserName(),
+                                };
                             }
                             return entity;
                         });
@@ -1305,11 +1209,11 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                     })
                         .then(() => {
                         if (shareSuccessful) {
-                            adaptable.logger.info(`Custom Shared Object '${Configuration.Name}' Shared Successfully`);
+                            adaptable.api.logInfo(`Custom Shared Object '${Configuration.Name}' Shared Successfully`);
                         }
                     })
                         .catch((error) => {
-                        adaptable.logger.error('TeamSharing share error : ' + error.message, actionTyped.Entity);
+                        adaptable.api.logError('TeamSharing share error : ' + error.message, actionTyped.Entity);
                     });
                     return returnAction;
                 }
@@ -1330,12 +1234,13 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                         const existingActiveSharedEntity = Configuration.type === 'Active' &&
                             middlewareAPI.getState().TeamSharing.ActiveSharedEntityMap[Entity.Uuid];
                         if (existingActiveSharedEntity) {
-                            middlewareAPI.dispatch(PopupRedux.PopupShowAlert({
+                            const alert = {
                                 alertType: 'generic',
                                 header: 'Team Sharing',
-                                message: `Couldn't share ${adaptable.api.internalApi.getModuleFriendlyName(Module)}, there is already an existing active share for it: ${existingActiveSharedEntity.Description}`,
+                                message: `Couldn't share ${adaptable.ModuleService.getModuleFriendlyName(Module)}, there is already an existing active share for it: ${existingActiveSharedEntity.Description}`,
                                 alertDefinition: ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
-                            }));
+                            };
+                            adaptable.api.alertApi.displayAdaptableAlertNotification(alert);
                             shareSuccessful = false;
                             return;
                         }
@@ -1353,22 +1258,24 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                     })
                         .then(() => {
                         if (shareSuccessful) {
-                            middlewareAPI.dispatch(PopupRedux.PopupShowAlert({
+                            const alert = {
                                 alertType: 'generic',
                                 header: 'Team Sharing',
-                                message: `${adaptable.api.internalApi.getModuleFriendlyName(Module)} Shared Successfully`,
+                                message: `${adaptable.ModuleService.getModuleFriendlyName(Module)} Shared Successfully`,
                                 alertDefinition: ObjectFactory.CreateInternalAlertDefinitionForMessages('Success'),
-                            }));
+                            };
+                            adaptable.api.alertApi.displayAdaptableAlertNotification(alert);
                         }
                     })
                         .catch((error) => {
-                        adaptable.logger.error('TeamSharing share error : ' + error.message, actionTyped.Entity);
-                        middlewareAPI.dispatch(PopupRedux.PopupShowAlert({
+                        adaptable.api.logError('TeamSharing share error : ' + error.message, actionTyped.Entity);
+                        const alert = {
                             alertType: 'generic',
                             header: 'Team Sharing',
                             message: "Couldn't share item: " + error.message,
                             alertDefinition: ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
-                        }));
+                        };
+                        adaptable.api.alertApi.displayAdaptableAlertNotification(alert);
                     });
                     return returnAction;
                 }
@@ -1388,14 +1295,15 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                             .getTeamSharingService()
                             .getSharedEntityDependants(removedEntityId, adaptableSharedEntities);
                         if (sharedEntityDependants.length) {
-                            middlewareAPI.dispatch(PopupRedux.PopupShowAlert({
+                            const alert = {
                                 alertType: 'generic',
                                 header: `Cannot remove the shared item as it is referenced in:`,
                                 message: sharedEntityDependants
-                                    .map((sharedEntity) => `${adaptable.api.internalApi.getModuleFriendlyName(sharedEntity.Module)} ${sharedEntity.Description}`)
+                                    .map((sharedEntity) => `${adaptable.ModuleService.getModuleFriendlyName(sharedEntity.Module)} ${sharedEntity.Description}`)
                                     .join('\n'),
                                 alertDefinition: ObjectFactory.CreateInternalAlertDefinitionForMessages('Warning'),
-                            }));
+                            };
+                            adaptable.api.alertApi.displayAdaptableAlertNotification(alert);
                             return;
                         }
                         // remove the deleted SharedEntity from local state
@@ -1405,13 +1313,14 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                         return adaptable.api.teamSharingApi.persistSharedEntities(newSharedEntities);
                     })
                         .catch((error) => {
-                        adaptable.logger.error('TeamSharing remove error : ' + error.message);
-                        middlewareAPI.dispatch(PopupRedux.PopupShowAlert({
+                        adaptable.api.logError('TeamSharing remove error : ' + error.message);
+                        const alert = {
                             alertType: 'generic',
                             header: 'Team Sharing',
                             message: "Couldn't remove item: " + error.message,
                             alertDefinition: ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
-                        }));
+                        };
+                        adaptable.api.alertApi.displayAdaptableAlertNotification(alert);
                     });
                     return returnAction;
                 }
@@ -1438,7 +1347,7 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                             ShowInputBox: false,
                             MessageType: 'Warning',
                         };
-                        middlewareAPI.dispatch(PopupRedux.PopupShowConfirmation(confirmation));
+                        adaptable.api.internalApi.showPopupConfirmation(confirmation);
                     }
                     else {
                         middlewareAPI.dispatch(processImportAction);
@@ -1463,7 +1372,7 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                             }
                         }
                         else {
-                            adaptable.logger.error('Team Sharing Import Error: Unknown item type', sharedEntity);
+                            adaptable.api.logError('Team Sharing Import Error: Unknown item type', sharedEntity);
                         }
                     }
                     if (activeSharedEntities.length) {
@@ -1474,12 +1383,13 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                         .waitForTeamSharingImportEnd()
                         .then(() => middlewareAPI.dispatch(TeamSharingRedux.TeamSharingCommitImport()))
                         .catch(() => middlewareAPI.dispatch(TeamSharingRedux.TeamSharingCommitImport()));
-                    middlewareAPI.dispatch(PopupRedux.PopupShowAlert({
+                    const alert = {
                         alertType: 'generic',
                         header: 'Team Sharing',
                         message: `Item Successfully Imported`,
                         alertDefinition: ObjectFactory.CreateInternalAlertDefinitionForMessages('Success'),
-                    }));
+                    };
+                    adaptable.api.alertApi.displayAdaptableAlertNotification(alert);
                     return returnAction;
                 }
                 // update the active SharedEntity with the latest (updated) state of the local AdaptableObject
@@ -1512,13 +1422,14 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                         return adaptable.api.teamSharingApi.persistSharedEntities(updatedSharedEntities);
                     })
                         .catch((error) => {
-                        adaptable.logger.error('TeamSharing update active item error : ' + error.message);
-                        middlewareAPI.dispatch(PopupRedux.PopupShowAlert({
+                        adaptable.api.logError('TeamSharing update active item error : ' + error.message);
+                        const alert = {
                             alertType: 'generic',
                             header: 'Team Sharing',
                             message: "Couldn't update active item: " + error.message,
                             alertDefinition: ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
-                        }));
+                        };
+                        adaptable.api.alertApi.displayAdaptableAlertNotification(alert);
                     });
                     return returnAction;
                 }
@@ -1532,58 +1443,17 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                         adaptable.api.internalApi.getTeamSharingService().showUpdateNotifications();
                     })
                         .catch((error) => {
-                        adaptable.logger.error('TeamSharing update error : ' + error.message);
-                        middlewareAPI.dispatch(PopupRedux.PopupShowAlert({
+                        adaptable.api.logError('TeamSharing update error : ' + error.message);
+                        const alert = {
                             alertType: 'generic',
                             header: 'Team Sharing',
                             message: "Couldn't check for updates: " + error.message,
                             alertDefinition: ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
-                        }));
+                        };
+                        adaptable.api.alertApi.displayAdaptableAlertNotification(alert);
                     });
                     return returnAction;
                 }
-                /*******************
-                 * DATA CHANGE HISTORY ACTIONS
-                 *******************/
-                case SystemRedux.SYSTEM_DATA_CHANGE_HISTORY_UNDO:
-                    const actionTypedUndo = action;
-                    const cellDataChangedInfo = actionTypedUndo.changeInfo;
-                    adaptable.api.gridApi.undoCellEdit(cellDataChangedInfo);
-                    return next(action);
-                /*******************
-                 * SYSTEM (INTERNAL) ACTIONS
-                 *******************/
-                case SystemRedux.SYSTEM_SET_NEW_COLUMN_LIST_ORDER:
-                    const actionTyped = action;
-                    adaptable.setColumnOrder(actionTyped.visibleColumnList);
-                    return next(action);
-                /*******************
-                 * GRID (INTERNAL) ACTIONS
-                 *******************/
-                case GridRedux.GRID_CREATE_CELLS_SUMMARY: {
-                    let module = (adaptable.adaptableModules.get(ModuleConstants.CellSummaryModuleId));
-                    let returnAction = next(action);
-                    let selectedCellInfo = middlewareAPI.getState().Grid.SelectedCellInfo;
-                    let apiSummaryReturn = module.createCellSummary(selectedCellInfo);
-                    middlewareAPI.dispatch(GridRedux.GridSetCellSummary(apiSummaryReturn));
-                    return returnAction;
-                }
-                case GridRedux.GRID_REFRESH_CELLS: {
-                    const actionTyped = action;
-                    let ret = next(action);
-                    adaptable.refreshCells(actionTyped.rowNodes, actionTyped.columnIds, true);
-                    return ret;
-                }
-                case GridRedux.GRID_SET_SORT: {
-                    let ret = next(action);
-                    adaptable.api.gridApi.internalApi.fireGridSortedEvent();
-                    return ret;
-                }
-                case GridRedux.GRID_CLEAR_SORT: {
-                    let ret = next(action);
-                    adaptable.api.gridApi.internalApi.fireGridSortedEvent();
-                    return ret;
-                }
                 /*******************
                  * POPUP (INTERNAL) ACTIONS
                  *******************/
@@ -1623,12 +1493,10 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                 case INIT_STATE: {
                     let returnAction = next(action);
                     if (adaptable.isReady) {
-                        // TODO see #create-create-module-menu
-                        // create the module menu (for use in the dashboard and the toolpanel)
                         // we need this here for when the state key is changed
                         // since we need the transient state to be restored in the same
                         // way as when Adaptable is initialised.
-                        adaptable.ModuleService.createModuleMenus();
+                        adaptable.ModuleService.createModuleUIItems();
                     }
                     return returnAction;
                 }