@adaptabletools/adaptable 11.3.0 → 12.0.0-canary.2

package/src/Api/TeamSharingApi.d.ts

@@ -1,22 +1,30 @@
 import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
 import { SharedEntity } from '../PredefinedConfig/TeamSharingState';
-import { AdaptableModule, SharedEntityConfig, TeamSharingState } from '../types';
+import { AdaptableModule, SharedEntityConfig } from '../types';
 /**
  * Provides run-time access to Team Sharing Module and associated state
  */
 export interface TeamSharingApi {
     /**
-     * Retrieves Team Sharing section of State
+     * Retrieves all shared entities which are currently shared. It is an asynchronous operation as it leverages the `TeamSharingOptions.getSharedEntities(...)` method.
      */
-    getTeamSharingState(): TeamSharingState;
+    getSharedEntities(): Promise<SharedEntity[]>;
     /**
-     * Retrieves all Shared Entities in Team Sharing State
+     * Sets the shared entities which are currently shared. It is an asynchronous operation as it leverages the `TeamSharingOptions.setSharedEntities(...)` method.
+     * @param sharedEntities the shared entities
+     * @return either TRUE if the shared entities were successfully set or FALSE if the shared entities were not set
      */
-    getSharedEntities(): SharedEntity[];
+    setSharedEntities(sharedEntities: SharedEntity[]): Promise<boolean>;
     /**
      * Whether Team Sharing is Activated
+     *
+     * @deprecated use `Adaptable.isTeamSharingAvailable()` instead
      */
     isTeamSharingActivated(): boolean;
+    /**
+     * Whether Team Sharing is Available to use
+     */
+    isTeamSharingAvailable(): boolean;
     /**
      * Whether current user has full Team Sharing rights (for creating & updating shared items)
      */
@@ -41,4 +49,9 @@ export interface TeamSharingApi {
      * @param sharedEntityConfig Config info about the Sharing Actions
      */
     shareEntity(entity: AdaptableObject, module: AdaptableModule, sharedEntityConfig: SharedEntityConfig): void;
+    /**
+     * Removes an Adaptable Object from the Team Share.
+     * @param entityId the ID of the AdaptableObject to be removed from Team Share
+     */
+    unshareEntity(entityId: string): void;
 }

package/src/Api/UserInterfaceApi.d.ts

@@ -70,12 +70,12 @@ export interface UserInterfaceApi {
      * Returns Style set for ReadOnly cells
      */
     getReadOnlyCellStyle(): AdaptableStyle | undefined;
-    /**
-     * Retrieves any Action Columns (provided in User Interface Options)
-     */
-    getAllActionColumn(): ActionColumn[];
     /**
      * Retrieves any Object Tags (provided in User Interface Options)
      */
     getAdaptableObjectTags(): AdaptableObjectTag[] | undefined;
+    /**
+     * Retrieves any Action Columns (provided in User Interface Options)
+     */
+    getAllActionColumn(): ActionColumn[];
 }

package/src/PredefinedConfig/AdaptableState.d.ts

@@ -6,7 +6,6 @@ import { CalculatedColumnState } from './CalculatedColumnState';
 import { ConditionalStyleState } from './ConditionalStyleState';
 import { CustomSortState } from './CustomSortState';
 import { DashboardState } from './DashboardState';
-import { DataSourceState } from './DataSourceState';
 import { ExportState } from './ExportState';
 import { FormatColumnState } from './FormatColumnState';
 import { FreeTextColumnState } from './FreeTextColumnState';
@@ -18,7 +17,6 @@ import { ShortcutState } from './ShortcutState';
 import { TeamSharingState } from './TeamSharingState';
 import { ThemeState } from './ThemeState';
 import { ConfigState } from './ConfigState';
-import { FilterState } from './FilterState';
 import { ApplicationState } from './ApplicationState';
 import { ToolPanelState } from './ToolPanelState';
 import { QueryState } from './QueryState';
@@ -41,9 +39,7 @@ export interface AdaptablePersistentState {
     ConditionalStyle: ConditionalStyleState;
     CustomSort: CustomSortState;
     Dashboard: DashboardState;
-    DataSource: DataSourceState;
     Export: ExportState;
-    Filter: FilterState;
     FormatColumn: FormatColumnState;
     FreeTextColumn: FreeTextColumnState;
     Layout: LayoutState;

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

@@ -11,13 +11,13 @@ export interface AdaptableButton<CONTEXT_TYPE extends BaseContext> extends Adapt
      */
     label?: string | ((button: AdaptableButton<CONTEXT_TYPE>, context: CONTEXT_TYPE) => string);
     /**
-     * Style for Button - can be object or function thats provides a `Style` object
+     * Style for Button - can be object or function that provides a `ButtonStyle` object
      */
     buttonStyle?: ButtonStyle | ((button: AdaptableButton<CONTEXT_TYPE>, context: CONTEXT_TYPE) => ButtonStyle);
     /**
-     * Icon to display, requires string for URL, other props are optional
+     * Icon for Button - can be object or function that provides a `AdaptableIcon` object
      */
-    icon?: AdaptableIcon;
+    icon?: AdaptableIcon | ((button: AdaptableButton<CONTEXT_TYPE>, context: CONTEXT_TYPE) => AdaptableIcon);
     /**
      * Tooltip for Button - can be string or function that provides string
      */

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

@@ -1,4 +1,8 @@
 import { AdaptableObject } from './AdaptableObject';
+/**
+ * Type of data stored in an Adaptable Column
+ */
+export declare type AdaptableColumnDataType = 'String' | 'Number' | 'Boolean' | 'Date' | 'Object' | 'Unknown';
 /**
  * Base class for Adaptable Column containing most important properties
  */
@@ -14,7 +18,7 @@ export interface AdaptableColumnBase extends AdaptableObject {
     /**
      * DataType of the column
      */
-    dataType: 'String' | 'Number' | 'NumberArray' | 'Boolean' | 'Date' | 'Object' | 'Unknown';
+    dataType: AdaptableColumnDataType;
 }
 export declare const isValidOrderForColumnGroups: ({ oldColumns, newColumns, }: {
     oldColumns: AdaptableColumn[];

package/src/PredefinedConfig/Common/AdaptablePredicate.js

@@ -53,7 +53,24 @@ exports.SystemPredicateDefs = [
         icon: { text: '!IN' },
         columnScope: { DataTypes: ['String', 'Number', 'Date'] },
         moduleScope: ['filter'],
-        handler: ({ displayValue, inputs }) => inputs.length === 0 || !inputs.includes(displayValue),
+        handler: ({ inputs, column, value }) => {
+            // basically negation of IN
+            if (inputs.length === 0) {
+                return true;
+            }
+            if (column.dataType === 'Date') {
+                return inputs.some((input) => {
+                    return !isSameDay_1.default(input, value);
+                });
+            }
+            if (column.dataType === 'Number') {
+                return !inputs.includes(value);
+            }
+            if (column.dataType === 'String') {
+                return !inputs.includes(value);
+            }
+            return true;
+        },
         toString: ({ inputs }) => `Exclude (${inputs.join(', ')})`,
     },
     {

package/src/PredefinedConfig/{FilterState.d.ts → Common/ColumnFilter.d.ts}

@@ -1,36 +1,5 @@
-import { ConfigState } from './ConfigState';
-import { AdaptableApi, AdaptableColumn } from '../types';
-import { AdaptableObject } from './Common/AdaptableObject';
-import { AdaptablePredicate } from './Common/AdaptablePredicate';
-import { TypeHint } from './Common/Types';
-/**
- * Predefined Configuration for Filters
- */
-export interface FilterState extends ConfigState {
-    /**
-     * Collection of Column Filters
-     */
-    ColumnFilters?: ColumnFilter[];
-    /**
-     * Whether to display Quick Filter Bar between Column Header and the Grid
-     * @defaultValue  true
-     */
-    IsQuickFilterVisible?: boolean;
-}
-export interface FilterPredicateInput {
-    type: 'number' | 'text' | 'date';
-    defaultValue?: any;
-}
-export interface FilterPredicateHandler {
-    (params: FilterPredicateParams): boolean;
-}
-export interface FilterPredicateParams {
-    value: any;
-    displayValue: string;
-    inputs: any[];
-    column: AdaptableColumn;
-    api: AdaptableApi;
-}
+import { AdaptableObject, AdaptablePredicate } from '../../types';
+import { TypeHint } from './Types';
 /**
  * Defines a Filter applied on a Column using a Predicate
  */

package/src/PredefinedConfig/Common/ColumnFilter.js

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

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

@@ -4,8 +4,8 @@ export declare enum DataType {
     Boolean = "Boolean",
     Date = "Date",
     Object = "Object",
-    All = "All",
-    Unknown = "Unknown"
+    Unknown = "Unknown",
+    All = "All"
 }
 export declare enum MathOperation {
     Add = "Add",

package/src/PredefinedConfig/Common/Enums.js

@@ -9,8 +9,8 @@ var DataType;
     DataType["Boolean"] = "Boolean";
     DataType["Date"] = "Date";
     DataType["Object"] = "Object";
-    DataType["All"] = "All";
     DataType["Unknown"] = "Unknown";
+    DataType["All"] = "All";
 })(DataType = exports.DataType || (exports.DataType = {}));
 var MathOperation;
 (function (MathOperation) {

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

@@ -0,0 +1,8 @@
+import { AdaptableFormData } from '../../types';
+import { BaseContext } from './BaseContext';
+export interface FormContext extends BaseContext {
+    /**
+     * Adaptable Form Data
+     */
+    formData: AdaptableFormData;
+}

package/src/PredefinedConfig/Common/FormContext.js

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

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

@@ -6,9 +6,9 @@ export declare type AdaptableDashboardToolbars = AdaptableDashboardToolbar[];
 /**
  * List of all the Toolbars that Adaptable provides
  */
-export declare type AdaptableDashboardToolbar = 'Alert' | 'BulkUpdate' | 'CellSummary' | 'DataChangeHistory' | 'DataSource' | 'Export' | 'Filter' | 'Glue42' | 'IPushPull' | 'Layout' | 'OpenFin' | 'Query' | 'QuickSearch' | 'SmartEdit' | 'StateManagement' | 'SystemStatus' | 'Theme';
+export declare type AdaptableDashboardToolbar = 'Alert' | 'BulkUpdate' | 'CellSummary' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'Filter' | 'Glue42' | 'IPushPull' | 'Layout' | 'OpenFin' | 'Query' | 'QuickSearch' | 'SmartEdit' | 'StateManagement' | 'SystemStatus' | 'Theme';
 export declare const ALL_TOOLBARS: AdaptableDashboardToolbar[];
-export declare type AdaptableStatusBarPanel = 'CellSummary' | 'Alert' | 'GridInfo' | 'Dashboard' | 'ToolPanel' | 'StatusBar' | 'StateManagement' | 'Alert' | 'CalculatedColumn' | 'ConditionalStyle' | 'CustomSort' | 'DataSource' | 'Export' | 'Filter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'Layout' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'Shortcut' | 'SystemStatus' | 'DataChangeHistory' | 'TeamSharing' | 'Theme' | 'BulkUpdate' | 'SettingsPanel' | 'SmartEdit';
+export declare type AdaptableStatusBarPanel = 'CellSummary' | 'Alert' | 'GridInfo' | 'Dashboard' | 'ToolPanel' | 'StatusBar' | 'StateManagement' | 'Alert' | 'CalculatedColumn' | 'ConditionalStyle' | 'CustomSort' | 'DataSet' | 'Export' | 'Filter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'Layout' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'Shortcut' | 'SystemStatus' | 'DataChangeHistory' | 'TeamSharing' | 'Theme' | 'BulkUpdate' | 'SettingsPanel' | 'SmartEdit';
 export declare const ALL_STATUS_SUB_PANELS: AdaptableStatusBarPanel[];
 export declare type AdaptableToolPanels = AdaptableToolPanel[];
 export declare type AdaptableToolPanel = 'Alert' | 'BulkUpdate' | 'CellSummary' | 'Dashboard' | 'DataChangeHistory' | 'Export' | 'Filter' | 'IPushPull' | 'Layout' | 'OpenFin' | 'Query' | 'QuickSearch' | 'SmartEdit' | 'StateManagement' | 'SystemStatus' | 'Theme';
@@ -22,16 +22,17 @@ export declare type AdaptableModuleButtons = AdaptableModuleButton[];
 /**
  * List of all the Module buttons Adaptable provides - each Module has a popup for which this is a shortcut button
  */
-export declare type AdaptableModuleButton = 'Alert' | 'FlashingCell' | 'BulkUpdate' | 'CalculatedColumn' | 'CellSummary' | 'ConditionalStyle' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSource' | 'Export' | 'Filter' | 'FormatColumn' | 'FreeTextColumn' | 'Glue42' | 'GridInfo' | 'Layout' | 'OpenFin' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'SettingsPanel' | 'Shortcut' | 'SmartEdit' | 'StateManagement' | 'SystemStatus' | 'TeamSharing' | 'Theme';
+export declare type AdaptableModuleButton = 'Alert' | 'FlashingCell' | 'BulkUpdate' | 'CalculatedColumn' | 'CellSummary' | 'ConditionalStyle' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'Filter' | 'FormatColumn' | 'FreeTextColumn' | 'Glue42' | 'GridInfo' | 'Layout' | 'OpenFin' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'SettingsPanel' | 'Shortcut' | 'SmartEdit' | 'StateManagement' | 'SystemStatus' | 'TeamSharing' | 'Theme';
 export declare type AdaptableStateKeys = AdaptableStateKey[];
 export declare type AdaptableStateKey = keyof AdaptablePersistentState | 'OpenFin' | 'Glue42' | 'IPushPull';
 /**
  * Modules provided by AdapTable, subject to Entitlements and usually have Predefined Config
  */
-export declare type AdaptableModule = 'Alert' | 'BulkUpdate' | 'CalculatedColumn' | 'CellSummary' | 'Charting' | 'ConditionalStyle' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSource' | 'Export' | 'Filter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'Glue42' | 'GridInfo' | 'IPushPull' | 'Layout' | 'OpenFin' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'SettingsPanel' | 'Shortcut' | 'SmartEdit' | 'StateManagement' | 'StatusBar' | 'SystemStatus' | 'TeamSharing' | 'Theme' | 'ToolPanel';
-export declare type AdaptableSettingsPanel = 'Alert' | 'CalculatedColumn' | 'ConditionalStyle' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSource' | 'Export' | 'Filter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'GridInfo' | 'Layout' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'Shortcut' | 'StateManagement' | 'StatusBar' | 'SystemStatus' | 'TeamSharing' | 'Theme' | 'ToolPanel';
+export declare type AdaptableModule = 'Alert' | 'BulkUpdate' | 'CalculatedColumn' | 'CellSummary' | 'Charting' | 'ConditionalStyle' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'Filter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'Glue42' | 'GridInfo' | 'IPushPull' | 'Layout' | 'OpenFin' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'SettingsPanel' | 'Shortcut' | 'SmartEdit' | 'StateManagement' | 'StatusBar' | 'SystemStatus' | 'TeamSharing' | 'Theme' | 'ToolPanel';
+export declare type AdaptableSettingsPanel = 'Alert' | 'CalculatedColumn' | 'ConditionalStyle' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'Filter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'GridInfo' | 'Layout' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'Shortcut' | 'StateManagement' | 'StatusBar' | 'SystemStatus' | 'TeamSharing' | 'Theme' | 'ToolPanel';
 export declare type TypeHint<Base, Literals> = (Base & {
     __subType?: true;
 }) | Literals;
 export declare type AdaptableQLModules = AdaptableQLModule[];
 export declare type AdaptableQLModule = 'Filter' | 'Query';
+export declare type AdaptableColumnType = 'abColDefBoolean' | 'abColDefDate' | 'abColDefNumber' | 'abColDefString' | 'abColDefObject' | 'abColDefCustom' | 'abSpecialColumn';

package/src/PredefinedConfig/Common/Types.js

@@ -9,7 +9,7 @@ exports.ALL_TOOLBARS = [
     'BulkUpdate',
     'CellSummary',
     'DataChangeHistory',
-    'DataSource',
+    'DataSet',
     'Export',
     'Filter',
     'Glue42',
@@ -32,7 +32,7 @@ exports.ALL_STATUS_SUB_PANELS = [
     'CustomSort',
     'Dashboard',
     'DataChangeHistory',
-    'DataSource',
+    'DataSet',
     'Export',
     'Filter',
     'FlashingCell',
@@ -72,4 +72,3 @@ exports.ALL_TOOL_PANELS = [
     'SystemStatus',
     'Theme',
 ];
-//  | 'QuickSearch'

package/src/PredefinedConfig/LayoutState.d.ts

@@ -1,6 +1,7 @@
 import { ConfigState } from './ConfigState';
 import { AdaptableObject } from './Common/AdaptableObject';
 import { ColumnSort } from './Common/ColumnSort';
+import { ColumnFilter } from '../types';
 /**
  * Predefined Configuration for the Layout Module
  */
@@ -36,6 +37,10 @@ export interface Layout extends AdaptableObject {
      * Sorting to apply in the Layout
      */
     ColumnSorts?: ColumnSort[];
+    /**
+     * Collection of Column Filters.
+     */
+    ColumnFilters?: ColumnFilter[];
     /**
      * Columns which are row-grouped when the Layout is applied
      */

package/src/PredefinedConfig/PredefinedConfig.d.ts

@@ -1,11 +1,9 @@
-import { FilterState } from './FilterState';
 import { ApplicationState } from './ApplicationState';
 import { AlertState } from './AlertState';
 import { CalculatedColumnState } from './CalculatedColumnState';
 import { ConditionalStyleState } from './ConditionalStyleState';
 import { CustomSortState } from './CustomSortState';
 import { DashboardState } from './DashboardState';
-import { DataSourceState } from './DataSourceState';
 import { ExportState } from './ExportState';
 import { FlashingCellState } from './FlashingCellState';
 import { FormatColumnState } from './FormatColumnState';
@@ -47,18 +45,10 @@ export interface PredefinedConfig {
      * Large series of properties to give users full control over the look and feel of the *Dashboard* - the section above the grid with toolbars and buttons
      */
     Dashboard?: DashboardState;
-    /**
-     * Supplies a collection of *DataSource* objects to facilitate replacing the DataSource in the Grid with an alternate set of data (e.g. a Book or Stored Proc name)
-     */
-    DataSource?: DataSourceState;
     /**
      * Supplies a collection of *Report* objects, together with name of the Current Report, as part of AdapTable export Module
      */
     Export?: ExportState;
-    /**
-     *  Stores Filters in AdapTable - both System and Column (predicate) Filters
-     */
-    Filter?: FilterState;
     /***
      * Objects which define which cells flash in response to data changes
      */

package/src/PredefinedConfig/StatusBarState.d.ts

@@ -16,8 +16,7 @@ export interface StatusBarState extends ConfigState {
 export declare const ADAPTABLE_STATUS_PANEL = "AdaptableStatusPanel";
 export interface AdaptableStatusBar {
     /**
-     * Key of status panel defined in AG Grid gridConfig - make sure that keys are the same
-     * Note: AG Grid statusPanel has a lowercase 'key'
+     * Key of status panel defined in AG Grid GridOptions - ensure keys are the same (Note: AG Grid statusPanel has a lowercase 'key')
      */
     Key: string;
     /**

package/src/PredefinedConfig/SystemState.d.ts

@@ -68,6 +68,9 @@ export interface SystemState extends InternalState, IPushPullState, Glue42State,
         };
     };
     ShowLayoutNotAssociatedObjects: boolean;
+    DashboardRevision: number;
+    IsQuickFilterVisible: boolean;
+    CurrentDataSet: string;
 }
 export interface ProgressIndicator {
     active: boolean;

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

@@ -1,5 +1,7 @@
 import * as Redux from 'redux';
+import { AdaptableState } from '../../../types';
 import { LayoutState, Layout } from '../../PredefinedConfig/LayoutState';
+import { ColumnFilter } from '../../types';
 /**
  * @ReduxAction A Layout has been added
  */
@@ -20,6 +22,45 @@ export declare const LAYOUT_SELECT = "LAYOUT_SELECT";
  * @ReduxAction A Layout has been (auto)saved
  */
 export declare const LAYOUT_SAVE = "LAYOUT_SAVE";
+export declare const LAYOUT_REMOVE_COLUMN = "LAYOUT_REMOVE_COLUMN";
+/**
+ * @ReduxAction A Column Filter has been added
+ */
+export declare const LAYOUT_COLUMN_FILTER_ADD = "LAYOUT_COLUMN_FILTER_ADD";
+/**
+ * @ReduxAction A Column Filter has been edited
+ */
+export declare const LAYOUT_COLUMN_FILTER_EDIT = "LAYOUT_COLUMN_FILTER_EDIT";
+/**
+ * @ReduxAction Column Filters have been set
+ */
+export declare const LAYOUT_COLUMN_FILTER_SET = "LAYOUT_COLUMN_FILTER_SET";
+/**
+ * @ReduxAction All Column Filters have been cleared
+ */
+export declare const LAYOUT_COLUMN_FILTER_CLEAR_ALL = "LAYOUT_COLUMN_FILTER_CLEAR_ALL";
+/**
+ * @ReduxAction A Column Filter has been cleared
+ */
+export declare const LAYOUT_COLUMN_FILTER_CLEAR = "LAYOUT_COLUMN_FILTER_CLEAR";
+export interface LayoutColumnFilterAction extends Redux.Action {
+    columnFilter: ColumnFilter;
+}
+export interface LayoutColumnFilterAddAction extends LayoutColumnFilterAction {
+}
+export interface LayoutColumnFilterEditAction extends LayoutColumnFilterAction {
+}
+export interface LayoutFilterSetAction extends LayoutColumnFilterAction {
+}
+export interface LayoutFilterClearAction extends LayoutColumnFilterAction {
+}
+export interface LayoutFilterClearAllAction 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;
 /**
  * @ReduxAction A new caption / header has been set for a Column in the Layout
  */
@@ -45,6 +86,10 @@ export interface LayoutSetColumnCaptionAction extends Redux.Action {
     columnId: string;
     caption: string;
 }
+export interface LayoutRemoveColumnAction extends Redux.Action {
+    layoutName: string;
+    columnId: string;
+}
 export interface LayoutUpdateCurrentDraftAction extends LayoutAction {
 }
 export interface LayoutSelectAction extends Redux.Action {
@@ -61,7 +106,9 @@ 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 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.LayoutReady = exports.LayoutUpdateCurrentDraft = exports.LayoutSelect = exports.LayoutSetColumnCaption = exports.LayoutSave = exports.LayoutDelete = exports.LayoutAdd = exports.LAYOUT_READY = exports.LAYOUT_UPDATE_CURRENT_DRAFT = exports.LAYOUT_SET_COLUMN_CAPTION = exports.LAYOUT_SAVE = exports.LAYOUT_SELECT = exports.LAYOUT_DELETE = exports.LAYOUT_EDIT = exports.LAYOUT_ADD = void 0;
+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;
 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,47 @@ exports.LAYOUT_SELECT = 'LAYOUT_SELECT';
  * @ReduxAction A Layout has been (auto)saved
  */
 exports.LAYOUT_SAVE = 'LAYOUT_SAVE';
+exports.LAYOUT_REMOVE_COLUMN = 'LAYOUT_REMOVE_COLUMN';
+/**
+ * @ReduxAction A Column Filter has been added
+ */
+exports.LAYOUT_COLUMN_FILTER_ADD = 'LAYOUT_COLUMN_FILTER_ADD';
+/**
+ * @ReduxAction A Column Filter has been edited
+ */
+exports.LAYOUT_COLUMN_FILTER_EDIT = 'LAYOUT_COLUMN_FILTER_EDIT';
+/**
+ * @ReduxAction Column Filters have been set
+ */
+exports.LAYOUT_COLUMN_FILTER_SET = 'LAYOUT_COLUMN_FILTER_SET';
+/**
+ * @ReduxAction All Column Filters have been cleared
+ */
+exports.LAYOUT_COLUMN_FILTER_CLEAR_ALL = 'LAYOUT_COLUMN_FILTER_CLEAR_ALL';
+/**
+ * @ReduxAction A Column Filter has been cleared
+ */
+exports.LAYOUT_COLUMN_FILTER_CLEAR = 'LAYOUT_COLUMN_FILTER_CLEAR';
+// Column Filter Methods
+exports.LayoutColumnFilterAdd = (columnFilter) => ({
+    type: exports.LAYOUT_COLUMN_FILTER_ADD,
+    columnFilter,
+});
+exports.LayoutColumnFilterEdit = (columnFilter) => ({
+    type: exports.LAYOUT_COLUMN_FILTER_EDIT,
+    columnFilter,
+});
+exports.LayoutColumnFilterSet = (columnFilter) => ({
+    type: exports.LAYOUT_COLUMN_FILTER_SET,
+    columnFilter,
+});
+exports.LayoutColumnFilterClearAll = () => ({
+    type: exports.LAYOUT_COLUMN_FILTER_CLEAR_ALL,
+});
+exports.LayoutColumnFilterClear = (columnFilter) => ({
+    type: exports.LAYOUT_COLUMN_FILTER_CLEAR,
+    columnFilter,
+});
 /**
  * @ReduxAction A new caption / header has been set for a Column in the Layout
  */
@@ -51,6 +92,11 @@ exports.LayoutSetColumnCaption = (layoutName, columnId, caption) => ({
     columnId,
     caption,
 });
+exports.LayouRemoveColumn = (layoutName, columnId) => ({
+    type: exports.LAYOUT_REMOVE_COLUMN,
+    layoutName,
+    columnId,
+});
 exports.LayoutSelect = (layoutName) => ({
     type: exports.LAYOUT_SELECT,
     layoutName,
@@ -63,12 +109,19 @@ exports.LayoutReady = (layoutState) => ({
     type: exports.LAYOUT_READY,
     layoutState,
 });
+exports.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);
+    return (_d = currentLayout === null || currentLayout === void 0 ? void 0 : currentLayout.ColumnFilters) !== null && _d !== void 0 ? _d : [];
+};
 const initialState = {
     CurrentLayout: GeneralConstants_1.EMPTY_STRING,
     Layouts: GeneralConstants_1.EMPTY_ARRAY,
 };
 exports.LayoutReducer = (state = initialState, action) => {
+    var _a, _b, _c, _d;
     let layouts;
+    const currentLayout = state.Layouts.find((layout) => layout.Name === state.CurrentLayout);
     switch (action.type) {
         case exports.LAYOUT_SELECT: {
             const newCurrentLayout = action.layoutName;
@@ -106,6 +159,86 @@ exports.LayoutReducer = (state = initialState, action) => {
             }
             return state;
         }
+        case exports.LAYOUT_REMOVE_COLUMN: {
+            const removeColumnAction = action;
+            const layoutname = removeColumnAction.layoutName;
+            const colToRemove = removeColumnAction.columnId;
+            let layoutToUpdate = state.Layouts.find((l) => l.Name === layoutname);
+            if (layoutToUpdate) {
+                layoutToUpdate.Columns = layoutToUpdate.Columns.filter((col) => {
+                    return col !== colToRemove;
+                });
+                return Object.assign(Object.assign({}, state), { Layouts: state.Layouts.map((abObject) => abObject.Uuid === layoutToUpdate.Uuid ? layoutToUpdate : abObject) });
+            }
+            return state;
+        }
+        case exports.LAYOUT_COLUMN_FILTER_SET: {
+            let columnFilters = (_a = currentLayout.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);
+            const Layouts = state.Layouts.map((layout) => {
+                if (layout.Name === currentLayout.Name) {
+                    return Object.assign(Object.assign({}, layout), { ColumnFilters: columnFilters });
+                }
+                return layout;
+            });
+            return Object.assign(Object.assign({}, state), { Layouts });
+        }
+        case exports.LAYOUT_COLUMN_FILTER_ADD: {
+            let columnFilters = [...((_b = currentLayout.ColumnFilters) !== null && _b !== void 0 ? _b : [])];
+            const columnFilterAction = action.columnFilter;
+            AdaptableHelper_1.default.addUuidAndSource(columnFilterAction);
+            columnFilters.push(columnFilterAction);
+            const Layouts = state.Layouts.map((layout) => {
+                if (layout.Name === currentLayout.Name) {
+                    return Object.assign(Object.assign({}, layout), { ColumnFilters: columnFilters });
+                }
+                return layout;
+            });
+            return Object.assign(Object.assign({}, state), { Layouts });
+        }
+        case exports.LAYOUT_COLUMN_FILTER_EDIT: {
+            const columnFilterAction = action.columnFilter;
+            let columnFilters = ((_c = currentLayout.ColumnFilters) !== null && _c !== void 0 ? _c : []).map((abObject) => abObject.Uuid === columnFilterAction.Uuid ? columnFilterAction : abObject);
+            const Layouts = state.Layouts.map((layout) => {
+                if (layout.Name === currentLayout.Name) {
+                    return Object.assign(Object.assign({}, layout), { ColumnFilters: columnFilters });
+                }
+                return layout;
+            });
+            return Object.assign(Object.assign({}, state), { Layouts });
+        }
+        case exports.LAYOUT_COLUMN_FILTER_CLEAR_ALL: {
+            const Layouts = state.Layouts.map((layout) => {
+                if (layout.Name === currentLayout.Name) {
+                    return Object.assign(Object.assign({}, layout), { ColumnFilters: [] });
+                }
+                return layout;
+            });
+            return Object.assign(Object.assign({}, state), { Layouts });
+        }
+        case exports.LAYOUT_COLUMN_FILTER_CLEAR: {
+            let columnFilters = [...((_d = currentLayout.ColumnFilters) !== null && _d !== void 0 ? _d : [])];
+            const actionTypedDelete = action;
+            const index = actionTypedDelete.columnFilter
+                ? columnFilters.findIndex((i) => i.Uuid == actionTypedDelete.columnFilter.Uuid)
+                : -1;
+            if (index != -1) {
+                columnFilters.splice(index, 1);
+            }
+            const Layouts = state.Layouts.map((layout) => {
+                if (layout.Name === currentLayout.Name) {
+                    return Object.assign(Object.assign({}, layout), { ColumnFilters: columnFilters });
+                }
+                return layout;
+            });
+            return Object.assign(Object.assign({}, state), { Layouts });
+        }
         default:
             return state;
     }

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

@@ -5,6 +5,7 @@ import { ModuleParams } from '../../View/Components/SharedProps/ModuleViewPopupP
 import { AdaptableModule } from '../../PredefinedConfig/Common/Types';
 import { AdaptableAlert } from '../../PredefinedConfig/Common/AdaptableAlert';
 import { AdaptableForm, BaseContext } from '../../types';
+import { FormContext } from '../../PredefinedConfig/Common/FormContext';
 export declare const POPUP_SHOW_SCREEN = "POPUP_SHOW_SCREEN";
 export declare const POPUP_HIDE_SCREEN = "POPUP_HIDE_SCREEN";
 export declare const POPUP_SHOW_LOADING = "POPUP_SHOW_LOADING";
@@ -89,9 +90,9 @@ export declare const PopupShowWindow: (config: {
 export declare const PopupHideWindow: (id: string) => PopupHideWindowAction;
 export declare const PopupShowForm: (config: {
     Id: string;
-    Form: AdaptableForm<BaseContext>;
+    Form: AdaptableForm<FormContext>;
     FormProps?: any;
-    prepareContext?: (context: BaseContext) => Promise<BaseContext> | BaseContext;
+    prepareContext?: (context: FormContext) => Promise<FormContext> | FormContext;
 }) => PopupShowFormAction;
 export declare const PopupHideForm: (id: string) => PopupHideFormAction;
 export declare const PopupShowAlert: (alert: AdaptableAlert) => PopupShowAlertAction;