@adaptabletools/adaptable 10.0.0 → 10.0.4-canary.0

package/src/Api/QueryLanguageApi.d.ts

@@ -1,4 +1,5 @@
 import { AdaptableModule } from '../PredefinedConfig/Common/Types';
+import { ExpressionFunctionMap } from '../types';
 /**
  * Manages AdapTableQL (Query Language)
  */
@@ -33,6 +34,10 @@ export interface QueryLanguageApi {
      * Returns all columns that can be used in an Expression
      */
     getQueryableColumnIds(): string[];
+    /**
+     * Returns the current Module Expression Map
+     */
+    getModuleExpressionFunctionMap(): ExpressionFunctionMap;
     /**
      * Runs the AST that AdapTableQL creates for a expression - useful when evaluating remotely
      * @param expression expression to be run

package/src/Api/UserInterfaceApi.d.ts

@@ -1,7 +1,8 @@
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
 import { AdaptableStyle } from '../PredefinedConfig/Common/AdaptableStyle';
 import { UserMenuItem } from '../PredefinedConfig/Common/Menu';
-import { ActionColumn, CellValuesList } from '../AdaptableOptions/UserInterfaceOptions';
+import { ActionColumn, BulkUpdatePermittedValues, CustomSortPermittedValues, EditLookUpPermittedValues, FilterPermittedValues, PermittedValues } from '../AdaptableOptions/UserInterfaceOptions';
+import { GridCell } from '../PredefinedConfig/Selection/GridCell';
 /**
  * Functions relating to User Interface section of Adaptable State
  */
@@ -17,27 +18,36 @@ export interface UserInterfaceApi {
     /**
      * Retrieves `permittedValues` property from User Interface Options
      */
-    getAllPermittedValuesItems(): CellValuesList[];
+    getAllPermittedValuesItems(): 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 dropdown Filter.
+     */
+    getFilterPermittedValuesForColumn(column: AdaptableColumn): FilterPermittedValues | undefined;
+    /**
+     * Retrieves Permitted values for Custom sort.
+     */
+    getCustomSortPermittedValuesForColumn(column: AdaptableColumn): CustomSortPermittedValues | undefined;
+    getBulkUpdatePermittedValuesForColumn(column: AdaptableColumn): BulkUpdatePermittedValues | undefined;
     /**
      * Retrieves `editLookUpItems` property from User Interface Options
      */
-    getAllEditLookUpItems(): CellValuesList[];
+    getAllEditLookUpItems(): EditLookUpPermittedValues[];
     /**
      * Retrieves EditLookUpItems for a given Column
      * @param columnId Column for which to retrieve EditLookUpItems
      */
-    getEditLookUpItemForColumn(columnId: string): CellValuesList | undefined;
+    getEditLookUpItemForColumn(column: AdaptableColumn): EditLookUpPermittedValues | undefined;
     /**
      * Retrieves actual Look Up Values from an EditLookUpItem
      * @param editLookUpItem editLookUpItem to check
-     * @param columnId Column to check
+     * @param  gridCell: the currently edited Grid Cell
      */
-    getEditLookUpValuesForEditLookUpItem(editLookUpItem: CellValuesList, columnId: string): any[] | undefined;
+    getEditLookUpValuesForEditLookUpItem(editLookUpItem: EditLookUpPermittedValues, gridCell: GridCell): any[] | undefined;
     /**
      * Adds menu item to Column Menu
      * @param userMenuItem Menu Item to add

package/src/PredefinedConfig/AlertState.d.ts

@@ -11,6 +11,7 @@ import { XOR } from '../Utilities/Extensions/TypeExtensions';
 import { AdaptableAggregationQuery, AdaptableBooleanQuery, AdaptableObservableQuery } from './Common/AdaptableQuery';
 import { ButtonStyle } from './Common/ButtonStyle';
 import { AlertButtonContext } from '../AdaptableOptions/NotificationsOptions';
+import { DataChangedInfo } from './Common/DataChangedInfo';
 /**
  * Predefined Configuration for Alert function
  */
@@ -45,22 +46,27 @@ export interface BaseAlertDefinition extends SuspendableObject {
 export interface FlashingAlertProperties {
     /**
      * Should a cell or whole row flash
+     * @defaultValue  'cell'
      */
     FlashTarget?: 'row' | 'cell';
     /**
      * Style for 'Down' value changes
+     *  @defaultValue  Red BackColour
      */
     DownChangeStyle?: AdaptableStyle;
     /**
      * Style for 'Up' value changes
+     * @defaultValue  Green BackColour
      */
     UpChangeStyle?: AdaptableStyle;
     /**
      * Style for 'Neutral' value changes
+     * @defaultValue  Gray BackColour
      */
     NeutralChangeStyle?: AdaptableStyle;
     /**
      * Duration of Flash - can be number (in ms) or 'always'
+     * @defaultValue 500ms
      */
     FlashDuration?: number | 'always';
 }
@@ -77,6 +83,10 @@ export interface AlertDefinition extends BaseAlertDefinition {
      * Type of Alert: 'Info', 'Success', 'Warning', 'Error'; influences Alert colour, icon and logging
      */
     MessageType: AdaptableMessageType;
+    /**
+     * Alert Message - can be string or function; if not provided AdapTable creates dynamically using Rule & Scope
+     */
+    MessageText?: string | ((scope: AdaptableScope, rule: AlertRule, dataChangedInfo?: DataChangedInfo) => string);
     /**
      * Series of properties which set what happens when Alert is triggered
      */

package/src/PredefinedConfig/CalculatedColumnState.d.ts

@@ -1,6 +1,7 @@
 import { ConfigState } from './ConfigState';
 import { AdaptableObject } from './Common/AdaptableObject';
 import { AdaptableScalarQuery } from './Common/AdaptableQuery';
+import { SpecialColumnSettings } from './Common/SpecialColumnSettings';
 /**
  * Predefined Configuration for Calculated Column function
  **/
@@ -24,7 +25,7 @@ export interface CalculatedColumn extends AdaptableObject {
      */
     FriendlyName?: string;
     /**
-     * Addtional optional properties for Column (e.g. filterable, resizable)
+     * Additional optional properties for Column (e.g. filterable, resizable)
      */
     CalculatedColumnSettings?: CalculatedColumnSettings;
     /**
@@ -35,9 +36,9 @@ export interface CalculatedColumn extends AdaptableObject {
 /**
  * Set of optional properties that define a Calculated Column's behaviour
  */
-export interface CalculatedColumnSettings {
+export interface CalculatedColumnSettings extends SpecialColumnSettings {
     /**
-     *  Expression's return value DataType; inferred by AdapTable but setable by User
+     *  Expression's return value DataType; inferred by AdapTable but settable by User
      */
     DataType?: 'String' | 'Number' | 'Boolean' | 'Date';
     /**
@@ -45,38 +46,4 @@ export interface CalculatedColumnSettings {
      * @defaultValue false
      */
     ShowToolTip?: boolean;
-    /**
-     * Preferred width (in pixels) for Column; if unset, calculated dynamically by underlying Grid
-     */
-    Width?: number;
-    /**
-     * Whether Column is filterable
-     * @defaultValue true
-     */
-    Filterable?: boolean;
-    /**
-     * Whether Column can be resized (by dragging column header edges)
-     * @defaultValue true
-     */
-    Resizable?: boolean;
-    /**
-     * Whether Column can be grouped
-     * @defaultValue true
-     */
-    Groupable?: boolean;
-    /**
-     * Whether Column is sortable
-     * @defaultValue true
-     */
-    Sortable?: boolean;
-    /**
-     * Whether Column can be used when grid is in pivot mode
-     * @defaultValue true
-     */
-    Pivotable?: boolean;
-    /**
-     * Whether Column can be used in an aggregation when grouping
-     * @defaultValue true
-     */
-    Aggregatable?: boolean;
 }

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

@@ -6,15 +6,15 @@ export interface AdaptableColumnBase extends AdaptableObject {
     /**
      * Name of Column in underlying grid (e.g. field or colId)
      */
-    ColumnId: string;
+    columnId: string;
     /**
      * How Column is referred to in Adaptable UI; 'Caption' or 'Header' property in underlying grid
      */
-    FriendlyName: string;
+    friendlyName: string;
     /**
      * DataType of the column
      */
-    DataType: 'String' | 'Number' | 'NumberArray' | 'Boolean' | 'Date' | 'Object' | 'Unknown';
+    dataType: 'String' | 'Number' | 'NumberArray' | 'Boolean' | 'Date' | 'Object' | 'Unknown';
 }
 export declare const isValidOrderForColumnGroups: ({ oldColumns, newColumns, }: {
     oldColumns: AdaptableColumn[];
@@ -24,10 +24,10 @@ export declare const isValidOrderForColumnGroups: ({ oldColumns, newColumns, }:
  * Defines a Column Group
  */
 export interface AdaptableColumnGroup {
-    AllowGroupSplit: boolean;
-    ColumnGroupId: string;
-    FriendlyName: string;
-    GroupCount: number;
+    allowGroupSplit: boolean;
+    columnGroupId: string;
+    friendlyName: string;
+    groupCount: number;
 }
 /**
  * Defines an Adaptable Column - created at run-time based on vendor grid column definition
@@ -36,89 +36,89 @@ export interface AdaptableColumn extends AdaptableColumnBase {
     /**
      * Is this the Primary Key column
      */
-    IsPrimaryKey: boolean;
+    isPrimaryKey: boolean;
     /**
      * Column width
      */
-    Width?: number;
+    width?: number;
     /**
      * Flex details of the column
      */
-    Flex?: number;
+    flex?: number;
     /**
      * Is column editable
      */
-    ReadOnly: boolean;
+    readOnly: boolean;
     /**
      * Is Column currently visible
      */
-    Visible: boolean;
+    visible: boolean;
     /**
      * Is Column sortable
      */
-    Sortable: boolean;
+    sortable: boolean;
     /**
      * Is Column able to be filtered
      */
-    Filterable: boolean;
+    filterable: boolean;
     /**
      * Can Column be moved at run-time to a new position
      */
-    Moveable: boolean;
+    moveable: boolean;
     /**
      * Can Column be removed from the grid
      */
-    Hideable: boolean;
+    hideable: boolean;
     /**
      * Can Column form a Row Group
      */
-    Groupable: boolean;
+    groupable: boolean;
     /**
      * Can Column be used in a Pivot Grid
      */
-    Pivotable: boolean;
+    pivotable: boolean;
     /**
      * Is Column able to display aggregations (e.g. 'sum') when grouped
      */
-    Aggregatable: boolean;
+    aggregatable: boolean;
     /**
      * Can the Column be in included in Queries / Expressions
      */
-    Queryable: boolean;
+    queryable: boolean;
     /**
      * Available aggregations for the Column
      */
-    AvailableAggregationFunctions?: string[];
+    availableAggregationFunctions?: string[];
     /**
      * Custom aggregation function for the Column
      */
-    AggregationFunction?: string;
+    aggregationFunction?: string;
     /**
      * Is Column currently grouped
      */
-    IsGrouped: boolean;
+    isGrouped: boolean;
     /**
      * Is Column pinned or locked into position
      */
-    IsFixed: boolean;
+    isFixed: boolean;
     /**
      * Is it a Sparkline Column
      */
-    IsSparkline: boolean;
+    isSparkline: boolean;
     /**
      * Has colummn been excluded from Quick Search results
      */
-    IsExcludedFromQuickSearch: boolean;
+    isExcludedFromQuickSearch: boolean;
     /**
      * The parent column group, if the column belongs to one
      */
-    ColumnGroup?: AdaptableColumnGroup;
+    columnGroup?: AdaptableColumnGroup;
 }
 export interface AdaptableColumnProperties {
-    Sortable: boolean;
-    Filterable: boolean;
-    Moveable: boolean;
-    Groupable: boolean;
-    Pivotable: boolean;
-    Aggregatable: boolean;
+    sortable: boolean;
+    filterable: boolean;
+    moveable: boolean;
+    groupable: boolean;
+    pivotable: boolean;
+    aggregatable: boolean;
 }

package/src/PredefinedConfig/Common/AdaptableColumn.js

@@ -8,14 +8,14 @@ exports.isValidOrderForColumnGroups = ({ oldColumns, newColumns, }) => {
         let count = 0;
         columns.forEach((column) => {
             var _a, _b;
-            if (column.ColumnGroup &&
-                column.ColumnGroup.GroupCount > 1 &&
-                !column.ColumnGroup.AllowGroupSplit) {
-                if (prevGroup !== column.ColumnGroup.ColumnGroupId) {
+            if (column.columnGroup &&
+                column.columnGroup.groupCount > 1 &&
+                !column.columnGroup.allowGroupSplit) {
+                if (prevGroup !== column.columnGroup.columnGroupId) {
                     count++;
                 }
             }
-            prevGroup = (_b = (_a = column.ColumnGroup) === null || _a === void 0 ? void 0 : _a.ColumnGroupId) !== null && _b !== void 0 ? _b : '';
+            prevGroup = (_b = (_a = column.columnGroup) === null || _a === void 0 ? void 0 : _a.columnGroupId) !== null && _b !== void 0 ? _b : '';
         });
         return count;
     };

package/src/PredefinedConfig/Common/AdaptablePredicate.js

@@ -16,6 +16,7 @@ const isAfter_1 = tslib_1.__importDefault(require("date-fns/isAfter"));
 const isBefore_1 = tslib_1.__importDefault(require("date-fns/isBefore"));
 const isSameDay_1 = tslib_1.__importDefault(require("date-fns/isSameDay"));
 const CalendarHelper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/CalendarHelper"));
+const DateHelper_1 = require("../../Utilities/Helpers/DateHelper");
 /**
  * Array of Predicate Defs which are shipped by AdapTable
  */
@@ -273,7 +274,7 @@ exports.SystemPredicateDefs = [
         icon: { path: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
         moduleScope: ['filter', 'alert', 'conditionalstyle'],
-        handler: ({ value }) => isToday_1.default(value),
+        handler: ({ value }) => isToday_1.default(DateHelper_1.parseDateValue(value)),
     },
     {
         id: 'Yesterday',
@@ -281,7 +282,7 @@ exports.SystemPredicateDefs = [
         icon: { path: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
         moduleScope: ['filter', 'alert', 'conditionalstyle'],
-        handler: ({ value }) => isYesterday_1.default(value),
+        handler: ({ value }) => isYesterday_1.default(DateHelper_1.parseDateValue(value)),
     },
     {
         id: 'Tomorrow',
@@ -289,7 +290,7 @@ exports.SystemPredicateDefs = [
         icon: { path: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
         moduleScope: ['filter', 'alert', 'conditionalstyle'],
-        handler: ({ value }) => isTomorrow_1.default(value),
+        handler: ({ value }) => isTomorrow_1.default(DateHelper_1.parseDateValue(value)),
     },
     {
         id: 'ThisWeek',
@@ -297,7 +298,7 @@ exports.SystemPredicateDefs = [
         icon: { path: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
         moduleScope: ['filter', 'alert', 'conditionalstyle'],
-        handler: ({ value }) => isThisWeek_1.default(value),
+        handler: ({ value }) => isThisWeek_1.default(DateHelper_1.parseDateValue(value)),
     },
     {
         id: 'ThisMonth',
@@ -305,7 +306,7 @@ exports.SystemPredicateDefs = [
         icon: { path: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
         moduleScope: ['filter', 'alert', 'conditionalstyle'],
-        handler: ({ value }) => isThisMonth_1.default(value),
+        handler: ({ value }) => isThisMonth_1.default(DateHelper_1.parseDateValue(value)),
     },
     {
         id: 'ThisQuarter',
@@ -313,7 +314,7 @@ exports.SystemPredicateDefs = [
         icon: { path: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
         moduleScope: ['filter', 'alert', 'conditionalstyle'],
-        handler: ({ value }) => isThisQuarter_1.default(value),
+        handler: ({ value }) => isThisQuarter_1.default(DateHelper_1.parseDateValue(value)),
     },
     {
         id: 'ThisYear',
@@ -321,7 +322,7 @@ exports.SystemPredicateDefs = [
         icon: { path: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
         moduleScope: ['filter', 'alert', 'conditionalstyle'],
-        handler: ({ value }) => isThisYear_1.default(value),
+        handler: ({ value }) => isThisYear_1.default(DateHelper_1.parseDateValue(value)),
     },
     {
         id: 'InPast',
@@ -329,7 +330,7 @@ exports.SystemPredicateDefs = [
         icon: { path: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
         moduleScope: ['filter', 'alert', 'conditionalstyle'],
-        handler: ({ value }) => isPast_1.default(value),
+        handler: ({ value }) => isPast_1.default(DateHelper_1.parseDateValue(value)),
     },
     {
         id: 'InFuture',
@@ -337,7 +338,7 @@ exports.SystemPredicateDefs = [
         icon: { path: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
         moduleScope: ['filter', 'alert', 'conditionalstyle'],
-        handler: ({ value }) => isFuture_1.default(value),
+        handler: ({ value }) => isFuture_1.default(DateHelper_1.parseDateValue(value)),
     },
     {
         id: 'After',
@@ -346,7 +347,7 @@ exports.SystemPredicateDefs = [
         columnScope: { DataTypes: ['Date'] },
         moduleScope: ['filter', 'alert', 'conditionalstyle'],
         inputs: [{ type: 'date' }],
-        handler: ({ value, inputs }) => isAfter_1.default(value, new Date(inputs[0])),
+        handler: ({ value, inputs }) => isAfter_1.default(DateHelper_1.parseDateValue(value), new Date(inputs[0])),
         toString: ({ inputs }) => `> ${inputs[0]}`,
     },
     {
@@ -356,7 +357,7 @@ exports.SystemPredicateDefs = [
         columnScope: { DataTypes: ['Date'] },
         moduleScope: ['filter', 'alert', 'conditionalstyle'],
         inputs: [{ type: 'date' }],
-        handler: ({ value, inputs }) => isBefore_1.default(value, new Date(inputs[0])),
+        handler: ({ value, inputs }) => isBefore_1.default(DateHelper_1.parseDateValue(value), new Date(inputs[0])),
         toString: ({ inputs }) => `< ${inputs[0]}`,
     },
     {
@@ -366,7 +367,7 @@ exports.SystemPredicateDefs = [
         columnScope: { DataTypes: ['Date'] },
         moduleScope: ['filter', 'alert', 'conditionalstyle'],
         inputs: [{ type: 'date' }],
-        handler: ({ value, inputs }) => isSameDay_1.default(value, new Date(inputs[0])),
+        handler: ({ value, inputs }) => isSameDay_1.default(DateHelper_1.parseDateValue(value), new Date(inputs[0])),
         toString: ({ inputs }) => `= ${inputs[0]}`,
     },
     {
@@ -376,7 +377,7 @@ exports.SystemPredicateDefs = [
         columnScope: { DataTypes: ['Date'] },
         moduleScope: ['filter', 'alert', 'conditionalstyle'],
         inputs: [{ type: 'date' }],
-        handler: ({ value, inputs }) => !isSameDay_1.default(value, new Date(inputs[0])),
+        handler: ({ value, inputs }) => !isSameDay_1.default(DateHelper_1.parseDateValue(value), new Date(inputs[0])),
         toString: ({ inputs }) => `!= ${inputs[0]}`,
     },
     {
@@ -385,7 +386,7 @@ exports.SystemPredicateDefs = [
         icon: { path: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
         moduleScope: ['filter', 'alert', 'conditionalstyle'],
-        handler: ({ value, api }) => isSameDay_1.default(value, CalendarHelper_1.default.getNextWorkingDay()),
+        handler: ({ value, api }) => isSameDay_1.default(DateHelper_1.parseDateValue(value), CalendarHelper_1.default.getNextWorkingDay()),
     },
     {
         id: 'LastWorkDay',
@@ -393,7 +394,7 @@ exports.SystemPredicateDefs = [
         icon: { path: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
         moduleScope: ['filter', 'alert', 'conditionalstyle'],
-        handler: ({ value, api }) => isSameDay_1.default(value, CalendarHelper_1.default.getPreviousWorkingDay()),
+        handler: ({ value, api }) => isSameDay_1.default(DateHelper_1.parseDateValue(value), CalendarHelper_1.default.getPreviousWorkingDay()),
     },
     {
         id: 'InRange',
@@ -466,7 +467,7 @@ exports.SystemPredicateDefs = [
         columnScope: { All: true },
         moduleScope: ['alert'],
         handler: ({ value, column, api, node }) => {
-            return (column === null || column === void 0 ? void 0 : column.IsPrimaryKey) ? api.columnApi.getDistinctRawValuesForColumn(column.ColumnId, node).includes(value)
+            return (column === null || column === void 0 ? void 0 : column.isPrimaryKey) ? api.columnApi.getDistinctRawValuesForColumn(column.columnId, node).includes(value)
                 : false;
         },
     },
@@ -477,7 +478,7 @@ exports.SystemPredicateDefs = [
         moduleScope: ['alert'],
         handler: ({ value, api, column, node }) => {
             const distinctValues = column
-                ? api.columnApi.getDistinctRawValuesForColumn(column.ColumnId, node)
+                ? api.columnApi.getDistinctRawValuesForColumn(column.columnId, node)
                 : [];
             return !distinctValues.includes(value);
         },
@@ -489,7 +490,7 @@ exports.SystemPredicateDefs = [
         moduleScope: ['alert'],
         handler: ({ value, api, column, node }) => {
             const distinctValues = column
-                ? api.columnApi.getDistinctRawValuesForColumn(column.ColumnId, node)
+                ? api.columnApi.getDistinctRawValuesForColumn(column.columnId, node)
                 : [];
             return distinctValues.includes(value);
         },

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

@@ -1,4 +1,5 @@
 import { RowNode } from '@ag-grid-community/all-modules';
+import { AdaptableColumn } from './AdaptableColumn';
 /**
  * Defines a Cell Edit - includes full details of old and new values, the column and the enclosing Row
  */
@@ -16,9 +17,9 @@ export interface DataChangedInfo {
      */
     newValue: any;
     /**
-     * Id of the Column in which the cell is situated
+     * Column in which cell is situated
      */
-    columnId: string;
+    column: AdaptableColumn;
     /**
      * Primary Key Column's value for the row where edited cell is situated
      */

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

@@ -3,11 +3,15 @@
  */
 export interface DataUpdateConfig {
     /**
-     * Whether data should be updated aysnchoronously
+     * Whether data should be updated asynchronously
      */
     runAsync?: boolean;
     /**
      * Callback function invoked when a batch successfully updates
      */
     callback?: (res: any) => void;
+    /**
+     * Index where to add new rows
+     */
+    addIndex?: number;
 }

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

@@ -0,0 +1,49 @@
+/**
+ * Base Settings for SpecialColumns
+ */
+export interface SpecialColumnSettings {
+    /**
+     * Preferred width (in pixels) for Column; if unset, calculated dynamically by underlying Grid
+     */
+    Width?: number;
+    /**
+     * Whether Column is filterable
+     * @defaultValue true
+     */
+    Filterable?: boolean;
+    /**
+     * Whether Column can be resized (by dragging column header edges)
+     * @defaultValue true
+     */
+    Resizable?: boolean;
+    /**
+     * Whether Column can be grouped
+     * @defaultValue true
+     */
+    Groupable?: boolean;
+    /**
+     * Whether Column is sortable
+     * @defaultValue true
+     */
+    Sortable?: boolean;
+    /**
+     * Whether Column can be used when grid is in pivot mode
+     * @defaultValue true
+     */
+    Pivotable?: boolean;
+    /**
+     * Whether Column can be used in an aggregation when grouping
+     * @defaultValue true
+     */
+    Aggregatable?: boolean;
+    /**
+     * Whether if no menu should be shown for this Column header.
+     * @defaultValue false
+     */
+    SuppressMenu?: boolean;
+    /**
+     * Whether if this Column should be movable via dragging
+     * @defaultValue false
+     */
+    SuppressMovable?: boolean;
+}

package/src/PredefinedConfig/FilterState.d.ts

@@ -48,4 +48,4 @@ export interface ColumnFilterPredicate extends AdaptablePredicate {
     PredicateId: TypeHint<string, SystemFilterPredicateId>;
 }
 export declare type SystemFilterPredicateIds = SystemFilterPredicateId[];
-export declare type SystemFilterPredicateId = 'Values' | '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' | 'InRange' | 'On' | 'NotOn' | 'NextWorkDay' | 'LastWorkDay' | 'True' | 'False';
+export declare type SystemFilterPredicateId = 'Values' | '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' | 'InRange' | 'On' | 'NotOn' | 'NextWorkDay' | 'LastWorkDay' | 'True' | 'False' | 'BooleanToggle';

package/src/PredefinedConfig/FreeTextColumnState.d.ts

@@ -1,5 +1,6 @@
 import { ConfigState } from './ConfigState';
 import { AdaptableObject } from './Common/AdaptableObject';
+import { SpecialColumnSettings } from './Common/SpecialColumnSettings';
 /**
  * Predefined Configuration for the Free Text Column function
  */
@@ -39,6 +40,10 @@ export interface FreeTextColumn extends AdaptableObject {
      * @defaultValue 'String'
      */
     DataType?: 'String' | 'Number' | 'Boolean' | 'Date';
+    /**
+     * Additional optional properties for Column (e.g. filterable, resizable)
+     */
+    FreeTextColumnSettings?: FreeTextColumnSettings;
 }
 /**
  * Defines a cell value stored in a Free Text Column
@@ -53,3 +58,8 @@ export interface FreeTextStoredValue {
      */
     FreeText: any;
 }
+/**
+ * Set of optional properties that define a FreeText Columns behaviour
+ */
+export interface FreeTextColumnSettings extends SpecialColumnSettings {
+}

package/src/PredefinedConfig/Selection/GridCell.d.ts

@@ -1,4 +1,5 @@
 import { RowNode } from '@ag-grid-community/all-modules';
+import { AdaptableColumn } from '../Common/AdaptableColumn';
 /**
  * Defines a Cell in Adaptable - every cell is an intersection of a Column Id and a Primary Key Value
  */
@@ -6,7 +7,7 @@ export interface GridCell {
     /**
      * Column in which cell is situtated
      */
-    columnId: string;
+    column: AdaptableColumn;
     /**
      * Actual raw value of cell
      */