@adaptabletools/adaptable 12.0.2 → 12.0.5

package/src/Redux/ActionsReducers/GridRedux.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GridReducer = exports.SetModuleButtonMenuItems = exports.SetSettingPanelModuleMenuItems = exports.SetTreeModeOff = exports.SetTreeModeOn = exports.SetPivotModeOff = exports.SetPivotModeOn = exports.GridRefreshCells = exports.GridSetCellSummary = exports.GridCreateCellSummary = exports.GridSetSelectedRows = exports.GridSetSelectedCells = exports.GridClearSort = exports.GridSetSort = exports.GridEditColumn = exports.GridRemoveColumn = exports.GridAddColumns = exports.GridAddColumn = exports.GridSetColumns = exports.GRID_SET_TREE_MODE_OFF = exports.GRID_SET_TREE_MODE_ON = exports.GRID_SET_PIVOT_MODE_OFF = exports.GRID_SET_PIVOT_MODE_ON = exports.GRID_SET_MODULE_BUTTON_MENUITEMS = exports.GRID_SET_MODULE_DROPDOWN_MENUITEMS = exports.GRID_REFRESH_CELLS = exports.GRID_SET_CELLS_SUMMARY = exports.GRID_CREATE_CELLS_SUMMARY = exports.GRID_SET_SELECTED_ROWS = exports.GRID_SET_SELECTED_CELLS = exports.GRID_CLEAR_SORT = exports.GRID_SET_SORT = exports.GRID_EDIT_COLUMN = exports.GRID_REMOVE_COLUMN = exports.GRID_ADD_COLUMNS = exports.GRID_ADD_COLUMN = exports.GRID_SET_COLUMNS = void 0;
+exports.GridReducer = exports.LayoutDraftColumnFilterClearAll = exports.LayoutDraftColumnFilterClear = exports.LayoutDraftColumnFilterSet = exports.LayoutDraftColumnFilterEdit = exports.LayoutDraftColumnFilterAdd = exports.LayoutUpdateCurrentDraft = exports.SetModuleButtonMenuItems = exports.SetSettingPanelModuleMenuItems = exports.SetTreeModeOff = exports.SetTreeModeOn = exports.SetPivotModeOff = exports.SetPivotModeOn = exports.GridRefreshCells = exports.GridSetCellSummary = exports.GridCreateCellSummary = exports.GridSetSelectedRows = exports.GridSetSelectedCells = exports.GridClearSort = exports.GridSetSort = exports.GridEditColumn = exports.GridRemoveColumn = exports.GridAddColumns = exports.GridAddColumn = exports.GridSetColumns = exports.LAYOUT_DRAFT_COLUMN_FILTER_CLEAR = exports.LAYOUT_DRAFT_COLUMN_FILTER_CLEAR_ALL = exports.LAYOUT_DRAFT_COLUMN_FILTER_SET = exports.LAYOUT_DRAFT_COLUMN_FILTER_EDIT = exports.LAYOUT_DRAFT_COLUMN_FILTER_ADD = exports.LAYOUT_UPDATE_CURRENT_DRAFT = exports.GRID_SET_TREE_MODE_OFF = exports.GRID_SET_TREE_MODE_ON = exports.GRID_SET_PIVOT_MODE_OFF = exports.GRID_SET_PIVOT_MODE_ON = exports.GRID_SET_MODULE_BUTTON_MENUITEMS = exports.GRID_SET_MODULE_DROPDOWN_MENUITEMS = exports.GRID_REFRESH_CELLS = exports.GRID_SET_CELLS_SUMMARY = exports.GRID_CREATE_CELLS_SUMMARY = exports.GRID_SET_SELECTED_ROWS = exports.GRID_SET_SELECTED_CELLS = exports.GRID_CLEAR_SORT = exports.GRID_SET_SORT = exports.GRID_EDIT_COLUMN = exports.GRID_REMOVE_COLUMN = exports.GRID_ADD_COLUMNS = exports.GRID_ADD_COLUMN = exports.GRID_SET_COLUMNS = void 0;
+const tslib_1 = require("tslib");
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 const LayoutRedux_1 = require("./LayoutRedux");
+const AdaptableHelper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/AdaptableHelper"));
 /**
  * @ReduxAction Columns have been set in the Grid
  */
@@ -75,6 +77,12 @@ exports.GRID_SET_TREE_MODE_ON = 'GRID_SET_TREE_MODE_ON';
  * @ReduxAction Grid is taken out of tree mode
  */
 exports.GRID_SET_TREE_MODE_OFF = 'GRID_SET_TREE_MODE_OFF';
+exports.LAYOUT_UPDATE_CURRENT_DRAFT = 'LAYOUT_UPDATE_CURRENT_DRAFT';
+exports.LAYOUT_DRAFT_COLUMN_FILTER_ADD = 'LAYOUT_DRAFT_COLUMN_FILTER_ADD';
+exports.LAYOUT_DRAFT_COLUMN_FILTER_EDIT = 'LAYOUT_DRAFT_COLUMN_FILTER_EDIT';
+exports.LAYOUT_DRAFT_COLUMN_FILTER_SET = 'LAYOUT_DRAFT_COLUMN_FILTER_SET';
+exports.LAYOUT_DRAFT_COLUMN_FILTER_CLEAR_ALL = 'LAYOUT_DRAFT_COLUMN_FILTER_CLEAR_ALL';
+exports.LAYOUT_DRAFT_COLUMN_FILTER_CLEAR = 'LAYOUT_DRAFT_COLUMN_FILTER_CLEAR';
 const GridSetColumns = (Columns) => ({
     type: exports.GRID_SET_COLUMNS,
     columns: Columns,
@@ -160,6 +168,35 @@ const SetModuleButtonMenuItems = (MenuItems) => ({
     menuItems: MenuItems,
 });
 exports.SetModuleButtonMenuItems = SetModuleButtonMenuItems;
+const LayoutUpdateCurrentDraft = (layout) => ({
+    type: exports.LAYOUT_UPDATE_CURRENT_DRAFT,
+    layout,
+});
+exports.LayoutUpdateCurrentDraft = LayoutUpdateCurrentDraft;
+const LayoutDraftColumnFilterAdd = (columnFilter) => ({
+    type: exports.LAYOUT_DRAFT_COLUMN_FILTER_ADD,
+    columnFilter,
+});
+exports.LayoutDraftColumnFilterAdd = LayoutDraftColumnFilterAdd;
+const LayoutDraftColumnFilterEdit = (columnFilter) => ({
+    type: exports.LAYOUT_DRAFT_COLUMN_FILTER_EDIT,
+    columnFilter,
+});
+exports.LayoutDraftColumnFilterEdit = LayoutDraftColumnFilterEdit;
+const LayoutDraftColumnFilterSet = (columnFilter) => ({
+    type: exports.LAYOUT_DRAFT_COLUMN_FILTER_SET,
+    columnFilter,
+});
+exports.LayoutDraftColumnFilterSet = LayoutDraftColumnFilterSet;
+const LayoutDraftColumnFilterClear = (columnFilter) => ({
+    type: exports.LAYOUT_DRAFT_COLUMN_FILTER_CLEAR,
+    columnFilter,
+});
+exports.LayoutDraftColumnFilterClear = LayoutDraftColumnFilterClear;
+const LayoutDraftColumnFilterClearAll = () => ({
+    type: exports.LAYOUT_DRAFT_COLUMN_FILTER_CLEAR_ALL,
+});
+exports.LayoutDraftColumnFilterClearAll = LayoutDraftColumnFilterClearAll;
 const initialState = {
     Columns: GeneralConstants_1.EMPTY_ARRAY,
     CurrentLayout: null,
@@ -173,6 +210,7 @@ const initialState = {
     IsGridInTreeMode: false,
 };
 const GridReducer = (state = initialState, action) => {
+    var _a, _b, _c, _d;
     switch (action.type) {
         case exports.GRID_SET_COLUMNS:
             return Object.assign({}, state, {
@@ -222,12 +260,77 @@ const GridReducer = (state = initialState, action) => {
             const menuItems = actionTyped.menuItems.sort((a, b) => a.label < b.label ? -1 : a.label > b.label ? 1 : 0);
             return Object.assign({}, state, { ModuleButtonMenuItems: menuItems });
         }
-        case LayoutRedux_1.LAYOUT_UPDATE_CURRENT_DRAFT: {
+        case exports.LAYOUT_UPDATE_CURRENT_DRAFT: {
             const currentDraftLayout = action.layout;
             return Object.assign({}, state, {
                 CurrentLayout: currentDraftLayout,
             });
         }
+        case exports.LAYOUT_DRAFT_COLUMN_FILTER_SET: {
+            const currentDraftLayout = state.CurrentLayout;
+            if (currentDraftLayout) {
+                let columnFilters = (_a = currentDraftLayout.ColumnFilters) !== null && _a !== void 0 ? _a : [];
+                const columnFilterAction = action
+                    .columnFilter;
+                AdaptableHelper_1.default.addUuidAndSource(columnFilterAction);
+                columnFilters = columnFilters
+                    .filter((colFilter) => {
+                    return colFilter.ColumnId !== columnFilterAction.ColumnId;
+                })
+                    .concat(columnFilterAction);
+                return Object.assign({}, state, {
+                    CurrentLayout: Object.assign(Object.assign({}, currentDraftLayout), { ColumnFilters: columnFilters }),
+                });
+            }
+        }
+        case exports.LAYOUT_DRAFT_COLUMN_FILTER_ADD: {
+            const currentDraftLayout = state.CurrentLayout;
+            if (currentDraftLayout) {
+                let columnFilters = [...((_b = currentDraftLayout.ColumnFilters) !== null && _b !== void 0 ? _b : [])];
+                const columnFilterAction = action
+                    .columnFilter;
+                AdaptableHelper_1.default.addUuidAndSource(columnFilterAction);
+                columnFilters.push(columnFilterAction);
+                return Object.assign({}, state, {
+                    CurrentLayout: Object.assign(Object.assign({}, currentDraftLayout), { ColumnFilters: columnFilters }),
+                });
+            }
+        }
+        case exports.LAYOUT_DRAFT_COLUMN_FILTER_EDIT: {
+            const currentDraftLayout = state.CurrentLayout;
+            if (currentDraftLayout) {
+                const columnFilterAction = action
+                    .columnFilter;
+                let columnFilters = ((_c = currentDraftLayout.ColumnFilters) !== null && _c !== void 0 ? _c : []).map((abObject) => abObject.Uuid === columnFilterAction.Uuid ? columnFilterAction : abObject);
+                return Object.assign({}, state, {
+                    CurrentLayout: Object.assign(Object.assign({}, currentDraftLayout), { ColumnFilters: columnFilters }),
+                });
+            }
+        }
+        case exports.LAYOUT_DRAFT_COLUMN_FILTER_CLEAR: {
+            const currentDraftLayout = state.CurrentLayout;
+            if (currentDraftLayout) {
+                let columnFilters = [...((_d = currentDraftLayout.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);
+                }
+                return Object.assign({}, state, {
+                    CurrentLayout: Object.assign(Object.assign({}, currentDraftLayout), { ColumnFilters: columnFilters }),
+                });
+            }
+        }
+        case exports.LAYOUT_DRAFT_COLUMN_FILTER_CLEAR_ALL: {
+            const currentDraftLayout = state.CurrentLayout;
+            if (currentDraftLayout) {
+                return Object.assign({}, state, {
+                    CurrentLayout: Object.assign(Object.assign({}, currentDraftLayout), { ColumnFilters: [] }),
+                });
+            }
+        }
         case LayoutRedux_1.LAYOUT_SELECT: {
             return Object.assign({}, state, {
                 CurrentLayout: null,

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

@@ -22,6 +22,9 @@ export declare const LAYOUT_SELECT = "LAYOUT_SELECT";
  * @ReduxAction A Layout has been (auto)saved
  */
 export declare const LAYOUT_SAVE = "LAYOUT_SAVE";
+/**
+ * @ReduxAction A Column has been removed
+ */
 export declare const LAYOUT_REMOVE_COLUMN = "LAYOUT_REMOVE_COLUMN";
 /**
  * @ReduxAction A Column Filter has been added
@@ -50,22 +53,21 @@ export interface LayoutColumnFilterAddAction extends LayoutColumnFilterAction {
 }
 export interface LayoutColumnFilterEditAction extends LayoutColumnFilterAction {
 }
-export interface LayoutFilterSetAction extends LayoutColumnFilterAction {
+export interface LayoutColumnFilterSetAction extends LayoutColumnFilterAction {
 }
-export interface LayoutFilterClearAction extends LayoutColumnFilterAction {
+export interface LayoutColumnFilterClearAction extends LayoutColumnFilterAction {
 }
-export interface LayoutFilterClearAllAction extends Redux.Action {
+export interface LayoutColumnFilterClearAllAction extends Redux.Action {
 }
 export declare const LayoutColumnFilterAdd: (columnFilter: ColumnFilter) => LayoutColumnFilterAddAction;
 export declare const LayoutColumnFilterEdit: (columnFilter: ColumnFilter) => LayoutColumnFilterEditAction;
-export declare const LayoutColumnFilterSet: (columnFilter: ColumnFilter) => LayoutFilterSetAction;
-export declare const LayoutColumnFilterClearAll: () => LayoutFilterClearAllAction;
-export declare const LayoutColumnFilterClear: (columnFilter: ColumnFilter) => LayoutFilterClearAction;
+export declare const LayoutColumnFilterSet: (columnFilter: ColumnFilter) => LayoutColumnFilterSetAction;
+export declare const LayoutColumnFilterClearAll: () => LayoutColumnFilterClearAllAction;
+export declare const LayoutColumnFilterClear: (columnFilter: ColumnFilter) => LayoutColumnFilterClearAction;
 /**
  * @ReduxAction A new caption / header has been set for a Column in the Layout
  */
 export declare const LAYOUT_SET_COLUMN_CAPTION = "LAYOUT_SET_COLUMN_CAPTION";
-export declare const LAYOUT_UPDATE_CURRENT_DRAFT = "LAYOUT_UPDATE_CURRENT_DRAFT";
 /**
  * @ReduxAction Layout Module is ready
  */
@@ -90,8 +92,6 @@ export interface LayoutRemoveColumnAction extends Redux.Action {
     layoutName: string;
     columnId: string;
 }
-export interface LayoutUpdateCurrentDraftAction extends LayoutAction {
-}
 export interface LayoutSelectAction extends Redux.Action {
     layoutName: string;
 }
@@ -106,9 +106,8 @@ export declare const LayoutAdd: (layout: Layout) => LayoutAddAction;
 export declare const LayoutDelete: (layout: Layout) => LayoutDeleteAction;
 export declare const LayoutSave: (layout: Layout) => LayoutSaveAction;
 export declare const LayoutSetColumnCaption: (layoutName: string, columnId: string, caption: string) => LayoutSetColumnCaptionAction;
-export declare const LayouRemoveColumn: (layoutName: string, columnId: string) => LayoutRemoveColumnAction;
+export declare const LayoutRemoveColumn: (layoutName: string, columnId: string) => LayoutRemoveColumnAction;
 export declare const LayoutSelect: (layoutName: string) => LayoutSelectAction;
-export declare const LayoutUpdateCurrentDraft: (layout: Layout) => LayoutUpdateCurrentDraftAction;
 export declare const LayoutReady: (layoutState: LayoutState) => LayoutReadyAction;
 export declare const getColumnFilterSelector: (state: AdaptableState) => ColumnFilter[];
 export declare const LayoutReducer: Redux.Reducer<LayoutState>;

package/src/Redux/ActionsReducers/LayoutRedux.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LayoutReducer = exports.getColumnFilterSelector = exports.LayoutReady = exports.LayoutUpdateCurrentDraft = exports.LayoutSelect = exports.LayouRemoveColumn = exports.LayoutSetColumnCaption = exports.LayoutSave = exports.LayoutDelete = exports.LayoutAdd = exports.LAYOUT_READY = exports.LAYOUT_UPDATE_CURRENT_DRAFT = exports.LAYOUT_SET_COLUMN_CAPTION = exports.LayoutColumnFilterClear = exports.LayoutColumnFilterClearAll = exports.LayoutColumnFilterSet = exports.LayoutColumnFilterEdit = exports.LayoutColumnFilterAdd = exports.LAYOUT_COLUMN_FILTER_CLEAR = exports.LAYOUT_COLUMN_FILTER_CLEAR_ALL = exports.LAYOUT_COLUMN_FILTER_SET = exports.LAYOUT_COLUMN_FILTER_EDIT = exports.LAYOUT_COLUMN_FILTER_ADD = exports.LAYOUT_REMOVE_COLUMN = exports.LAYOUT_SAVE = exports.LAYOUT_SELECT = exports.LAYOUT_DELETE = exports.LAYOUT_EDIT = exports.LAYOUT_ADD = void 0;
+exports.LayoutReducer = exports.getColumnFilterSelector = exports.LayoutReady = exports.LayoutSelect = exports.LayoutRemoveColumn = exports.LayoutSetColumnCaption = exports.LayoutSave = exports.LayoutDelete = exports.LayoutAdd = exports.LAYOUT_READY = exports.LAYOUT_SET_COLUMN_CAPTION = exports.LayoutColumnFilterClear = exports.LayoutColumnFilterClearAll = exports.LayoutColumnFilterSet = exports.LayoutColumnFilterEdit = exports.LayoutColumnFilterAdd = exports.LAYOUT_COLUMN_FILTER_CLEAR = exports.LAYOUT_COLUMN_FILTER_CLEAR_ALL = exports.LAYOUT_COLUMN_FILTER_SET = exports.LAYOUT_COLUMN_FILTER_EDIT = exports.LAYOUT_COLUMN_FILTER_ADD = exports.LAYOUT_REMOVE_COLUMN = exports.LAYOUT_SAVE = exports.LAYOUT_SELECT = exports.LAYOUT_DELETE = exports.LAYOUT_EDIT = exports.LAYOUT_ADD = void 0;
 const tslib_1 = require("tslib");
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 const AdaptableHelper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/AdaptableHelper"));
@@ -24,6 +24,9 @@ exports.LAYOUT_SELECT = 'LAYOUT_SELECT';
  * @ReduxAction A Layout has been (auto)saved
  */
 exports.LAYOUT_SAVE = 'LAYOUT_SAVE';
+/**
+ * @ReduxAction A Column has been removed
+ */
 exports.LAYOUT_REMOVE_COLUMN = 'LAYOUT_REMOVE_COLUMN';
 /**
  * @ReduxAction A Column Filter has been added
@@ -74,7 +77,6 @@ exports.LayoutColumnFilterClear = LayoutColumnFilterClear;
  * @ReduxAction A new caption / header has been set for a Column in the Layout
  */
 exports.LAYOUT_SET_COLUMN_CAPTION = 'LAYOUT_SET_COLUMN_CAPTION';
-exports.LAYOUT_UPDATE_CURRENT_DRAFT = 'LAYOUT_UPDATE_CURRENT_DRAFT';
 /**
  * @ReduxAction Layout Module is ready
  */
@@ -101,22 +103,17 @@ const LayoutSetColumnCaption = (layoutName, columnId, caption) => ({
     caption,
 });
 exports.LayoutSetColumnCaption = LayoutSetColumnCaption;
-const LayouRemoveColumn = (layoutName, columnId) => ({
+const LayoutRemoveColumn = (layoutName, columnId) => ({
     type: exports.LAYOUT_REMOVE_COLUMN,
     layoutName,
     columnId,
 });
-exports.LayouRemoveColumn = LayouRemoveColumn;
+exports.LayoutRemoveColumn = LayoutRemoveColumn;
 const LayoutSelect = (layoutName) => ({
     type: exports.LAYOUT_SELECT,
     layoutName,
 });
 exports.LayoutSelect = LayoutSelect;
-const LayoutUpdateCurrentDraft = (layout) => ({
-    type: exports.LAYOUT_UPDATE_CURRENT_DRAFT,
-    layout,
-});
-exports.LayoutUpdateCurrentDraft = LayoutUpdateCurrentDraft;
 const LayoutReady = (layoutState) => ({
     type: exports.LAYOUT_READY,
     layoutState,
@@ -124,7 +121,10 @@ const LayoutReady = (layoutState) => ({
 exports.LayoutReady = LayoutReady;
 const getColumnFilterSelector = (state) => {
     var _a, _b, _c, _d;
-    const currentLayout = (_c = (_b = (_a = state.Layout) === null || _a === void 0 ? void 0 : _a.Layouts) === null || _b === void 0 ? void 0 : _b.find) === null || _c === void 0 ? void 0 : _c.call(_b, (layout) => layout.Name === state.Layout.CurrentLayout);
+    // in case of non-saving Layouts, we load the current Layout(possibly draft) from GridState
+    const currentLayout = state.Grid.CurrentLayout
+        ? state.Grid.CurrentLayout
+        : (_c = (_b = (_a = state.Layout) === null || _a === void 0 ? void 0 : _a.Layouts) === null || _b === void 0 ? void 0 : _b.find) === null || _c === void 0 ? void 0 : _c.call(_b, (layout) => layout.Name === state.Layout.CurrentLayout);
     return (_d = currentLayout === null || currentLayout === void 0 ? void 0 : currentLayout.ColumnFilters) !== null && _d !== void 0 ? _d : [];
 };
 exports.getColumnFilterSelector = getColumnFilterSelector;

package/src/Redux/Store/AdaptableStore.js

@@ -281,7 +281,7 @@ exports.AdaptableStore = AdaptableStore;
 const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
     return function (next) {
         return function (action) {
-            var _a, _b, _c, _d, _e, _f, _g, _h;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             switch (action.type) {
                 /*******************
                  * NAMED QUERY ACTIONS
@@ -682,12 +682,18 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     if (adaptable.adaptableOptions.searchOptions.filterResultsAfterQuickSearch) {
                         const actionTyped = action;
                         const searchText = actionTyped.quickSearchText;
+                        //  const gridOptions = adaptable.api.gridApi.getAgGridInstance();
                         if (StringExtensions_1.StringExtensions.IsNotNullOrEmpty(searchText)) {
+                            // Currently using this but any searchable would allow us to limit the cols checked
                             const queryText = 'ANY_CONTAINS("' + searchText + '") ';
+                            // const queryText = 'ANY_SEARCHABLE_CONTAINS("' + searchText + '") ';
                             adaptable.api.queryApi.setCurrentQuery(queryText);
+                            // Better still would be to use ag grid if that is possible?
+                            //    gridOptions.api.setQuickFilter(searchText);
                         }
                         else {
                             adaptable.api.queryApi.clearCurrentQuery();
+                            //  gridOptions.api.setQuickFilter('');
                         }
                     }
                     return returnAction;
@@ -714,9 +720,38 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 case LayoutRedux.LAYOUT_COLUMN_FILTER_ADD:
                 case LayoutRedux.LAYOUT_COLUMN_FILTER_EDIT:
                 case LayoutRedux.LAYOUT_COLUMN_FILTER_SET:
-                case LayoutRedux.LAYOUT_COLUMN_FILTER_CLEAR_ALL:
-                case LayoutRedux.LAYOUT_COLUMN_FILTER_CLEAR: {
-                    let returnAction = next(action);
+                case LayoutRedux.LAYOUT_COLUMN_FILTER_CLEAR:
+                case LayoutRedux.LAYOUT_COLUMN_FILTER_CLEAR_ALL: {
+                    let returnAction;
+                    if ((_g = adaptable.adaptableOptions.layoutOptions) === null || _g === void 0 ? void 0 : _g.autoSaveLayouts) {
+                        returnAction = next(action);
+                    }
+                    else {
+                        if (!middlewareAPI.getState().Grid.CurrentLayout) {
+                            const currentLayout = adaptable.api.layoutApi.getCurrentLayout();
+                            middlewareAPI.dispatch(GridRedux.LayoutUpdateCurrentDraft(currentLayout));
+                        }
+                        // we have a layout draft, we have to update that state
+                        let draftLayoutAction;
+                        switch (action.type) {
+                            case LayoutRedux.LAYOUT_COLUMN_FILTER_ADD:
+                                draftLayoutAction = GridRedux.LayoutDraftColumnFilterAdd(action.columnFilter);
+                                break;
+                            case LayoutRedux.LAYOUT_COLUMN_FILTER_EDIT:
+                                draftLayoutAction = GridRedux.LayoutDraftColumnFilterEdit(action.columnFilter);
+                                break;
+                            case LayoutRedux.LAYOUT_COLUMN_FILTER_SET:
+                                draftLayoutAction = GridRedux.LayoutDraftColumnFilterSet(action.columnFilter);
+                                break;
+                            case LayoutRedux.LAYOUT_COLUMN_FILTER_CLEAR:
+                                draftLayoutAction = GridRedux.LayoutDraftColumnFilterClear(action.columnFilter);
+                                break;
+                            case LayoutRedux.LAYOUT_COLUMN_FILTER_CLEAR_ALL:
+                                draftLayoutAction = GridRedux.LayoutDraftColumnFilterClearAll();
+                                break;
+                        }
+                        returnAction = next(draftLayoutAction);
+                    }
                     setTimeout(() => adaptable.applyGridFiltering(), 5);
                     adaptable.api.gridApi.fireSearchChangedEvent('Filter');
                     return returnAction;
@@ -840,18 +875,18 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                             // tell grid the layout has been selected
                             adaptable.setLayout(currentLayout);
                         }
-                        if (!((_g = adaptable.adaptableOptions.layoutOptions) === null || _g === void 0 ? void 0 : _g.autoSaveLayouts)) {
-                            middlewareAPI.dispatch(LayoutRedux.LayoutUpdateCurrentDraft(currentLayout));
+                        if (!((_h = adaptable.adaptableOptions.layoutOptions) === null || _h === void 0 ? void 0 : _h.autoSaveLayouts)) {
+                            middlewareAPI.dispatch(GridRedux.LayoutUpdateCurrentDraft(currentLayout));
                         }
                     }
                     if (returnAction.type == LayoutRedux.LAYOUT_ADD ||
                         returnAction.type == LayoutRedux.LAYOUT_SAVE) {
                         const actionTyped = action;
                         // if autosave is false
-                        if (!((_h = adaptable.adaptableOptions.layoutOptions) === null || _h === void 0 ? void 0 : _h.autoSaveLayouts)) {
+                        if (!((_j = adaptable.adaptableOptions.layoutOptions) === null || _j === void 0 ? void 0 : _j.autoSaveLayouts)) {
                             // and the current layout is saved, make sure we also update the draft
                             if (actionTyped.layout.Name === newLayoutState.CurrentLayout) {
-                                middlewareAPI.dispatch(LayoutRedux.LayoutUpdateCurrentDraft(actionTyped.layout));
+                                middlewareAPI.dispatch(GridRedux.LayoutUpdateCurrentDraft(actionTyped.layout));
                             }
                         }
                     }

package/src/Strategy/FormatColumnModule.js

@@ -247,7 +247,7 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 },
                 {
                     name: 'Display Format',
-                    values: [FormatColumnFormatWizardSection_1.getFormatColumnFormatSummaryValue(formatColumn, this.api.formatColumnApi)],
+                    values: [FormatColumnFormatWizardSection_1.getFormatColumnFormatSummaryValue(formatColumn, this.api)],
                 },
                 getFormatColumnSettingsViewItems_1.getFormatColumnSettingsViewItems(formatColumn),
                 getObjectTagsViewItems_1.getObjectTagsViewItems(formatColumn, this.api),

package/src/Strategy/LayoutModule.js

@@ -10,6 +10,7 @@ const LayoutRadioSelector_1 = require("../View/Layout/LayoutRadioSelector");
 const LayoutStatusBarSubPanelPopover_1 = require("../View/Layout/LayoutStatusBarSubPanelPopover");
 const EditCurrentLayoutButton_1 = require("../View/Layout/EditCurrentLayoutButton");
 const LayoutCloneButton_1 = require("../View/Layout/LayoutCloneButton");
+const SaveLayoutButton_1 = require("../View/Layout/SaveLayoutButton");
 class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.LayoutModuleId, 'Layout', 'layout', 'LayoutPopup', 'Named sets of column visibility, order, groupings, aggregation, pivots etc.', api);
@@ -293,7 +294,7 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     content: text,
                     popover: popover,
                     popoverMinWidth: 150,
-                    extraActions: [EditCurrentLayoutButton_1.EditCurrentLayoutButton],
+                    extraActions: [EditCurrentLayoutButton_1.EditCurrentLayoutButton, SaveLayoutButton_1.SaveLayoutButton],
                 };
             },
         };

package/src/Utilities/Constants/GeneralConstants.d.ts

@@ -28,6 +28,7 @@ export declare const AG_GRID_GROUPED_COLUMN: string;
 export declare const AG_GRID_PIVOT_COLUMN: string;
 export declare const ADAPTABLE_ROW_ACTION_BUTTONS = "adaptableRowActionButtons";
 export declare const ADAPTABLE_ROW_ACTION_BUTTONS_FRIENDLY_NAME = "(ActionRowButtons)";
+export declare const DEFAULT_DATE_FORMAT_PATTERN = "dd-MM-yyyy";
 export declare const SYSTEM_STATUS_DEFAULT_MAX_MESSAGES_IN_STORE: number;
 export declare const QUICK_SEARCH_DEFAULT_BACK_COLOR: string;
 export declare const QUICK_SEARCH_DEFAULT_FORE_COLOR: string;

package/src/Utilities/Constants/GeneralConstants.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VISUAL_DATA_REPORT = exports.SYSTEM_THEMES = exports.SMART_EDIT_MATH_OPERATION_STATE_PROPERTY = exports.SMART_EDIT_VALUE_STATE_PROPERTY = exports.QUICK_SEARCH_STYLE_STATE_PROPERTY = exports.QUICK_SEARCH_TEXT_STATE_PROPERTY = exports.CURRENT_THEME_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_DURATION_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_DOWN_COLOR_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_UP_COLOR_STATE_PROPERTY = exports.CURRENT_REPORT_STATE_PROPERTY = exports.CURRENT_LAYOUT_STATE_PROPERTY = exports.SUMMARY_OPERATION_STATE_PROPERTY = exports.ALERT_DEFAULT_SHOW_POPUP = exports.ALERT_DEFAULT_MESSAGE_TYPE = exports.PLUS_MINUS_DEFAULT_NUDGE_VALUE = exports.DEFAULT_LIVE_REPORT_THROTTLE_TIME = exports.THEME_DEFAULT_CURRENT_THEME = exports.SYSTEM_DEFAULT_SYSTEM_STATUS_TYPE = exports.CELL_SUMMARY_DEFAULT_OPERATION = exports.QUICK_SEARCH_DEBOUNCE_TIME = exports.QUICK_SEARCH_DEFAULT_FORE_COLOR = exports.QUICK_SEARCH_DEFAULT_BACK_COLOR = exports.SYSTEM_STATUS_DEFAULT_MAX_MESSAGES_IN_STORE = exports.ADAPTABLE_ROW_ACTION_BUTTONS_FRIENDLY_NAME = exports.ADAPTABLE_ROW_ACTION_BUTTONS = exports.AG_GRID_PIVOT_COLUMN = exports.AG_GRID_GROUPED_COLUMN = exports.HALF_SECOND = exports.AB_SPECIAL_COLUMN = exports.EMPTY_ARRAY = exports.EMPTY_STRING = exports.FILTER_THROTTLE = exports.FILTER_NEVER = exports.FILTER_ALWAYS = exports.ALL_COLUMN_VALUES = exports.READ_ONLY_STYLE = exports.MENU_PREFIX = exports.AGGRID_TOOLPANEL_COLUMNS = exports.AGGRID_TOOLPANEL_FILTERS = exports.ADAPTABLE_TOOLPANEL_COMPONENT = exports.ADAPTABLE_TOOLPANEL_ID = exports.ADAPTABLE = exports.ADAPTABLE_ID = exports.USER_NAME = exports.DARK_THEME = exports.LIGHT_THEME = exports.DEFAULT_LAYOUT = exports.MISSING_COLUMN = exports.AUTOGENERATED_PK_COLUMN = void 0;
-exports.THEME_STYLE = exports.SELECTED_ROWS_REPORT = exports.SELECTED_CELLS_REPORT = exports.CURRENT_DATA_REPORT = exports.ALL_DATA_REPORT = void 0;
+exports.SYSTEM_THEMES = exports.SMART_EDIT_MATH_OPERATION_STATE_PROPERTY = exports.SMART_EDIT_VALUE_STATE_PROPERTY = exports.QUICK_SEARCH_STYLE_STATE_PROPERTY = exports.QUICK_SEARCH_TEXT_STATE_PROPERTY = exports.CURRENT_THEME_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_DURATION_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_DOWN_COLOR_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_UP_COLOR_STATE_PROPERTY = exports.CURRENT_REPORT_STATE_PROPERTY = exports.CURRENT_LAYOUT_STATE_PROPERTY = exports.SUMMARY_OPERATION_STATE_PROPERTY = exports.ALERT_DEFAULT_SHOW_POPUP = exports.ALERT_DEFAULT_MESSAGE_TYPE = exports.PLUS_MINUS_DEFAULT_NUDGE_VALUE = exports.DEFAULT_LIVE_REPORT_THROTTLE_TIME = exports.THEME_DEFAULT_CURRENT_THEME = exports.SYSTEM_DEFAULT_SYSTEM_STATUS_TYPE = exports.CELL_SUMMARY_DEFAULT_OPERATION = exports.QUICK_SEARCH_DEBOUNCE_TIME = exports.QUICK_SEARCH_DEFAULT_FORE_COLOR = exports.QUICK_SEARCH_DEFAULT_BACK_COLOR = exports.SYSTEM_STATUS_DEFAULT_MAX_MESSAGES_IN_STORE = exports.DEFAULT_DATE_FORMAT_PATTERN = exports.ADAPTABLE_ROW_ACTION_BUTTONS_FRIENDLY_NAME = exports.ADAPTABLE_ROW_ACTION_BUTTONS = exports.AG_GRID_PIVOT_COLUMN = exports.AG_GRID_GROUPED_COLUMN = exports.HALF_SECOND = exports.AB_SPECIAL_COLUMN = exports.EMPTY_ARRAY = exports.EMPTY_STRING = exports.FILTER_THROTTLE = exports.FILTER_NEVER = exports.FILTER_ALWAYS = exports.ALL_COLUMN_VALUES = exports.READ_ONLY_STYLE = exports.MENU_PREFIX = exports.AGGRID_TOOLPANEL_COLUMNS = exports.AGGRID_TOOLPANEL_FILTERS = exports.ADAPTABLE_TOOLPANEL_COMPONENT = exports.ADAPTABLE_TOOLPANEL_ID = exports.ADAPTABLE = exports.ADAPTABLE_ID = exports.USER_NAME = exports.DARK_THEME = exports.LIGHT_THEME = exports.DEFAULT_LAYOUT = exports.MISSING_COLUMN = exports.AUTOGENERATED_PK_COLUMN = void 0;
+exports.THEME_STYLE = exports.SELECTED_ROWS_REPORT = exports.SELECTED_CELLS_REPORT = exports.CURRENT_DATA_REPORT = exports.ALL_DATA_REPORT = exports.VISUAL_DATA_REPORT = void 0;
 const Enums_1 = require("../../PredefinedConfig/Common/Enums");
 const UIHelper_1 = require("../../View/UIHelper");
 exports.AUTOGENERATED_PK_COLUMN = '__ADAPTABLE_PK__';
@@ -31,6 +31,7 @@ exports.AG_GRID_GROUPED_COLUMN = 'ag-Grid-AutoColumn';
 exports.AG_GRID_PIVOT_COLUMN = 'pivot_';
 exports.ADAPTABLE_ROW_ACTION_BUTTONS = 'adaptableRowActionButtons';
 exports.ADAPTABLE_ROW_ACTION_BUTTONS_FRIENDLY_NAME = '(ActionRowButtons)';
+exports.DEFAULT_DATE_FORMAT_PATTERN = 'dd-MM-yyyy';
 /*
 Redux / State Defaults
 Try to put all our Redux / State defaults here and ONLY reference from here - avoid magic numbers / strings.

package/src/Utilities/ExpressionFunctions/aggregatedBooleanExpressionFunctions.d.ts

@@ -1,4 +1,7 @@
 import { ExpressionFunction } from '../../parser/src/types';
+/**
+ * List of all the Aggregation Functions available in AdaptableQL
+ */
 export declare type AggregationFunctionName = 'WHERE' | 'COL' | AggregationFunction | ComparisonFunction;
 declare type AggregationFunction = 'SUM';
 declare type ComparisonFunction = 'EQ' | 'NEQ' | 'LT' | 'GT' | 'LTE' | 'GTE';

package/src/Utilities/ExpressionFunctions/aggregatedBooleanExpressionFunctions.js

@@ -28,7 +28,7 @@ exports.aggregatedBooleanExpressionFunctions = {
     SUM: {
         handler(args, context) {
             const columnParameter = expressionFunctionUtils_1.extractColumnParameter('SUM', args);
-            expressionFunctionUtils_1.validateColumnType(columnParameter.value, ['Number'], 'SUM', context.api);
+            expressionFunctionUtils_1.validateColumnType(columnParameter.value, ['Number'], 'SUM', context.adaptableApi);
             const sumAggregationFn = (dataSource$) => getSumAggregation$(dataSource$, getColumnValueSum(columnParameter.value, context));
             const result = {
                 type: 'aggregation',
@@ -195,15 +195,15 @@ const getSumAggregation$ = (source$, initialSum) => {
 };
 const getColumnValueSum = (column, context) => {
     let sum = 0;
-    context.api.internalApi.forAllRowNodesDo((rowNode) => {
+    context.adaptableApi.internalApi.forAllRowNodesDo((rowNode) => {
         // if there is a WHERE clause defined, check if the current rowNode satisfies the condition
         if (context.filterFn && !context.filterFn(rowNode)) {
             return;
         }
-        if (context.api.gridApi.isGroupRowNode(rowNode)) {
+        if (context.adaptableApi.gridApi.isGroupRowNode(rowNode)) {
             return;
         }
-        const cellValue = context.api.gridApi.getRawValueFromRowNode(rowNode, column);
+        const cellValue = context.adaptableApi.gridApi.getRawValueFromRowNode(rowNode, column);
         if (cellValue != undefined) {
             sum = sum + expressionFunctionUtils_1.getNumericValue(rowNode.data[column]);
         }

package/src/Utilities/ExpressionFunctions/aggregatedScalarExpressionFunctions.d.ts

@@ -2,6 +2,9 @@ import { ExpressionFunction } from '../../parser/src/types';
 import { BaseParameter } from './expressionFunctionUtils';
 import { RowNode } from '@ag-grid-community/all-modules';
 import { AggregateParams } from './scalarAggregationHelper';
+/**
+ * List of all the AggregatedScalar Functions available in AdaptableQL
+ */
 export declare type AggregatedScalarFunctionName = AggregationFunction | OperandFunction;
 declare type AggregationFunction = 'SUM' | 'PERCENTAGE' | 'AVG' | 'MIN' | 'MAX' | 'CUMUL';
 declare type OperandFunction = 'COL' | 'OVER' | 'GROUP_BY';

package/src/Utilities/ExpressionFunctions/aggregatedScalarExpressionFunctions.js

@@ -8,7 +8,7 @@ exports.aggregatedScalarExpressionFunctions = {
         handler(args, context) {
             const sumColumnParameter = expressionFunctionUtils_1.extractColumnParameter('SUM', args);
             const sumColumnName = sumColumnParameter.value;
-            expressionFunctionUtils_1.validateColumnType(sumColumnName, ['Number'], 'SUM', context.api);
+            expressionFunctionUtils_1.validateColumnType(sumColumnName, ['Number'], 'SUM', context.adaptableApi);
             const groupByParameter = expressionFunctionUtils_1.extractParameter('SUM', 'operand', ['GROUP_BY'], args, true);
             const aggregationExpressionEvaluation = {
                 aggregationParams: {
@@ -50,7 +50,7 @@ exports.aggregatedScalarExpressionFunctions = {
             var _a;
             const percentageColumnParameter = expressionFunctionUtils_1.extractColumnParameter('PERCENTAGE', args);
             const percentageColumnName = percentageColumnParameter.value;
-            expressionFunctionUtils_1.validateColumnType(percentageColumnName, ['Number'], 'PERCENTAGE', context.api);
+            expressionFunctionUtils_1.validateColumnType(percentageColumnName, ['Number'], 'PERCENTAGE', context.adaptableApi);
             const sumOperand = expressionFunctionUtils_1.extractParameter('PERCENTAGE', 'aggregation', ['SUM'], args, true);
             const groupByOperand = expressionFunctionUtils_1.extractParameter('PERCENTAGE', 'operand', ['GROUP_BY'], args, true);
             if (sumOperand && groupByOperand) {
@@ -79,7 +79,7 @@ exports.aggregatedScalarExpressionFunctions = {
                     },
                 },
                 rowValueGetter: (rowNode, aggregationValue) => {
-                    return ((context.api.gridApi.getRawValueFromRowNode(rowNode, percentageColumnName) /
+                    return ((context.adaptableApi.gridApi.getRawValueFromRowNode(rowNode, percentageColumnName) /
                         aggregationValue) *
                         100);
                 },
@@ -118,7 +118,7 @@ exports.aggregatedScalarExpressionFunctions = {
         handler(args, context) {
             const avgColumnParameter = expressionFunctionUtils_1.extractColumnParameter('AVG', args);
             const avgColumnName = avgColumnParameter.value;
-            expressionFunctionUtils_1.validateColumnType(avgColumnName, ['Number'], 'AVG', context.api);
+            expressionFunctionUtils_1.validateColumnType(avgColumnName, ['Number'], 'AVG', context.adaptableApi);
             const groupByParameter = expressionFunctionUtils_1.extractParameter('AVG', 'operand', ['GROUP_BY'], args, true);
             const aggregationExpressionEvaluation = {
                 aggregationParams: {
@@ -162,7 +162,7 @@ exports.aggregatedScalarExpressionFunctions = {
         handler(args, context) {
             const minColumnParameter = expressionFunctionUtils_1.extractColumnParameter('MIN', args);
             const minColumnName = minColumnParameter.value;
-            expressionFunctionUtils_1.validateColumnType(minColumnName, ['Number'], 'MIN', context.api);
+            expressionFunctionUtils_1.validateColumnType(minColumnName, ['Number'], 'MIN', context.adaptableApi);
             const groupByParameter = expressionFunctionUtils_1.extractParameter('MIN', 'operand', ['GROUP_BY'], args, true);
             const aggregationExpressionEvaluation = {
                 aggregationParams: {
@@ -203,7 +203,7 @@ exports.aggregatedScalarExpressionFunctions = {
         handler(args, context) {
             const maxColumnParameter = expressionFunctionUtils_1.extractColumnParameter('MAX', args);
             const maxColumnName = maxColumnParameter.value;
-            expressionFunctionUtils_1.validateColumnType(maxColumnName, ['Number'], 'MAX', context.api);
+            expressionFunctionUtils_1.validateColumnType(maxColumnName, ['Number'], 'MAX', context.adaptableApi);
             const groupByParameter = expressionFunctionUtils_1.extractParameter('MAX', 'operand', ['GROUP_BY'], args, true);
             const aggregationExpressionEvaluation = {
                 aggregationParams: {
@@ -284,7 +284,7 @@ exports.aggregatedScalarExpressionFunctions = {
     OVER: {
         handler(args, context) {
             const columnParameter = expressionFunctionUtils_1.extractColumnParameter('OVER', args);
-            expressionFunctionUtils_1.validateColumnType(columnParameter.value, ['Number', 'Date'], 'OVER', context.api);
+            expressionFunctionUtils_1.validateColumnType(columnParameter.value, ['Number', 'Date'], 'OVER', context.adaptableApi);
             const result = {
                 type: 'operand',
                 name: 'OVER',

package/src/Utilities/ExpressionFunctions/booleanExpressionFunctions.d.ts

@@ -1,3 +1,6 @@
 import { ExpressionFunction } from '../../parser/src/types';
+/**
+ * List of all the Boolean Functions available in AdaptableQL
+ */
 export declare type BooleanFunctionName = 'EQ' | 'NEQ' | 'GT' | 'LT' | 'GTE' | 'LTE' | 'AND' | 'OR' | 'NOT' | 'BETWEEN' | 'IN' | 'IS_BLANK' | 'CONTAINS' | 'STARTS_WITH' | 'ENDS_WITH' | 'ANY_CONTAINS' | 'QUERY';
 export declare const booleanExpressionFunctions: Record<BooleanFunctionName, ExpressionFunction>;

package/src/Utilities/ExpressionFunctions/booleanExpressionFunctions.js

@@ -225,18 +225,40 @@ exports.booleanExpressionFunctions = {
         handler(args, context) {
             var _a;
             const searchTerm = expressionFunctionUtils_1.getStringValue(context, String(args[0]));
-            return (_a = context.api) === null || _a === void 0 ? void 0 : _a.columnApi.getColumns().some((column) => {
+            return (_a = context.adaptableApi) === null || _a === void 0 ? void 0 : _a.columnApi.getColumns().some((column) => {
                 var _a;
-                const value = (_a = context.api) === null || _a === void 0 ? void 0 : _a.gridApi.getDisplayValueFromRowNode(context.node, column.columnId);
+                const value = (_a = context.adaptableApi) === null || _a === void 0 ? void 0 : _a.gridApi.getDisplayValueFromRowNode(context.node, column.columnId);
                 const columnValue = expressionFunctionUtils_1.getStringValue(context, String(value));
                 return columnValue.indexOf(searchTerm) !== -1;
             });
         },
         isPredicate: true,
-        description: 'Returns true if any column contains input',
+        description: 'Returns true if any Column contains input',
         signatures: ['ANY_CONTAINS(value)'],
         examples: ['ANY_CONTAINS("abc")'],
     },
+    /*
+    ANY_SEARCHABLE_CONTAINS: {
+      handler(args, context) {
+        const searchTerm = getStringValue(context, String(args[0]));
+        return context.api?.columnApi
+          .getVisibleColumns()
+          .filter((c) => !c.isExcludedFromQuickSearch)
+          .some((column) => {
+            const value = context.api?.gridApi.getDisplayValueFromRowNode(
+              context.node,
+              column.columnId
+            );
+            const columnValue = getStringValue(context, String(value));
+            return columnValue.indexOf(searchTerm) !== -1;
+          });
+      },
+      isPredicate: true,
+      description: 'Returns true if any Searchable Column contains input',
+      signatures: ['ANY_SEARCHABLE_CONTAINS(value)'],
+      examples: ['ANY_SEARCHABLE_CONTAINS("abc")'],
+    },
+  */
     QUERY: {
         handler(args, context) {
             var _a, _b;
@@ -244,7 +266,7 @@ exports.booleanExpressionFunctions = {
             if (StringExtensions_1.default.IsNullOrEmpty(namedQueryName)) {
                 return false;
             }
-            const namedQuery = (_a = context.api) === null || _a === void 0 ? void 0 : _a.queryApi.getNamedQueryByName(namedQueryName);
+            const namedQuery = (_a = context.adaptableApi) === null || _a === void 0 ? void 0 : _a.queryApi.getNamedQueryByName(namedQueryName);
             if (!namedQuery) {
                 throw new ExpressionEvaluationError_1.ExpressionEvaluationError('QUERY', `Named Query with name ${namedQueryName} not found!`);
             }