@adaptabletools/adaptable 12.0.1 → 12.0.4

package/src/Api/Implementation/LayoutApiImpl.js

@@ -76,6 +76,12 @@ class LayoutApiImpl extends ApiBase_1.ApiBase {
         const currentLayout = this.getCurrentLayout();
         return ((_d = (_c = (_b = (_a = currentLayout === null || currentLayout === void 0 ? void 0 : currentLayout.ColumnSorts) === null || _a === void 0 ? void 0 : _a.find) === null || _b === void 0 ? void 0 : _b.call(_a, (sort) => sort.ColumnId === columnId)) === null || _c === void 0 ? void 0 : _c.SortOrder) !== null && _d !== void 0 ? _d : null);
     }
+    areDraftAndCurrentLayoutEqual() {
+        const state = this.getAdaptableState();
+        const currentLayout = this.getLayoutByName(state.Layout.CurrentLayout);
+        const draftLayout = state.Grid.CurrentLayout;
+        return this.areLayoutsEqual(currentLayout, draftLayout);
+    }
     getCurrentLayoutName() {
         return this.getAdaptableState().Layout.CurrentLayout;
     }
@@ -329,7 +335,7 @@ class LayoutApiImpl extends ApiBase_1.ApiBase {
             const layout = this.getLayoutByName(layoutName);
             if (layout) {
                 if (layout.Columns.includes(columnId)) {
-                    this.dispatchAction(LayoutRedux.LayouRemoveColumn(layoutName, columnId));
+                    this.dispatchAction(LayoutRedux.LayoutRemoveColumn(layoutName, columnId));
                     this.getAdaptableApi().columnApi.hideColumn(columnId);
                 }
             }

package/src/Api/LayoutApi.d.ts

@@ -198,4 +198,9 @@ export interface LayoutApi {
      * @param layoutName layout from which to remove Column
      */
     removeColumnFromLayout(columnId: string, layoutName: string): void;
+    /**
+     * Checks if the draft layout and the current layout are the same.
+     * Useful when `autoSaveLayouts=true`
+     */
+    areDraftAndCurrentLayoutEqual(): boolean;
 }

package/src/Api/StatusBarApi.d.ts

@@ -1,5 +1,8 @@
 import { GridOptions } from '@ag-grid-community/all-modules';
 import { AdaptableStatusBar } from '../PredefinedConfig/StatusBarState';
+/**
+ * Methods for managaing the Adaptable Status Bar
+ */
 export interface StatusBarApi {
     /**
      * Retrieves the current AG Grid Status Bar Panels

package/src/PredefinedConfig/AdaptableState.d.ts

@@ -22,6 +22,7 @@ import { ToolPanelState } from './ToolPanelState';
 import { QueryState } from './QueryState';
 import { FlashingCellState } from './FlashingCellState';
 import { StatusBarState } from './StatusBarState';
+import { ChartingState } from './ChartingState';
 /**
  * The main state object of Adaptable
  */
@@ -52,6 +53,7 @@ export interface AdaptablePersistentState {
     TeamSharing: TeamSharingState;
     Theme: ThemeState;
     ToolPanel: ToolPanelState;
+    Charting: ChartingState;
 }
 /**
  * The state which is available in the internal Redux store but never persisted

package/src/PredefinedConfig/CalculatedColumnState.d.ts

@@ -46,11 +46,6 @@ export interface CalculatedColumnSettings extends SpecialColumnSettings {
      * @defaultValue false
      */
     ShowToolTip?: boolean;
-    /**
-     * If true, the Calculated Column Expression will NOT be evaluated and the value is loaded from the row data property with the same name as the ColumnId
-     * @defaultValue false
-     */
-    ExternallyEvaluatedExpression?: boolean;
 }
 /**
  * Calculated Column Query which may be a Scalar or an AggregatedScalar Expression

package/src/PredefinedConfig/ChartingState.d.ts

@@ -0,0 +1,20 @@
+import { ChartModel } from '@ag-grid-community/all-modules';
+import { ConfigState } from './ConfigState';
+/**
+ * Wraps an AG Grid Chart Model
+ */
+export interface ChartDefinition {
+    /**
+     * AG Grid Chart Model
+     */
+    model: ChartModel;
+}
+/**
+ * Used for persisting AG Grids in Adaptable State
+ */
+export interface ChartingState extends ConfigState {
+    /**
+     * Charting Definitions - wrap AG Grid Chart Models
+     */
+    ChartDefinitions?: ChartDefinition[];
+}

package/src/PredefinedConfig/ChartingState.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -14,6 +14,9 @@ export interface CellSummmary {
     Count: number | undefined;
     [key: string]: any;
 }
+/**
+ * Defines a Custom Cell Summary operation provided by a user
+ */
 export interface CellSummaryOperation {
     /**
      * Name of the Operation - will be displayed in the Cell Summary components

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

@@ -13,8 +13,17 @@ export interface ColumnFilter extends AdaptableObject {
      */
     Predicate: ColumnFilterPredicate;
 }
+/**
+ * A Predicate used in Column Filtering
+ */
 export interface ColumnFilterPredicate extends AdaptablePredicate {
     PredicateId: TypeHint<string, SystemFilterPredicateId>;
 }
+/**
+ * Array containing all System Filter Predicates
+ */
 export declare type SystemFilterPredicateIds = SystemFilterPredicateId[];
+/**
+ * List of all the Filter Predicates shipped by AdapTable
+ */
 export declare type SystemFilterPredicateId = 'Values' | 'ExcludeValues' | 'Blanks' | 'NonBlanks' | 'Equals' | 'NotEquals' | 'GreaterThan' | 'LessThan' | 'Positive' | 'Negative' | 'Zero' | 'Between' | 'NotBetween' | 'Is' | 'IsNot' | 'Contains' | 'NotContains' | 'StartsWith' | 'EndsWith' | 'Regex' | 'Today' | 'Yesterday' | 'Tomorrow' | 'ThisWeek' | 'ThisMonth' | 'ThisQuarter' | 'ThisYear' | 'InPast' | 'InFuture' | 'Before' | 'After' | 'InRange' | 'On' | 'NotOn' | 'NextWorkDay' | 'LastWorkDay' | 'True' | 'False' | 'BooleanToggle';

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

@@ -7,11 +7,14 @@ import { FDC3Intent } from '../../types';
  * it has a field describing what type it is, and data indicating its identity. Use this as a base
  * to derive your own with any custom properties or metadata.
  */
+/**
+ * General-purpose context type, as defined by FDC3
+ */
 export interface FDC3Context {
     /**
-     * Type of context that uniquely identifies it, e.g. "instrument"; used to refer to the accepted context(s) when declaring intents
+     * Type of FDC3Context that uniquely identifies it, e.g. "instrument"; used to refer to the accepted context(s) when declaring intents
      */
-    type: ContextType;
+    type: FDC3ContextType;
     /**
      * Name of the context data (optional) - a text string that describes the data being sent
      */
@@ -228,7 +231,13 @@ export interface AdaptableFDC3EventInfo extends BaseEventInfo {
      */
     context: FDC3Context;
 }
-export declare type ContextType = 'fdc3.instrument' | 'fdc3.instrumentList' | 'fdc3.position' | 'fdc3.portfolio' | 'fdc3.contact' | 'fdc3.contactList' | 'fdc3.organization' | 'fdc3.country';
+/**
+ * Defines which FDC3 context is being used
+ */
+export declare type FDC3ContextType = 'fdc3.instrument' | 'fdc3.instrumentList' | 'fdc3.position' | 'fdc3.portfolio' | 'fdc3.contact' | 'fdc3.contactList' | 'fdc3.organization' | 'fdc3.country';
+/**
+ * Context used when providing Custom FDC3 content
+ */
 export interface CustomFDC3Context extends FDC3Context {
     type: any;
 }

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

@@ -1,6 +1,5 @@
 /**
- * Determines whether Adaptable should re-apply filtering after cell and ticking data edits. *
- * If the 'applyFilter' value is 'Throttle' then the 'throttleDelay' property should be additionally set.
+ * Whether Adaptable re-applies filtering after data edits; if `applyFilter` value is 'Throttle', `throttleDelay` should be set
  */
 export interface FilterActionOnDataChange {
     /**

package/src/PredefinedConfig/Common/FilterActionOnDataChange.js

@@ -1,6 +1,5 @@
 "use strict";
 /**
- * Determines whether Adaptable should re-apply filtering after cell and ticking data edits. *
- * If the 'applyFilter' value is 'Throttle' then the 'throttleDelay' property should be additionally set.
+ * Whether Adaptable re-applies filtering after data edits; if `applyFilter` value is 'Throttle', `throttleDelay` should be set
  */
 Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -34,5 +34,5 @@ export declare type TypeHint<Base, Literals> = (Base & {
     __subType?: true;
 }) | Literals;
 export declare type AdaptableQLModules = AdaptableQLModule[];
-export declare type AdaptableQLModule = 'Filter' | 'Query';
+export declare type AdaptableQLModule = 'CalculatedColumn' | 'Filter' | 'Query';
 export declare type AdaptableColumnType = 'abColDefBoolean' | 'abColDefDate' | 'abColDefNumber' | 'abColDefString' | 'abColDefObject' | 'abColDefCustom' | 'abSpecialColumn';

package/src/PredefinedConfig/ExportState.d.ts

@@ -75,5 +75,11 @@ export interface ReportData {
      */
     rows: Record<string, any>[];
 }
+/**
+ * Names of Reports provided by AdapTable
+ */
 export declare type SystemReportName = 'Visual Data' | 'All Data' | 'Current Data' | 'Selected Cells' | 'Selected Rows';
+/**
+ * Array containing all System Report names
+ */
 export declare type SystemReportNames = SystemReportName[];

package/src/PredefinedConfig/FormatColumnState.d.ts

@@ -142,8 +142,11 @@ export interface ColumnComparison {
      */
     Color: string;
 }
+/**
+ * Array of CellTextOption available in Format Columns
+ */
 export declare type CellTextOptions = CellTextOption[];
 /**
- * List of all the Module buttons Adaptable provides - each Module has a popup for which this is a shortcut button
+ * Text optionally to show in a Format Column special style: 'CellValue' or 'PercentageValue'
  */
 export declare type CellTextOption = 'CellValue' | 'PercentageValue';

package/src/PredefinedConfig/IPushPullState.d.ts

@@ -35,20 +35,31 @@ export interface IPushPullDomain {
 }
 /**
  * An ipushpull report
- *
- * Contains the name of the Report (which will exist in the Export State), and the ipushpull `Folder` and `Page` to which it will be sent.
  */
 export interface IPushPullReport extends AdaptableObject {
+    /**
+     * Name of the Report
+     */
     ReportName: string;
+    /**
+     * ipushpull Folder which contains the Page
+     */
     Folder: string;
+    /**
+     * ipushpull Page which will contain the data
+     */
     Page: string;
 }
 /**
- * Defines an ipushpull Schedule.  Used in the Schedule Module (where the State will be stored).
- *
- * Properties include the report being exported to Excel (via ipushpull) and whether it is Snapshot or Live Data
+ * Defines an ipushpull Schedule
  */
 export interface IPushPullSchedule extends BaseSchedule {
+    /**
+     * The report being exported to Excel (via ipushpull)
+     */
     IPushPullReport: IPushPullReport;
+    /**
+     * How data is sent: 'Snapshot' or 'Live Data'
+     */
     Transmission: 'Snapshot' | 'Live Data';
 }

package/src/PredefinedConfig/LayoutState.d.ts

@@ -16,7 +16,7 @@ export interface LayoutState extends ConfigState {
     Layouts?: Layout[];
 }
 /**
- * Layout object - contains everything required including Columns, Sorts, Widths, Aggregations, Grouping and Pivoting details
+ * Defines a Layout; contains everything required i.e. Columns, Sorts, Widths, Aggregations, Grouping & Pivoting
  */
 export interface Layout extends AdaptableObject {
     /**

package/src/PredefinedConfig/PredefinedConfig.d.ts

@@ -17,6 +17,7 @@ import { ThemeState } from './ThemeState';
 import { ToolPanelState } from './ToolPanelState';
 import { QueryState } from './QueryState';
 import { StatusBarState } from './StatusBarState';
+import { ChartingState } from './ChartingState';
 /**
  * This is the main Predefined Config interface which developers will populate at design-time
  */
@@ -97,4 +98,8 @@ export interface PredefinedConfig {
      * Sets the order and visibility of the Tool Panel controls in the AdapTable ToolPanel (on right of grid)
      */
     ToolPanel?: ToolPanelState;
+    /**
+     * Predefine charting models
+     */
+    Charting?: ChartingState;
 }

package/src/PredefinedConfig/ScheduleState.d.ts

@@ -26,7 +26,7 @@ export interface ScheduleState extends ConfigState {
      */
     Glue42Schedules?: Glue42Schedule[];
     /**
-     * Schedules connected to OpenFin data exports - available if OpenFin plugin is running
+     * Schedules connected to OpenFin exports - available if OpenFin plugin is running
      */
     OpenFinSchedules?: OpenFinSchedule[];
 }

package/src/PredefinedConfig/ShortcutState.d.ts

@@ -27,7 +27,7 @@ export interface Shortcut extends SuspendableObject {
      */
     ShortcutKey: string;
     /**
-     * Value which acts as 2nd operand for ShortcutOperation (the first operand being the cell value)
+     * Value acting as 2nd operand for ShortcutOperation (1st operand is the cell value)
      */
     ShortcutValue: number;
     /**

package/src/PredefinedConfig/TeamSharingState.d.ts

@@ -67,11 +67,17 @@ export interface SharedEntity extends AdaptableObject {
      */
     Type: SharedEntityType;
 }
+/**
+ * Defines Objects which have been imported into Team Sharing
+ */
 export interface TeamSharingImportInfo<T extends AdaptableObject> {
     ModuleEntities: T[];
     AddAction: (entity: T) => any;
     EditAction: (entity: T) => any;
 }
+/**
+ * Describes an Object which is being Team Shared
+ */
 export interface SharedEntityConfig {
     description: string;
     type: SharedEntityType;

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

@@ -0,0 +1,23 @@
+import { ChartModel } from '@ag-grid-community/all-modules';
+import * as Redux from 'redux';
+import { AdaptableState } from '../../../types';
+import { ChartingState } from '../../PredefinedConfig/ChartingState';
+/**
+ * @ReduxAction Set AG Grid Charting Models
+ */
+export declare const SET_CHARTING_CHARTS = "SET_CHARTING_CHARTS";
+/**
+ * @ReduxAction Charting Module is ready
+ */
+export declare const CHARTING_READY = "CHARTING_READY";
+export interface ChartingSetChartModelsAction extends Redux.Action {
+    charts: ChartModel[];
+}
+export interface ChartingReadyAction extends Redux.Action {
+    chartingState: ChartingState;
+}
+export declare const ChartingSetChartModels: (charts: ChartModel[]) => ChartingSetChartModelsAction;
+export declare const ChartingReady: (chartingState: ChartingState) => ChartingReadyAction;
+export declare const initialState: ChartingState;
+export declare const ChartingGetChartModels: (state: AdaptableState) => ChartingState['ChartDefinitions'];
+export declare const ChartingReducer: Redux.Reducer<ChartingState>;

package/src/Redux/ActionsReducers/ChartingRedux.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ChartingReducer = exports.ChartingGetChartModels = exports.initialState = exports.ChartingReady = exports.ChartingSetChartModels = exports.CHARTING_READY = exports.SET_CHARTING_CHARTS = void 0;
+const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
+/**
+ * @ReduxAction Set AG Grid Charting Models
+ */
+exports.SET_CHARTING_CHARTS = 'SET_CHARTING_CHARTS';
+/**
+ * @ReduxAction Charting Module is ready
+ */
+exports.CHARTING_READY = 'CHARTING_READY';
+const ChartingSetChartModels = (charts) => ({
+    charts,
+    type: exports.SET_CHARTING_CHARTS,
+});
+exports.ChartingSetChartModels = ChartingSetChartModels;
+const ChartingReady = (chartingState) => ({
+    type: exports.CHARTING_READY,
+    chartingState,
+});
+exports.ChartingReady = ChartingReady;
+exports.initialState = {
+    ChartDefinitions: GeneralConstants_1.EMPTY_ARRAY,
+};
+const ChartingGetChartModels = (state) => state.Charting.ChartDefinitions;
+exports.ChartingGetChartModels = ChartingGetChartModels;
+const ChartingReducer = (state = exports.initialState, action) => {
+    switch (action.type) {
+        case exports.SET_CHARTING_CHARTS:
+            const newCharts = action.charts.map((chartModel) => ({
+                model: chartModel,
+            }));
+            return Object.assign(Object.assign({}, state), { ChartDefinitions: newCharts });
+    }
+    return state;
+};
+exports.ChartingReducer = ChartingReducer;

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

@@ -6,7 +6,7 @@ import { SelectedRowInfo } from '../../PredefinedConfig/Selection/SelectedRowInf
 import { AdaptableMenuItem } from '../../PredefinedConfig/Common/Menu';
 import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
 import { ColumnSort } from '../../PredefinedConfig/Common/ColumnSort';
-import { CellSummmary } from '../../types';
+import { Layout, CellSummmary, ColumnFilter } from '../../types';
 import { RowNode } from '@ag-grid-community/all-modules';
 /**
  * @ReduxAction Columns have been set in the Grid
@@ -80,6 +80,12 @@ export declare const GRID_SET_TREE_MODE_ON = "GRID_SET_TREE_MODE_ON";
  * @ReduxAction Grid is taken out of tree mode
  */
 export declare const GRID_SET_TREE_MODE_OFF = "GRID_SET_TREE_MODE_OFF";
+export declare const LAYOUT_UPDATE_CURRENT_DRAFT = "LAYOUT_UPDATE_CURRENT_DRAFT";
+export declare const LAYOUT_DRAFT_COLUMN_FILTER_ADD = "LAYOUT_DRAFT_COLUMN_FILTER_ADD";
+export declare const LAYOUT_DRAFT_COLUMN_FILTER_EDIT = "LAYOUT_DRAFT_COLUMN_FILTER_EDIT";
+export declare const LAYOUT_DRAFT_COLUMN_FILTER_SET = "LAYOUT_DRAFT_COLUMN_FILTER_SET";
+export declare const LAYOUT_DRAFT_COLUMN_FILTER_CLEAR_ALL = "LAYOUT_DRAFT_COLUMN_FILTER_CLEAR_ALL";
+export declare const LAYOUT_DRAFT_COLUMN_FILTER_CLEAR = "LAYOUT_DRAFT_COLUMN_FILTER_CLEAR";
 export interface GridDataChangedAction extends Redux.Action {
     cellDataChangedInfo: CellDataChangedInfo;
 }
@@ -151,6 +157,23 @@ export interface SetTreeModeOnAction extends Redux.Action {
 }
 export interface SetTreeModeOffAction extends Redux.Action {
 }
+export interface LayoutUpdateCurrentDraftAction extends Redux.Action {
+    layout: Layout;
+}
+export interface LayoutDraftColumnFilterAddAction extends Redux.Action {
+    columnFilter: ColumnFilter;
+}
+export interface LayoutDraftColumnFilterEditAction extends Redux.Action {
+    columnFilter: ColumnFilter;
+}
+export interface LayoutDraftColumnFilterSetAction extends Redux.Action {
+    columnFilter: ColumnFilter;
+}
+export interface LayoutDraftColumnFilterClearAction extends Redux.Action {
+    columnFilter: ColumnFilter;
+}
+export interface LayoutDraftColumnFilterClearAllAction extends Redux.Action {
+}
 export declare const GridSetColumns: (Columns: AdaptableColumn[]) => GridSetColumnsAction;
 export declare const GridAddColumn: (Column: AdaptableColumn) => GridAddColumnAction;
 export declare const GridAddColumns: (Columns: AdaptableColumn[]) => GridAddColumnsAction;
@@ -169,4 +192,10 @@ export declare const SetTreeModeOn: () => SetTreeModeOnAction;
 export declare const SetTreeModeOff: () => SetTreeModeOffAction;
 export declare const SetSettingPanelModuleMenuItems: (MenuItems: AdaptableMenuItem[]) => SetSettingPanelModuleMenuItemsAction;
 export declare const SetModuleButtonMenuItems: (MenuItems: AdaptableMenuItem[]) => SetModuleButtonMenuItemsAction;
+export declare const LayoutUpdateCurrentDraft: (layout: Layout) => LayoutUpdateCurrentDraftAction;
+export declare const LayoutDraftColumnFilterAdd: (columnFilter: ColumnFilter) => LayoutDraftColumnFilterAddAction;
+export declare const LayoutDraftColumnFilterEdit: (columnFilter: ColumnFilter) => LayoutDraftColumnFilterEditAction;
+export declare const LayoutDraftColumnFilterSet: (columnFilter: ColumnFilter) => LayoutDraftColumnFilterSetAction;
+export declare const LayoutDraftColumnFilterClear: (columnFilter: ColumnFilter) => LayoutDraftColumnFilterClearAction;
+export declare const LayoutDraftColumnFilterClearAll: () => LayoutDraftColumnFilterClearAllAction;
 export declare const GridReducer: Redux.Reducer<GridState>;

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>;