@adaptabletools/adaptable-cjs 20.0.0-canary.9 → 20.0.1

package/src/Api/{ConfigApi.d.ts → StateApi.d.ts}

@@ -1,47 +1,55 @@
-import { ThemeState } from '../PredefinedConfig/ThemeState';
-import { ShortcutState } from '../PredefinedConfig/ShortcutState';
-import { QuickSearchState } from '../PredefinedConfig/QuickSearchState';
-import { LayoutState } from '../PredefinedConfig/LayoutState';
-import { FormatColumnState } from '../PredefinedConfig/FormatColumnState';
-import { ExportState } from '../PredefinedConfig/ExportState';
-import { DashboardState } from '../PredefinedConfig/DashboardState';
-import { CustomSortState } from '../PredefinedConfig/CustomSortState';
-import { CalculatedColumnState } from '../PredefinedConfig/CalculatedColumnState';
-import { AlertState } from '../PredefinedConfig/AlertState';
-import { ConfigState } from '../PredefinedConfig/ConfigState';
-import { PlusMinusState } from '../PredefinedConfig/PlusMinusState';
-import { ApplicationState } from '../PredefinedConfig/ApplicationState';
-import { AdaptablePersistentState, AdaptableState } from '../PredefinedConfig/AdaptableState';
-import { FreeTextColumnState } from '../PredefinedConfig/FreeTextColumnState';
-import { ToolPanelState } from '../PredefinedConfig/ToolPanelState';
-import { AdaptableStateKey, AdaptableModule } from '../PredefinedConfig/Common/Types';
-import { AdaptableSearchState, AdaptableSortState, NamedQueryState, PredefinedConfig, ScheduleState, NoteState, ChartingState, FlashingCellState, StatusBarState, StyledColumnState } from '../types';
+import { ThemeState } from '../AdaptableState/ThemeState';
+import { ShortcutState } from '../AdaptableState/ShortcutState';
+import { QuickSearchState } from '../AdaptableState/QuickSearchState';
+import { LayoutState } from '../AdaptableState/LayoutState';
+import { FormatColumnState } from '../AdaptableState/FormatColumnState';
+import { ExportState } from '../AdaptableState/ExportState';
+import { DashboardState } from '../AdaptableState/DashboardState';
+import { CustomSortState } from '../AdaptableState/CustomSortState';
+import { CalculatedColumnState } from '../AdaptableState/CalculatedColumnState';
+import { AlertState } from '../AdaptableState/AlertState';
+import { BaseState } from '../AdaptableState/BaseState';
+import { PlusMinusState } from '../AdaptableState/PlusMinusState';
+import { ApplicationState } from '../AdaptableState/ApplicationState';
+import { AdaptablePersistentState, AdaptableState } from '../AdaptableState/AdaptableState';
+import { FreeTextColumnState } from '../AdaptableState/FreeTextColumnState';
+import { ToolPanelState } from '../AdaptableState/ToolPanelState';
+import { AdaptableModule, AdaptableStateKey } from '../AdaptableState/Common/Types';
+import { AdaptableSearchState, AdaptableSortState, ChartingState, FlashingCellState, InitialState, NamedQueryState, NoteState, PredefinedConfig, ScheduleState, StatusBarState, StyledColumnState } from '../types';
 /**
- * Range of functions to access Predefined Config and Adaptable State
+ * Range of functions to access Initial and Full Adaptable State
  */
-export interface ConfigApi {
+export interface StateApi {
     /**
-     * Changes the key used for persisting the AdaptableState into localStorage. Optionally provides a predefinedConfig to load.
+     * Changes key used for persisting AdaptableState into localStorage; optionally provides an initialState to load
      * @param adaptableStateKey - key for persisting the AdaptableState into localStorage
-     * @param config.predefinedConfig - new predefinedConfig to load
-     * @param config.flushCurrentState - whether to flush(persist) the current state before loading the new predefinedConfig
+     * @param config.initialState - new initialState to load
+     * @param config.flushCurrentState - whether to flush(persist) the current state before loading the new initialState
      * @param config.progressIndicatorLabel - label for the progress indicator
      *
      */
     setAdaptableStateKey(adaptableStateKey: string, config?: {
-        predefinedConfig?: PredefinedConfig;
+        initialState?: InitialState;
         flushCurrentState?: boolean;
         progressIndicatorLabel?: string;
     }): Promise<void>;
     /**
-     * Returns current Predefined Config
+     * @deprecated use `getInitialState()` instead
      */
     getPredefinedConfig(): PredefinedConfig | any;
     /**
-     * Reloads existing or supplied Predefined Config; clears persistent state by calling `StateOptions.clearState` function for remote storage removal
-     * @param newPredefinedConfig optional Config to load
+     * Returns the Initial Adaptable State
+     */
+    getInitialState(): InitialState | any;
+    /**
+     * @deprecated use `reloadInitialState()` instead
      */
     reloadPredefinedConfig(newPredefinedConfig?: PredefinedConfig): void;
+    /**
+     * Reloads existing (or supplied) Initial State; clears persistent state by calling `StateOptions.clearState`
+     * @param newInitialState optional new InitialState to load
+     */
+    reloadInitialState(newInitialState?: InitialState): void;
     /**
      * Copies all Adaptable state to clipboard
      */
@@ -54,7 +62,7 @@ export interface ConfigApi {
      * Loads supplied user state, replacing (NOT merging) existing User(persisted) State.
      * @param state
      */
-    loadUserState(config: PredefinedConfig): void;
+    loadUserState(state: InitialState): void;
     /**
      * Retrieves ALL state which is currently stored by Adaptable (both persistent and transient/internal)
      */
@@ -86,7 +94,7 @@ export interface ConfigApi {
      * @param stateKey section of State to return
      * @param returnJson whether to return section as JSON or object
      */
-    getUserStateByStateKey(stateKey: AdaptableStateKey, returnJson?: boolean): ConfigState | string;
+    getUserStateByStateKey(stateKey: AdaptableStateKey, returnJson?: boolean): BaseState | string;
     /**
      * Adds '1' to current revision number of State element
      * @param stateKey Adaptable State Key to update

package/src/Api/StatusBarApi.d.ts

@@ -1,5 +1,5 @@
 import { StatusPanelDef } from 'ag-grid-enterprise';
-import { AdaptableStatusBar } from '../PredefinedConfig/StatusBarState';
+import { AdaptableStatusBar } from '../AdaptableState/StatusBarState';
 /**
  * Methods for managing the AdapTable Status Bar
  */

package/src/Api/StyledColumnApi.d.ts

@@ -1,5 +1,5 @@
-import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
-import { StyledColumn, StyledColumnState } from '../PredefinedConfig/StyledColumnState';
+import { AdaptableColumn } from '../AdaptableState/Common/AdaptableColumn';
+import { StyledColumn, StyledColumnState } from '../AdaptableState/StyledColumnState';
 /**
  * Provides run-time access to Styled Column Module and associated state
  */
@@ -58,8 +58,8 @@ export interface StyledColumnApi {
      */
     unSuspendStyledColumn(styledColumn: StyledColumn): void;
     /**
-    * Suspends all Styled Columns
-    */
+     * Suspends all Styled Columns
+     */
     suspendAllStyledColumn(): void;
     /**
      * Activates all suspended Styled Column

package/src/Api/SystemStatusApi.d.ts

@@ -1,4 +1,4 @@
-import { SystemStatusMessageInfo } from '../PredefinedConfig/Common/SystemStatusMessageInfo';
+import { SystemStatusMessageInfo } from '../AdaptableState/Common/SystemStatusMessageInfo';
 /**
  * Provides access to System Status Module and associated state
  */

package/src/Api/TeamSharingApi.d.ts

@@ -1,5 +1,5 @@
-import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
-import { AdaptableSharedEntity, CustomSharedEntity, CustomSharedEntityConfig, SharedEntity } from '../PredefinedConfig/TeamSharingState';
+import { AdaptableObject } from '../AdaptableState/Common/AdaptableObject';
+import { AdaptableSharedEntity, CustomSharedEntity, CustomSharedEntityConfig, SharedEntity } from '../AdaptableState/TeamSharingState';
 import { AdaptableModule, AdaptableSharedEntityConfig } from '../types';
 /**
  * Provides run-time access to Team Sharing Module and associated state

package/src/Api/ThemeApi.d.ts

@@ -1,4 +1,4 @@
-import { AdaptableTheme, ThemeState } from '../PredefinedConfig/ThemeState';
+import { AdaptableTheme, ThemeState } from '../AdaptableState/ThemeState';
 /**
  * Provides run-time access to the Theme Module and associated state
  */

package/src/Api/ToolPanelApi.d.ts

@@ -1,7 +1,7 @@
-import { ToolPanelState, ToolPanelVisibilityMode } from '../PredefinedConfig/ToolPanelState';
+import { ToolPanelState, ToolPanelVisibilityMode } from '../AdaptableState/ToolPanelState';
 import { CustomToolPanel, ToolPanelButtonContext } from '../AdaptableOptions/ToolPanelOptions';
-import { AdaptableButton } from '../PredefinedConfig/Common/AdaptableButton';
-import { AdaptableModuleButtons, AdaptableToolPanel } from '../PredefinedConfig/Common/Types';
+import { AdaptableButton } from '../AdaptableState/Common/AdaptableButton';
+import { AdaptableModuleButtons, AdaptableToolPanel } from '../AdaptableState/Common/Types';
 /**
  * Functions for managing the AdapTable ToolPanel Component (at side of grid)
  */

package/src/Api/UserInterfaceApi.d.ts

@@ -1,8 +1,8 @@
-import { AdaptableStyle } from '../PredefinedConfig/Common/AdaptableStyle';
-import { AdaptableObject, AdaptableObjectTag } from '../PredefinedConfig/Common/AdaptableObject';
+import { AdaptableStyle } from '../AdaptableState/Common/AdaptableStyle';
+import { AdaptableObject, AdaptableObjectTag } from '../AdaptableState/Common/AdaptableObject';
 import { AdaptableIcon, AdaptableModule } from '../types';
-import { CustomWindowConfig } from '../PredefinedConfig/Common/CustomWindowConfig';
-import { ProgressIndicatorConfig } from '../PredefinedConfig/Common/ProgressIndicatorConfig';
+import { CustomWindowConfig } from '../AdaptableState/Common/CustomWindowConfig';
+import { ProgressIndicatorConfig } from '../AdaptableState/Common/ProgressIndicatorConfig';
 /**
  * Functions relating to User Interface section of Adaptable State
  */

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

@@ -1,4 +1,4 @@
-import { AlertState, AlertDefinition } from '../../PredefinedConfig/AlertState';
+import { AlertState, AlertDefinition } from '../../AdaptableState/AlertState';
 import * as Redux from 'redux';
 /**
  * @ReduxAction An Alert Definition has been added

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

@@ -1,5 +1,5 @@
 import * as Redux from 'redux';
-import { ApplicationState, ApplicationDataEntry } from '../../PredefinedConfig/ApplicationState';
+import { ApplicationState, ApplicationDataEntry } from '../../AdaptableState/ApplicationState';
 /**
  * @ReduxAction An Application Data Entry has been added
  */

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

@@ -1,4 +1,4 @@
-import { CalculatedColumnState, CalculatedColumn } from '../../PredefinedConfig/CalculatedColumnState';
+import { CalculatedColumnState, CalculatedColumn } from '../../AdaptableState/CalculatedColumnState';
 import * as Redux from 'redux';
 /**
  * @ReduxAction A Calculated Column has been added

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

@@ -1,6 +1,6 @@
 import * as Redux from 'redux';
 import { AdaptableState } from '../../../types';
-import { ChartDefinition, ChartingState, ExternalChartDefinition } from '../../PredefinedConfig/ChartingState';
+import { ChartDefinition, ChartingState, ExternalChartDefinition } from '../../AdaptableState/ChartingState';
 /**
  * @ReduxAction Set AG Grid Charting Models
  */

package/src/Redux/ActionsReducers/ChartingRedux.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ChartingReducer = exports.ChartingGetExternalChartDefinitions = exports.ChartingGetChartModels = exports.initialState = exports.ChartingDeleteExternalChart = exports.ChartingAddExternalChart = exports.ChartingEditExternalChart = exports.ChartingDeleteChart = exports.ChartingAddChart = exports.ChartingEditChart = exports.ChartingReady = exports.ChartingSetChartModels = exports.CHARTING_DELETE_EXTERNAL_CHART = exports.CHARTING_ADD_EXTERNAL_CHART = exports.CHARTING_EDIT_EXTERNAL_CHART = exports.CHARTING_DELETE_CHART = exports.CHARTING_ADD_CHART = exports.CHARTING_EDIT_CHART = exports.CHARTING_READY = exports.SET_CHARTING_CHARTS = void 0;
-const Uuid_1 = require("../../PredefinedConfig/Uuid");
+const Uuid_1 = require("../../AdaptableState/Uuid");
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 /**
  * @ReduxAction Set AG Grid Charting Models

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

@@ -1,5 +1,5 @@
 import * as Redux from 'redux';
-import { CommentThread, AdaptableComment, CommentState } from '../../PredefinedConfig/CommentState';
+import { CommentThread, AdaptableComment, CommentState } from '../../AdaptableState/CommentState';
 import { CellAddress } from '../../types';
 /**
  * @ReduxAction A Comments has been added

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

@@ -1,4 +1,4 @@
-import { CustomSortState, CustomSort } from '../../PredefinedConfig/CustomSortState';
+import { CustomSortState, CustomSort } from '../../AdaptableState/CustomSortState';
 import * as Redux from 'redux';
 /**
  * @ReduxAction A Custom Sort has been added

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

@@ -1,8 +1,8 @@
 import * as Redux from 'redux';
 import { CustomToolbar, DashboardButtonContext } from '../../AdaptableOptions/DashboardOptions';
-import { AdaptableButton } from '../../PredefinedConfig/Common/AdaptableButton';
-import { AdaptableDashboardToolbar, AdaptableModuleButtons } from '../../PredefinedConfig/Common/Types';
-import { DashboardState, AdaptableCoordinate, DashboardTab } from '../../PredefinedConfig/DashboardState';
+import { AdaptableButton } from '../../AdaptableState/Common/AdaptableButton';
+import { AdaptableDashboardToolbar, AdaptableModuleButtons } from '../../AdaptableState/Common/Types';
+import { DashboardState, AdaptableCoordinate, DashboardTab } from '../../AdaptableState/DashboardState';
 /**
  * @ReduxAction The Module Buttons have been set in the Dashboard
  */
@@ -115,6 +115,6 @@ export declare const DashboardSetTitle: (title: string) => DashboardSetTitleActi
 export declare const DashboardReady: (dashboardState: DashboardState) => DashboardReadyAction;
 export declare const DashboardSetPinnedToolbars: (pinnedToolbars: DashboardState['PinnedToolbars']) => {
     type: string;
-    pinnedToolbars: string[] | import("../../PredefinedConfig/Common/Types").AdaptableDashboardToolbars;
+    pinnedToolbars: string[] | import("../../AdaptableState/Common/Types").AdaptableDashboardToolbars;
 };
 export declare const DashboardReducer: Redux.Reducer<DashboardState>;

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

@@ -1,5 +1,5 @@
 import * as Redux from 'redux';
-import { ExportState, Report, ReportFormatType } from '../../PredefinedConfig/ExportState';
+import { ExportState, Report, ReportFormatType } from '../../AdaptableState/ExportState';
 /**
  * @ReduxAction A Report has been selected
  */

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

@@ -1,6 +1,6 @@
-import { FlashingCellState } from '../../PredefinedConfig/FlashingCellState';
+import { FlashingCellState } from '../../AdaptableState/FlashingCellState';
 import * as Redux from 'redux';
-import { FlashingCellDefinition } from '../../PredefinedConfig/FlashingCellState';
+import { FlashingCellDefinition } from '../../AdaptableState/FlashingCellState';
 /**
  * @ReduxAction A Flashing Cell Definition has been added
  */

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

@@ -1,4 +1,4 @@
-import { FormatColumnState, FormatColumn } from '../../PredefinedConfig/FormatColumnState';
+import { FormatColumnState, FormatColumn } from '../../AdaptableState/FormatColumnState';
 import * as Redux from 'redux';
 /**
  * @ReduxAction A Format Column has been added

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

@@ -1,5 +1,5 @@
 import * as Redux from 'redux';
-import { FreeTextColumn, FreeTextColumnState, FreeTextStoredValue } from '../../PredefinedConfig/FreeTextColumnState';
+import { FreeTextColumn, FreeTextColumnState, FreeTextStoredValue } from '../../AdaptableState/FreeTextColumnState';
 /**
  * @ReduxAction A Free Text Column has been added
  */

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

@@ -1,18 +1,18 @@
 import * as Redux from 'redux';
-import { InternalState } from '../../PredefinedConfig/InternalState';
+import { InternalState } from '../../AdaptableState/InternalState';
 import { PreviewInfo } from '../../Utilities/Interface/Preview';
-import { Report, ReportFormatType, ReportNameType } from '../../PredefinedConfig/ExportState';
+import { Report, ReportFormatType, ReportNameType } from '../../AdaptableState/ExportState';
 import { BulkUpdateValidationResult } from '../../Strategy/Interface/IBulkUpdateModule';
-import { AdaptableAlert } from '../../PredefinedConfig/Common/AdaptableAlert';
-import { SystemStatusMessageInfo } from '../../PredefinedConfig/Common/SystemStatusMessageInfo';
-import { SummaryOperation } from '../../PredefinedConfig/Common/Enums';
-import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
+import { AdaptableAlert } from '../../AdaptableState/Common/AdaptableAlert';
+import { SystemStatusMessageInfo } from '../../AdaptableState/Common/SystemStatusMessageInfo';
+import { SummaryOperation } from '../../AdaptableState/Common/Enums';
+import { CellDataChangedInfo } from '../../AdaptableState/Common/CellDataChangedInfo';
 import { SmartEditOperation } from '../../AdaptableOptions/EditOptions';
 import { DataImportedInfo, DataSet, CellAddress, CellSummmaryInfo, AdaptableMenuItem, AdaptableColumn, ExportDestinationType } from '../../types';
 import { ChartModel } from 'ag-grid-enterprise';
-import { CachedQuery } from '../../PredefinedConfig/NamedQueryState';
-import { SelectedCellInfo } from '../../PredefinedConfig/Selection/SelectedCellInfo';
-import { SelectedRowInfo } from '../../PredefinedConfig/Selection/SelectedRowInfo';
+import { CachedQuery } from '../../AdaptableState/NamedQueryState';
+import { SelectedCellInfo } from '../../AdaptableState/Selection/SelectedCellInfo';
+import { SelectedRowInfo } from '../../AdaptableState/Selection/SelectedRowInfo';
 import { CellHighlightInfo, RowHighlightInfo, RowsHighlightInfo } from '../../types';
 import { IRowNode } from 'ag-grid-enterprise';
 export declare const SET_COLUMNS = "SET_COLUMNS";
@@ -337,7 +337,7 @@ export declare const CellPopupShow: (cellPosition: CellAddress, editMode?: boole
 export declare const CellPopupEditFocusedEntity: (focusedEntity: 'Note' | 'Comment') => CellPopupEditFocusedEntityAction;
 export declare const RowSummarySet: (rowSummaries: InternalState['RowSummary']['rowSummaries']) => {
     readonly type: "SUMMARY_ROW_SET";
-    readonly rowSummaries: import("../../PredefinedConfig/InternalState").SystemRowSummary[];
+    readonly rowSummaries: import("../../AdaptableState/InternalState").SystemRowSummary[];
 };
 export declare const CellPopupHide: () => CellPopupHideAction;
 export declare const DisableDeleteConfirmationSelector: (state: InternalState) => boolean;

package/src/Redux/ActionsReducers/InternalRedux.js

@@ -5,7 +5,7 @@ exports.DataChangeHistoryEnable = exports.DataChangeHistoryClearRow = exports.Da
 exports.InternalReducer = exports.DataImportCompleted = exports.CommentsAndNotesFocusedEntitySelector = exports.CommentsAndNotesEditModeSelector = exports.CommentsAndNotesSelector = exports.QuickSearchFloatingVisibilitySelector = exports.DisableDeleteConfirmationSelector = exports.CellPopupHide = exports.RowSummarySet = exports.CellPopupEditFocusedEntity = exports.CellPopupShow = exports.QuickSearchFloatingVisibility = exports.SystemExportEnd = exports.SystemExportBegin = exports.DisableDeleteConfirmation = exports.ChartingCurrentChartModelsSelector = exports.ChartingSetCurrentChartModels = exports.DataSetSelect = exports.DashboardRefresh = exports.LayoutShowNotAssociatedObjects = exports.QuickFilterBarHide = exports.QuickFilterBarShow = exports.SettingsPanelSet = exports.DataChangeHistoryResume = exports.DataChangeHistorySuspend = exports.DataChangeHistoryDisable = void 0;
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 const ReduxConstants_1 = require("../../Utilities/Constants/ReduxConstants");
-const Enums_1 = require("../../PredefinedConfig/Common/Enums");
+const Enums_1 = require("../../AdaptableState/Common/Enums");
 const Helper_1 = require("../../Utilities/Helpers/Helper");
 const AnnotationsService_1 = require("../../Utilities/Services/AnnotationsService");
 /*

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

@@ -1,6 +1,6 @@
 import * as Redux from 'redux';
 import { AdaptableState } from '../../../types';
-import { LayoutState, Layout } from '../../PredefinedConfig/LayoutState';
+import { LayoutState, Layout } from '../../AdaptableState/LayoutState';
 import { ColumnFilter } from '../../types';
 /**
  * @ReduxAction A new caption / header has been set for a Column in the Layout
@@ -99,7 +99,8 @@ export interface LayoutColumnFilterEditAction extends LayoutColumnFilterAction {
 }
 export interface LayoutColumnFilterSetAction extends LayoutColumnFilterAction {
 }
-export interface LayoutColumnFilterClearAction extends LayoutColumnFilterAction {
+export interface LayoutColumnFilterClearAction extends Redux.Action {
+    columnId: string;
 }
 export interface LayoutColumnFilterClearAllAction extends Redux.Action {
 }
@@ -121,7 +122,7 @@ export declare const LayoutColumnFilterAdd: (columnFilter: ColumnFilter) => Layo
 export declare const LayoutColumnFilterEdit: (columnFilter: ColumnFilter) => LayoutColumnFilterEditAction;
 export declare const LayoutColumnFilterSet: (columnFilter: ColumnFilter) => LayoutColumnFilterSetAction;
 export declare const LayoutColumnFilterClearAll: () => LayoutColumnFilterClearAllAction;
-export declare const LayoutColumnFilterClear: (columnFilter: ColumnFilter) => LayoutColumnFilterClearAction;
+export declare const LayoutColumnFilterClear: (columnId: string) => LayoutColumnFilterClearAction;
 export declare const LayoutColumnFilterSuspend: (columnFilter: ColumnFilter) => LayoutColumnFilterSuspendAction;
 export declare const LayoutColumnFilterUnSuspend: (columnFilter: ColumnFilter) => LayoutColumnFilterUnSuspendAction;
 export declare const LayoutColumnFilterSuspendAll: () => LayoutColumnFilterSuspendAllAction;
@@ -180,10 +181,10 @@ export declare const getCurrentLayoutSelector: (state: AdaptableState) => Layout
 export declare const getColumnFilterSelector: (state: AdaptableState, columnId: string) => {
     ColumnId: string;
     Predicates: import("../../types").ColumnFilterPredicate[];
-    PredicatesLogic?: "AND" | "OR";
+    PredicatesOperator?: import("../../types").PredicatesOperator;
     IsSuspended?: boolean;
     Uuid?: string;
-    Source?: "Config" | "User";
+    Source?: "InitialState" | "User";
     AdaptableVersion?: `${string}.${string}.${string}`;
     IsReadOnly?: boolean;
     Tags?: string[];

package/src/Redux/ActionsReducers/LayoutRedux.js

@@ -113,9 +113,9 @@ const LayoutColumnFilterClearAll = () => ({
     type: exports.LAYOUT_COLUMN_FILTER_CLEAR_ALL,
 });
 exports.LayoutColumnFilterClearAll = LayoutColumnFilterClearAll;
-const LayoutColumnFilterClear = (columnFilter) => ({
+const LayoutColumnFilterClear = (columnId) => ({
     type: exports.LAYOUT_COLUMN_FILTER_CLEAR,
-    columnFilter,
+    columnId,
 });
 exports.LayoutColumnFilterClear = LayoutColumnFilterClear;
 const LayoutColumnFilterSuspend = (columnFilter) => ({
@@ -366,7 +366,7 @@ const LayoutReducer = (state = initialState, action) => {
             const actionTypedDelete = action;
             const columnFilters = (currentLayout.ColumnFilters ?? []).filter((cf) => {
                 // make sure we are deleting all filters on the same column
-                return cf.ColumnId !== actionTypedDelete.columnFilter.ColumnId;
+                return cf.ColumnId !== actionTypedDelete.columnId;
             });
             const Layouts = state.Layouts.map((layout) => {
                 if (layout.Name === currentLayout.Name) {

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

@@ -1,4 +1,4 @@
-import { NamedQueryState, NamedQuery } from '../../PredefinedConfig/NamedQueryState';
+import { NamedQueryState, NamedQuery } from '../../AdaptableState/NamedQueryState';
 import * as Redux from 'redux';
 /**
  * @ReduxAction A Named Query has been added

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

@@ -1,5 +1,5 @@
 import * as Redux from 'redux';
-import { AdaptableNote, NoteState } from '../../PredefinedConfig/NoteState';
+import { AdaptableNote, NoteState } from '../../AdaptableState/NoteState';
 import { CellAddress } from '../../types';
 /**
  * @ReduxAction A Note has been added

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

@@ -3,129 +3,36 @@ import * as Redux from 'redux';
  * @ReduxAction Plugins have been instantiated
  */
 export declare const PLUGINS_SET_PLUGIN_STATE = "PLUGINS_SET_PLUGIN_STATE";
-/**
- * @ReduxAction Throttle time for live reports has been set
- */
 export declare const IPUSHPULL_SET_THROTTLE_TIME = "IPUSHPULL_SET_THROTTLE_TIME";
-/**
- * @ReduxAction A snapshot report has been sent
- */
 export declare const IPUSHPULL_SEND_SNAPSHOT = "IPUSHPULL_SEND_SNAPSHOT";
-/**
- * @ReduxAction An ipushpull report has been selected
- */
 export declare const IPUSHPULL_REPORT_SELECT = "IPUSHPULL_REPORT_SELECT";
-/**
- * @ReduxAction Live data has been sent to ipushpull
- */
 export declare const IPUSHPULL_START_LIVE_DATA = "IPUSHPULL_START_LIVE_DATA";
-/**
- * @ReduxAction Live data to ipushpull has been stopped
- */
 export declare const IPUSHPULL_STOP_LIVE_DATA = "IPUSHPULL_STOP_LIVE_DATA";
-/**
- * @ReduxAction A new ipushpull page has been added
- */
 export declare const IPUSHPULL_ADD_PAGE = "IPUSHPULL_ADD_PAGE";
-/**
- * @ReduxAction Logged in to ipushpull
- */
 export declare const IPUSHPULL_LOGIN = "IPUSHPULL_LOGIN";
-/**
- * @ReduxAction Logged out from ipushpull
- */
 export declare const IPUSHPULL_LOGOUT = "IPUSHPULL_LOGOUT";
-/**
- * @ReduxAction Error message set from failed login
- */
 export declare const IPUSHPULL_SET_LOGIN_ERROR_MESSAGE = "IPUSHPULL_SET_LOGIN_ERROR_MESSAGE";
-/**
- * @ReduxAction Login details to ipushpull have been set
- */
 export declare const IPUSHPULL_SET_LOGIN_DETAILS = "IPUSHPULL_SET_LOGIN_DETAILS";
-/**
- * @ReduxAction ipushpull has been made available
- */
 export declare const IPUSHPULL_SET_AVAILABLE_ON = "IPUSHPULL_SET_AVAILABLE_ON";
-/**
- * @ReduxAction ipushpull has been made unavailable
- */
 export declare const IPUSHPULL_SET_AVAILABLE_OFF = "SET_IPUSHPULL_AVAILABLE_OFF";
-/**
- * @ReduxAction ipushpull is now running
- */
 export declare const IPUSHPULL_SET_RUNNING_ON = "IPUSHPULL_SET_RUNNING_ON";
-/**
- * @ReduxAction ipushpull is no longer running
- */
 export declare const IPUSHPULL_SET_RUNNING_OFF = "IPUSHPULL_SET_RUNNING_OFF";
-/**
- * @ReduxAction A live report to ipuspull has been set
- */
 export declare const IPUSHPULL_LIVE_REPORT_SET = "IPUSHPULL_LIVE_REPORT_SET";
-/**
- * @ReduxAction The live report to ipuspull has been cleared
- */
 export declare const IPUSHPULL_LIVE_REPORT_CLEAR = "IPUSHPULL_LIVE_REPORT_CLEAR";
-/**
- * @ReduxAction ipushpull domain pages have been set
- */
 export declare const IPUSHPULL_DOMAIN_PAGES_SET = "IPUSHPULL_DOMAIN_PAGES_SET";
-/**
- * @ReduxAction ipushpull domain pages have been cleared
- */
 export declare const IPUSHPULL_DOMAIN_PAGES_CLEAR = "IPUSHPULL_DOMAIN_PAGES_CLEAR";
-/**
- * @ReduxAction ipushpull set current(selected) report name
- */
 export declare const IPUSHPULL_SET_CURRENT_REPORTNAME = "IPUSHPULL_SET_CURRENT_REPORTNAME";
-/**
- * @ReduxAction ipushpull set current(selected) folder
- */
 export declare const IPUSHPULL_SET_CURRENT_FOLDER = "IPUSHPULL_SET_CURRENT_FOLDER";
-/**
- * @ReduxAction ipushpull set current(selected) page
- */
 export declare const IPUSHPULL_SET_CURRENT_PAGE = "IPUSHPULL_SET_CURRENT_PAGE";
-/**
- * @ReduxAction ipushpull set available pages (depending on current folder)
- */
 export declare const IPUSHPULL_SET_AVAILABLE_PAGES = "IPUSHPULL_SET_AVAILABLE_PAGES";
-/**
- * @ReduxAction Live data has been sent to OpenFin
- */
 export declare const OPENFIN_START_LIVE_DATA = "OPENFIN_START_LIVE_DATA";
-/**
- * @ReduxAction Live data is not longer sent to OpenFin
- */
 export declare const OPENFIN_STOP_LIVE_DATA = "OPENFIN_STOP_LIVE_DATA";
-/**
- * @ReduxAction An OpenFin live report has started
- */
 export declare const OPENFIN_LIVE_REPORT_SET = "OPENFIN_LIVE_REPORT_SET";
-/**
- * @ReduxAction An OpenFin live report has stopped
- */
 export declare const OPENFIN_LIVE_REPORT_CLEAR = "OPENFIN_LIVE_REPORT_CLEAR";
-/**
- * @ReduxAction OpenFin is now available
- */
 export declare const OPENFIN_SET_AVAILABLE_ON = "OPENFIN_SET_AVAILABLE_ON";
-/**
- * @ReduxAction OpenFin is no longer available
- */
 export declare const OPENFIN_SET_AVAILABLE_OFF = "OPENFIN_SET_AVAILABLE_OFF";
-/**
- * @ReduxAction OpenFin is now running
- */
 export declare const OPENFIN_SET_RUNNING_ON = "OPENFIN_SET_RUNNING_ON";
-/**
- * @ReduxAction OpenFin is no longer running
- */
 export declare const OPENFIN_SET_RUNNING_OFF = "OPENFIN_SET_RUNNING_OFF";
-/**
- * @ReduxAction set current(selected) report name
- */
 export declare const OPENFIN_SET_CURRENT_REPORTNAME = "OPENFIN_SET_CURRENT_REPORTNAME";
 export interface PluginsAction extends Redux.Action {
     pluginState: any;