@adaptabletools/adaptable 12.0.1-canary.0 → 12.0.3

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;
@@ -165,6 +165,9 @@ const LayoutReducer = (state = initialState, action) => {
             const currentLayoutName = setColumnCaptionAction.layoutName;
             let currentLayout = state.Layouts.find((l) => l.Name === currentLayoutName);
             if (currentLayout) {
+                if (!currentLayout.ColumnHeadersMap) {
+                    currentLayout.ColumnHeadersMap = {};
+                }
                 currentLayout.ColumnHeadersMap[setColumnCaptionAction.columnId] =
                     setColumnCaptionAction.caption;
                 return Object.assign({}, state, {

package/src/Redux/Store/AdaptableStore.js

@@ -33,6 +33,7 @@ const ScheduleRedux = tslib_1.__importStar(require("../ActionsReducers/ScheduleR
 const TeamSharingRedux = tslib_1.__importStar(require("../ActionsReducers/TeamSharingRedux"));
 const QueryRedux = tslib_1.__importStar(require("../ActionsReducers/QueryRedux"));
 const StatusBarRedux = tslib_1.__importStar(require("../ActionsReducers/StatusBarRedux"));
+const ChartingRedux = tslib_1.__importStar(require("../ActionsReducers/ChartingRedux"));
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 const ConfigConstants = tslib_1.__importStar(require("../../Utilities/Constants/ConfigConstants"));
 const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
@@ -146,6 +147,7 @@ class AdaptableStore {
             Theme: ThemeRedux.ThemeReducer,
             ToolPanel: ToolPanelRedux.ToolPanelReducer,
             Query: QueryRedux.QueryReducer,
+            Charting: ChartingRedux.ChartingReducer,
             // dead reducers
             PercentBar: DeadRedux.PercentBarReducer,
             UpdatedRow: DeadRedux.UpdatedRowReducer,
@@ -279,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
@@ -712,9 +714,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;
@@ -838,18 +869,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/AdaptableModuleBase.d.ts

@@ -23,6 +23,10 @@ export declare abstract class AdaptableModuleBase implements IModule {
     protected getViewAccessLevel(): AccessLevel;
     protected getEditAccessLevel(): AccessLevel;
     isModuleAvailable(): boolean;
+    /**
+     * Used inside the unified UI to show the share button
+     */
+    isModuleObjectsShareable(): boolean;
     isModuleEditable(): boolean;
     updateOldConfig(): void;
     getModuleAdaptableObjects(): AdaptableObject[];

package/src/Strategy/AdaptableModuleBase.js

@@ -36,6 +36,12 @@ class AdaptableModuleBase {
     isModuleAvailable() {
         return this.hasRequiredAccessLevel(this.getViewAccessLevel());
     }
+    /**
+     * Used inside the unified UI to show the share button
+     */
+    isModuleObjectsShareable() {
+        return true;
+    }
     isModuleEditable() {
         return this.hasRequiredAccessLevel(this.getEditAccessLevel());
     }

package/src/Strategy/AlertModule.js

@@ -30,10 +30,10 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             }
             if (this.api.internalApi.getAdaptableOptions().alertOptions.dataChangeDetectionPolicy ===
                 'formattedValue') {
-                const { oldValue, newValue } = cellDataChangedInfo;
+                const { oldValue, newValue, rowNode } = cellDataChangedInfo;
                 const columnId = cellDataChangedInfo.column.columnId;
-                const oldFormattedValue = this.api.gridApi.getFormattedValueFromRawValue(columnId, oldValue);
-                const newFormattedValue = this.api.gridApi.getFormattedValueFromRawValue(columnId, newValue);
+                const oldFormattedValue = this.api.gridApi.getFormattedValueFromRawValue(rowNode, columnId, oldValue);
+                const newFormattedValue = this.api.gridApi.getFormattedValueFromRawValue(rowNode, columnId, newValue);
                 if (oldFormattedValue === newFormattedValue) {
                     // if the formattedValues are identical, then no alert is fired
                     return;

package/src/Strategy/ChartingModule.js

@@ -6,7 +6,7 @@ const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
 const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
 class ChartingModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
-        super(ModuleConstants.ChartingModuleId, 'Charts', 'chart', 'ChartPopup', 'Create Charts in order to see Adaptable Data visually', api);
+        super(ModuleConstants.ChartingModuleId, 'Charts', 'chart', 'ChartPopup', 'Create AG Grid Charts in order to see Adaptable Data visually', api);
     }
     isModuleAvailable() {
         return this.api.chartingApi.isChartingEnabled() && super.isModuleAvailable();

package/src/Strategy/DashboardModule.js

@@ -63,6 +63,7 @@ class DashboardModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 {
                     label: this.moduleInfo.FriendlyName,
                     isVisible: true,
+                    module: this.moduleInfo.ModuleName,
                     icon: {
                         name: 'dashboard',
                     },

package/src/Strategy/ExportModule.js

@@ -76,6 +76,7 @@ class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return [
             {
                 label: 'Export Selected Cells',
+                module: this.moduleInfo.ModuleName,
                 isVisible: true,
                 icon: { name: this.moduleInfo.Glyph },
                 subItems: menuItems,

package/src/Strategy/FlashingCellModule.js

@@ -29,10 +29,10 @@ class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             // - flash for the underlying small data changes, but the visual does not
             if (this.api.internalApi.getAdaptableOptions().alertOptions.dataChangeDetectionPolicy ===
                 'formattedValue') {
-                const { oldValue, newValue } = cellDataChangedInfo;
+                const { oldValue, newValue, rowNode } = cellDataChangedInfo;
                 const columnId = cellDataChangedInfo.column.columnId;
-                const oldFormattedValue = this.api.gridApi.getFormattedValueFromRawValue(columnId, oldValue);
-                const newFormattedValue = this.api.gridApi.getFormattedValueFromRawValue(columnId, newValue);
+                const oldFormattedValue = this.api.gridApi.getFormattedValueFromRawValue(rowNode, columnId, oldValue);
+                const newFormattedValue = this.api.gridApi.getFormattedValueFromRawValue(rowNode, columnId, newValue);
                 if (oldFormattedValue === newFormattedValue) {
                     // if the formattedValues are identical, then no alert is fired
                     return;

package/src/Strategy/FormatColumnModule.js

@@ -196,14 +196,14 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 let formatColumn = this.api.formatColumnApi.getFormatColumnForColumnId(column.columnId);
                 let hasCheckBox = formatColumn && ((_a = formatColumn.ColumnStyle) === null || _a === void 0 ? void 0 : _a.CheckBoxStyle);
                 if (hasCheckBox) {
-                    returnColumnMenuItems.push(this.createColumnMenuItemClickFunction('Remove Checkbox', 'check-box-outline', () => {
+                    returnColumnMenuItems.push(this.createColumnMenuItemClickFunction('Remove Checkbox', 'unchecked', () => {
                         this.api.formatColumnApi.deleteFormatColumn(formatColumn);
                     }));
                 }
                 else {
                     //    const test = this.api.formatColumnApi.getCheckBoxStyleFormatColumn(column);
                     if (formatColumn) {
-                        returnColumnMenuItems.push(this.createColumnMenuItemClickFunction('Show as Checkbox', 'check-box', () => {
+                        returnColumnMenuItems.push(this.createColumnMenuItemClickFunction('Show as Checkbox', 'checked', () => {
                             formatColumn.ColumnStyle = {
                                 CheckBoxStyle: true,
                             };
@@ -212,7 +212,7 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                         }));
                     }
                     else {
-                        returnColumnMenuItems.push(this.createColumnMenuItemClickFunction('Show as Checkbox', 'check-box', () => {
+                        returnColumnMenuItems.push(this.createColumnMenuItemClickFunction('Show as Checkbox', 'checked', () => {
                             let newFormatColumn = {
                                 Scope: {
                                     ColumnIds: [column.columnId],

package/src/Strategy/GridInfoModule.js

@@ -42,6 +42,7 @@ class GridInfoModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 return [
                     {
                         label: 'Show Info',
+                        module: this.moduleInfo.ModuleName,
                         isVisible: true,
                         icon: {
                             name: this.moduleInfo.Glyph,
@@ -90,6 +91,7 @@ class GridInfoModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 return [
                     {
                         label: 'Show Info',
+                        module: this.moduleInfo.ModuleName,
                         isVisible: true,
                         icon: {
                             name: this.moduleInfo.Glyph,

package/src/Strategy/Interface/IModule.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import { CSSProperties } from 'react';
 import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
 import { AdaptableMenuItem, ContextMenuContext } from '../../PredefinedConfig/Common/Menu';
 import { AdaptableModule } from '../../PredefinedConfig/Common/Types';
@@ -64,6 +64,14 @@ export interface AdaptableObjectView {
      * Reference to the underling object.
      */
     abObject: AdaptableObject;
+    /**
+     * Style added on the item wrapper.
+     */
+    style?: CSSProperties;
+    /**
+     * ClassName added on the item wrapper.
+     */
+    className?: string;
 }
 export interface AdaptableObjectCompactView {
     item: AdaptableObjectItemView;
@@ -79,6 +87,7 @@ export interface AdaptableModuleView {
      * Allows to add custom actions.
      */
     actions?: AdaptableModuleViewAction[];
+    onMount?: () => void;
     onOpenEditPopup?: (abObject?: AdaptableObject) => void;
     getDeleteAction?: (abObject: AdaptableObject) => Redux.Action;
     getCompactDeleteAction?: (abObject: AdaptableObject) => Redux.Action;
@@ -124,6 +133,7 @@ export interface IModule {
     setModuleEntitlement(): void;
     isModuleAvailable(): boolean;
     isModuleEditable(): boolean;
+    isModuleObjectsShareable(): boolean;
     getTeamSharingAction(): TeamSharingImportInfo<AdaptableObject> | undefined;
     getModuleAdaptableObjects(): AdaptableObject[];
     getTeamSharingReferences(adaptableObject: AdaptableObject): TeamSharingReferences;

package/src/Strategy/LayoutModule.js

@@ -162,6 +162,7 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             returnColumnMenuItems.push({
                 label: 'Select',
                 isVisible: true,
+                module: this.moduleInfo.ModuleName,
                 icon: {
                     name: 'tab-unselected',
                 },
@@ -198,6 +199,7 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 gridMenuItems.push(this.createColumnMenuItemClickFunction('Select', 'tab-unselected', clickFunction));
                 returnColumnMenuItems.push({
                     label: 'Grid',
+                    module: this.moduleInfo.ModuleName,
                     isVisible: true,
                     icon: { name: 'align-justify' },
                     subItems: gridMenuItems,

package/src/Strategy/TeamSharingModule.d.ts

@@ -1,11 +1,21 @@
 import { AdaptableModuleBase } from './AdaptableModuleBase';
-import { IModule } from './Interface/IModule';
+import { AdaptableModuleView, AdaptableObjectView, IModule } from './Interface/IModule';
 import { AdaptableApi } from '../Api/AdaptableApi';
+import { SharedEntity } from '../../types';
 export declare class TeamSharingModule extends AdaptableModuleBase implements IModule {
     private SKIP_TEAMSHARING_UPDATE_ACTIONS;
     constructor(api: AdaptableApi);
     isModuleAvailable(): boolean;
+    isModuleObjectsShareable(): boolean;
     getPopupMaxWidth(): number | undefined;
     private handleStateChanged;
     private extractAdaptableObjectFromAction;
+    isAdaptableObjectPresentInLocalState(sharedEntity: SharedEntity): boolean;
+    private isSharedEntityADependency;
+    private isStaleAndActive;
+    private getDependencies;
+    private getStaleDependencies;
+    toView(sharedEntity: SharedEntity): AdaptableObjectView;
+    toViewAll(): AdaptableObjectView[];
+    getViewProperties(): AdaptableModuleView;
 }