@adaptabletools/adaptable 19.2.4 → 20.0.0-canary.0

package/src/Api/PredicateApi.d.ts

@@ -46,6 +46,7 @@ export interface PredicateApi {
      * @param predicate Predicate Definition to stringify
      */
     predicateToString(predicate: AdaptablePredicate): string;
+    predicatesToString(predicates: AdaptablePredicate[], logicalOperator?: string): string;
     /**
      * Checks whether a given Predicate Definition is valid
      * @param predicate Predicate Definition to check

package/src/Api/RowFormApi.d.ts

@@ -0,0 +1,19 @@
+/**
+ * Functions for accessing Action Columns
+ */
+export interface RowFormApi {
+    /**
+     * Open edit dialog for row with the given primary key value
+     * @param primaryKey - the primary key of the edited row
+     */
+    displayEditRowForm(primaryKey: any): void;
+    /**
+     * Open create dialog for a new row
+     */
+    displayCreateRowForm(): void;
+    /**
+     * Open create dialog for cloning an existing row
+     * @param primaryKey - Primary Key of the duplicated row
+     */
+    displayCloneRowForm(primaryKey?: any): void;
+}

package/src/Api/StatusBarApi.d.ts

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

package/src/Api/UserInterfaceApi.d.ts

@@ -1,9 +1,6 @@
-import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
 import { AdaptableStyle } from '../PredefinedConfig/Common/AdaptableStyle';
-import { BulkUpdatePermittedValues, CustomSortPermittedValues, EditLookUpPermittedValues, FilterPermittedValues, PermittedValues } from '../AdaptableOptions/UserInterfaceOptions';
-import { GridCell } from '../PredefinedConfig/Selection/GridCell';
-import { AdaptableObjectTag } from '../PredefinedConfig/Common/AdaptableObject';
-import { AdaptableIcon } from '../types';
+import { AdaptableObject, AdaptableObjectTag } from '../PredefinedConfig/Common/AdaptableObject';
+import { AdaptableIcon, AdaptableModule } from '../types';
 import { CustomWindowConfig } from '../PredefinedConfig/Common/CustomWindowConfig';
 import { ProgressIndicatorConfig } from '../PredefinedConfig/Common/ProgressIndicatorConfig';
 /**
@@ -19,43 +16,7 @@ export interface UserInterfaceApi {
      */
     getStyleClassNames(): string[] | undefined;
     /**
-     * Retrieves `permittedValues` property from User Interface Options
-     */
-    getPermittedValuesItems(): PermittedValues[];
-    /**
-     * Retrieves Permitted Values for a given Column
-     * @param column column for which to retrieve Permitted Values
-     */
-    getPermittedValuesForColumn(column: AdaptableColumn): any[];
-    /**
-     * Retrieves Permitted values for filtering by column values in Floating Filter and Quick Filter Bar
-     */
-    getFilterPermittedValuesForColumn(column: AdaptableColumn): FilterPermittedValues | undefined;
-    /**
-     * Retrieves Permitted values for Custom Sort Module
-     */
-    getCustomSortPermittedValuesForColumn(column: AdaptableColumn): CustomSortPermittedValues | undefined;
-    /**
-     * Retrieves Permitted values for Bulk Update Module
-     */
-    getBulkUpdatePermittedValuesForColumn(column: AdaptableColumn): BulkUpdatePermittedValues | undefined;
-    /**
-     * Retrieves `editLookUpItems` property from User Interface Options
-     */
-    getEditLookUpItems(): EditLookUpPermittedValues[];
-    /**
-     * Retrieves EditLookUpItems for a given Column
-     * @param columnId Column for which to retrieve EditLookUpItems
-     */
-    getEditLookUpItemForColumn(column: AdaptableColumn): EditLookUpPermittedValues | undefined;
-    /**
-     * Retrieves actual Look Up Values from an EditLookUpItem
-     * @param editLookUpItem editLookUpItem to check
-     * @param  gridCell: the currently edited Grid Cell
-     */
-    getEditLookUpValuesForEditLookUpItem(editLookUpItem: EditLookUpPermittedValues, gridCell: GridCell): any[] | undefined;
-    /**
-     * Returns Style set for Editable Cells
+     * Returns Style set for Editable cells
      */
     getEditableCellStyle(): AdaptableStyle | undefined;
     /**
@@ -70,6 +31,12 @@ export interface UserInterfaceApi {
      * Retrieves any Object Tags (provided in User Interface Options)
      */
     getAdaptableObjectTags(): AdaptableObjectTag[] | undefined;
+    /**
+     * Retrieves all objects in list which contain the given Tag
+     * @param tag Tag to check
+     * @param adaptableModule optional Module to check
+     */
+    getAdaptableObjectsWithTag(tag: AdaptableObjectTag, adaptableModule?: AdaptableModule): AdaptableObject[] | undefined;
     /**
      * Returns AdapTable Icon with given name
      * @param name name of Icon

package/src/EnvVars.js

@@ -1,4 +1,4 @@
 import env from './env';
 export const ADAPTABLE_VERSION = env.VERSION;
 export const ADAPTABLE_PUBLISH_TIMESTAMP = env.PUBLISH_TIMESTAMP;
-export const INFINITE_TABLE_LICENSE_KEY = env.INFINITE_TABLE_LICENSE_KEY;
+export const INFINITE_TABLE_LICENSE_KEY = env.NEXT_PUBLIC_INFINITE_TABLE_LICENSE_KEY;

package/src/PredefinedConfig/AdaptableState.d.ts

@@ -1,6 +1,5 @@
 import { PopupState } from './PopupState';
-import { GridState } from './GridState';
-import { SystemState } from './SystemState';
+import { InternalState } from './InternalState';
 import { AlertState } from './AlertState';
 import { CalculatedColumnState } from './CalculatedColumnState';
 import { CustomSortState } from './CustomSortState';
@@ -62,9 +61,8 @@ export interface AdaptablePersistentState {
  * The state which is available in the internal Redux store but never persisted
  */
 export interface AdaptableTransientState {
+    Internal: InternalState;
     Popup: PopupState;
-    Grid: GridState;
-    System: SystemState;
     Comment: CommentState;
     Plugins: {
         [key: string]: any;

package/src/PredefinedConfig/AlertState.d.ts

@@ -41,7 +41,7 @@ export interface AlertDefinition extends SuspendableObject {
      */
     MessageHeader?: string;
     /**
-     * Title of dipslayed Alert Message; if null, AdapTable creates dynamically using Rule & Scope
+     * Title of displayed Alert Message; if null, AdapTable creates dynamically using Rule & Scope
      */
     MessageText?: string;
     /**
@@ -76,17 +76,17 @@ export type AlertRule = XOR<{
  */
 export type AdaptableAlertQuery = XOR<AdaptableBooleanQuery, XOR<AdaptableObservableQuery, AdaptableAggregatedBooleanQuery>>;
 /**
- * Actions available in an Alert
+ * Commands available in an Alert
  */
-export type AdaptableAlertAction = 'highlight-cell' | 'highlight-row' | 'jump-to-cell' | 'jump-to-row' | 'jump-to-column' | 'suspend' | 'undo';
+export type AdaptableAlertCommand = 'highlight-cell' | 'highlight-row' | 'jump-to-cell' | 'jump-to-row' | 'jump-to-column' | 'suspend' | 'undo';
 /**
  * Defines a button that appears in an Alert Form
  */
 export interface AlertButton<AlertFormContext> extends Omit<AdaptableButton<BaseContext>, 'onClick' | 'label' | 'buttonStyle' | 'hidden' | 'disabled' | 'tooltip'> {
     /**
-     * Predefined Action(s) to trigger when button is clicked; but the implementation in `actionHandlers` property of Alert Options
+     * Predefined Command(s) to trigger when button is clicked; implemented in `commandHandlers` property of Alert Options
      */
-    Action?: AdaptableAlertAction | AdaptableAlertAction[] | string | string[] | ((context: AlertFormContext) => void);
+    Command?: AdaptableAlertCommand | AdaptableAlertCommand[] | string | string[] | ((context: AlertFormContext) => void);
     /**
      * Label to show in the Button
      */
@@ -150,4 +150,4 @@ export type SystemAlertPredicateIds = SystemAlertPredicateId[];
 /**
  * List of System Predicates available for Alerts
  */
-export type SystemAlertPredicateId = 'Blanks' | 'NonBlanks' | 'Equals' | 'NotEquals' | 'GreaterThan' | 'LessThan' | 'Positive' | 'Negative' | 'Zero' | 'Between' | 'NotBetween' | 'Is' | 'IsNot' | 'Contains' | 'NotContains' | 'StartsWith' | 'EndsWith' | 'Regex' | 'Today' | 'Yesterday' | 'Tomorrow' | 'ThisWeek' | 'ThisMonth' | 'ThisQuarter' | 'ThisYear' | 'InPast' | 'InFuture' | 'Before' | 'After' | 'On' | 'NotOn' | 'NextWorkDay' | 'LastWorkDay' | 'WorkDay' | 'Holiday' | 'True' | 'False' | 'PercentChange' | 'ExistingValuesOnly' | 'NoDuplicateValues' | 'IsNumeric' | 'IsNotNumeric' | 'AddedRow' | 'RemovedRow' | 'Values' | 'ExcludeValues' | 'AnyChange';
+export type SystemAlertPredicateId = 'Blanks' | 'NonBlanks' | 'Equals' | 'NotEquals' | 'GreaterThan' | 'LessThan' | 'Positive' | 'Negative' | 'Zero' | 'Between' | 'NotBetween' | 'Is' | 'IsNot' | 'Contains' | 'NotContains' | 'StartsWith' | 'EndsWith' | 'Regex' | 'Today' | 'Yesterday' | 'Tomorrow' | 'ThisWeek' | 'ThisMonth' | 'ThisQuarter' | 'ThisYear' | 'InPast' | 'InFuture' | 'Before' | 'After' | 'On' | 'NotOn' | 'NextWorkDay' | 'LastWorkDay' | 'WorkDay' | 'Holiday' | 'True' | 'False' | 'PercentChange' | 'IsNumeric' | 'IsNotNumeric' | 'In' | 'NotIn' | 'AnyChange';

package/src/PredefinedConfig/ChartingState.d.ts

@@ -1,4 +1,4 @@
-import { ChartModel } from '@ag-grid-community/core';
+import { ChartModel } from 'ag-grid-enterprise';
 import { AdaptableObject } from '../types';
 import { ConfigState } from './ConfigState';
 export declare const isExternalChartDefinition: (chartDefinition: ChartDefinition | ExternalChartDefinition) => chartDefinition is ExternalChartDefinition<unknown>;

package/src/PredefinedConfig/CommentState.d.ts

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

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

@@ -1,7 +1,7 @@
 import { AdaptableObject } from './AdaptableObject';
 import { CellDataChangedInfo } from './CellDataChangedInfo';
-import { GridDataChangedInfo } from '../../Api/Events/GridDataChanged';
 import { AlertDefinition } from '../AlertState';
+import { RowDataChangedInfo } from './RowDataChangedInfo';
 /**
  * Defines an Alert fired by AdapTable
  */
@@ -31,7 +31,7 @@ export interface AdaptableRowChangedAlert<TData = any> extends AdaptableAlertBas
     /**
      * Row DataChange which triggered Alert
      */
-    gridDataChangedInfo: GridDataChangedInfo<TData>;
+    rowDataChangedInfo: RowDataChangedInfo<TData>;
 }
 /**
  * Defines the base(common) properties of an Alert fired by AdapTable, regardless of the type of change

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

@@ -1,8 +1,14 @@
 import { AdaptableObject } from './AdaptableObject';
+import { BaseCellDataType } from 'ag-grid-enterprise';
+export type AdaptableColumnDataType = BaseCellDataType | 'textArray' | 'numberArray' | 'tupleArray' | 'objectArray' | 'unknown';
 /**
- * Type of data stored in an AdapTable Column
+ * Column Types recognised by AdapTable; to be set in GridOptions
  */
-export type AdaptableColumnDataType = 'String' | 'Number' | 'Boolean' | 'Date' | 'Object' | 'StringArray' | 'NumberArray' | 'TupleNumberArray' | 'ObjectNumberArray' | 'Unknown';
+export type AdaptableColumnType = 'calculatedColumn' | 'freeTextColumn' | 'actionColumn' | 'fdc3Column';
+export declare const CALCULATED_COLUMN_TYPE: AdaptableColumnType;
+export declare const FREE_TEXT_COLUMN_TYPE: AdaptableColumnType;
+export declare const ACTION_COLUMN_TYPE: AdaptableColumnType;
+export declare const FDC3_COLUMN_TYPE: AdaptableColumnType;
 /**
  * Base class for AdapTable Column containing most important properties
  */
@@ -57,6 +63,14 @@ export interface AdaptableColumn<TData = any> extends AdaptableColumnBase {
      * Field in the row to get cell data from
      */
     field?: Extract<keyof TData, string>;
+    /**
+     * Whether the Column is always hidden
+     */
+    alwaysHidden: boolean;
+    /**
+     * Whether the Column is the Tree Column (in Tree View)
+     */
+    isTreeColumn: boolean;
     /**
      * Is this the Primary Key Column
      */
@@ -102,7 +116,7 @@ export interface AdaptableColumn<TData = any> extends AdaptableColumnBase {
      */
     groupable: boolean;
     /**
-     * Can Column be used in a Pivot Grid
+     * Can Column be used in a Pivot Layout
      */
     pivotable: boolean;
     /**
@@ -129,6 +143,14 @@ export interface AdaptableColumn<TData = any> extends AdaptableColumnBase {
      * Is Column currently Row-Grouped
      */
     isGrouped: boolean;
+    /**
+     * Is Column a generated Row Group Column
+     */
+    isGeneratedRowGroupColumn: boolean;
+    /**
+     * Is Column a generated Pivot Result Column
+     */
+    isGeneratedPivotResultColumn: boolean;
     /**
      * Is Column pinned or locked into position
      */
@@ -141,14 +163,22 @@ export interface AdaptableColumn<TData = any> extends AdaptableColumnBase {
      * Is it a Sparkline Column
      */
     isSparkline: boolean;
-    /**
-     * Has colummn been excluded from Quick Search results
-     */
-    isExcludedFromQuickSearch: boolean;
     /**
      * The parent Column group (if Column belongs to one)
      */
     columnGroup?: AdaptableColumnGroup;
+    /**
+     * Is Column a Calculated Column
+     */
+    isCalculatedColumn: boolean;
+    /**
+     * Is Column a Free Text Column
+     */
+    isFreeTextColumn: boolean;
+    /**
+     * Is Column an Action Column
+     */
+    isActionColumn: boolean;
 }
 export interface AdaptableColumnProperties {
     sortable: boolean;

package/src/PredefinedConfig/Common/AdaptableColumn.js

@@ -1,14 +1,13 @@
-const isAdaptableColumn = (input) => {
-    return (typeof (input === null || input === void 0 ? void 0 : input.columnId) === 'string' &&
-        typeof input.dataType === 'string');
-};
+export const CALCULATED_COLUMN_TYPE = 'calculatedColumn';
+export const FREE_TEXT_COLUMN_TYPE = 'freeTextColumn';
+export const ACTION_COLUMN_TYPE = 'actionColumn';
+export const FDC3_COLUMN_TYPE = 'fdc3Column';
 // this is only implemented for 1 level groups
 export const isValidOrderForColumnGroups = ({ oldColumns, newColumns, }) => {
     const getGroups = (columns) => {
         let prevGroup = '';
         let count = 0;
         columns.forEach((column) => {
-            var _a, _b;
             if (column &&
                 column.columnGroup &&
                 column.columnGroup.groupCount > 1 &&
@@ -17,7 +16,7 @@ export const isValidOrderForColumnGroups = ({ oldColumns, newColumns, }) => {
                     count++;
                 }
             }
-            prevGroup = (_b = (_a = column === null || column === void 0 ? void 0 : column.columnGroup) === null || _a === void 0 ? void 0 : _a.columnGroupId) !== null && _b !== void 0 ? _b : '';
+            prevGroup = column?.columnGroup?.columnGroupId ?? '';
         });
         return count;
     };

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

@@ -0,0 +1,11 @@
+import { AdaptableColumn } from '../../types';
+import { BaseContext } from './BaseContext';
+/**
+ * Context provided for per Column callbacks
+ */
+export interface AdaptableColumnContext<TData = any> extends BaseContext {
+    /**
+     * Column being filtered
+     */
+    column: AdaptableColumn<TData>;
+}

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

@@ -1,4 +1,4 @@
-import { InitialGroupOrderComparatorParams, IRowNode } from '@ag-grid-community/core';
+import { IRowNode } from 'ag-grid-enterprise';
 /**
  * Standard comparer function used to evaluate custom sorts, returns -1, 0, 1 as required
  */
@@ -19,4 +19,3 @@ nodeA?: IRowNode<TData>,
  * Second Row Node to compare
  */
 nodeB?: IRowNode<TData>) => number;
-export type AdaptableNodeComparerFunction<TData = any> = (params: InitialGroupOrderComparatorParams<TData>) => number;

package/src/PredefinedConfig/Common/AdaptableForm.js

@@ -1,7 +1,6 @@
 export function getDefaultAdaptableFormData(formDef) {
     return (formDef.fields || []).flat().reduce((data, field) => {
-        var _a;
-        data[field.name] = (_a = field.defaultValue) !== null && _a !== void 0 ? _a : '';
+        data[field.name] = field.defaultValue ?? '';
         return data;
     }, {});
 }

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

@@ -54,4 +54,4 @@ export interface AdaptableBaseIcon {
 /**
  * All AdapTable System Icon names
  */
-export type AdaptableSystemIconName = 'add' | 'alert' | 'building' | 'laptop' | 'arrow-down' | 'arrow-left' | 'arrow-right' | 'arrow-up' | 'arrow-up-long' | 'arrow-down-long' | 'arrow-expand' | 'paperclip' | 'unfilled-circle' | 'boolean-list' | 'broadcast' | 'brush' | 'spanner' | 'edit-table' | 'calculated-column' | 'calendar' | 'call' | 'cells' | 'fdc3' | 'flag' | 'chart' | 'chat' | 'check' | 'check-circle' | 'checked' | 'clone' | 'close' | 'cloud-upload' | 'collapse' | 'column-add' | 'columns' | 'filter-list' | 'copy' | 'comment' | 'comments' | 'contains' | 'dashboard' | 'json' | 'data-set' | 'date-range' | 'delete' | 'division' | 'dock' | 'dollar' | 'drag' | 'edit' | 'ends-with' | 'equals' | 'equation' | 'error' | 'excel' | 'expand' | 'exponent' | 'export' | 'export-data' | 'fast-backward' | 'fast-forward' | 'filter' | 'filter-off' | 'lightning' | 'folder' | 'folder-open' | 'folder-shared' | 'color-palette' | 'horizontal-lines' | 'function' | 'greater-than' | 'greater-than-or-equal' | 'history' | 'home' | 'import-export' | 'info' | 'brain' | 'download' | 'grid' | 'interactions' | 'less-than' | 'less-than-or-equal' | 'list' | 'logout' | 'mail' | 'menu' | 'minus' | 'multiplication' | 'money' | 'newpage' | 'news' | 'filled-circle' | 'not-contains' | 'not-equal' | 'open-in-new' | 'order' | 'organisation' | 'pause' | 'percent' | 'percent-tag' | 'person' | 'contact' | 'pie-chart' | 'play' | 'plus' | 'add-circle' | 'search' | 'search-table' | 'select-all' | 'select-off' | 'select-fwd' | 'sync' | 'quote' | 'refresh' | 'regex' | 'reminder' | 'save' | 'schedule' | 'science' | 'settings' | 'link' | 'sort-asc' | 'sort-desc' | 'spark-line' | 'resume' | 'starts-with' | 'assignment' | 'statusbar' | 'stop' | 'traffic-lights' | 'tab-unselected' | 'theme' | 'clipboard' | 'target' | 'triangle-down' | 'triangle-up' | 'unchecked' | 'undo' | 'downloaded' | 'upload' | 'warning' | 'gradient' | 'badge' | 'italic' | 'bold' | 'align-left' | 'align-right' | 'align-center' | 'align-justify' | 'underline' | 'strikethrough' | 'overline' | 'case-upper' | 'case-lower' | 'case-sentence' | 'visibility-on' | 'visibility-off' | 'visibility-off-bold' | 'visibility-on-bold' | 'note' | 'import' | 'grid-filter' | 'grid-info' | 'csv' | 'rows' | 'expand-all' | 'collapse-all' | 'column-outline';
+export type AdaptableSystemIconName = 'add' | 'alert' | 'building' | 'laptop' | 'arrow-down' | 'arrow-left' | 'arrow-right' | 'arrow-up' | 'arrow-up-long' | 'arrow-down-long' | 'arrow-expand' | 'paperclip' | 'unfilled-circle' | 'boolean-list' | 'broadcast' | 'brush' | 'spanner' | 'edit-table' | 'calculated-column' | 'calendar' | 'call' | 'cells' | 'fdc3' | 'flag' | 'chart' | 'chat' | 'check' | 'check-circle' | 'checked' | 'clone' | 'close' | 'cloud-upload' | 'collapse' | 'column-add' | 'columns' | 'filter-list' | 'copy' | 'comment' | 'comments' | 'contains' | 'dashboard' | 'json' | 'data-set' | 'date-range' | 'delete' | 'division' | 'dock' | 'dollar' | 'drag' | 'edit' | 'ends-with' | 'equals' | 'equation' | 'error' | 'excel' | 'expand' | 'exponent' | 'export' | 'export-data' | 'fast-backward' | 'fast-forward' | 'filter' | 'filter-off' | 'lightning' | 'folder' | 'folder-open' | 'folder-shared' | 'color-palette' | 'horizontal-lines' | 'function' | 'greater-than' | 'greater-than-or-equal' | 'history' | 'home' | 'import-export' | 'info' | 'brain' | 'download' | 'grid' | 'interactions' | 'less-than' | 'less-than-or-equal' | 'list' | 'logout' | 'mail' | 'menu' | 'minus' | 'multiplication' | 'money' | 'newpage' | 'news' | 'filled-circle' | 'not-contains' | 'not-equal' | 'open-in-new' | 'order' | 'organisation' | 'pause' | 'percent' | 'percent-tag' | 'person' | 'contact' | 'pie-chart' | 'play' | 'plus' | 'add-circle' | 'search' | 'search-table' | 'select-all' | 'select-off' | 'select-fwd' | 'styled-grid' | 'sync' | 'quote' | 'refresh' | 'regex' | 'reminder' | 'save' | 'schedule' | 'science' | 'settings' | 'link' | 'sort-asc' | 'sort-desc' | 'spark-line' | 'resume' | 'starts-with' | 'assignment' | 'statusbar' | 'stop' | 'traffic-lights' | 'tab-unselected' | 'theme' | 'clipboard' | 'target' | 'triangle-down' | 'triangle-up' | 'unchecked' | 'undo' | 'downloaded' | 'upload' | 'warning' | 'gradient' | 'badge' | 'italic' | 'bold' | 'align-left' | 'align-right' | 'align-center' | 'align-justify' | 'underline' | 'strikethrough' | 'overline' | 'case-upper' | 'case-lower' | 'case-sentence' | 'visibility-on' | 'visibility-off' | 'visibility-off-bold' | 'visibility-on-bold' | 'note' | 'import' | 'grid-filter' | 'grid-info' | 'csv' | 'rows' | 'expand-all' | 'collapse-all' | 'column-outline';

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

@@ -1,5 +1,6 @@
 import { TypeUuid } from '../Uuid';
 import { ColumnScope } from './ColumnScope';
+export type AdaptableVersion = `${string}.${string}.${string}`;
 /**
  * Base interface which all other Adaptable State-related objects extend
  */
@@ -12,6 +13,7 @@ export interface AdaptableObject {
      * Source of state object: 'Config' if provided via `AdaptableOptions.predefinedConfig`, 'User' or undefined for runtime state.
      */
     Source?: 'Config' | 'User';
+    AdaptableVersion?: AdaptableVersion;
     /**
      * Sets Entity to ReadOnly (overwriting a Strategy Entitlement of 'Full')
      */

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

@@ -1,4 +1,4 @@
-import { IRowNode } from '@ag-grid-community/core';
+import { IRowNode } from 'ag-grid-enterprise';
 import { AdaptableIcon, ColumnFilter } from '../../types';
 import { AdaptableColumn, AdaptableColumnDataType } from './AdaptableColumn';
 import { ColumnScope } from './ColumnScope';
@@ -104,6 +104,7 @@ export interface PredicateDefHandlerContext extends BaseContext {
      * Any (optional) inputs required to perform evaluation
      */
     inputs?: any[];
+    predicatesLogic?: ColumnFilter['PredicatesLogic'];
 }
 /**
  * Inputs required for a Predicate
@@ -129,6 +130,6 @@ export declare const SystemBadgeStylePredicateIds: string[];
  */
 export interface ColumnFilterDef {
     dataType: AdaptableColumnDataType;
-    predicate: AdaptablePredicateDef;
+    predicates: AdaptablePredicateDef[];
     columnFilter: ColumnFilter;
 }