@adaptabletools/adaptable 20.0.0-canary.8 → 20.0.0

package/src/Api/Internal/StyledColumnInternalApi.d.ts

@@ -1,6 +1,6 @@
 import { ApiBase } from '../Implementation/ApiBase';
-import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
-import { BadgeStyle, BadgeStyleDefinition, CellColorRange, ColumnComparison, NumericStyledColumn, StyledColumn } from '../../PredefinedConfig/StyledColumnState';
+import { AdaptableColumn } from '../../AdaptableState/Common/AdaptableColumn';
+import { BadgeStyle, BadgeStyleDefinition, CellColorRange, ColumnComparison, NumericStyledColumn, StyledColumn } from '../../AdaptableState/StyledColumnState';
 import { IRowNode } from 'ag-grid-enterprise';
 import { PredicateDefHandlerContext } from '../../types';
 export declare class StyledColumnInternalApi extends ApiBase {

package/src/Api/Internal/SystemStatusInternalApi.d.ts

@@ -1,5 +1,5 @@
 import { ApiBase } from '../Implementation/ApiBase';
-import { SystemStatusMessageInfo } from '../../PredefinedConfig/Common/SystemStatusMessageInfo';
+import { SystemStatusMessageInfo } from '../../AdaptableState/Common/SystemStatusMessageInfo';
 export declare class SystemStatusInternalApi extends ApiBase {
     addSystemStatusMessageInfo(systemStatusMessageInfo: SystemStatusMessageInfo): void;
     getSystemStatusMessageInfos(): SystemStatusMessageInfo[];

package/src/Api/Internal/TeamSharingInternalApi.d.ts

@@ -1,5 +1,5 @@
 import { ApiBase } from '../Implementation/ApiBase';
-import { AdaptableSharedEntity } from '../../PredefinedConfig/TeamSharingState';
+import { AdaptableSharedEntity } from '../../AdaptableState/TeamSharingState';
 export declare class TeamSharingInternalApi extends ApiBase {
     /**
      * Retrieves shared entry dependencies.

package/src/Api/LayoutApi.d.ts

@@ -1,6 +1,6 @@
 import { AdaptableColumn, ColumnSort, PivotLayout, TableLayout } from '../../types';
-import { ExtendedLayoutInfo } from '../PredefinedConfig/Common/ExtendedLayoutInfo';
-import { LayoutState, Layout } from '../PredefinedConfig/LayoutState';
+import { ExtendedLayoutInfo } from '../AdaptableState/Common/ExtendedLayoutInfo';
+import { LayoutState, Layout } from '../AdaptableState/LayoutState';
 /**
  * Provides run-time access to the Layout Module and associated state
  */
@@ -176,7 +176,7 @@ export interface LayoutApi {
      */
     addColumnToTableLayout(columnId: string, layoutName: string): void;
     /**
-     * Adds a Column to Current Layout
+     * Adds a Column to Current (Table) Layout
      * @param columnId Column to add
      */
     addColumnToCurrentTableLayout(columnId: string): void;

package/src/Api/NoteApi.d.ts

@@ -1,4 +1,4 @@
-import { AdaptableNote, AdaptableNotes, NoteState } from '../PredefinedConfig/NoteState';
+import { AdaptableNote, AdaptableNotes, NoteState } from '../AdaptableState/NoteState';
 import { CellAddress } from '../../types';
 /**
  * Provides run-time access to Notes Module and related State

package/src/Api/OpenFinApi.d.ts

@@ -1,5 +1,5 @@
-import { OpenFinReport, OpenFinSchedule, OpenFinState } from '../PredefinedConfig/OpenFinState';
-import { AdaptableAlert } from '../PredefinedConfig/Common/AdaptableAlert';
+import { OpenFinReport, OpenFinSchedule, OpenFinState } from '../AdaptableState/OpenFinState';
+import { AdaptableAlert } from '../AdaptableState/Common/AdaptableAlert';
 import { OpenFinPluginOptions } from '../AdaptableOptions/OpenFinPluginOptions';
 /**
  * Provides run-time access to the OpenFin Plugin

package/src/Api/PlusMinusApi.d.ts

@@ -1,5 +1,5 @@
-import { PlusMinusState, PlusMinusNudge } from '../PredefinedConfig/PlusMinusState';
-import { CellUpdateRequest, GridCell } from '../PredefinedConfig/Selection/GridCell';
+import { PlusMinusState, PlusMinusNudge } from '../AdaptableState/PlusMinusState';
+import { CellUpdateRequest, GridCell } from '../AdaptableState/Selection/GridCell';
 /**
  * Provides run-time access to the Plus / Minus Module and associated state
  */

package/src/Api/PredicateApi.d.ts

@@ -1,5 +1,5 @@
 import { AdaptableColumnPredicate } from '../../types';
-import { AdaptablePredicateDef, AdaptablePredicate, PredicateDefHandlerContext, PredicateModuleScope } from '../PredefinedConfig/Common/AdaptablePredicate';
+import { AdaptablePredicateDef, AdaptablePredicate, PredicateDefHandlerContext, PredicateModuleScope } from '../AdaptableState/Common/AdaptablePredicate';
 /**
  * Functions which manage the Predicate object in AdapTable
  */

package/src/Api/QuickSearchApi.d.ts

@@ -1,5 +1,5 @@
-import { AdaptableStyle } from '../PredefinedConfig/Common/AdaptableStyle';
-import { QuickSearchState } from '../PredefinedConfig/QuickSearchState';
+import { AdaptableStyle } from '../AdaptableState/Common/AdaptableStyle';
+import { QuickSearchState } from '../AdaptableState/QuickSearchState';
 /**
  * Provides run-time access to Quick Search Module
  */

package/src/Api/ScheduleApi.d.ts

@@ -1,8 +1,8 @@
-import { BaseSchedule } from '../PredefinedConfig/Common/Schedule';
-import { ReportSchedule } from '../PredefinedConfig/ExportState';
-import { IPushPullSchedule } from '../PredefinedConfig/IPushPullState';
-import { OpenFinSchedule } from '../PredefinedConfig/OpenFinState';
-import { ReminderSchedule, ScheduleState } from '../PredefinedConfig/ScheduleState';
+import { BaseSchedule } from '../AdaptableState/Common/Schedule';
+import { ReportSchedule } from '../AdaptableState/ExportState';
+import { IPushPullSchedule } from '../AdaptableState/IPushPullState';
+import { OpenFinSchedule } from '../AdaptableState/OpenFinState';
+import { ReminderSchedule, ScheduleState } from '../AdaptableState/ScheduleState';
 /**
  * Provides run-time access to the Schedule Module and associated state
  */

package/src/Api/ShortcutApi.d.ts

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

package/src/Api/SmartEditApi.d.ts

@@ -1,5 +1,5 @@
 import { SmartEditOperation } from '../AdaptableOptions/EditOptions';
-import { MathOperation } from '../PredefinedConfig/Common/Enums';
+import { MathOperation } from '../AdaptableState/Common/Enums';
 import { SmartEditCustomOperation } from '../types';
 /**
  * Provides run-time access to the Smart Edit Module

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 current 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` for remote storage removal
+     * @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,4 +1,4 @@
-import { createUuid } from '../../PredefinedConfig/Uuid';
+import { createUuid } from '../../AdaptableState/Uuid';
 import { EMPTY_ARRAY } from '../../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

@@ -1,6 +1,6 @@
 import { EMPTY_ARRAY, EMPTY_STRING } from '../../Utilities/Constants/GeneralConstants';
 import { CELL_SUMMARY_DEFAULT_OPERATION } from '../../Utilities/Constants/ReduxConstants';
-import { MathOperation } from '../../PredefinedConfig/Common/Enums';
+import { MathOperation } from '../../AdaptableState/Common/Enums';
 import { cloneObject } from '../../Utilities/Helpers/Helper';
 import { AnnotationsService } from '../../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

@@ -105,9 +105,9 @@ export const LayoutColumnFilterSet = (columnFilter) => ({
 export const LayoutColumnFilterClearAll = () => ({
     type: LAYOUT_COLUMN_FILTER_CLEAR_ALL,
 });
-export const LayoutColumnFilterClear = (columnFilter) => ({
+export const LayoutColumnFilterClear = (columnId) => ({
     type: LAYOUT_COLUMN_FILTER_CLEAR,
-    columnFilter,
+    columnId,
 });
 export const LayoutColumnFilterSuspend = (columnFilter) => ({
     type: LAYOUT_COLUMN_FILTER_SUSPEND,
@@ -338,7 +338,7 @@ export 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/PlusMinusRedux.d.ts

@@ -1,6 +1,6 @@
-import { PlusMinusState, PlusMinusNudge } from '../../PredefinedConfig/PlusMinusState';
+import { PlusMinusState, PlusMinusNudge } from '../../AdaptableState/PlusMinusState';
 import * as Redux from 'redux';
-import { CellUpdateRequest } from '../../PredefinedConfig/Selection/GridCell';
+import { CellUpdateRequest } from '../../AdaptableState/Selection/GridCell';
 /**
  * @ReduxAction A Plus Minus Rule has been applied
  */

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

@@ -1,8 +1,8 @@
 import * as Redux from 'redux';
-import { AdaptableAlert } from '../../PredefinedConfig/Common/AdaptableAlert';
-import { FormContext } from '../../PredefinedConfig/Common/FormContext';
-import { AdaptableModule } from '../../PredefinedConfig/Common/Types';
-import { PopupState } from '../../PredefinedConfig/PopupState';
+import { AdaptableAlert } from '../../AdaptableState/Common/AdaptableAlert';
+import { FormContext } from '../../AdaptableState/Common/FormContext';
+import { AdaptableModule } from '../../AdaptableState/Common/Types';
+import { PopupState } from '../../AdaptableState/PopupState';
 import { AdaptableForm, BaseContext, ProgressIndicatorConfig } from '../../types';
 import { InputAction, UIConfirmation, UIPrompt } from '../../Utilities/Interface/MessagePopups';
 import { ModuleParams } from '../../View/Components/SharedProps/ModuleViewPopupProps';

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

@@ -1,6 +1,6 @@
 import * as Redux from 'redux';
-import { QuickSearchState } from '../../PredefinedConfig/QuickSearchState';
-import { AdaptableStyle } from '../../PredefinedConfig/Common/AdaptableStyle';
+import { QuickSearchState } from '../../AdaptableState/QuickSearchState';
+import { AdaptableStyle } from '../../AdaptableState/Common/AdaptableStyle';
 /**
  * @ReduxAction Runs Quick Search
  */

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

@@ -1,10 +1,10 @@
 import * as Redux from 'redux';
-import { ScheduleState } from '../../PredefinedConfig/ScheduleState';
+import { ScheduleState } from '../../AdaptableState/ScheduleState';
 import { ReminderSchedule, ReportSchedule } from '../../types';
-import { IPushPullSchedule } from '../../PredefinedConfig/IPushPullState';
-import { OpenFinSchedule } from '../../PredefinedConfig/OpenFinState';
-import { BaseSchedule } from '../../PredefinedConfig/Common/Schedule';
-import { ScheduleType } from '../../PredefinedConfig/Common/Enums';
+import { IPushPullSchedule } from '../../AdaptableState/IPushPullState';
+import { OpenFinSchedule } from '../../AdaptableState/OpenFinState';
+import { BaseSchedule } from '../../AdaptableState/Common/Schedule';
+import { ScheduleType } from '../../AdaptableState/Common/Enums';
 /**
  * @ReduxAction Runs a Scheduled job
  */

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

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

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

@@ -1,6 +1,6 @@
 import * as Redux from 'redux';
 import { AdaptableState } from '../../../types';
-import { StatusBarState, AdaptableStatusBar } from '../../PredefinedConfig/StatusBarState';
+import { StatusBarState, AdaptableStatusBar } from '../../AdaptableState/StatusBarState';
 /**
  * @ReduxAction Sets Status Bar panels
  */