@adaptabletools/adaptable 18.0.0-canary.2 → 18.0.0-canary.20

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

@@ -0,0 +1,38 @@
+import * as Redux from 'redux';
+import { AdaptableNote, NoteState } from '../../PredefinedConfig/NoteState';
+import { CellAddress } from '../../types';
+/**
+ * @ReduxAction A Note has been added
+ */
+export declare const NOTE_ADD = "NOTE_ADD";
+/**
+ * @ReduxAction A Note has been edited
+ */
+export declare const NOTE_EDIT = "NOTE_EDIT";
+/**
+ * @ReduxAction A Note has been deleted
+ */
+export declare const NOTE_DELETE = "NOTE_DELETE";
+/**
+ * @ReduxAction Note Module is ready
+ */
+export declare const NOTE_READY = "NOTE_READY";
+export interface AdaptableNoteAction extends Redux.Action {
+    adaptableNote: AdaptableNote;
+}
+export interface AdaptableNoteAddAction extends AdaptableNoteAction {
+}
+export interface AdaptableNoteEditAction extends AdaptableNoteAction {
+}
+export interface AdaptableNoteDeleteAction extends AdaptableNoteAction {
+}
+export interface NoteReadyAction extends Redux.Action {
+    noteState: NoteState;
+}
+export declare const NoteAdd: (note: AdaptableNote) => AdaptableNoteAddAction;
+export declare const NoteEdit: (note: AdaptableNote) => AdaptableNoteEditAction;
+export declare const NoteDelete: (note: AdaptableNote) => AdaptableNoteDeleteAction;
+export declare const NoteReady: (note: NoteState) => NoteReadyAction;
+export declare const GetAllNotesSelector: (state: NoteState) => AdaptableNote[];
+export declare const GetNotesSelector: (state: NoteState, address: CellAddress) => AdaptableNote[];
+export declare const NoteReducer: Redux.Reducer<NoteState>;

package/src/Redux/ActionsReducers/{NotesRedux.js → NoteRedux.js}

@@ -1,52 +1,53 @@
 import AdaptableHelper from '../../Utilities/Helpers/AdaptableHelper';
 import { EMPTY_ARRAY } from '../../Utilities/Constants/GeneralConstants';
 /**
- * @ReduxAction A Notes has been added
+ * @ReduxAction A Note has been added
  */
-export const NOTES_ADD = 'NOTES_ADD';
+export const NOTE_ADD = 'NOTE_ADD';
 /**
- * @ReduxAction A Notes has been edited
+ * @ReduxAction A Note has been edited
  */
-export const NOTES_EDIT = 'NOTES_EDIT';
+export const NOTE_EDIT = 'NOTE_EDIT';
 /**
- * @ReduxAction A Notes has been deleted
+ * @ReduxAction A Note has been deleted
  */
-export const NOTES_DELETE = 'NOTES_DELETE';
+export const NOTE_DELETE = 'NOTE_DELETE';
 /**
- * @ReduxAction Notes Module is ready
+ * @ReduxAction Note Module is ready
  */
-export const NOTES_READY = 'NOTES_READY';
-export const NotesAdd = (note) => ({
-    type: NOTES_ADD,
+export const NOTE_READY = 'NOTE_READY';
+export const NoteAdd = (note) => ({
+    type: NOTE_ADD,
     adaptableNote: note,
 });
-export const NotesEdit = (note) => ({
-    type: NOTES_EDIT,
+export const NoteEdit = (note) => ({
+    type: NOTE_EDIT,
     adaptableNote: note,
 });
-export const NotesDelete = (note) => ({
-    type: NOTES_DELETE,
+export const NoteDelete = (note) => ({
+    type: NOTE_DELETE,
     adaptableNote: note,
 });
-export const NotesReady = (note) => ({
-    type: NOTES_READY,
-    notesState: note,
+export const NoteReady = (note) => ({
+    type: NOTE_READY,
+    noteState: note,
 });
-export const GetNotesSelector = (state, config) => {
+export const GetAllNotesSelector = (state) => state.Notes;
+export const GetNotesSelector = (state, address) => {
     var _a;
-    if (!config) {
+    if (!address) {
         return [];
     }
     return ((_a = state === null || state === void 0 ? void 0 : state.Notes) !== null && _a !== void 0 ? _a : []).filter((note) => {
-        if (note.PrimaryKeyValue === config.PrimaryKeyValue && note.ColumnId === config.ColumnId) {
+        if (note.PrimaryKeyValue === address.PrimaryKeyValue && note.ColumnId === address.ColumnId) {
             // happy check
             return true;
         }
         // Primary keys retreived from the grid dom are always strings, so we must also consider them strings
-        if ((typeof config.PrimaryKeyValue === 'number' && typeof note.PrimaryKeyValue === 'string') ||
-            (typeof config.PrimaryKeyValue === 'string' && typeof note.PrimaryKeyValue === 'number')) {
-            return (note.PrimaryKeyValue.toString() === config.PrimaryKeyValue.toString() &&
-                note.ColumnId === config.ColumnId);
+        if ((typeof address.PrimaryKeyValue === 'number' && typeof note.PrimaryKeyValue === 'string') ||
+            (typeof address.PrimaryKeyValue === 'string' && typeof note.PrimaryKeyValue === 'number')) {
+            return (note.PrimaryKeyValue.toString() === address.PrimaryKeyValue.toString() &&
+                note.ColumnId === address.ColumnId);
         }
         return false;
     });
@@ -54,20 +55,20 @@ export const GetNotesSelector = (state, config) => {
 const initialState = {
     Notes: EMPTY_ARRAY,
 };
-export const NotesReducer = (state = initialState, action) => {
+export const NoteReducer = (state = initialState, action) => {
     let adaptableNotes;
     switch (action.type) {
-        case NOTES_ADD: {
+        case NOTE_ADD: {
             const note = action.adaptableNote;
             AdaptableHelper.addUuidAndSource(note);
             adaptableNotes = [...state.Notes, note];
             return Object.assign(Object.assign({}, state), { Notes: adaptableNotes });
         }
-        case NOTES_EDIT: {
+        case NOTE_EDIT: {
             const note = action.adaptableNote;
             return Object.assign(Object.assign({}, state), { Notes: state.Notes.map((abObject) => (abObject.Uuid === note.Uuid ? note : abObject)) });
         }
-        case NOTES_DELETE: {
+        case NOTE_DELETE: {
             const note = action.adaptableNote;
             return Object.assign(Object.assign({}, state), { Notes: state.Notes.filter((abObject) => abObject.Uuid !== note.Uuid) });
         }

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

@@ -77,6 +77,7 @@ export declare const SYSTEM_VISUAL_EXPORT_END = "SYSTEM_VISUAL_EXPORT_END";
 export declare const SYSTEM_CELL_POPUP_SHOW = "SYSTEM_CELL_POPUP_SHOW";
 export declare const SYSTEM_CELL_POPUP_HIDE = "SYSTEM_CELL_POPUP_HIDE";
 export declare const SYSTEM_CELL_POPUP_EDIT_FOCUSED_ENTITY = "SYSTEM_CELL_POPUP_EDIT_FOCUSED_ENTITY";
+export declare const SYSTEM_SUMMARY_ROW_SET = "SYSTEM_SUMMARY_ROW_SET";
 export declare const DATA_IMPORT_COMPLETED = "DATA_IMPORT_COMPLETED";
 export interface DataImportCompletedAction extends Redux.Action {
     dataImportedInfo: DataImportedInfo;
@@ -328,12 +329,16 @@ export declare const SystemVisualExportEnd: () => SystemVisualExportEndAction;
 export declare const SystemQuickSearchFloatingVisibility: (visible: boolean) => SystemQuickSearchFloatingVisibilityAction;
 export declare const SystemCellPopupShow: (cellPosition: CellAddress, editMode?: boolean) => SystemCellPopupShowAction;
 export declare const SystemCellPopupEditFocusedEntity: (focusedEntity: 'Note' | 'Comment') => SystemCellPopupEditFocusedEntityAction;
+export declare const SystemRowSummarySet: (systemRowSummaries: SystemState['RowSummary']['rowSummaries']) => {
+    readonly type: "SYSTEM_SUMMARY_ROW_SET";
+    readonly rowSummaries: import("../../PredefinedConfig/SystemState").SystemRowSummary[];
+};
 export declare const SystemCellPopupHide: () => SystemCellPopupHideAction;
 export declare const SystemDisableDeleteConfirmationSelector: (state: SystemState) => boolean;
 export declare const SystemPreviousGroupedColumnsSelector: (state: SystemState) => Record<string, Record<string, number>>;
 export declare const SystemQuickSearchFloatingVisibilitySelector: (state: SystemState) => boolean;
 export declare const SystemCommentsAndNotesSelector: (state: SystemState) => CellAddress;
 export declare const SystemCommentsAndNotesEditModeSelector: (state: SystemState) => boolean;
-export declare const SystemCommentsAndNotesFocusedEntitySelector: (state: SystemState) => "Note" | "Comment";
+export declare const SystemCommentsAndNotesFocusedEntitySelector: (state: SystemState) => "Comment" | "Note";
 export declare const DataImportCompleted: (dataImportedInfo: DataImportedInfo) => DataImportCompletedAction;
 export declare const SystemReducer: Redux.Reducer<SystemState>;

package/src/Redux/ActionsReducers/SystemRedux.js

@@ -87,10 +87,12 @@ export const SYSTEM_SET_QUICK_SEARCH_FLOATING_VISIBILITY = 'SYSTEM_SET_QUICK_SEA
 // Data Export (Report)
 export const SYSTEM_VISUAL_EXPORT_BEGIN = 'SYSTEM_VISUAL_EXPORT_BEGIN';
 export const SYSTEM_VISUAL_EXPORT_END = 'SYSTEM_VISUAL_EXPORT_END';
-// Notes
+// Notes and Comments
 export const SYSTEM_CELL_POPUP_SHOW = 'SYSTEM_CELL_POPUP_SHOW';
 export const SYSTEM_CELL_POPUP_HIDE = 'SYSTEM_CELL_POPUP_HIDE';
 export const SYSTEM_CELL_POPUP_EDIT_FOCUSED_ENTITY = 'SYSTEM_CELL_POPUP_EDIT_FOCUSED_ENTITY';
+// Row Summaries
+export const SYSTEM_SUMMARY_ROW_SET = 'SYSTEM_SUMMARY_ROW_SET';
 // Data Import
 export const DATA_IMPORT_COMPLETED = 'DATA_IMPORT_COMPLETED';
 export const SystemHighlightCellAdd = (cellHighlightInfo) => ({
@@ -316,6 +318,10 @@ export const SystemCellPopupEditFocusedEntity = (focusedEntity) => ({
     type: SYSTEM_CELL_POPUP_EDIT_FOCUSED_ENTITY,
     focusedEntity,
 });
+export const SystemRowSummarySet = (systemRowSummaries) => ({
+    type: SYSTEM_SUMMARY_ROW_SET,
+    rowSummaries: systemRowSummaries,
+});
 export const SystemCellPopupHide = () => ({
     type: SYSTEM_CELL_POPUP_HIDE,
 });
@@ -389,7 +395,7 @@ const initialState = {
     },
     DisableDeleteConfirmation: false,
     Export: {
-        inProgressVisualData: false,
+        visualDataExportInProgress: false,
     },
 };
 export const SystemReducer = (state = initialState, action) => {
@@ -722,12 +728,12 @@ export const SystemReducer = (state = initialState, action) => {
         }
         case SYSTEM_VISUAL_EXPORT_BEGIN: {
             return Object.assign(Object.assign({}, state), { Export: {
-                    inProgressVisualData: true,
+                    visualDataExportInProgress: true,
                 } });
         }
         case SYSTEM_VISUAL_EXPORT_END: {
             return Object.assign(Object.assign({}, state), { Export: {
-                    inProgressVisualData: false,
+                    visualDataExportInProgress: false,
                 } });
         }
         case SYSTEM_SET_QUICK_SEARCH_FLOATING_VISIBILITY: {
@@ -758,6 +764,12 @@ export const SystemReducer = (state = initialState, action) => {
                     popupPosition: null,
                 } });
         }
+        case SYSTEM_SUMMARY_ROW_SET: {
+            const typedAction = action;
+            return Object.assign(Object.assign({}, state), { RowSummary: {
+                    rowSummaries: typedAction.rowSummaries,
+                } });
+        }
         default:
             return state;
     }

package/src/Redux/Store/AdaptableStore.d.ts

@@ -2,8 +2,7 @@ import * as Redux from 'redux';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { AdaptableState } from '../../PredefinedConfig/AdaptableState';
 import { ConfigState } from '../../PredefinedConfig/ConfigState';
-import { PredefinedConfig } from '../../PredefinedConfig/PredefinedConfig';
-import { IAdaptableStore } from './Interface/IAdaptableStore';
+import { IAdaptableStore, LoadStoreConfig } from './Interface/IAdaptableStore';
 type EmitterCallback = (data?: any) => any;
 type EmitterAnyCallback = (eventName: string, data?: any) => any;
 export declare const INIT_STATE = "INIT_STATE";
@@ -22,7 +21,6 @@ export declare const LoadState: (State: {
     [s: string]: ConfigState;
 }) => LoadStateAction;
 export declare class AdaptableStore implements IAdaptableStore {
-    private isAgGridReady;
     TheStore: Redux.Store<AdaptableState>;
     Load: Promise<any>;
     private emitter;
@@ -36,12 +34,12 @@ export declare class AdaptableStore implements IAdaptableStore {
     /**
      *
      * @param adaptable The Adaptable instance
-     * @param isAgGridReady A promise which is resolved when AG Grid is ready for binding
+     * @param postLoadHook A function that hydrates the state after it has been loaded from storage
      */
-    constructor(adaptable: IAdaptable, isAgGridReady: Promise<any>);
+    constructor(adaptable: IAdaptable);
     destroy(): void;
     getCurrentStorageState(): AdaptableState;
     saveStateNow(adaptable: IAdaptable): Promise<any>;
-    loadStore: (adaptable: IAdaptable, adaptableStateKey: string, predefinedConfig?: PredefinedConfig) => Promise<any>;
+    loadStore: (config: LoadStoreConfig) => Promise<any>;
 }
 export {};

package/src/Redux/Store/AdaptableStore.js

@@ -29,7 +29,7 @@ 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 NotesRedux from '../ActionsReducers/NotesRedux';
+import * as NoteRedux from '../ActionsReducers/NoteRedux';
 import * as PlusMinusRedux from '../ActionsReducers/PlusMinusRedux';
 import * as QueryRedux from '../ActionsReducers/QueryRedux';
 import * as QuickSearchRedux from '../ActionsReducers/QuickSearchRedux';
@@ -39,7 +39,7 @@ 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, SYSTEM_VISUAL_EXPORT_BEGIN, SYSTEM_VISUAL_EXPORT_END, } from '../ActionsReducers/SystemRedux';
+import { SYSTEM_PROGRESS_INDICATOR_HIDE, SYSTEM_PROGRESS_INDICATOR_SHOW, } from '../ActionsReducers/SystemRedux';
 import * as TeamSharingRedux from '../ActionsReducers/TeamSharingRedux';
 import * as ThemeRedux from '../ActionsReducers/ThemeRedux';
 import * as ToolPanelRedux from '../ActionsReducers/ToolPanelRedux';
@@ -47,9 +47,9 @@ import { isAdaptableSharedEntity, isCustomSharedEntity, } from '../../Predefined
 export const INIT_STATE = 'INIT_STATE';
 export const LOAD_STATE = 'LOAD_STATE';
 const NON_PERSIST_ACTIONS = {
-    [LOAD_STATE]: true,
     '@@INIT': true,
     '@@redux/init': true,
+    [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,
@@ -66,13 +66,12 @@ export class AdaptableStore {
     /**
      *
      * @param adaptable The Adaptable instance
-     * @param isAgGridReady A promise which is resolved when AG Grid is ready for binding
+     * @param postLoadHook A function that hydrates the state after it has been loaded from storage
      */
-    constructor(adaptable, isAgGridReady) {
+    constructor(adaptable) {
         /*
           This is the main store for Adaptable State
         */
-        this.isAgGridReady = isAgGridReady;
         this.loadStorageInProgress = false;
         this.loadStateOnStartup = true; // set to false if you want no state
         this.on = (eventName, callback) => {
@@ -84,7 +83,9 @@ export class AdaptableStore {
         this.emit = (eventName, data) => {
             return this.emitter.emit(eventName, data);
         };
-        this.loadStore = (adaptable, adaptableStateKey, predefinedConfig) => {
+        this.loadStore = (config) => {
+            const { adaptable, adaptableStateKey, predefinedConfig, postLoadHook } = config;
+            const postProcessState = postLoadHook !== null && postLoadHook !== void 0 ? postLoadHook : ((state) => state);
             this.storageEngine.setStateKey(adaptableStateKey);
             // START STATE LOAD
             this.loadStorageInProgress = true;
@@ -92,17 +93,15 @@ export class AdaptableStore {
                 .load(predefinedConfig)
                 .then((storedState) => {
                 if (storedState && this.loadStateOnStartup) {
-                    this.TheStore.dispatch(LoadState(adaptable.adaptableOptions.stateOptions.applyState(storedState)));
+                    this.TheStore.dispatch(LoadState(postProcessState(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(InitState());
                 // END STATE LOAD
                 this.loadStorageInProgress = false;
             }, (e) => {
-                adaptable.logger.error('Failed to load previous Adaptable State : ', e);
+                adaptable.logger.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());
@@ -122,6 +121,7 @@ export class AdaptableStore {
             Popup: PopupRedux.PopupReducer,
             System: SystemRedux.SystemReducer,
             Plugins: PluginsRedux.PluginsReducer,
+            Comment: CommentsRedux.CommentsReducer,
             // Reducers for Persisted State
             Alert: AlertRedux.AlertReducer,
             FlashingCell: FlashingCellRedux.FlashingCellReducer,
@@ -143,8 +143,7 @@ export class AdaptableStore {
             ToolPanel: ToolPanelRedux.ToolPanelReducer,
             Charting: ChartingRedux.ChartingReducer,
             StyledColumn: StyledColumnRedux.StyledColumnReducer,
-            Notes: NotesRedux.NotesReducer,
-            Comment: CommentsRedux.CommentsReducer,
+            Note: NoteRedux.NoteReducer,
             Query: QueryRedux.QueryReducer,
             NamedQuery: NamedQueryRedux.NamedQueryReducer,
         };
@@ -160,17 +159,6 @@ export class AdaptableStore {
                 case LOAD_STATE:
                     const { State } = action;
                     Object.keys(State).forEach((key) => {
-                        // this check should be removed in version 12 !!!
-                        if (key === 'Chart') {
-                            adaptable.logger.consoleWarn(`DEPRECATED: AdapTable Charts Plugin is deprecated! AG Grid built-in charts are fully supported & integrated in AdapTable.
-
-            Please contact 'support@adaptabletools.com' if you require any charting features that are not currently available.`);
-                        }
-                        if (key === 'SparklineColumn') {
-                            adaptable.logger.consoleWarn(`DEPRECATED: AdapTable SparklineColumn is deprecated! AG Grid built-in Sparklines are fully supported & integrated in AdapTable.
-
-            Please contact 'support@adaptabletools.com' if you require any sparklines features that are not currently available.`);
-                        }
                         state[key] = State[key];
                     });
                     break;
@@ -251,7 +239,6 @@ export class AdaptableStore {
         ...pluginsMiddleware // the plugins middleware
         )));
         this.storageEngine = storageEngine;
-        this.loadStore(adaptable, adaptable.adaptableOptions.adaptableStateKey);
     }
     destroy() {
         var _a;
@@ -275,7 +262,7 @@ 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;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
             switch (action.type) {
                 /*******************
                  * NAMED QUERY ACTIONS
@@ -323,6 +310,14 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                     const ret = next(action);
                     return ret;
                 }
+                /*******************
+                 * System Row Summary ACTIONS
+                 *******************/
+                case SystemRedux.SYSTEM_SUMMARY_ROW_SET: {
+                    let nextAction = next(action);
+                    adaptable.api.layoutApi.internalApi.setupRowSummaries();
+                    return nextAction;
+                }
                 /*******************
                  * FLASHING CELL ACTIONS
                  *******************/
@@ -338,7 +333,7 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                 }
                 case SystemRedux.SYSTEM_FLASHING_CELL_DELETE_ALL: {
                     let ret = next(action);
-                    adaptable.redrawRenderedRows();
+                    adaptable.redrawBody();
                     return ret;
                 }
                 /*******************
@@ -394,7 +389,7 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                         });
                     }
                     // called also for rendered column actions, see RENDERED COLUMN ACTIONS block
-                    adaptable.setupColumns();
+                    adaptable.updateColumnModelAndRefreshGrid();
                     return returnAction;
                 }
                 /*******************
@@ -409,7 +404,7 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                 case FlashingCellRedux.FLASHING_CELL_DEFINITION_SUSPEND_ALL: {
                     const returnAction = next(action);
                     // called also for rendered column actions, see RENDERED COLUMN ACTIONS block
-                    adaptable.setupColumns();
+                    adaptable.updateColumnModelAndRefreshGrid();
                     return returnAction;
                 }
                 /**
@@ -574,11 +569,6 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                 /*******************
                  * SPECIAL COLUMN ACTIONS
                  *******************/
-                case CalculatedColumnRedux.CALCULATED_COLUMN_READY: {
-                    // create aggregated scalar columns at grid startup
-                    adaptable.api.calculatedColumnApi.refreshAggregatedCalculatedColumns();
-                    return;
-                }
                 /**
                  * Use Case: We have added / edited / deleted a Special Column (i.e. one not in initial ColumnDefs)
                  * Action: We update the Special ColumnDefs
@@ -596,7 +586,7 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                             .createAggregatedScalarLiveValue(returnAction.calculatedColumn);
                         adaptable.api.calculatedColumnApi.internalApi.fireCalculatedColumnChangedEvent(action.type, actionTyped.calculatedColumn);
                     }
-                    adaptable.updateColDefsForSpecialColumns();
+                    adaptable.updateColumnModelAndRefreshGrid();
                     return returnAction;
                 }
                 /**
@@ -621,7 +611,7 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                         .getCalculatedColumnExpressionService()
                         .destroyAggregatedScalarLiveValue(returnAction.calculatedColumn);
                     adaptable.api.calculatedColumnApi.internalApi.fireCalculatedColumnChangedEvent(action.type, actionTyped.calculatedColumn);
-                    adaptable.updateColDefsForSpecialColumns();
+                    adaptable.updateColumnModelAndRefreshGrid();
                     return returnAction;
                 }
                 /**
@@ -642,7 +632,7 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                         return;
                     }
                     const returnAction = next(action);
-                    adaptable.updateColDefsForSpecialColumns();
+                    adaptable.updateColumnModelAndRefreshGrid();
                     return returnAction;
                 }
                 /*******************
@@ -679,7 +669,7 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                 case CustomSortRedux.CUSTOM_SORT_UNSUSPEND_ALL: {
                     const returnAction = next(action);
                     // called also for alert actions, see ALERT ACTIONS block
-                    adaptable.setupColumns();
+                    adaptable.updateColumnModelAndRefreshGrid();
                     return returnAction;
                 }
                 /*******************
@@ -778,7 +768,6 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                                 draftLayoutAction = GridRedux.LayoutDraftColumnFilterUnsuspendAll();
                                 break;
                         }
-                        //  GRID FILTER
                         returnAction = next(draftLayoutAction);
                     }
                     setTimeout(() => {
@@ -798,17 +787,27 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                 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;
+                    // - 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) {
-                        returnAction = action;
+                        return next(action);
                     }
                     else {
-                        // save in draft
+                        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 }));
@@ -869,12 +868,12 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                  * Note ACTIONS
                  *******************/
                 /**
-                 * Use Case: Notes has been edited/deleted/added
+                 * Use Case: Note has been edited/deleted/added
                  * Action: Triangle can be removed/added
                  */
-                case NotesRedux.NOTES_ADD:
-                case NotesRedux.NOTES_EDIT:
-                case NotesRedux.NOTES_DELETE: {
+                case NoteRedux.NOTE_ADD:
+                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);
@@ -908,9 +907,9 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                         requestAnimationFrame(() => {
                             var _a, _b;
                             const commentThreads = adaptable.api.commentApi.getCommentThreads();
-                            adaptable.api.eventApi.emit('CommentsChanged', adaptable.api.commentApi.getCommentThreads());
+                            adaptable.api.eventApi.emit('CommentChanged', adaptable.api.commentApi.getCommentThreads());
                             (_b = (_a = adaptable.api.optionsApi
-                                .getCommentsOptions()) === null || _a === void 0 ? void 0 : _a.persistCommentThreads) === null || _b === void 0 ? void 0 : _b.call(_a, commentThreads);
+                                .getCommentOptions()) === null || _a === void 0 ? void 0 : _a.persistCommentThreads) === null || _b === void 0 ? void 0 : _b.call(_a, commentThreads);
                         });
                     }
                     return returnAction;
@@ -935,7 +934,7 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                             }
                         }
                         // This cannot be called because it would trigger an infinite loop
-                        // adaptable.api.eventApi.emit('CommentsChanged', commentThreads);
+                        // adaptable.api.eventApi.emit('CommentChanged', commentThreads);
                         // refresh all comments cells to show or hide the triangle
                         [...addedCommentThreads, ...deletedCommentThreads].forEach((commentThread) => {
                             const node = adaptable.api.gridApi.getRowNodeForPrimaryKey(commentThread.PrimaryKeyValue);
@@ -1019,12 +1018,18 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                     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;
-                    // Tell Grid to apply filtering if filters have been changed in a loaded Layout
                     if (adaptable.api.columnFilterApi.internalApi.areColumnFiltersDifferent(oldFilters, newFilters)) {
                         adaptable.applyColumnFiltering();
                     }
+                    // 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 (returnAction.type == LayoutRedux.LAYOUT_SELECT ||
                         returnAction.type == LayoutRedux.LAYOUT_DELETE ||
                         returnAction.type == LayoutRedux.LAYOUT_SET_COLUMN_CAPTION) {
@@ -1037,7 +1042,7 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                             // tell grid the layout has been selected
                             adaptable.setLayout(currentLayout);
                         }
-                        if (!((_m = adaptable.adaptableOptions.layoutOptions) === null || _m === void 0 ? void 0 : _m.autoSaveLayouts)) {
+                        if (!((_p = adaptable.adaptableOptions.layoutOptions) === null || _p === void 0 ? void 0 : _p.autoSaveLayouts)) {
                             middlewareAPI.dispatch(GridRedux.LayoutUpdateCurrentDraft(currentLayout));
                         }
                     }
@@ -1045,7 +1050,7 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                         returnAction.type == LayoutRedux.LAYOUT_SAVE) {
                         const actionTyped = action;
                         // if autosave is false
-                        if (!((_o = adaptable.adaptableOptions.layoutOptions) === null || _o === void 0 ? void 0 : _o.autoSaveLayouts)) {
+                        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));
@@ -1063,6 +1068,7 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                             adaptable.setLayout(savingLayout);
                         }
                     }
+                    adaptable.refreshQuickFilter();
                     return returnAction;
                 }
                 /*******************
@@ -1273,12 +1279,6 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                     }
                     return next(action);
                 }
-                case SYSTEM_VISUAL_EXPORT_BEGIN:
-                case SYSTEM_VISUAL_EXPORT_END: {
-                    let returnAction = next(action);
-                    adaptable.ReportService.resetExcelStyleMemoization();
-                    return returnAction;
-                }
                 /*******************
                  * CHARTING ACTIONS
                  *******************/
@@ -1656,24 +1656,14 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                  *******************/
                 case INIT_STATE: {
                     let returnAction = next(action);
-                    if (adaptable.isDestroyed) {
-                        return returnAction;
-                    }
-                    // make sure we have the grid columns in state, before we do any layout work
-                    adaptable.updateColumnsIntoStore();
-                    const layoutState = middlewareAPI.getState().Layout;
-                    const defaultLayout = adaptable.api.layoutApi.internalApi.createDefaultLayoutIfNeeded();
-                    let currentLayout = (layoutState === null || layoutState === void 0 ? void 0 : layoutState.CurrentLayout) || (defaultLayout === null || defaultLayout === void 0 ? void 0 : defaultLayout.Name);
-                    if (!adaptable.api.layoutApi.getLayoutByName(currentLayout)) {
-                        currentLayout = defaultLayout ? defaultLayout.Name : layoutState.Layouts[0].Name;
+                    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();
                     }
-                    middlewareAPI.dispatch(LayoutRedux.LayoutSelect(currentLayout));
-                    // do this now so it sets module entitlements
-                    adaptable.EntitlementService.setModulesEntitlements();
-                    // create the module menu (for use in the dashboard and the toolpanel)
-                    adaptable.ModuleService.createModuleMenus();
-                    // update initial mode of DataChangeHistory
-                    adaptable.api.internalApi.initializeDataChangeHistory();
                     return returnAction;
                 }
                 default: {