@adaptabletools/adaptable 16.2.4 → 17.0.0-canary.1

package/src/Redux/Store/AdaptableStore.js

@@ -1,72 +1,67 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AdaptableStore = exports.LoadState = exports.InitState = exports.LOAD_STATE = exports.INIT_STATE = void 0;
-const tslib_1 = require("tslib");
-const Enums_1 = require("../../PredefinedConfig/Common/Enums");
-const Redux = tslib_1.__importStar(require("redux"));
-const AdaptableReduxLocalStorageEngine_1 = require("./AdaptableReduxLocalStorageEngine");
-const AdaptableReduxMerger_1 = require("./AdaptableReduxMerger");
-const PopupRedux = tslib_1.__importStar(require("../ActionsReducers/PopupRedux"));
-const PopupRedux_1 = require("../ActionsReducers/PopupRedux");
-const PluginsRedux = tslib_1.__importStar(require("../ActionsReducers/PluginsRedux"));
-const AlertRedux = tslib_1.__importStar(require("../ActionsReducers/AlertRedux"));
-const FlashingCellRedux = tslib_1.__importStar(require("../ActionsReducers/FlashingCellRedux"));
-const SmartEditRedux = tslib_1.__importStar(require("../ActionsReducers/SmartEditRedux"));
-const BulkUpdateRedux = tslib_1.__importStar(require("../ActionsReducers/BulkUpdateRedux"));
-const CustomSortRedux = tslib_1.__importStar(require("../ActionsReducers/CustomSortRedux"));
-const CalculatedColumnRedux = tslib_1.__importStar(require("../ActionsReducers/CalculatedColumnRedux"));
-const ShortcutRedux = tslib_1.__importStar(require("../ActionsReducers/ShortcutRedux"));
-const GridRedux = tslib_1.__importStar(require("../ActionsReducers/GridRedux"));
-const SystemRedux = tslib_1.__importStar(require("../ActionsReducers/SystemRedux"));
-const SystemRedux_1 = require("../ActionsReducers/SystemRedux");
-const PlusMinusRedux = tslib_1.__importStar(require("../ActionsReducers/PlusMinusRedux"));
-const ExportRedux = tslib_1.__importStar(require("../ActionsReducers/ExportRedux"));
-const QuickSearchRedux = tslib_1.__importStar(require("../ActionsReducers/QuickSearchRedux"));
-const ThemeRedux = tslib_1.__importStar(require("../ActionsReducers/ThemeRedux"));
-const FormatColumnRedux = tslib_1.__importStar(require("../ActionsReducers/FormatColumnRedux"));
-const StyledColumnRedux = tslib_1.__importStar(require("../ActionsReducers/StyledColumnRedux"));
-const NotesRedux = tslib_1.__importStar(require("../ActionsReducers/NotesRedux"));
-const ApplicationRedux = tslib_1.__importStar(require("../ActionsReducers/ApplicationRedux"));
-const FreeTextColumnRedux = tslib_1.__importStar(require("../ActionsReducers/FreeTextColumnRedux"));
-const LayoutRedux = tslib_1.__importStar(require("../ActionsReducers/LayoutRedux"));
-const DashboardRedux = tslib_1.__importStar(require("../ActionsReducers/DashboardRedux"));
-const ToolPanelRedux = tslib_1.__importStar(require("../ActionsReducers/ToolPanelRedux"));
-const ScheduleRedux = tslib_1.__importStar(require("../ActionsReducers/ScheduleRedux"));
-const TeamSharingRedux = tslib_1.__importStar(require("../ActionsReducers/TeamSharingRedux"));
-const QueryRedux = tslib_1.__importStar(require("../ActionsReducers/QueryRedux"));
-const StatusBarRedux = tslib_1.__importStar(require("../ActionsReducers/StatusBarRedux"));
-const ChartingRedux = tslib_1.__importStar(require("../ActionsReducers/ChartingRedux"));
-const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
-const ConfigConstants = tslib_1.__importStar(require("../../Utilities/Constants/ConfigConstants"));
-const ObjectFactory_1 = require("../../Utilities/ObjectFactory");
-const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
-const PreviewHelper_1 = require("../../Utilities/Helpers/PreviewHelper");
-const StringExtensions_1 = require("../../Utilities/Extensions/StringExtensions");
-const Emitter_1 = tslib_1.__importDefault(require("../../Utilities/Emitter"));
-const AdaptableAlert_1 = require("../../PredefinedConfig/Common/AdaptableAlert");
-const AdaptableToaster_1 = require("../../View/Components/Popups/AdaptableToaster");
-const TeamSharingState_1 = require("../../PredefinedConfig/TeamSharingState");
-exports.INIT_STATE = 'INIT_STATE';
-exports.LOAD_STATE = 'LOAD_STATE';
+import { ExportDestination } from '../../PredefinedConfig/Common/Enums';
+import * as Redux from 'redux';
+import { createEngine as createEngineLocal } from './AdaptableReduxLocalStorageEngine';
+import { mergeReducer } from './AdaptableReduxMerger';
+import * as PopupRedux from '../ActionsReducers/PopupRedux';
+import { PopupShowForm } from '../ActionsReducers/PopupRedux';
+import * as PluginsRedux from '../ActionsReducers/PluginsRedux';
+import * as AlertRedux from '../ActionsReducers/AlertRedux';
+import * as FlashingCellRedux from '../ActionsReducers/FlashingCellRedux';
+import * as SmartEditRedux from '../ActionsReducers/SmartEditRedux';
+import * as BulkUpdateRedux from '../ActionsReducers/BulkUpdateRedux';
+import * as CustomSortRedux from '../ActionsReducers/CustomSortRedux';
+import * as CalculatedColumnRedux from '../ActionsReducers/CalculatedColumnRedux';
+import * as ShortcutRedux from '../ActionsReducers/ShortcutRedux';
+import * as GridRedux from '../ActionsReducers/GridRedux';
+import * as SystemRedux from '../ActionsReducers/SystemRedux';
+import { SYSTEM_PROGRESS_INDICATOR_HIDE, SYSTEM_PROGRESS_INDICATOR_SHOW, SYSTEM_VISUAL_EXPORT_BEGIN, SYSTEM_VISUAL_EXPORT_END, } from '../ActionsReducers/SystemRedux';
+import * as PlusMinusRedux from '../ActionsReducers/PlusMinusRedux';
+import * as ExportRedux from '../ActionsReducers/ExportRedux';
+import * as QuickSearchRedux from '../ActionsReducers/QuickSearchRedux';
+import * as ThemeRedux from '../ActionsReducers/ThemeRedux';
+import * as FormatColumnRedux from '../ActionsReducers/FormatColumnRedux';
+import * as StyledColumnRedux from '../ActionsReducers/StyledColumnRedux';
+import * as NotesRedux from '../ActionsReducers/NotesRedux';
+import * as ApplicationRedux from '../ActionsReducers/ApplicationRedux';
+import * as FreeTextColumnRedux from '../ActionsReducers/FreeTextColumnRedux';
+import * as LayoutRedux from '../ActionsReducers/LayoutRedux';
+import * as DashboardRedux from '../ActionsReducers/DashboardRedux';
+import * as ToolPanelRedux from '../ActionsReducers/ToolPanelRedux';
+import * as ScheduleRedux from '../ActionsReducers/ScheduleRedux';
+import * as TeamSharingRedux from '../ActionsReducers/TeamSharingRedux';
+import * as NamedQueryRedux from '../ActionsReducers/NamedQueryRedux';
+import * as QueryRedux from '../ActionsReducers/QueryRedux';
+import * as StatusBarRedux from '../ActionsReducers/StatusBarRedux';
+import * as ChartingRedux from '../ActionsReducers/ChartingRedux';
+import * as ModuleConstants from '../../Utilities/Constants/ModuleConstants';
+import * as ConfigConstants from '../../Utilities/Constants/ConfigConstants';
+import { ObjectFactory } from '../../Utilities/ObjectFactory';
+import { EMPTY_STRING, VISUAL_DATA_REPORT } from '../../Utilities/Constants/GeneralConstants';
+import { PreviewHelper } from '../../Utilities/Helpers/PreviewHelper';
+import { StringExtensions } from '../../Utilities/Extensions/StringExtensions';
+import Emitter from '../../Utilities/Emitter';
+import { isAdaptableCellChangedAlert, isAdaptableRowChangedAlert, } from '../../PredefinedConfig/Common/AdaptableAlert';
+import { showToast } from '../../View/Components/Popups/AdaptableToaster';
+import { isAdaptableSharedEntity, isCustomSharedEntity, } from '../../PredefinedConfig/TeamSharingState';
+export const INIT_STATE = 'INIT_STATE';
+export const LOAD_STATE = 'LOAD_STATE';
 const NON_PERSIST_ACTIONS = {
-    [exports.LOAD_STATE]: true,
+    [LOAD_STATE]: true,
     '@@INIT': true,
     '@@redux/init': true,
-    [exports.INIT_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
-    [SystemRedux_1.SYSTEM_PROGRESS_INDICATOR_SHOW]: true,
-    [SystemRedux_1.SYSTEM_PROGRESS_INDICATOR_HIDE]: true,
+    [SYSTEM_PROGRESS_INDICATOR_SHOW]: true,
+    [SYSTEM_PROGRESS_INDICATOR_HIDE]: true,
 };
-const InitState = () => ({
-    type: exports.INIT_STATE,
+export const InitState = () => ({
+    type: INIT_STATE,
 });
-exports.InitState = InitState;
-const LoadState = (State) => ({
-    type: exports.LOAD_STATE,
+export const LoadState = (State) => ({
+    type: LOAD_STATE,
     State,
 });
-exports.LoadState = LoadState;
-class AdaptableStore {
+export class AdaptableStore {
     /**
      *
      * @param adaptable The Adaptable instance
@@ -96,27 +91,27 @@ class AdaptableStore {
                 .load(predefinedConfig)
                 .then((storedState) => {
                 if (storedState && this.loadStateOnStartup) {
-                    this.TheStore.dispatch((0, exports.LoadState)(adaptable.adaptableOptions.stateOptions.applyState(storedState)));
+                    this.TheStore.dispatch(LoadState(adaptable.adaptableOptions.stateOptions.applyState(storedState)));
                 }
             })
                 // we need AG Grid to be ready because several states(ex. Layout) depend on its API
                 .then(() => this.isAgGridReady)
                 .then(() => {
-                this.TheStore.dispatch((0, exports.InitState)());
+                this.TheStore.dispatch(InitState());
                 // END STATE LOAD
                 this.loadStorageInProgress = false;
             }, (e) => {
                 adaptable.logger.error('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((0, exports.InitState)());
+                this.TheStore.dispatch(InitState());
                 // END STATE LOAD
                 this.loadStorageInProgress = false;
                 this.TheStore.dispatch(PopupRedux.PopupShowAlert({
                     alertType: 'generic',
                     header: 'Configuration',
                     message: 'Error loading your configuration:' + e,
-                    alertDefinition: ObjectFactory_1.ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
+                    alertDefinition: ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
                 }));
             }));
         };
@@ -145,10 +140,11 @@ class AdaptableStore {
             TeamSharing: TeamSharingRedux.TeamSharingReducer,
             Theme: ThemeRedux.ThemeReducer,
             ToolPanel: ToolPanelRedux.ToolPanelReducer,
-            Query: QueryRedux.QueryReducer,
             Charting: ChartingRedux.ChartingReducer,
             StyledColumn: StyledColumnRedux.StyledColumnReducer,
             Notes: NotesRedux.NotesReducer,
+            Query: QueryRedux.QueryReducer,
+            NamedQuery: NamedQueryRedux.NamedQueryReducer,
         };
         // allow plugins to participate in the root reducer
         adaptable.forPlugins((plugin) => {
@@ -159,7 +155,7 @@ class AdaptableStore {
         const initialRootReducer = Redux.combineReducers(rootReducerObject);
         const rootReducerWithResetManagement = (state, action) => {
             switch (action.type) {
-                case exports.LOAD_STATE:
+                case LOAD_STATE:
                     const { State } = action;
                     Object.keys(State).forEach((key) => {
                         // this check should be removed in version 12 !!!
@@ -180,11 +176,11 @@ class AdaptableStore {
             return initialRootReducer(state, action);
         };
         let storageEngine;
-        this.emitter = new Emitter_1.default();
+        this.emitter = new Emitter();
         // If the user has remote storage set then we use Remote Engine, otherwise we use Local Enginge
         // not sure we can do this as we need to be backwardly compatible with existing users so need to stick with adaptable id (which should be unique)
         // const localStorageKey =  'adaptable-adaptable-state-' + adaptable.adaptableOptions.primaryKey;
-        storageEngine = (0, AdaptableReduxLocalStorageEngine_1.createEngine)({
+        storageEngine = createEngineLocal({
             adaptableId: adaptable.adaptableOptions.adaptableId,
             adaptableStateKey: adaptable.adaptableOptions.adaptableStateKey,
             userName: adaptable.adaptableOptions.userName,
@@ -209,7 +205,7 @@ class AdaptableStore {
             });
         };
         // this is now VERY BADLY NAMED!
-        let rootReducer = (0, AdaptableReduxMerger_1.mergeReducer)(rootReducerWithResetManagement, exports.LOAD_STATE);
+        let rootReducer = mergeReducer(rootReducerWithResetManagement, LOAD_STATE);
         const composeEnhancers = (x) => x;
         const persistedReducer = (state, action) => {
             var _a, _b;
@@ -270,14 +266,13 @@ class AdaptableStore {
         return Promise.resolve(true);
     }
 }
-exports.AdaptableStore = AdaptableStore;
 // this is the main function for dealing with Redux Actions which require additional functionality to be triggered.
 // Please document each use case where we have to use the Store rather than a module or a popup screen
 // This should ideally be the ONLY place where we LISTEN to store changes
-const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
+const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
     return function (next) {
         return function (action) {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
             switch (action.type) {
                 /*******************
                  * NAMED QUERY ACTIONS
@@ -286,38 +281,38 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                  * Use Case: User has deleted a Named Query
                  * Action: Check whether it is referenced elsewhere before deleting
                  */
-                case QueryRedux.NAMED_QUERY_DELETE: {
+                case NamedQueryRedux.NAMED_QUERY_DELETE: {
                     const actionTyped = action;
                     // check if Named Query is not referenced elsewhere
-                    const namedQueryReferences = adaptable.api.queryApi.internalApi.getNamedQueryModuleReferences(actionTyped.namedQuery.Name);
+                    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_1.ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
+                            alertDefinition: ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
                         }));
                         return;
                     }
                     const ret = next(action);
                     return ret;
                 }
-                case QueryRedux.NAMED_QUERY_EDIT: {
+                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
                         .getState()
-                        .Query.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)) === null || _a === void 0 ? void 0 : _a.Name) !== null && _b !== void 0 ? _b : '';
                     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.queryApi.internalApi.getNamedQueryModuleReferences(previousNamedQueryName);
+                        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_1.ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
+                                alertDefinition: ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
                             }));
                             return;
                         }
@@ -325,16 +320,6 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     const ret = next(action);
                     return ret;
                 }
-                /**
-                 * Use Case: Query has changed
-                 * Action: Filter the Grid and fire Query Run Event
-                 */
-                case QueryRedux.QUERY_RUN: {
-                    let ret = next(action);
-                    setTimeout(() => adaptable.applyGridFiltering(), 5);
-                    adaptable.api.queryApi.internalApi.fireQueryRunEvent();
-                    return ret;
-                }
                 /*******************
                  * FLASHING CELL ACTIONS
                  *******************/
@@ -433,13 +418,13 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     let ret = next(action);
                     const adaptableAlert = actionTyped.alert;
                     if (((_c = adaptableAlert.alertDefinition.AlertProperties) === null || _c === void 0 ? void 0 : _c.HighlightCell) &&
-                        (0, AdaptableAlert_1.isAdaptableCellChangedAlert)(adaptableAlert) &&
+                        isAdaptableCellChangedAlert(adaptableAlert) &&
                         adaptableAlert.cellDataChangedInfo) {
                         const rowNode = adaptableAlert.cellDataChangedInfo.rowNode;
                         adaptable.refreshCells([rowNode], [adaptableAlert.cellDataChangedInfo.column.columnId], true);
                     }
                     if (((_d = adaptableAlert.alertDefinition.AlertProperties) === null || _d === void 0 ? void 0 : _d.HighlightRow) &&
-                        (0, AdaptableAlert_1.isAdaptableRowChangedAlert)(adaptableAlert) &&
+                        isAdaptableRowChangedAlert(adaptableAlert) &&
                         adaptableAlert.gridDataChangedInfo) {
                         adaptable.api.gridApi.refreshRowNodes(adaptableAlert.gridDataChangedInfo.rowNodes);
                     }
@@ -456,13 +441,13 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     alerts.forEach((alert) => {
                         var _a, _b;
                         if (((_a = alert.alertDefinition.AlertProperties) === null || _a === void 0 ? void 0 : _a.HighlightCell) &&
-                            (0, AdaptableAlert_1.isAdaptableCellChangedAlert)(alert) &&
+                            isAdaptableCellChangedAlert(alert) &&
                             alert.cellDataChangedInfo) {
                             let rowNode = alert.cellDataChangedInfo.rowNode;
                             adaptable.refreshCells([rowNode], [alert.cellDataChangedInfo.column.columnId], true);
                         }
                         if (((_b = alert.alertDefinition.AlertProperties) === null || _b === void 0 ? void 0 : _b.HighlightRow) &&
-                            (0, AdaptableAlert_1.isAdaptableRowChangedAlert)(alert) &&
+                            isAdaptableRowChangedAlert(alert) &&
                             alert.gridDataChangedInfo) {
                             adaptable.api.gridApi.refreshRowNodes(alert.gridDataChangedInfo.rowNodes);
                         }
@@ -478,7 +463,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     const actionTyped = action;
                     const adaptableAlert = actionTyped.alert;
                     if ((_e = adaptableAlert.alertDefinition.AlertProperties) === null || _e === void 0 ? void 0 : _e.HighlightCell) {
-                        if ((0, AdaptableAlert_1.isAdaptableCellChangedAlert)(adaptableAlert) &&
+                        if (isAdaptableCellChangedAlert(adaptableAlert) &&
                             adaptableAlert.cellDataChangedInfo) {
                             const rowNode = adaptableAlert.cellDataChangedInfo.rowNode;
                             adaptable.refreshCells([rowNode], [adaptableAlert.cellDataChangedInfo.column.columnId], true);
@@ -491,11 +476,11 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     const actionTyped = action;
                     const adaptableAlert = actionTyped.alert;
                     if ((_f = adaptableAlert.alertDefinition.AlertProperties) === null || _f === void 0 ? void 0 : _f.HighlightRow) {
-                        if ((0, AdaptableAlert_1.isAdaptableCellChangedAlert)(adaptableAlert) &&
+                        if (isAdaptableCellChangedAlert(adaptableAlert) &&
                             adaptableAlert.cellDataChangedInfo) {
                             adaptable.api.gridApi.refreshRowNodes([adaptableAlert.cellDataChangedInfo.rowNode]);
                         }
-                        if ((0, AdaptableAlert_1.isAdaptableRowChangedAlert)(adaptableAlert) &&
+                        if (isAdaptableRowChangedAlert(adaptableAlert) &&
                             adaptableAlert.gridDataChangedInfo) {
                             adaptable.api.gridApi.refreshRowNodes(adaptableAlert.gridDataChangedInfo.rowNodes);
                         }
@@ -623,7 +608,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                             alertType: 'generic',
                             header: 'CalculatedColumn could not be deleted',
                             message: `It is still referenced in the following modules: ${calculatedColumnReferences.join(', ')}`,
-                            alertDefinition: ObjectFactory_1.ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
+                            alertDefinition: ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
                         }));
                         return;
                     }
@@ -647,7 +632,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                             alertType: 'generic',
                             header: 'FreeTextColumn could not be deleted',
                             message: `It is still referenced in the following modules: ${freeTextColumnReferences.join(', ')}`,
-                            alertDefinition: ObjectFactory_1.ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
+                            alertDefinition: ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
                         }));
                         return;
                     }
@@ -666,6 +651,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 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:
@@ -706,11 +692,11 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     if (adaptable.adaptableOptions.quickSearchOptions.filterResultsAfterQuickSearch) {
                         const actionTyped = action;
                         const searchText = actionTyped.quickSearchText;
-                        if (StringExtensions_1.StringExtensions.IsNotNullOrEmpty(searchText)) {
-                            adaptable.setAgQuickSearch(searchText);
+                        if (StringExtensions.IsNotNullOrEmpty(searchText)) {
+                            adaptable.setAgGridQuickSearch(searchText);
                         }
                         else {
-                            adaptable.setAgQuickSearch('');
+                            adaptable.setAgGridQuickSearch('');
                         }
                     }
                     return returnAction;
@@ -732,7 +718,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 }
                 /**
                  * Use Case: Column Filters have changed
-                 * Action: Apply grid filtering and fire associated events
+                 * Action: Apply Column Filtering and fire associated events
                  */
                 case LayoutRedux.LAYOUT_COLUMN_FILTER_ADD:
                 case LayoutRedux.LAYOUT_COLUMN_FILTER_EDIT:
@@ -745,7 +731,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 case LayoutRedux.LAYOUT_COLUMN_FILTER_UNSUSPEND_ALL: {
                     let returnAction;
                     // needs to be called before 'next' so previous and next column filters are known
-                    const shouldTriggerGridFiltering = adaptable.api.filterApi.internalApi.shouldNewColumnFilterTriggerGridFiltering(action);
+                    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) {
@@ -787,17 +773,54 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                                 draftLayoutAction = GridRedux.LayoutDraftColumnFilterUnsuspendAll();
                                 break;
                         }
+                        //  GRID FILTER
                         returnAction = next(draftLayoutAction);
                     }
                     setTimeout(() => {
-                        if (shouldTriggerGridFiltering) {
-                            adaptable.applyGridFiltering();
+                        if (shouldTriggerColumnFiltering) {
+                            adaptable.applyColumnFiltering();
                         }
                     }, 5);
-                    adaptable.api.filterApi.internalApi.fireFilterAppliedEvent();
+                    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: {
+                    setTimeout(() => adaptable.applyGridFiltering(), 5);
+                    adaptable.api.gridFilterApi.internalApi.fireGridFilterAppliedEvent();
+                    adaptable.api.layoutApi.internalApi.fireLayoutChangedEvent(action.type, null, middlewareAPI.getState().Layout);
+                    const currentLayout = adaptable.api.layoutApi.getCurrentLayout();
+                    let returnAction;
+                    if (((_h = adaptable.adaptableOptions.layoutOptions) === null || _h === void 0 ? void 0 : _h.autoSaveLayouts) &&
+                        !currentLayout.IsReadOnly) {
+                        returnAction = action;
+                    }
+                    else {
+                        // save in draft
+                        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
                  *******************/
@@ -811,7 +834,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     adaptable.api.dataSetApi.internalApi.fireDataSetSelectedEvent(dataSet);
                     requestAnimationFrame(() => {
                         if (dataSet.form) {
-                            middlewareAPI.dispatch((0, PopupRedux_1.PopupShowForm)({
+                            middlewareAPI.dispatch(PopupShowForm({
                                 Id: 'data-set-form',
                                 Form: dataSet.form,
                                 prepareContext: (context) => {
@@ -935,11 +958,11 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     let returnAction = next(action);
                     const newLayoutState = middlewareAPI.getState().Layout;
                     adaptable.api.layoutApi.internalApi.fireLayoutChangedEvent(action.type, oldLayoutState, newLayoutState);
-                    const oldFilters = (_h = oldLayoutState.Layouts.find((l) => l.Name == oldLayoutState.CurrentLayout)) === null || _h === void 0 ? void 0 : _h.ColumnFilters;
-                    const newFilters = (_j = newLayoutState.Layouts.find((l) => l.Name == newLayoutState.CurrentLayout)) === null || _j === void 0 ? void 0 : _j.ColumnFilters;
+                    const oldFilters = (_j = oldLayoutState.Layouts.find((l) => l.Name == oldLayoutState.CurrentLayout)) === null || _j === void 0 ? void 0 : _j.ColumnFilters;
+                    const newFilters = (_k = newLayoutState.Layouts.find((l) => l.Name == newLayoutState.CurrentLayout)) === null || _k === void 0 ? void 0 : _k.ColumnFilters;
                     // Tell Grid to apply filtering if filters have been changed in a loaded Layout
-                    if (adaptable.api.filterApi.internalApi.areColumnFiltersDifferent(oldFilters, newFilters)) {
-                        adaptable.applyGridFiltering();
+                    if (adaptable.api.columnFilterApi.internalApi.areColumnFiltersDifferent(oldFilters, newFilters)) {
+                        adaptable.applyColumnFiltering();
                     }
                     if (returnAction.type == LayoutRedux.LAYOUT_SELECT ||
                         returnAction.type == LayoutRedux.LAYOUT_DELETE ||
@@ -953,7 +976,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                             // tell grid the layout has been selected
                             adaptable.setLayout(currentLayout);
                         }
-                        if (!((_k = adaptable.adaptableOptions.layoutOptions) === null || _k === void 0 ? void 0 : _k.autoSaveLayouts)) {
+                        if (!((_l = adaptable.adaptableOptions.layoutOptions) === null || _l === void 0 ? void 0 : _l.autoSaveLayouts)) {
                             middlewareAPI.dispatch(GridRedux.LayoutUpdateCurrentDraft(currentLayout));
                         }
                     }
@@ -961,7 +984,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         returnAction.type == LayoutRedux.LAYOUT_SAVE) {
                         const actionTyped = action;
                         // if autosave is false
-                        if (!((_l = adaptable.adaptableOptions.layoutOptions) === null || _l === void 0 ? void 0 : _l.autoSaveLayouts)) {
+                        if (!((_m = adaptable.adaptableOptions.layoutOptions) === null || _m === void 0 ? void 0 : _m.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));
@@ -1048,7 +1071,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     let module = (adaptable.adaptableModules.get(ModuleConstants.SmartEditModuleId));
                     const actionTyped = action;
                     let thePreview = middlewareAPI.getState().System.SmartEditPreviewInfo;
-                    let newValues = PreviewHelper_1.PreviewHelper.GetCellUpdateRequestsFromPreview(thePreview, actionTyped.bypassValidationWarnings);
+                    let newValues = PreviewHelper.GetCellUpdateRequestsFromPreview(thePreview, actionTyped.bypassValidationWarnings);
                     module.ApplySmartEdit(newValues);
                     middlewareAPI.dispatch(PopupRedux.PopupHideScreen());
                     return next(action);
@@ -1103,7 +1126,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 case BulkUpdateRedux.BULK_UPDATE_COMPLETE: {
                     const actionTyped = action;
                     let thePreview = middlewareAPI.getState().System.BulkUpdatePreviewInfo;
-                    let newValues = PreviewHelper_1.PreviewHelper.GetCellUpdateRequestsFromPreview(thePreview, actionTyped.bypassValidationWarnings);
+                    let newValues = PreviewHelper.GetCellUpdateRequestsFromPreview(thePreview, actionTyped.bypassValidationWarnings);
                     adaptable.api.bulkUpdateApi.applyBulkUpdate(newValues);
                     middlewareAPI.dispatch(PopupRedux.PopupHideScreen());
                     return next(action);
@@ -1166,8 +1189,8 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     let returnAction = next(action);
                     const selectedReport = actionTyped.SelectedReport;
                     if (!selectedReport ||
-                        (selectedReport === GeneralConstants_1.VISUAL_DATA_REPORT &&
-                            middlewareAPI.getState().Export.CurrentDestination !== Enums_1.ExportDestination.Excel)) {
+                        (selectedReport === VISUAL_DATA_REPORT &&
+                            middlewareAPI.getState().Export.CurrentDestination !== ExportDestination.Excel)) {
                         middlewareAPI.dispatch(ExportRedux.DestinationSelect(''));
                     }
                     return returnAction;
@@ -1185,12 +1208,12 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     let report = actionTyped.report;
                     let currentReport = middlewareAPI.getState().Export.CurrentReport;
                     if (report && report.Name == currentReport) {
-                        middlewareAPI.dispatch(ExportRedux.ReportSelect(GeneralConstants_1.EMPTY_STRING));
+                        middlewareAPI.dispatch(ExportRedux.ReportSelect(EMPTY_STRING));
                     }
                     return next(action);
                 }
-                case SystemRedux_1.SYSTEM_VISUAL_EXPORT_BEGIN:
-                case SystemRedux_1.SYSTEM_VISUAL_EXPORT_END: {
+                case SYSTEM_VISUAL_EXPORT_BEGIN:
+                case SYSTEM_VISUAL_EXPORT_END: {
                     let returnAction = next(action);
                     adaptable.ReportService.resetExcelStyleMemoization();
                     return returnAction;
@@ -1219,7 +1242,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                             alertType: 'generic',
                             header: 'Team Sharing',
                             message: "Couldn't get shared items: " + error.message,
-                            alertDefinition: ObjectFactory_1.ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
+                            alertDefinition: ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
                         }));
                     });
                     return returnAction;
@@ -1239,7 +1262,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         let newCustomShare = true;
                         const updatedSharedEntities = sharedEntities.map((entity) => {
                             // if it has the same UUID, override it
-                            if ((0, TeamSharingState_1.isCustomSharedEntity)(entity) && entity.Uuid === customSharedEntity.Uuid) {
+                            if (isCustomSharedEntity(entity) && entity.Uuid === customSharedEntity.Uuid) {
                                 newCustomShare = false;
                                 return Object.assign(Object.assign({}, customSharedEntity), { ChangedAt: Date.now(), ChangedBy: adaptable.api.optionsApi.getUserName() });
                             }
@@ -1284,7 +1307,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                                 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}`,
-                                alertDefinition: ObjectFactory_1.ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
+                                alertDefinition: ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
                             }));
                             shareSuccessful = false;
                             return;
@@ -1307,7 +1330,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                                 alertType: 'generic',
                                 header: 'Team Sharing',
                                 message: `${adaptable.api.internalApi.getModuleFriendlyName(Module)} Shared Successfully`,
-                                alertDefinition: ObjectFactory_1.ObjectFactory.CreateInternalAlertDefinitionForMessages('Success'),
+                                alertDefinition: ObjectFactory.CreateInternalAlertDefinitionForMessages('Success'),
                             }));
                         }
                     })
@@ -1317,7 +1340,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                             alertType: 'generic',
                             header: 'Team Sharing',
                             message: "Couldn't share item: " + error.message,
-                            alertDefinition: ObjectFactory_1.ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
+                            alertDefinition: ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
                         }));
                     });
                     return returnAction;
@@ -1333,7 +1356,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         .loadSharedEntities()
                         .then((sharedEntities) => {
                         // ensure that no other SharedDependencies reference the to-be-deleted entity
-                        const adaptableSharedEntities = sharedEntities.filter(TeamSharingState_1.isAdaptableSharedEntity);
+                        const adaptableSharedEntities = sharedEntities.filter(isAdaptableSharedEntity);
                         const sharedEntityDependants = adaptable.api.internalApi
                             .getTeamSharingService()
                             .getSharedEntityDependants(removedEntityId, adaptableSharedEntities);
@@ -1344,7 +1367,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                                 message: sharedEntityDependants
                                     .map((sharedEntity) => `${adaptable.api.internalApi.getModuleFriendlyName(sharedEntity.Module)} ${sharedEntity.Description}`)
                                     .join('\n'),
-                                alertDefinition: ObjectFactory_1.ObjectFactory.CreateInternalAlertDefinitionForMessages('Warning'),
+                                alertDefinition: ObjectFactory.CreateInternalAlertDefinitionForMessages('Warning'),
                             }));
                             return;
                         }
@@ -1360,7 +1383,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                             alertType: 'generic',
                             header: 'Team Sharing',
                             message: "Couldn't remove item: " + error.message,
-                            alertDefinition: ObjectFactory_1.ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
+                            alertDefinition: ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
                         }));
                     });
                     return returnAction;
@@ -1428,7 +1451,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         alertType: 'generic',
                         header: 'Team Sharing',
                         message: `Item Successfully Imported`,
-                        alertDefinition: ObjectFactory_1.ObjectFactory.CreateInternalAlertDefinitionForMessages('Success'),
+                        alertDefinition: ObjectFactory.CreateInternalAlertDefinitionForMessages('Success'),
                     }));
                     return returnAction;
                 }
@@ -1445,7 +1468,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     adaptable.api.teamSharingApi
                         .loadSharedEntities()
                         .then((sharedEntities) => {
-                        const adaptableSharedEntities = sharedEntities.filter(TeamSharingState_1.isAdaptableSharedEntity);
+                        const adaptableSharedEntities = sharedEntities.filter(isAdaptableSharedEntity);
                         // check if remote server has a newer revision
                         const [localRevision, remoteRevision] = adaptable.api.internalApi
                             .getTeamSharingService()
@@ -1467,7 +1490,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                             alertType: 'generic',
                             header: 'Team Sharing',
                             message: "Couldn't update active item: " + error.message,
-                            alertDefinition: ObjectFactory_1.ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
+                            alertDefinition: ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
                         }));
                     });
                     return returnAction;
@@ -1487,7 +1510,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                             alertType: 'generic',
                             header: 'Team Sharing',
                             message: "Couldn't check for updates: " + error.message,
-                            alertDefinition: ObjectFactory_1.ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
+                            alertDefinition: ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
                         }));
                     });
                     return returnAction;
@@ -1538,7 +1561,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                  * POPUP (INTERNAL) ACTIONS
                  *******************/
                 case PopupRedux.POPUP_SHOW_ALERT: {
-                    (0, AdaptableToaster_1.showToast)({
+                    showToast({
                         api: adaptable.api,
                         adaptableAlert: action.alert,
                     });
@@ -1570,7 +1593,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 /*******************
                  * MANAGING STATE ACTIONS
                  *******************/
-                case exports.INIT_STATE: {
+                case INIT_STATE: {
                     let returnAction = next(action);
                     if (adaptable.isDestroyed) {
                         return returnAction;
@@ -1598,4 +1621,4 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
             }
         };
     };
-};
+});