@adaptabletools/adaptable-cjs 18.0.0-canary.17 → 18.0.0-canary.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable-cjs",
-  "version": "18.0.0-canary.17",
+  "version": "18.0.0-canary.19",
   "description": "Powerful data-agnostic HTML5 AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
   "keywords": [
     "web-components",

package/src/AdaptableOptions/AdaptableOptions.d.ts

@@ -134,11 +134,11 @@ export interface AdaptableOptions<TData = any> {
      */
     containerOptions?: ContainerOptions;
     /**
-     * Options for managing Notes
+     * Options for managing personal Notes
      */
     noteOptions?: NoteOptions;
     /**
-     * Options for managing AdapTable Comments
+     * Options for managing collaborative Comments
      */
     commentOptions?: CommentOptions<TData>;
     /**

package/src/AdaptableOptions/CommentOptions.d.ts

@@ -1,18 +1,18 @@
-import { CommentThread, BaseContext, CellAddress } from '../../types';
+import { CommentThread, BaseContext, GridCell } from '../types';
 /**
  * Options for managing Comments and Comment Threads in AdapTable
  */
 export interface CommentOptions<TData = any> {
     /**
-     * Whether a cell can be receive Comments
+     * Whether a cell can contain Comments
      */
     isCellCommentable?: (commentableCellContext: CommentableCellContext) => boolean;
     /**
-     * Loads initial Comments
+     * Loads Comments
      */
     loadCommentThreads?(commentLoadContext: CommentLoadContext): Promise<CommentThread[]>;
     /**
-     * Called when Comments change
+     * Called when Comments change and need to be saved
      * @param commentThreads
      */
     persistCommentThreads?(commentThreads: CommentThread[]): void;
@@ -22,9 +22,12 @@ export interface CommentOptions<TData = any> {
  */
 export interface CommentableCellContext extends BaseContext {
     /**
-     * Cell in AdapTable which might receive a Comment
+     * Grid Cell in AdapTable which has been clicked
      */
-    cellAddress: CellAddress;
+    gridCell: GridCell;
 }
+/**
+ * Context used when loading Comments
+ */
 export interface CommentLoadContext extends BaseContext {
 }

package/src/AdaptableOptions/GroupingOptions.d.ts

@@ -4,13 +4,6 @@ import { KeyCreatorParams } from '@ag-grid-community/core';
  * Options for managing Row and Column Groups in AdapTable
  */
 export interface GroupingOptions<TData = any> {
-    /**
-     * Show aggregated totals row at top of Grid when row grouping
-     *
-     * @defaultValue false
-     * @gridInfoItem
-     */
-    showGroupingTotalsAsHeader?: boolean;
     /**
     * Value to use for 'Balanced Groups' (string columns only)
     */

package/src/AdaptableOptions/NoteOptions.d.ts

@@ -1,4 +1,4 @@
-import { BaseContext, CellAddress } from '../../types';
+import { BaseContext, GridCell } from '../../types';
 /**
  * Options for managing AdapTable Notes
  */
@@ -13,7 +13,7 @@ export interface NoteOptions<TData = any> {
  */
 export interface NotableCellContext extends BaseContext {
     /**
-     * Cell which should contain the Note
-     */
-    address: CellAddress;
+      * Grid Cell in AdapTable which has been clicked
+      */
+    gridCell: GridCell;
 }

package/src/Api/Events/GridDataChanged.d.ts

@@ -13,7 +13,7 @@ export type GridDataChangeTrigger = 'Add' | 'Edit' | 'Delete' | 'Load';
      */
     dataRows: TData[];
     /**
-     * Trigger for row change: 'Add', 'Edit', 'Delete', 'Load'
+     * Trigger for row change: Load, Add, Edit, or Delete
      */
     rowTrigger: GridDataChangeTrigger;
     /**

package/src/Api/Implementation/ApiBase.d.ts

@@ -7,7 +7,7 @@ import { ModuleInfo } from '../../Strategy/Interface/IModule';
 import { AdaptableOptions } from '../../AdaptableOptions/AdaptableOptions';
 import { AdaptableApi } from '../AdaptableApi';
 import { ExportOptions } from '../../AdaptableOptions/ExportOptions';
-import { ActionColumnApi, ActionColumnOptions, ActionRowApi, ActionRowOptions, AlertApi, AlertOptions, ApplicationApi, BulkUpdateApi, CalculatedColumnApi, CalendarApi, CalendarOptions, CellSummaryApi, CellSummaryOptions, ChartingApi, ChartingOptions, ColumnApi, ColumnFilterApi, ColumnFilterOptions, ColumnOptions, ConfigApi, ContainerOptions, CustomSortApi, CustomSortOptions, DashboardApi, DashboardOptions, DataChangeHistoryApi, DataChangeHistoryOptions, DataSetApi, DataSetOptions, EditOptions, EntitlementApi, EntitlementOptions, EventApi, ExportApi, ExpressionApi, ExpressionOptions, Fdc3Api, Fdc3Options, FlashingCellApi, FlashingCellOptions, FormatColumnApi, FormatColumnOptions, FreeTextColumnApi, GridApi, GridFilterApi, GroupingOptions, LayoutApi, LayoutAssociatedObject, LayoutOptions, MenuOptions, NamedQueryApi, NoteOptions, NotificationsOptions, PluginsApi, PlusMinusApi, PredicateApi, PredicateOptions, QuickSearchApi, QuickSearchOptions, ScheduleApi, ScopeApi, SettingsPanelApi, SettingsPanelOptions, ShortcutApi, SmartEditApi, StateOptions, StatusBarApi, StyledColumnApi, SystemStatusApi, TeamSharingApi, TeamSharingOptions, ThemeApi, ToolPanelApi, ToolPanelOptions, UserInterfaceApi, UserInterfaceOptions } from '../../types';
+import { ActionColumnApi, ActionColumnOptions, ActionRowApi, ActionRowOptions, AlertApi, AlertOptions, ApplicationApi, BulkUpdateApi, CalculatedColumnApi, CalendarApi, CalendarOptions, CellSummaryApi, CellSummaryOptions, ChartingApi, ChartingOptions, ColumnApi, ColumnFilterApi, ColumnFilterOptions, ColumnOptions, CommentOptions, ConfigApi, ContainerOptions, CustomSortApi, CustomSortOptions, DashboardApi, DashboardOptions, DataChangeHistoryApi, DataChangeHistoryOptions, DataSetApi, DataSetOptions, EditOptions, EntitlementApi, EntitlementOptions, EventApi, ExportApi, ExpressionApi, ExpressionOptions, Fdc3Api, Fdc3Options, FlashingCellApi, FlashingCellOptions, FormatColumnApi, FormatColumnOptions, FreeTextColumnApi, GridApi, GridFilterApi, GroupingOptions, LayoutApi, LayoutAssociatedObject, LayoutOptions, MenuOptions, NamedQueryApi, NoteOptions, NotificationsOptions, PluginsApi, PlusMinusApi, PredicateApi, PredicateOptions, QuickSearchApi, QuickSearchOptions, ScheduleApi, ScopeApi, SettingsPanelApi, SettingsPanelOptions, ShortcutApi, SmartEditApi, StateOptions, StatusBarApi, StyledColumnApi, SystemStatusApi, TeamSharingApi, TeamSharingOptions, ThemeApi, ToolPanelApi, ToolPanelOptions, UserInterfaceApi, UserInterfaceOptions } from '../../types';
 import { ModuleParams } from '../../View/Components/SharedProps/ModuleViewPopupProps';
 export declare abstract class ApiBase {
     protected adaptable: IAdaptable;
@@ -53,6 +53,7 @@ export declare abstract class ApiBase {
     protected getActionColumnOptions(): ActionColumnOptions;
     protected getActionRowOptions(): ActionRowOptions;
     protected getColumnOptions(): ColumnOptions;
+    protected getCommentOptions(): CommentOptions;
     protected getNoteOptions(): NoteOptions;
     protected getCustomSortOptions(): CustomSortOptions;
     protected getDataSetOptions(): DataSetOptions;

package/src/Api/Implementation/ApiBase.js

@@ -105,6 +105,9 @@ class ApiBase {
     getColumnOptions() {
         return this.getOptions().columnOptions;
     }
+    getCommentOptions() {
+        return this.getOptions().commentOptions;
+    }
     getNoteOptions() {
         return this.getOptions().noteOptions;
     }

package/src/Api/Internal/ColumnFilterInternalApi.d.ts

@@ -49,6 +49,7 @@ export declare class ColumnFilterInternalApi extends ApiBase {
      * Fires Column Filter Applied Event - typically used to enable filtering on the server
      */
     fireColumnFilterAppliedEvent(): void;
+    fireGridFilterAppliedEvent(): void;
     /**
      * Compares to sets of Column Filters to see if they are identical
      * @param filters1

package/src/Api/Internal/ColumnFilterInternalApi.js

@@ -186,6 +186,18 @@ class ColumnFilterInternalApi extends ApiBase_1.ApiBase {
             this.adaptable.api.eventApi.emit('ColumnFilterApplied', columnFilterAppliedInfo);
         }
     }
+    fireGridFilterAppliedEvent() {
+        if (this.adaptable.isReady) {
+            const adaptableApi = this.getAdaptableApi();
+            const gridFilterAppliedInfo = {
+                columnFilters: this.getColumnFilterApi().getColumnFilters(),
+                adaptableApi: adaptableApi,
+                userName: adaptableApi.optionsApi.getUserName(),
+                adaptableId: adaptableApi.optionsApi.getAdaptableId(),
+            };
+            this.adaptable.api.eventApi.emit('GridFilterApplied', gridFilterAppliedInfo);
+        }
+    }
     /**
      * Compares to sets of Column Filters to see if they are identical
      * @param filters1

package/src/Api/Internal/GridFilterInternalApi.d.ts

@@ -1,4 +1,9 @@
 import { ApiBase } from '../Implementation/ApiBase';
+import { GridFilter } from '../../types';
 export declare class GridFilterInternalApi extends ApiBase {
     fireGridFilterAppliedEvent(): void;
+    /**
+   * Compares to Grid Filters to see if they are identical
+   */
+    isGridFilterDifferent(oldFilter: GridFilter, newFilter: GridFilter): boolean;
 }

package/src/Api/Internal/GridFilterInternalApi.js

@@ -19,5 +19,11 @@ class GridFilterInternalApi extends ApiBase_1.ApiBase {
             adaptableApi.eventApi.emit('GridFilterApplied', gridFilterAppliedInfo);
         }
     }
+    /**
+   * Compares to Grid Filters to see if they are identical
+   */
+    isGridFilterDifferent(oldFilter, newFilter) {
+        return (oldFilter === null || oldFilter === void 0 ? void 0 : oldFilter.Expression) === (newFilter === null || newFilter === void 0 ? void 0 : newFilter.Expression);
+    }
 }
 exports.GridFilterInternalApi = GridFilterInternalApi;

package/src/PredefinedConfig/Common/DataUpdateConfig.d.ts

@@ -7,11 +7,7 @@ export interface DataUpdateConfig {
      */
     runAsync?: boolean;
     /**
-     * Whether to flush async updates.
-     *
-     * If `true`, any async transactions will be flushed.
-     * This flag can be true even if you runAsync is `false`.
-     * So even if the currenct transaction/operation is synchronous, this will flush existing async transactions.
+     * Whether to flush async updates
      */
     flushAsync?: boolean;
     /**

package/src/PredefinedConfig/Common/Menu.d.ts

@@ -5,11 +5,16 @@ import { SelectedCellInfo } from '../Selection/SelectedCellInfo';
 import { SelectedRowInfo } from '../Selection/SelectedRowInfo';
 import { Column, IRowNode } from '@ag-grid-community/core';
 import { AdaptableIcon, BaseContext } from '../../types';
+export type AdaptableColumnMenuItemName = (typeof ADAPTABLE_COLUMN_MENU_ITEMS)[number];
+export type AdaptableContextMenuItemName = (typeof ADAPTABLE_CONTEXT_MENU_ITEMS)[number];
 /**
- * List of Shipped Adaptable Menu Items
+ * List of Shipped Adaptable Column Menu Items
  */
-export declare const ADAPTABLE_MENU_ITEMS: readonly ["alert-clear", "bulk-update-apply", "calculated-column-edit", "cell-summary-show", "column-info", "comment-add", "comment-remove", "custom-sort-add", "custom-sort-edit", "dashboard", "dashboard-collapse", "dashboard-configure", "dashboard-dock", "dashboard-expand", "dashboard-float", "dashboard-hide", "dashboard-show", "data-import", "export", "export-clipboard", "export-csv", "export-excel", "export-json", "export-table", "export-custom-destination", "fdc3", "fdc3-broadcast", "fdc3-raise-intent", "filter", "filter-bar-visbility", "filter-clear", "filter-suspend", "filter-cell-value", "flashing-cell-add", "flashing-cell-clear", "flashing-cell-delete", "flashing-row-clear", "format-column", "format-column-add", "format-column-edit", "free-text-column-edit", "grid-info", "layout-aggregated-view", "layout-auto-size", "layout-clear-selection", "layout-column-caption-change", "layout-column-hide", "layout-column-select", "layout-column-select-preserve", "layout-column-select-reset", "layout-edit", "layout-grid", "layout-select", "layout-select-all", "note-add", "note-remove", "plus-minus-add", "smart-edit-apply", "settings-panel-open", "styled-column-badge", "styled-column", "styled-column-gradient", "styled-column-percent-bar", "styled-column-sparkline", "system-status-show", "internal"];
-export type AdaptableMenuItemName = typeof ADAPTABLE_MENU_ITEMS[number];
+export declare const ADAPTABLE_COLUMN_MENU_ITEMS: readonly ["calculated-column-edit", "cell-summary-show", "column-filter-bar-hide", "column-filter-bar-show", "column-filter-clear", "column-filter-on-cell-value", "column-filter-suspend", "column-filter-unsuspend", "column-info-show", "custom-sort-add", "custom-sort-edit", "dashboard-collapse", "dashboard-configure", "dashboard-dock", "dashboard-expand", "dashboard-float", "dashboard-hide", "dashboard-show", "data-import", "flashing-cell-add", "flashing-cell-delete", "format-column-add", "format-column-edit", "free-text-column-edit", "grid-info-show", "layout-column-caption-change", "layout-column-hide", "layout-column-select", "layout-column-select-preserve", "layout-column-select-reset", "layout-edit", "layout-grid-parent", "layout-select-parent", "layout-select-all", "plus-minus-add", "settings-panel-open", "styled-column-badge-add", "styled-column-badge-edit", "styled-column-gradient-add", "styled-column-gradient-edit", "styled-column-percent-bar-add", "styled-column-percent-bar-edit", "styled-column-sparkline-add", "styled-column-sparkline-edit", "system-status-show", "internal", "parent"];
+/**
+ * List of Shipped Adaptable Context Menu Items
+ */
+export declare const ADAPTABLE_CONTEXT_MENU_ITEMS: readonly ["alert-clear", "bulk-update-apply", "calculated-column-edit", "cell-summary-show", "column-filter-on-cell-value", "column-filter-clear", "column-filter-suspend", "column-filter-unsuspend", "column-info-show", "comment-add", "comment-remove", "dashboard-collapse", "dashboard-configure", "dashboard-dock", "dashboard-expand", "dashboard-float", "dashboard-hide", "dashboard-show", "data-import", "export-clipboard", "export-csv", "export-excel", "export-json", "export-table", "export-custom-destination", "fdc3-broadcast", "fdc3-raise-intent", "flashing-cell-clear", "flashing-row-clear", "grid-info-show", "layout-aggregated-view", "layout-auto-size", "layout-clear-selection", "layout-edit", "layout-select-all", "note-add", "note-remove", "settings-panel-open", "smart-edit-apply", "system-status-show"];
 /**
  * Menu item used by Adaptable in both Column and Context Menus
  */
@@ -17,7 +22,7 @@ export interface AdaptableMenuItem {
     /**
      * Unique name for the Menu Item
      */
-    name: AdaptableMenuItemName;
+    name: AdaptableColumnMenuItemName | AdaptableContextMenuItemName;
     /**
      * Text that appears in the menu
      */

package/src/PredefinedConfig/Common/Menu.js

@@ -1,20 +1,73 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ADAPTABLE_MENU_ITEMS = void 0;
+exports.ADAPTABLE_CONTEXT_MENU_ITEMS = exports.ADAPTABLE_COLUMN_MENU_ITEMS = void 0;
 /**
- * List of Shipped Adaptable Menu Items
+ * List of Shipped Adaptable Column Menu Items
  */
-exports.ADAPTABLE_MENU_ITEMS = [
+exports.ADAPTABLE_COLUMN_MENU_ITEMS = [
+    'calculated-column-edit',
+    'cell-summary-show',
+    'column-filter-bar-hide',
+    'column-filter-bar-show',
+    'column-filter-clear',
+    'column-filter-on-cell-value',
+    'column-filter-suspend',
+    'column-filter-unsuspend',
+    'column-info-show',
+    'custom-sort-add',
+    'custom-sort-edit',
+    'dashboard-collapse',
+    'dashboard-configure',
+    'dashboard-dock',
+    'dashboard-expand',
+    'dashboard-float',
+    'dashboard-hide',
+    'dashboard-show',
+    'data-import',
+    'flashing-cell-add',
+    'flashing-cell-delete',
+    'format-column-add',
+    'format-column-edit',
+    'free-text-column-edit',
+    'grid-info-show',
+    'layout-column-caption-change',
+    'layout-column-hide',
+    'layout-column-select',
+    'layout-column-select-preserve',
+    'layout-column-select-reset',
+    'layout-edit',
+    'layout-grid-parent',
+    'layout-select-parent',
+    'layout-select-all',
+    'plus-minus-add',
+    'settings-panel-open',
+    'styled-column-badge-add',
+    'styled-column-badge-edit',
+    'styled-column-gradient-add',
+    'styled-column-gradient-edit',
+    'styled-column-percent-bar-add',
+    'styled-column-percent-bar-edit',
+    'styled-column-sparkline-add',
+    'styled-column-sparkline-edit',
+    'system-status-show',
+    'internal',
+    'parent',
+];
+/**
+ * List of Shipped Adaptable Context Menu Items
+ */
+exports.ADAPTABLE_CONTEXT_MENU_ITEMS = [
     'alert-clear',
     'bulk-update-apply',
     'calculated-column-edit',
     'cell-summary-show',
-    'column-info',
+    'column-filter-on-cell-value',
+    'column-filter-clear',
+    'column-filter-suspend',
+    'column-filter-unsuspend',
+    'column-info-show',
     'comment-add',
     'comment-remove',
-    'custom-sort-add',
-    'custom-sort-edit',
-    'dashboard',
     'dashboard-collapse',
     'dashboard-configure',
     'dashboard-dock',
@@ -23,52 +76,25 @@ exports.ADAPTABLE_MENU_ITEMS = [
     'dashboard-hide',
     'dashboard-show',
     'data-import',
-    'export',
     'export-clipboard',
     'export-csv',
     'export-excel',
     'export-json',
     'export-table',
     'export-custom-destination',
-    'fdc3',
     'fdc3-broadcast',
     'fdc3-raise-intent',
-    'filter',
-    'filter-bar-visbility',
-    'filter-clear',
-    'filter-suspend',
-    'filter-cell-value',
-    'flashing-cell-add',
     'flashing-cell-clear',
-    'flashing-cell-delete',
     'flashing-row-clear',
-    'format-column',
-    'format-column-add',
-    'format-column-edit',
-    'free-text-column-edit',
-    'grid-info',
+    'grid-info-show',
     'layout-aggregated-view',
     'layout-auto-size',
     'layout-clear-selection',
-    'layout-column-caption-change',
-    'layout-column-hide',
-    'layout-column-select',
-    'layout-column-select-preserve',
-    'layout-column-select-reset',
     'layout-edit',
-    'layout-grid',
-    'layout-select',
     'layout-select-all',
     'note-add',
     'note-remove',
-    'plus-minus-add',
-    'smart-edit-apply',
     'settings-panel-open',
-    'styled-column-badge',
-    'styled-column',
-    'styled-column-gradient',
-    'styled-column-percent-bar',
-    'styled-column-sparkline',
+    'smart-edit-apply',
     'system-status-show',
-    'internal' // used by AdapTable in Settings Panel
 ];

package/src/PredefinedConfig/NoteState.d.ts

@@ -16,7 +16,7 @@ export interface AdaptableNote extends AdaptableObject {
     /**
      * When Note was made
      */
-    Timestamp: number;
+    Timestamp?: number;
     /**
      * Content of the Note
      */

package/src/Redux/Store/AdaptableStore.js

@@ -269,7 +269,7 @@ exports.AdaptableStore = 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
@@ -777,7 +777,6 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                                 draftLayoutAction = GridRedux.LayoutDraftColumnFilterUnsuspendAll();
                                 break;
                         }
-                        //  GRID FILTER
                         returnAction = next(draftLayoutAction);
                     }
                     setTimeout(() => {
@@ -797,17 +796,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 }));
@@ -1018,12 +1027,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) {
@@ -1036,7 +1051,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));
                         }
                     }
@@ -1044,7 +1059,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));

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, AdaptableMenuItemName, 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';
@@ -41,15 +41,15 @@ export declare abstract class AdaptableModuleBase implements IModule {
     addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
     addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     createMainMenuItemShowPopup({ Name, Label, ComponentName, Icon, PopupParams, }: {
-        Name: AdaptableMenuItemName;
+        Name: AdaptableColumnMenuItemName | AdaptableContextMenuItemName;
         Label: string;
         ComponentName: string;
         Icon: AdaptableSystemIconName;
         PopupParams?: ModuleParams;
     }): MenuItemShowPopup;
-    createColumnMenuItemClickFunction(Name: AdaptableMenuItemName, Label: string, Icon: AdaptableSystemIconName, ClickFunction: () => void): MenuItemDoClickFunction;
-    createColumnMenuItemReduxAction(Name: AdaptableMenuItemName, Label: string, Icon: AdaptableSystemIconName, Action: Action): MenuItemDoReduxAction;
-    createColumnMenuItemShowPopup(Name: AdaptableMenuItemName, Label: string, ComponentName: string, Icon: AdaptableSystemIconName, PopupParams?: ModuleParams): MenuItemShowPopup;
+    createMenuItemClickFunction(Name: AdaptableColumnMenuItemName | AdaptableContextMenuItemName, Label: string, Icon: AdaptableSystemIconName, ClickFunction: () => void): MenuItemDoClickFunction;
+    createMenuItemReduxAction(Name: AdaptableColumnMenuItemName | AdaptableContextMenuItemName, Label: string, Icon: AdaptableSystemIconName, Action: Action): MenuItemDoReduxAction;
+    createMenuItemShowPopup(Name: AdaptableColumnMenuItemName | AdaptableContextMenuItemName, Label: string, ComponentName: string, Icon: AdaptableSystemIconName, PopupParams?: ModuleParams): MenuItemShowPopup;
     getTeamSharingAction(): TeamSharingImportInfo<AdaptableObject> | undefined;
     getModuleNamedQueryReferences(): string[];
     getModuleCalculatedColumnReferences(): CalculatedColumn[];

package/src/Strategy/AdaptableModuleBase.js

@@ -107,15 +107,15 @@ class AdaptableModuleBase {
         return new MenuItem_1.MenuItemShowPopup(Name, Label, this.moduleInfo.ModuleName, ComponentName, Icon, true, PopupParams);
     }
     // creates a menu item for the column menu to perform a function
-    createColumnMenuItemClickFunction(Name, Label, Icon, ClickFunction) {
+    createMenuItemClickFunction(Name, Label, Icon, ClickFunction) {
         return new MenuItem_1.MenuItemDoClickFunction(Name, Label, this.moduleInfo.ModuleName, ClickFunction, Icon, true);
     }
     // creates a menu item for the column menu to enact a Redux action
-    createColumnMenuItemReduxAction(Name, Label, Icon, Action) {
+    createMenuItemReduxAction(Name, Label, Icon, Action) {
         return new MenuItem_1.MenuItemDoReduxAction(Name, Label, this.moduleInfo.ModuleName, Action, Icon, true);
     }
     // popups called by the column menu - invisible if module is hidden or readonly
-    createColumnMenuItemShowPopup(Name, Label, ComponentName, Icon, PopupParams) {
+    createMenuItemShowPopup(Name, Label, ComponentName, Icon, PopupParams) {
         return new MenuItem_1.MenuItemShowPopup(Name, Label, this.moduleInfo.ModuleName, ComponentName, Icon, true, PopupParams);
     }
     getTeamSharingAction() {

package/src/Strategy/AlertModule.js

@@ -87,7 +87,7 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     relevantAlert = this.api.alertApi.internalApi.getAdaptableAlertWithHighlightRow(menuContext.rowNode);
                 }
                 if (relevantAlert) {
-                    items.push(this.createColumnMenuItemReduxAction('alert-clear', 'Clear Alert', this.moduleInfo.Glyph, SystemRedux.SystemAlertDelete(relevantAlert)));
+                    items.push(this.createMenuItemReduxAction('alert-clear', 'Clear Alert', this.moduleInfo.Glyph, SystemRedux.SystemAlertDelete(relevantAlert)));
                 }
             }
         }

package/src/Strategy/CalculatedColumnModule.js

@@ -61,7 +61,7 @@ class CalculatedColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             source: 'ColumnMenu',
         };
         return [
-            this.createColumnMenuItemShowPopup('calculated-column-edit', 'Edit Calculated Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam),
+            this.createMenuItemShowPopup('calculated-column-edit', 'Edit Calculated Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam),
         ];
     }
     getTeamSharingAction() {

package/src/Strategy/ColumnFilterModule.d.ts

@@ -13,8 +13,8 @@ export declare class ColumnFilterModule extends AdaptableModuleBase implements I
     getExplicitlyReferencedColumnIds(columnFilter: ColumnFilter): string[];
     hasNamedQueryReferences(): boolean;
     onAdaptableReady(): void;
-    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
+    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     private getExistingColumnFilter;
     getTeamSharingAction(): TeamSharingImportInfo<ColumnFilter>;
     toViewCompact(filter: ColumnFilter): AdaptableObjectCompactView;