@adaptabletools/adaptable 18.0.0-canary.9 → 18.0.0

package/src/Redux/ActionsReducers/LayoutRedux.js

@@ -269,8 +269,10 @@ export const LayoutReducer = (state = initialState, action) => {
             return Object.assign(Object.assign({}, state), { Layouts });
         }
         case LAYOUT_COLUMN_FILTER_ADD: {
-            let columnFilters = [...((_b = currentLayout.ColumnFilters) !== null && _b !== void 0 ? _b : [])];
             const columnFilterAction = action.columnFilter;
+            let columnFilters = ((_b = currentLayout.ColumnFilters) !== null && _b !== void 0 ? _b : []).filter(
+            // make sure we are not adding a filter that already exists
+            (cf) => cf.ColumnId !== columnFilterAction.ColumnId);
             AdaptableHelper.addUuidAndSource(columnFilterAction);
             columnFilters.push(columnFilterAction);
             const Layouts = state.Layouts.map((layout) => {
@@ -283,10 +285,13 @@ export const LayoutReducer = (state = initialState, action) => {
         }
         case LAYOUT_COLUMN_FILTER_EDIT: {
             const columnFilterAction = action.columnFilter;
-            let columnFilters = ((_c = currentLayout.ColumnFilters) !== null && _c !== void 0 ? _c : []).map((abObject) => abObject.Uuid === columnFilterAction.Uuid ? columnFilterAction : abObject);
+            // it is safer to change the col id, we cannot have multiple filter on the same id
+            // first we filter out other filters with the same colId, to ensure we have only one
+            const cleanColumnFilters = ((_c = currentLayout.ColumnFilters) !== null && _c !== void 0 ? _c : []).filter((cf) => cf.ColumnId !== columnFilterAction.ColumnId);
+            cleanColumnFilters.push(columnFilterAction);
             const Layouts = state.Layouts.map((layout) => {
                 if (layout.Name === currentLayout.Name) {
-                    return Object.assign(Object.assign({}, layout), { ColumnFilters: columnFilters });
+                    return Object.assign(Object.assign({}, layout), { ColumnFilters: cleanColumnFilters });
                 }
                 return layout;
             });
@@ -302,14 +307,11 @@ export const LayoutReducer = (state = initialState, action) => {
             return Object.assign(Object.assign({}, state), { Layouts });
         }
         case LAYOUT_COLUMN_FILTER_CLEAR: {
-            let columnFilters = [...((_d = currentLayout.ColumnFilters) !== null && _d !== void 0 ? _d : [])];
             const actionTypedDelete = action;
-            const index = actionTypedDelete.columnFilter
-                ? columnFilters.findIndex((i) => i.Uuid == actionTypedDelete.columnFilter.Uuid)
-                : -1;
-            if (index != -1) {
-                columnFilters.splice(index, 1);
-            }
+            const columnFilters = ((_d = currentLayout.ColumnFilters) !== null && _d !== void 0 ? _d : []).filter((cf) => {
+                // make sure we are deleting all filters on the same column
+                return cf.ColumnId !== actionTypedDelete.columnFilter.ColumnId;
+            });
             const Layouts = state.Layouts.map((layout) => {
                 if (layout.Name === currentLayout.Name) {
                     return Object.assign(Object.assign({}, layout), { ColumnFilters: columnFilters });

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 GetNoteSelector: (state: NoteState, address: CellAddress) => AdaptableNote;
+export declare const NoteReducer: Redux.Reducer<NoteState>;

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

@@ -1,44 +1,44 @@
 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 GetAllNotesSelector = (state) => state.Notes;
-export const GetNotesSelector = (state, address) => {
+export const GetNoteSelector = (state, address) => {
     var _a;
     if (!address) {
-        return [];
+        return null;
     }
-    return ((_a = state === null || state === void 0 ? void 0 : state.Notes) !== null && _a !== void 0 ? _a : []).filter((note) => {
+    return ((_a = state === null || state === void 0 ? void 0 : state.Notes) !== null && _a !== void 0 ? _a : []).find((note) => {
         if (note.PrimaryKeyValue === address.PrimaryKeyValue && note.ColumnId === address.ColumnId) {
             // happy check
             return true;
@@ -55,20 +55,20 @@ export const GetNotesSelector = (state, address) => {
 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/PopupRedux.d.ts

@@ -1,15 +1,13 @@
 import * as Redux from 'redux';
-import { PopupState } from '../../PredefinedConfig/PopupState';
-import { InputAction, UIPrompt, UIConfirmation } from '../../Utilities/Interface/MessagePopups';
-import { ModuleParams } from '../../View/Components/SharedProps/ModuleViewPopupProps';
-import { AdaptableModule } from '../../PredefinedConfig/Common/Types';
 import { AdaptableAlert } from '../../PredefinedConfig/Common/AdaptableAlert';
-import { AdaptableForm, BaseContext } from '../../types';
 import { FormContext } from '../../PredefinedConfig/Common/FormContext';
+import { AdaptableModule } from '../../PredefinedConfig/Common/Types';
+import { PopupState } from '../../PredefinedConfig/PopupState';
+import { AdaptableForm, BaseContext } from '../../types';
+import { InputAction, UIConfirmation, UIPrompt } from '../../Utilities/Interface/MessagePopups';
+import { ModuleParams } from '../../View/Components/SharedProps/ModuleViewPopupProps';
 export declare const POPUP_SHOW_SCREEN = "POPUP_SHOW_SCREEN";
 export declare const POPUP_HIDE_SCREEN = "POPUP_HIDE_SCREEN";
-export declare const POPUP_SHOW_LOADING = "POPUP_SHOW_LOADING";
-export declare const POPUP_HIDE_LOADING = "POPUP_HIDE_LOADING";
 export declare const POPUP_SHOW_ALERT = "POPUP_SHOW_ALERT";
 export declare const POPUP_SHOW_PROMPT = "POPUP_SHOW_PROMPT";
 export declare const POPUP_HIDE_PROMPT = "POPUP_HIDE_PROMPT";
@@ -51,10 +49,6 @@ export interface PopupShowFormAction extends Redux.Action {
 export interface PopupHideFormAction extends Redux.Action {
     Id: string;
 }
-export interface PopupShowLoadingAction extends Redux.Action {
-}
-export interface PopupHideLoadingAction extends Redux.Action {
-}
 export interface PopupShowAlertAction extends Redux.Action {
     alert: AdaptableAlert;
 }
@@ -97,8 +91,6 @@ export declare const PopupShowForm: (config: {
 }) => PopupShowFormAction;
 export declare const PopupHideForm: (id: string) => PopupHideFormAction;
 export declare const PopupShowAlert: (alert: AdaptableAlert) => PopupShowAlertAction;
-export declare const PopupShowLoading: () => PopupShowLoadingAction;
-export declare const PopupHideLoading: () => PopupHideLoadingAction;
 export declare const PopupShowPrompt: (prompt: UIPrompt) => PopupShowPromptAction;
 export declare const PopupHidePrompt: () => PopupHidePromptAction;
 export declare const PopupConfirmPrompt: (inputText: string) => PopupConfirmPromptAction;

package/src/Redux/ActionsReducers/PopupRedux.js

@@ -1,7 +1,5 @@
 export const POPUP_SHOW_SCREEN = 'POPUP_SHOW_SCREEN';
 export const POPUP_HIDE_SCREEN = 'POPUP_HIDE_SCREEN';
-export const POPUP_SHOW_LOADING = 'POPUP_SHOW_LOADING';
-export const POPUP_HIDE_LOADING = 'POPUP_HIDE_LOADING';
 export const POPUP_SHOW_ALERT = 'POPUP_SHOW_ALERT';
 export const POPUP_SHOW_PROMPT = 'POPUP_SHOW_PROMPT';
 export const POPUP_HIDE_PROMPT = 'POPUP_HIDE_PROMPT';
@@ -53,12 +51,6 @@ export const PopupShowAlert = (alert) => {
         alert: alert,
     };
 };
-export const PopupShowLoading = () => ({
-    type: POPUP_SHOW_LOADING,
-});
-export const PopupHideLoading = () => ({
-    type: POPUP_HIDE_LOADING,
-});
 export const PopupShowPrompt = (prompt) => ({
     type: POPUP_SHOW_PROMPT,
     prompt: prompt,
@@ -91,9 +83,6 @@ const initialState = {
         ComponentName: '',
         Params: null,
     },
-    LoadingPopup: {
-        ShowLoadingPopup: true,
-    },
     ConfirmationPopup: {
         ShowConfirmationPopup: false,
         Msg: '',
@@ -229,14 +218,6 @@ export const PopupReducer = (state = initialState, action) => {
                 ConfirmationPopup: newConfirmationPopup,
             });
         }
-        case POPUP_SHOW_LOADING: {
-            let newLoadingPopup = { ShowLoadingPopup: true };
-            return Object.assign({}, state, { LoadingPopup: newLoadingPopup });
-        }
-        case POPUP_HIDE_LOADING: {
-            let newLoadingPopup = { ShowLoadingPopup: false };
-            return Object.assign({}, state, { LoadingPopup: newLoadingPopup });
-        }
         case POPUP_CLEAR_PARAM: {
             let newScreenPopup = {
                 ShowScreenPopup: state.ScreenPopup.ShowScreenPopup,

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

@@ -13,7 +13,7 @@ import { SummaryOperation } from '../../PredefinedConfig/Common/Enums';
 import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
 import { RowsHighlightInfo } from '../../PredefinedConfig/Common/RowsHighlightInfo';
 import { SmartEditOperation } from '../../AdaptableOptions/EditOptions';
-import { DataImportedInfo, DataSet, CellAddress } from '../../types';
+import { DataImportedInfo, DataSet, CellAddress, CustomRenderFunction, AdaptableFrameworkComponent } from '../../types';
 import { ChartModel } from '@ag-grid-community/core';
 import { CachedQuery } from '../../PredefinedConfig/NamedQueryState';
 export declare const FLASHING_CELL_ROW_KEY = "__ROW";
@@ -200,7 +200,9 @@ export interface SystemCellSummaryChangeOperationAction extends Redux.Action {
     cellSummaryOperation: SummaryOperation | string;
 }
 export interface SystemProgressIndicatorShowAction extends Redux.Action {
-    label: string;
+    text?: string;
+    render?: CustomRenderFunction;
+    frameworkComponent?: AdaptableFrameworkComponent;
 }
 export interface SystemProgressIndicatorHideAction extends Redux.Action {
 }
@@ -302,7 +304,11 @@ export declare const SetNewColumnListOrder: (VisibleColumnList: string[]) => Set
 export declare const SetLastAppliedShortcut: (gridCell: GridCell | undefined) => SetLastAppliedShortcutAction;
 export declare const SystemCachedQueryAdd: (cachedQuery: CachedQuery) => SystemCachedQueryAddAction;
 export declare const SystemCellSummaryChangeOperation: (cellSummaryOperation: SummaryOperation | string) => SystemCellSummaryChangeOperationAction;
-export declare const SystemProgressIndicatorShow: (label: string) => SystemProgressIndicatorShowAction;
+export declare const SystemProgressIndicatorShow: (config: {
+    text?: string;
+    render?: CustomRenderFunction;
+    frameworkComponent?: AdaptableFrameworkComponent;
+}) => SystemProgressIndicatorShowAction;
 export declare const SystemProgressIndicatorHide: () => SystemProgressIndicatorHideAction;
 export declare const SystemLicenseShowWatermark: (text: string) => SystemLicenseShowWatermarkAction;
 export declare const SystemLicenseDisablePersistence: () => SystemLicenseDisablePersistenceAction;
@@ -329,7 +335,7 @@ 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 SystemRowSummartSet: (systemRowSummaries: SystemState['RowSummary']['rowSummaries']) => {
+export declare const SystemRowSummarySet: (systemRowSummaries: SystemState['RowSummary']['rowSummaries']) => {
     readonly type: "SYSTEM_SUMMARY_ROW_SET";
     readonly rowSummaries: import("../../PredefinedConfig/SystemState").SystemRowSummary[];
 };
@@ -339,6 +345,6 @@ export declare const SystemPreviousGroupedColumnsSelector: (state: SystemState)
 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

@@ -220,9 +220,11 @@ export const SystemCellSummaryChangeOperation = (cellSummaryOperation) => ({
     type: SYSTEM_CELL_SUMMARY_CHANGE_OPERATION,
     cellSummaryOperation: cellSummaryOperation,
 });
-export const SystemProgressIndicatorShow = (label) => ({
+export const SystemProgressIndicatorShow = (config) => ({
     type: SYSTEM_PROGRESS_INDICATOR_SHOW,
-    label,
+    text: config.text,
+    render: config.render,
+    frameworkComponent: config.frameworkComponent,
 });
 export const SystemProgressIndicatorHide = () => ({
     type: SYSTEM_PROGRESS_INDICATOR_HIDE,
@@ -318,7 +320,7 @@ export const SystemCellPopupEditFocusedEntity = (focusedEntity) => ({
     type: SYSTEM_CELL_POPUP_EDIT_FOCUSED_ENTITY,
     focusedEntity,
 });
-export const SystemRowSummartSet = (systemRowSummaries) => ({
+export const SystemRowSummarySet = (systemRowSummaries) => ({
     type: SYSTEM_SUMMARY_ROW_SET,
     rowSummaries: systemRowSummaries,
 });
@@ -370,7 +372,7 @@ const initialState = {
     SmartEditValue: 1,
     SmartEditOperation: MathOperation.Multiply,
     CellSummaryOperation: CELL_SUMMARY_DEFAULT_OPERATION,
-    ProgressIndicator: { active: false, label: '' },
+    ProgressIndicator: { active: false, text: '' },
     License: {
         watermark: { show: false, text: null },
         disablePersistence: false,
@@ -395,7 +397,7 @@ const initialState = {
     },
     DisableDeleteConfirmation: false,
     Export: {
-        inProgressVisualData: false,
+        visualDataExportInProgress: false,
     },
 };
 export const SystemReducer = (state = initialState, action) => {
@@ -627,7 +629,9 @@ export const SystemReducer = (state = initialState, action) => {
             const updatedState = {
                 ProgressIndicator: {
                     active: true,
-                    label: actionTypedAdd.label,
+                    text: actionTypedAdd.text,
+                    render: actionTypedAdd.render,
+                    frameworkComponent: actionTypedAdd.frameworkComponent,
                 },
             };
             return Object.assign({}, state, updatedState);
@@ -636,7 +640,6 @@ export const SystemReducer = (state = initialState, action) => {
             const updatedState = {
                 ProgressIndicator: {
                     active: false,
-                    label: '',
                 },
             };
             return Object.assign({}, state, updatedState);
@@ -728,12 +731,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: {

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';
@@ -121,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,
@@ -142,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,
         };
@@ -262,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
@@ -315,9 +315,7 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                  *******************/
                 case SystemRedux.SYSTEM_SUMMARY_ROW_SET: {
                     let nextAction = next(action);
-                    setTimeout(() => {
-                        adaptable.setupRowSummaries();
-                    }, 0);
+                    adaptable.api.layoutApi.internalApi.setupRowSummaries();
                     return nextAction;
                 }
                 /*******************
@@ -770,7 +768,6 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                                 draftLayoutAction = GridRedux.LayoutDraftColumnFilterUnsuspendAll();
                                 break;
                         }
-                        //  GRID FILTER
                         returnAction = next(draftLayoutAction);
                     }
                     setTimeout(() => {
@@ -790,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 }));
@@ -861,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);
@@ -899,18 +906,18 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                         adaptable.refreshCells([node], [columnId], true);
                         requestAnimationFrame(() => {
                             var _a, _b;
-                            const commentThreads = adaptable.api.commentApi.getCommentThreads();
-                            adaptable.api.eventApi.emit('CommentsChanged', adaptable.api.commentApi.getCommentThreads());
+                            const commentThreads = adaptable.api.commentApi.getGridComments();
+                            adaptable.api.eventApi.emit('CommentChanged', adaptable.api.commentApi.getGridComments());
                             (_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;
                 }
                 case CommentsRedux.COMMENTS_LOAD: {
-                    const previousCommentThreads = adaptable.api.commentApi.getCommentThreads();
+                    const previousCommentThreads = adaptable.api.commentApi.getGridComments();
                     let returnAction = next(action);
-                    const newCommentThreads = (_j = adaptable.api.commentApi.getCommentThreads()) !== null && _j !== void 0 ? _j : [];
+                    const newCommentThreads = (_j = adaptable.api.commentApi.getGridComments()) !== null && _j !== void 0 ? _j : [];
                     requestAnimationFrame(() => {
                         let addedCommentThreads = [];
                         let deletedCommentThreads = [];
@@ -927,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);
@@ -1011,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) {
@@ -1029,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));
                         }
                     }
@@ -1037,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));
@@ -1266,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
                  *******************/

package/src/Strategy/AdaptableModuleBase.d.ts

@@ -3,7 +3,7 @@ import { Action } from 'redux';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
 import { ModuleParams } from '../View/Components/SharedProps/ModuleViewPopupProps';
 import { MenuItemShowPopup, MenuItemDoReduxAction, MenuItemDoClickFunction } from '../Utilities/MenuItem';
-import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
+import { AdaptableMenuItem, AdaptableContextMenuItemName, ContextMenuContext, AdaptableColumnMenuItemName } from '../PredefinedConfig/Common/Menu';
 import { AdaptableModule } from '../PredefinedConfig/Common/Types';
 import { TeamSharingImportInfo } from '../PredefinedConfig/TeamSharingState';
 import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
@@ -36,19 +36,19 @@ export declare abstract class AdaptableModuleBase implements IModule {
     onAdaptableReady(): void;
     onAdaptableStateReloaded(adaptableStateReloadedInfo: AdaptableStateReloadedInfo): void;
     setModuleEntitlement(): void;
-    addModuleMenuItem(source: 'ModuleMenu' | 'ModuleButton'): AdaptableMenuItem | undefined;
-    addModuleButtonMenuItem(): AdaptableMenuItem | undefined;
-    addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
-    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
-    createMainMenuItemShowPopup({ Label, ComponentName, Icon, PopupParams, }: {
+    createModuleMenuItem(source: 'ModuleMenu' | 'ModuleButton'): AdaptableMenuItem | undefined;
+    createColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem<AdaptableColumnMenuItemName>[] | undefined;
+    createContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem<AdaptableContextMenuItemName>[] | undefined;
+    createMainMenuItemShowPopup<MENU_TYPE_NAME extends AdaptableColumnMenuItemName | AdaptableContextMenuItemName = AdaptableColumnMenuItemName | AdaptableContextMenuItemName>({ Name, Label, ComponentName, Icon, PopupParams, }: {
+        Name: MENU_TYPE_NAME;
         Label: string;
         ComponentName: string;
         Icon: AdaptableSystemIconName;
         PopupParams?: ModuleParams;
-    }): MenuItemShowPopup;
-    createColumnMenuItemClickFunction(Label: string, Icon: AdaptableSystemIconName, ClickFunction: () => void): MenuItemDoClickFunction;
-    createColumnMenuItemReduxAction(Label: string, Icon: AdaptableSystemIconName, Action: Action): MenuItemDoReduxAction;
-    createColumnMenuItemShowPopup(Label: string, ComponentName: string, Icon: AdaptableSystemIconName, PopupParams?: ModuleParams): MenuItemShowPopup;
+    }): MenuItemShowPopup<MENU_TYPE_NAME>;
+    createMenuItemClickFunction<MENU_TYPE_NAME extends AdaptableColumnMenuItemName | AdaptableContextMenuItemName = AdaptableColumnMenuItemName | AdaptableContextMenuItemName>(Name: MENU_TYPE_NAME, Label: string, Icon: AdaptableSystemIconName, ClickFunction: () => void): MenuItemDoClickFunction<MENU_TYPE_NAME>;
+    createMenuItemReduxAction<MENU_TYPE_NAME extends AdaptableColumnMenuItemName | AdaptableContextMenuItemName = AdaptableColumnMenuItemName | AdaptableContextMenuItemName>(Name: MENU_TYPE_NAME, Label: string, Icon: AdaptableSystemIconName, Action: Action): MenuItemDoReduxAction<MENU_TYPE_NAME>;
+    createMenuItemShowPopup<MENU_TYPE_NAME extends AdaptableColumnMenuItemName | AdaptableContextMenuItemName = AdaptableColumnMenuItemName | AdaptableContextMenuItemName>(Name: MENU_TYPE_NAME, Label: string, ComponentName: string, Icon: AdaptableSystemIconName, PopupParams?: ModuleParams): MenuItemShowPopup<MENU_TYPE_NAME>;
     getTeamSharingAction(): TeamSharingImportInfo<AdaptableObject> | undefined;
     getModuleNamedQueryReferences(): string[];
     getModuleCalculatedColumnReferences(): CalculatedColumn[];