@adaptabletools/adaptable 20.0.0-canary.9 → 20.0.0

package/src/AdaptableOptions/ExportOptions.d.ts

@@ -1,8 +1,8 @@
-import { AdaptableForm } from '../PredefinedConfig/Common/AdaptableForm';
-import { FormContext } from '../PredefinedConfig/Common/FormContext';
-import { Report, ReportColumn, ReportData, ReportFormatType, ReportNameType, SystemReportFormat, SystemReportName } from '../PredefinedConfig/ExportState';
+import { AdaptableForm } from '../AdaptableState/Common/AdaptableForm';
+import { FormContext } from '../AdaptableState/Common/FormContext';
+import { Report, ReportColumn, ReportData, ReportFormatType, ReportNameType, SystemReportFormat, SystemReportName } from '../AdaptableState/ExportState';
 import { AdaptableColumn, BaseContext, AdaptableColumnContext } from '../types';
-import { TypeHint } from '../PredefinedConfig/Common/Types';
+import { TypeHint } from '../AdaptableState/Common/Types';
 import { CsvCell, ExcelCell, ExcelDataType, ExcelRow, IRowNode } from 'ag-grid-enterprise';
 /**
  * Options regarding Exporting data from AdapTable
@@ -25,10 +25,6 @@ export interface ExportOptions<TData = any> {
      * User-provided Report Destinations (in addition to those shipped in AdapTable)
      */
     customDestinations?: CustomDestination[];
-    /**
-     * Reports generated entirely by users (and not evaluated AdapTable)
-     */
-    externalReports?: ExternalReport[];
     /**
      * System Reports to use; leave blank for all, empty array for none
      *
@@ -67,10 +63,6 @@ export interface ExportOptions<TData = any> {
      * @defaultValue true
      */
     isColumnExportable?: (context: AdaptableColumnContext) => boolean;
-    /**
-     * Function invoked before a Report is run, enabling users to preload the data before it is exported
-     */
-    preProcessExport?: (preProcessExportContext: PreProcessExportContext) => boolean | Promise<ReportData | boolean>;
     /**
      * Separator for CSV exports
      *
@@ -87,6 +79,15 @@ export interface ExportOptions<TData = any> {
      * Function to provide the Detail Rows when exporting in Master-Detail grids. This function will be invoked for each master row node.
      */
     getDetailRows?: (context: GetDetailRowsContext<TData>) => CsvDetailRow[] | ExcelDetailRow[] | undefined;
+    /**
+     * Provides custom handling of the Export process before the default export is executed.
+     *
+     * @returns A Promise resolving to one of:
+     *   - `true` - Continue with the default export process
+     *   - `false` - Cancel the export process
+     *   - `ExportResultData` - Custom export data (useful for server-side data)
+     */
+    processExport?: (processExportContext: ProcessExportContext) => Promise<ExportResultData | boolean>;
 }
 /**
  * Detail Row Data in a CSV format; technically an array of AG Grid {@link https://www.ag-grid.com/javascript-data-grid/csv-export/#csvcell | CsvCell}s
@@ -129,43 +130,10 @@ export interface GetDetailRowsContext<TData = any> extends BaseExportContext {
      */
     createCellExcel: (cellContent: any, cellType: ExcelDataType) => ExcelCell;
 }
-/**
- * Context provided to `ExportOptions.processExport()` callback used when pre-processing Export
- */
-export interface PreProcessExportContext extends BaseContext {
-    /**
-     * Report being exported
-     */
-    report: Report;
-    /**
-     * Returns Columns to export based on Report's `ReportColumnScope`
-     * @param includePrimaryKey - whether to include the primary key column (defaults to `false`)
-     */
-    getReportColumns: (includePrimaryKey?: boolean) => AdaptableColumn[];
-    /**
-     * Returns row data which would typically be exported based on the Report's `ReportRowScope`
-     * @param reportColumns - the columns to include in the report
-     * @param includePrimaryKey - whether to include the primary key column (defaults to `false`)
-     */
-    getReportRowData: (reportColumns: AdaptableColumn[], includePrimaryKey?: boolean) => Record<string, any>[];
-}
 /**
  * Format of exported Data - 'rawValue' or 'formattedValue'
  */
 export type DataFormatType = 'rawValue' | 'formattedValue';
-/**
- * Defines a Report where all the data is provided entirely by the user
- */
-export interface ExternalReport {
-    /**
-     * Name of the Report
-     */
-    name: string;
-    /**
-     * Function invoked to return the data (in the form of a `ExportResultData` object)
-     */
-    onExport: (context: ExternalReportContext) => Promise<ExportResultData>;
-}
 /**
  * Defines a custom Export destination
  */
@@ -226,7 +194,6 @@ export type SystemExportDestination =
  */
  | 'Clipboard';
 export type ExportDestinationType = TypeHint<string, SystemExportDestination>;
-export type ExportDestination = SystemExportDestination | CustomDestination;
 /**
  * Context information available in all Export-related functions
  */
@@ -235,6 +202,10 @@ export interface BaseExportContext extends BaseContext {
      * Name of the Report being run
      */
     reportName: ReportNameType;
+    /**
+     * The Report Configuration being run
+     */
+    report: Report;
     /**
      * Format of the Report being run
      */
@@ -248,18 +219,23 @@ export interface BaseExportContext extends BaseContext {
  * Report Context sent when using Custom Export Destinations
  */
 export interface ReportContext extends BaseExportContext {
-    /**
-     * Definition of Report being Run
-     */
-    report: Report;
     /**
      * Export Data for the Report
      */
     reportData: ExportResultData;
 }
-export interface ExternalReportContext extends BaseExportContext {
-    getGridReportColumns: () => ReportColumn[];
+export interface ProcessExportContext extends BaseExportContext {
+    /**
+     * Returns Columns to export based on Report's `ReportColumnScope`
+     */
+    getReportColumns: () => ReportColumn[];
+    /**
+     * Converts the Report Data to Excel format
+     */
     convertToExcel: (reportData: ReportData) => Blob;
+    /**
+     * Converts the Report Data to CSV format
+     */
     convertToCsv: (reportData: ReportData) => string;
 }
 /**

package/src/AdaptableOptions/ExpressionOptions.d.ts

@@ -1,7 +1,7 @@
-import { AdaptablePredicate } from '../PredefinedConfig/Common/AdaptablePredicate';
-import { AdaptableModule, AdaptableQLModule } from '../PredefinedConfig/Common/Types';
-import { BaseContext } from '../PredefinedConfig/Common/BaseContext';
-import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
+import { AdaptablePredicate } from '../AdaptableState/Common/AdaptablePredicate';
+import { AdaptableModule, AdaptableQLModule } from '../AdaptableState/Common/Types';
+import { BaseContext } from '../AdaptableState/Common/BaseContext';
+import { AdaptableColumn } from '../AdaptableState/Common/AdaptableColumn';
 import { AdaptableObject, AggregatedBooleanFunctionName, AggregatedExpressionFunction, AggregatedScalarFunctionName, BooleanFunctionName, ExpressionFunction, ObservableFunctionName, ScalarFunctionName, AdaptableField, AdaptableColumnContext } from '../types';
 /**
  * Options for managing Expressions in AdapTable's Query Language

package/src/AdaptableOptions/Fdc3Options.d.ts

@@ -1,8 +1,8 @@
-import { BaseContext } from '../PredefinedConfig/Common/BaseContext';
+import { BaseContext } from '../AdaptableState/Common/BaseContext';
 import { IRowNode } from 'ag-grid-enterprise';
 import { Action, Chart, ChatInitSettings, ChatMessage, ChatRoom, ChatSearchCriteria, Contact, ContactList, Context, ContextMetadata, ContextType, Country, Currency, Email, Instrument, InstrumentList, Intent, IntentResolution, IntentResult, Interaction, Message, Organization, Portfolio, Position, StandardContextType, StandardIntent, TimeRange, TransactionResult, Valuation } from '@finos/fdc3';
-import { AdaptableIcon } from '../PredefinedConfig/Common/AdaptableIcon';
-import { ButtonStyle } from '../PredefinedConfig/Common/ButtonStyle';
+import { AdaptableIcon } from '../AdaptableState/Common/AdaptableIcon';
+import { ButtonStyle } from '../AdaptableState/Common/ButtonStyle';
 import { RowScope } from '../types';
 /**
  * Options for configuring FDC3 in AdapTable

package/src/AdaptableOptions/FilterOptions.d.ts

@@ -1,9 +1,9 @@
-import { FilterActionOnDataChange } from '../PredefinedConfig/Common/FilterActionOnDataChange';
+import { FilterActionOnDataChange } from '../AdaptableState/Common/FilterActionOnDataChange';
 import { BaseContext } from '../../types';
-import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
+import { AdaptableColumn } from '../AdaptableState/Common/AdaptableColumn';
 import { SystemAlertPredicateId, SystemFilterPredicateId } from '../../types';
 import { StrictExtract } from '../Utilities/Extensions/TypeExtensions';
-import { AdaptableColumnContext } from '../PredefinedConfig/Common/AdaptableColumnContext';
+import { AdaptableColumnContext } from '../AdaptableState/Common/AdaptableColumnContext';
 import { IRowNode } from 'ag-grid-enterprise';
 /**
  * Options for managing Column & Grid Filters in AdapTable

package/src/AdaptableOptions/FlashingCellOptions.d.ts

@@ -1,4 +1,4 @@
-import { AdaptableStyle } from '../PredefinedConfig/Common/AdaptableStyle';
+import { AdaptableStyle } from '../AdaptableState/Common/AdaptableStyle';
 /**
  * Properties for Flashing Cell
  */

package/src/AdaptableOptions/FormatColumnOptions.d.ts

@@ -1,5 +1,5 @@
-import { ColumnScope } from '../PredefinedConfig/Common/ColumnScope';
-import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
+import { ColumnScope } from '../AdaptableState/Common/ColumnScope';
+import { AdaptableColumn } from '../AdaptableState/Common/AdaptableColumn';
 import { BaseContext } from '../../types';
 import { IRowNode } from 'ag-grid-enterprise';
 /**

package/src/AdaptableOptions/LayoutOptions.d.ts

@@ -1,14 +1,14 @@
-import { AlertDefinition } from '../PredefinedConfig/AlertState';
-import { CustomSort } from '../PredefinedConfig/CustomSortState';
-import { FlashingCellDefinition } from '../PredefinedConfig/FlashingCellState';
-import { FormatColumn } from '../PredefinedConfig/FormatColumnState';
-import { PlusMinusNudge } from '../PredefinedConfig/PlusMinusState';
-import { Shortcut } from '../PredefinedConfig/ShortcutState';
-import { StyledColumn } from '../PredefinedConfig/StyledColumnState';
-import { BaseSchedule } from '../PredefinedConfig/Common/Schedule';
-import { Layout } from '../PredefinedConfig/LayoutState';
-import { AdaptableModule } from '../PredefinedConfig/Common/Types';
-import { AdaptableObjectTag } from '../PredefinedConfig/Common/AdaptableObject';
+import { AlertDefinition } from '../AdaptableState/AlertState';
+import { CustomSort } from '../AdaptableState/CustomSortState';
+import { FlashingCellDefinition } from '../AdaptableState/FlashingCellState';
+import { FormatColumn } from '../AdaptableState/FormatColumnState';
+import { PlusMinusNudge } from '../AdaptableState/PlusMinusState';
+import { Shortcut } from '../AdaptableState/ShortcutState';
+import { StyledColumn } from '../AdaptableState/StyledColumnState';
+import { BaseSchedule } from '../AdaptableState/Common/Schedule';
+import { Layout } from '../AdaptableState/LayoutState';
+import { AdaptableModule } from '../AdaptableState/Common/Types';
+import { AdaptableObjectTag } from '../AdaptableState/Common/AdaptableObject';
 import { BaseContext } from '../../types';
 /**
  * Options for configuring Layouts; these manage Column visibility, order, sorting, grouping, width etc.

package/src/AdaptableOptions/OpenFinPluginOptions.d.ts

@@ -1,4 +1,4 @@
-import { AdaptableAlert } from '../PredefinedConfig/Common/AdaptableAlert';
+import { AdaptableAlert } from '../AdaptableState/Common/AdaptableAlert';
 /**
  * Options required for when using the OpenFin plugin
  */

package/src/AdaptableOptions/QuickSearchOptions.d.ts

@@ -30,13 +30,13 @@ export interface QuickSearchOptions<TData = any> {
      */
     clearQuickSearchOnStartUp?: boolean;
     /**
-     * Filters quick search results so only matching rows are displayed
+     * Filters Grid after quick search so only matching rows are displayed
      *
      * @defaultValue false
      * @gridInfoItem
      * @noCodeItem
      */
-    filterResultsAfterQuickSearch?: boolean;
+    filterGridAfterQuickSearch?: boolean;
     /**
      * Run Quick Search using Case Sensitivity
      *

package/src/AdaptableOptions/SettingsPanelOptions.d.ts

@@ -1,5 +1,5 @@
 import { AdaptableFrameworkComponent, AdaptableIcon } from '../../types';
-import { AdaptableSettingsPanel } from '../PredefinedConfig/Common/Types';
+import { AdaptableSettingsPanel } from '../AdaptableState/Common/Types';
 import { CustomRenderContext } from '../agGrid/AdaptableFrameworkComponent';
 /**
  * Options for managing the AdapTable Settings Panel

package/src/AdaptableOptions/StateOptions.d.ts

@@ -1,4 +1,4 @@
-import { AdaptableState } from '../PredefinedConfig/AdaptableState';
+import { AdaptableState } from '../AdaptableState/AdaptableState';
 /**
  * Options related to Adaptable State hydration / dehydration; allows users to intercept state persistence and loading with custom functionality
  */
@@ -72,7 +72,7 @@ export interface AdaptablePersistStateFunction {
 }
 /**
  * Allows clearing state when a custom persistState is used.
- * Only called by configApi.reloadPredefinedConfig
+ * Only called by StateApi.reloadInitialState
  */
 export interface AdaptableClearStateFunction {
     (adaptableStateFunctionConfig: AdaptableStateFunctionConfig): Promise<any>;

package/src/AdaptableOptions/TeamSharingOptions.d.ts

@@ -1,5 +1,5 @@
-import { CustomSharedEntity, SharedEntity } from '../PredefinedConfig/TeamSharingState';
-import { BaseContext } from '../PredefinedConfig/Common/BaseContext';
+import { CustomSharedEntity, SharedEntity } from '../AdaptableState/TeamSharingState';
+import { BaseContext } from '../AdaptableState/Common/BaseContext';
 /**
  * Options for managing Team Sharing - which enables Adaptable Objects to be shared between colleagues
  */
@@ -55,7 +55,7 @@ export interface TeamSharingOptions {
      */
     showUpdateNotificationOncePerUpdate?: boolean;
     /**
-     * Suppress warning when an Import overrides existing Config item
+     * Suppress warning when an Import overrides existing Adaptable State item
      *
      * @defaultValue false
      * @gridInfoItem

package/src/AdaptableOptions/ToolPanelOptions.d.ts

@@ -1,7 +1,7 @@
-import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
+import { AdaptableObject } from '../AdaptableState/Common/AdaptableObject';
 import { AdaptableFrameworkComponent } from '../agGrid/AdaptableFrameworkComponent';
-import { AdaptableButton } from '../PredefinedConfig/Common/AdaptableButton';
-import { ToolPanelState } from '../PredefinedConfig/ToolPanelState';
+import { AdaptableButton } from '../AdaptableState/Common/AdaptableButton';
+import { ToolPanelState } from '../AdaptableState/ToolPanelState';
 import { BaseContext, CustomRenderContext } from '../types';
 /**
  * Options related to managing the AdapTable ToolPanel Component

package/src/AdaptableOptions/UserInterfaceOptions.d.ts

@@ -1,7 +1,7 @@
-import { AdaptableIcon } from '../PredefinedConfig/Common/AdaptableIcon';
+import { AdaptableIcon } from '../AdaptableState/Common/AdaptableIcon';
 import { DateInputOptions } from './DateInputOptions';
-import { AdaptableObjectTag } from '../PredefinedConfig/Common/AdaptableObject';
-import { AdaptableStyle } from '../PredefinedConfig/Common/AdaptableStyle';
+import { AdaptableObjectTag } from '../AdaptableState/Common/AdaptableObject';
+import { AdaptableStyle } from '../AdaptableState/Common/AdaptableStyle';
 import { AlternativeModuleName, BaseContext } from '../../types';
 /**
  * Options for managing the User Interface of AdapTable
@@ -41,8 +41,8 @@ export interface UserInterfaceOptions<TData = any> {
      */
     readOnlyCellStyle?: AdaptableStyle;
     /**
-      * Style to set for Cells which have been edited
-      */
+     * Style to set for Cells which have been edited
+     */
     editedCellStyle?: AdaptableStyle;
     /**
      * Optional list of CSS styles that can be used when creating Adaptable Styles in Adaptable (e.g. in Format Column and other Modules)

package/src/{PredefinedConfig → AdaptableState}/AdaptableState.d.ts

@@ -14,7 +14,7 @@ import { QuickSearchState } from './QuickSearchState';
 import { ShortcutState } from './ShortcutState';
 import { TeamSharingState } from './TeamSharingState';
 import { ThemeState } from './ThemeState';
-import { ConfigState } from './ConfigState';
+import { BaseState } from './BaseState';
 import { ApplicationState } from './ApplicationState';
 import { ToolPanelState } from './ToolPanelState';
 import { FlashingCellState } from './FlashingCellState';
@@ -28,7 +28,7 @@ import { CommentState } from './CommentState';
  * The main state object of Adaptable
  */
 export interface AdaptableState extends AdaptablePersistentState, AdaptableTransientState {
-    [s: string]: ConfigState;
+    [s: string]: BaseState;
 }
 /**
  * The state object of Adaptable which is persisted
@@ -36,26 +36,26 @@ export interface AdaptableState extends AdaptablePersistentState, AdaptableTrans
 export interface AdaptablePersistentState {
     Application: ApplicationState;
     Alert: AlertState;
-    FlashingCell: FlashingCellState;
     CalculatedColumn: CalculatedColumnState;
+    Charting: ChartingState;
     CustomSort: CustomSortState;
     Dashboard: DashboardState;
     Export: ExportState;
+    FlashingCell: FlashingCellState;
     FormatColumn: FormatColumnState;
     FreeTextColumn: FreeTextColumnState;
     Layout: LayoutState;
-    PlusMinus: PlusMinusState;
     NamedQuery: NamedQueryState;
+    Note: NoteState;
+    PlusMinus: PlusMinusState;
     QuickSearch: QuickSearchState;
     Schedule: ScheduleState;
-    StyledColumn: StyledColumnState;
     Shortcut: ShortcutState;
     StatusBar: StatusBarState;
+    StyledColumn: StyledColumnState;
     TeamSharing: TeamSharingState;
     Theme: ThemeState;
     ToolPanel: ToolPanelState;
-    Charting: ChartingState;
-    Note: NoteState;
 }
 /**
  * The state which is available in the internal Redux store but never persisted

package/src/{PredefinedConfig → AdaptableState}/AlertState.d.ts

@@ -1,4 +1,4 @@
-import { ConfigState } from './ConfigState';
+import { BaseState } from './BaseState';
 import { ColumnScope } from './Common/ColumnScope';
 import { AdaptableColumnPredicate } from './Common/AdaptablePredicate';
 import { TypeHint } from './Common/Types';
@@ -12,9 +12,9 @@ import { AdaptableAggregatedBooleanQuery, AdaptableBooleanQuery, AdaptableObserv
 import { ButtonStyle } from './Common/ButtonStyle';
 import { AlertFormContext, BaseContext, NotificationsOptions } from '../types';
 /**
- * Predefined Configuration for Alert Module
+ * Adaptable State section for Alert Module
  */
-export interface AlertState extends ConfigState {
+export interface AlertState extends BaseState {
     /**
      * Alert Definitions - will trigger Alerts when rule is met
      */

package/src/{PredefinedConfig → AdaptableState}/ApplicationState.d.ts

@@ -1,8 +1,8 @@
-import { ConfigState } from './ConfigState';
+import { BaseState } from './BaseState';
 /**
- * Predefined Configuration for the Application Module
+ * Adaptable State Section for the Application Module
  **/
-export interface ApplicationState extends ConfigState {
+export interface ApplicationState extends BaseState {
     /**
      * Array of Key / Value pairs enabling custom data to be stored in Adaptable State.
      */

package/src/{PredefinedConfig/ConfigState.d.ts → AdaptableState/BaseState.d.ts}

@@ -1,9 +1,9 @@
 /**
  * Base Interface for all Adaptable State objects; contains`Revision` property, used for versioning
  */
-export interface ConfigState {
+export interface BaseState {
     /**
-     * Version number of the Item - allows developers to update one section in Predefined Config while keeping others unchanged
+     * Version number of the Item - allows developers to update one section in Initial Adaptable State while keeping others unchanged
      */
     Revision?: number | {
         Key: number;

package/src/{PredefinedConfig → AdaptableState}/CalculatedColumnState.d.ts

@@ -1,12 +1,12 @@
-import { ConfigState } from './ConfigState';
+import { BaseState } from './BaseState';
 import { AdaptableObject } from './Common/AdaptableObject';
 import { AdaptableAggregatedScalarQuery, AdaptableScalarQuery } from './Common/AdaptableQuery';
 import { SpecialColumnSettings } from './Common/SpecialColumnSettings';
 import { XOR } from '../Utilities/Extensions/TypeExtensions';
 /**
- * Predefined Configuration for Calculated Column Module
+ * Adaptable State Section for Calculated Column Module
  **/
-export interface CalculatedColumnState extends ConfigState {
+export interface CalculatedColumnState extends BaseState {
     /**
      * Collection of Calculated Columns
      */

package/src/{PredefinedConfig → AdaptableState}/ChartingState.d.ts

@@ -1,6 +1,6 @@
 import { ChartModel } from 'ag-grid-enterprise';
 import { AdaptableObject } from '../types';
-import { ConfigState } from './ConfigState';
+import { BaseState } from './BaseState';
 export declare const isExternalChartDefinition: (chartDefinition: ChartDefinition | ExternalChartDefinition) => chartDefinition is ExternalChartDefinition<unknown>;
 export declare const isAgChartDefinition: (chartDefinition: ChartDefinition | ExternalChartDefinition) => chartDefinition is ChartDefinition;
 /**
@@ -38,7 +38,7 @@ export interface ChartDefinition extends AdaptableObject {
 /**
  * Persists AG Grid Charts in Adaptable State
  */
-export interface ChartingState extends ConfigState {
+export interface ChartingState extends BaseState {
     /**
      * Wrappers around AG Grid Chart Models
      */

package/src/{PredefinedConfig → AdaptableState}/CommentState.d.ts

@@ -1,9 +1,9 @@
-import { CellAddress, ConfigState } from '../types';
+import { CellAddress, BaseState } from '../types';
 import { TypeUuid } from './Uuid';
 /**
  * Internal State used for Comments Module
  */
-export interface CommentState extends ConfigState {
+export interface CommentState extends BaseState {
     /**
      * Collection of AdapTable Comments
      */

package/src/{PredefinedConfig → AdaptableState}/Common/AdaptableObject.d.ts

@@ -10,9 +10,9 @@ export interface AdaptableObject {
      */
     Uuid?: TypeUuid;
     /**
-     * Source of state object: 'Config' if provided via `AdaptableOptions.predefinedConfig`, 'User' or undefined for runtime state.
+     * Source of state object: 'InitialState' if provided via `AdaptableOptions.initialState`, 'User' or undefined for runtime state.
      */
-    Source?: 'Config' | 'User';
+    Source?: 'InitialState' | 'User';
     AdaptableVersion?: AdaptableVersion;
     /**
      * Sets Entity to ReadOnly (overwriting a Strategy Entitlement of 'Full')

package/src/{PredefinedConfig → AdaptableState}/Common/AdaptablePredicate.d.ts

@@ -104,7 +104,7 @@ export interface PredicateDefHandlerContext extends BaseContext {
      * Any (optional) inputs required to perform evaluation
      */
     inputs?: any[];
-    predicatesLogic?: ColumnFilter['PredicatesLogic'];
+    predicatesOperator?: ColumnFilter['PredicatesOperator'];
 }
 /**
  * Inputs required for a Predicate

package/src/{PredefinedConfig → AdaptableState}/Common/AdaptablePredicate.js

@@ -1,16 +1,16 @@
-import isAfter from 'date-fns/isAfter';
-import isBefore from 'date-fns/isBefore';
-import isEqual from 'date-fns/isEqual';
-import isFuture from 'date-fns/isFuture';
-import isPast from 'date-fns/isPast';
-import isSameDay from 'date-fns/isSameDay';
-import isThisMonth from 'date-fns/isThisMonth';
-import isThisQuarter from 'date-fns/isThisQuarter';
-import isThisWeek from 'date-fns/isThisWeek';
-import isThisYear from 'date-fns/isThisYear';
-import isToday from 'date-fns/isToday';
-import isTomorrow from 'date-fns/isTomorrow';
-import isYesterday from 'date-fns/isYesterday';
+import { isAfter } from 'date-fns';
+import { isBefore } from 'date-fns';
+import { isEqual } from 'date-fns';
+import { isFuture } from 'date-fns';
+import { isPast } from 'date-fns';
+import { isSameDay } from 'date-fns';
+import { isThisMonth } from 'date-fns';
+import { isThisQuarter } from 'date-fns';
+import { isThisWeek } from 'date-fns';
+import { isThisYear } from 'date-fns';
+import { isToday } from 'date-fns';
+import { isTomorrow } from 'date-fns';
+import { isYesterday } from 'date-fns';
 import StringExtensions from '../../Utilities/Extensions/StringExtensions';
 import { parseDateValue } from '../../Utilities/Helpers/DateHelper';
 import Helper from '../../Utilities/Helpers/Helper';
@@ -25,8 +25,8 @@ export const SystemPredicateDefs = [
         columnScope: { DataTypes: ['text', 'number', 'date'] },
         moduleScope: ['columnFilter', 'flashingcell', 'formatColumn', 'alert', 'badgeStyle'],
         handler: (context) => {
-            const { inputs, column, value, adaptableApi } = context;
-            const predicateInputs = context.inputs.reduce((acc, input) => {
+            const { inputs = [], column, value, adaptableApi } = context;
+            const predicateInputs = (context.inputs || []).reduce((acc, input) => {
                 const predicate = adaptableApi.predicateApi.getPredicateDefById(input);
                 if (predicate) {
                     acc.push(predicate);

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

@@ -13,10 +13,10 @@ export interface ColumnFilter extends SuspendableObject {
      */
     Predicates: ColumnFilterPredicate[];
     /**
-     * The Logic to use when combining multiple Predicates
+     * Logic used when combining multiple Predicates ('AND'|'OR')
      * @defaultValue 'AND'
      */
-    PredicatesLogic?: 'AND' | 'OR';
+    PredicatesOperator?: PredicatesOperator;
 }
 /**
  * A Predicate used in Column Filtering
@@ -24,6 +24,10 @@ export interface ColumnFilter extends SuspendableObject {
 export interface ColumnFilterPredicate extends AdaptablePredicate {
     PredicateId: TypeHint<string, SystemFilterPredicateId>;
 }
+/**
+ * Logic used to join multiple Predicates
+ */
+export type PredicatesOperator = 'AND' | 'OR';
 /**
  * Array containing all System Filter Predicates
  */

package/src/{PredefinedConfig → AdaptableState}/Common/Types.d.ts

@@ -32,7 +32,7 @@ export type AdaptableModuleButton = 'Alert' | 'BulkUpdate' | 'CalculatedColumn'
 export type AdaptableStateKeys = AdaptableStateKey[];
 export type AdaptableStateKey = keyof AdaptablePersistentState | 'OpenFin' | 'IPushPull';
 /**
- * Modules provided by AdapTable, subject to Entitlements and usually have Predefined Config
+ * Modules provided by AdapTable, subject to Entitlements and usually have Initial Adaptable State
  */
 export type AdaptableModule = 'Alert' | 'BulkUpdate' | 'CalculatedColumn' | 'CellSummary' | 'Charting' | 'Comment' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'Fdc3' | 'ColumnFilter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'GridInfo' | 'ColumnInfo' | 'IPushPull' | 'Layout' | 'OpenFin' | 'PlusMinus' | 'QuickSearch' | 'Schedule' | 'SettingsPanel' | 'Shortcut' | 'SmartEdit' | 'StyledColumn' | 'StateManagement' | 'StatusBar' | 'SystemStatus' | 'TeamSharing' | 'Theme' | 'ToolPanel' | 'Note' | 'DataImport' | 'GridFilter' | 'NamedQuery';
 export declare const ALL_MODULES: AdaptableModule[];

package/src/{PredefinedConfig → AdaptableState}/CustomSortState.d.ts

@@ -1,9 +1,9 @@
-import { ConfigState } from './ConfigState';
+import { BaseState } from './BaseState';
 import { SuspendableObject } from './Common/SuspendableObject';
 /**
- * Predefined Configuration for Custom Sort Module
+ * Adaptable State Section for Custom Sort Module
  */
-export interface CustomSortState extends ConfigState {
+export interface CustomSortState extends BaseState {
     /**
      * Collection of Custom Sort objects.
      */

package/src/{PredefinedConfig → AdaptableState}/DashboardState.d.ts

@@ -1,10 +1,10 @@
-import { ConfigState } from './ConfigState';
+import { BaseState } from './BaseState';
 import { AdaptableDashboardToolbars, AdaptableModuleButtons } from './Common/Types';
 import { AdaptableObject } from './Common/AdaptableObject';
 /**
- * Predefined Configuration for the AdapTable Dashboard
+ * Adaptable State Section for the AdapTable Dashboard
  */
-export interface DashboardState extends ConfigState {
+export interface DashboardState extends BaseState {
     /**
      * Named group of Toolbars
      * @defaultValue Empty Array

package/src/{PredefinedConfig → AdaptableState}/ExportState.d.ts

@@ -1,4 +1,4 @@
-import { ConfigState } from './ConfigState';
+import { BaseState } from './BaseState';
 import { BaseSchedule } from './Common/Schedule';
 import { ColumnScope } from './Common/ColumnScope';
 import { AdaptableColumnBase } from './Common/AdaptableColumn';
@@ -7,9 +7,9 @@ import { AdaptableBooleanQuery } from './Common/AdaptableQuery';
 import { TypeHint } from './Common/Types';
 import { ExportDestinationType } from '../AdaptableOptions/ExportOptions';
 /**
- * Predefined Configuration for Export Module
+ * Adaptable State Section for Export Module
  */
-export interface ExportState extends ConfigState {
+export interface ExportState extends BaseState {
     /**
      * Selected Report Type - in Export Toolbar & Tool Panel
      */