@adaptabletools/adaptable-cjs 18.0.17 → 18.1.0-canary.1

package/src/Api/Internal/AlertInternalApi.js

@@ -219,13 +219,36 @@ class AlertInternalApi extends ApiBase_1.ApiBase {
      * Returns a description of an Alert Definition
      * @param alertDefinition Alert Definition to use
      */
-    getAlertDescription(alertDefinition, cellDataChangedInfo) {
-        const customMessage = this.getCustomAlertDescription(alertDefinition, { cellDataChangedInfo });
+    getAlertDescriptionForDataChange(alertDefinition, cellDataChangedInfo) {
+        let customMessage = this.getCustomAlertDescription(alertDefinition, { cellDataChangedInfo });
+        const anotationContext = cellDataChangedInfo
+            ? {
+                column: cellDataChangedInfo.column,
+                rowNode: cellDataChangedInfo.rowNode,
+                oldValue: cellDataChangedInfo.oldValue,
+                newValue: cellDataChangedInfo.newValue,
+                primaryKeyValue: cellDataChangedInfo.primaryKeyValue,
+                timestamp: cellDataChangedInfo.changedAt,
+                trigger: cellDataChangedInfo.trigger,
+            }
+            : {};
         if (customMessage) {
+            customMessage = cellDataChangedInfo
+                ? this.annotateAlertText(customMessage, anotationContext)
+                : customMessage;
             return customMessage;
         }
         if (alertDefinition.MessageText != null) {
-            return alertDefinition.MessageText;
+            let alertText = alertDefinition.MessageText;
+            try {
+                alertText = cellDataChangedInfo
+                    ? this.annotateAlertText(alertText, anotationContext)
+                    : alertText;
+                return alertText;
+            }
+            catch (e) {
+                this.logError('Error in getAlertMessageHeader', e);
+            }
         }
         let scopeDescription = this.getColumnScopeApi().getScopeDescription(alertDefinition.Scope);
         let ruleDescription = this.getAlertRuleDescription(alertDefinition);
@@ -235,11 +258,75 @@ class AlertInternalApi extends ApiBase_1.ApiBase {
      * Returns a description title of an Alert Definition
      * @param alertDefinition Alert Definition to use
      */
-    getAlertMessageHeader(alertDefinition, cellDataChangedInfo) {
+    getAlertMessageHeaderForDataChange(alertDefinition, cellDataChangedInfo) {
         var _a, _b;
-        return ((_a = this.getCustomAlertMessageHeader(alertDefinition, {
+        const anotationContext = cellDataChangedInfo
+            ? {
+                column: cellDataChangedInfo.column,
+                rowNode: cellDataChangedInfo.rowNode,
+                oldValue: cellDataChangedInfo.oldValue,
+                newValue: cellDataChangedInfo.newValue,
+                primaryKeyValue: cellDataChangedInfo.primaryKeyValue,
+                timestamp: cellDataChangedInfo.changedAt,
+                trigger: cellDataChangedInfo.trigger,
+            }
+            : {};
+        let message = (_a = this.getCustomAlertMessageHeader(alertDefinition, {
             cellDataChangedInfo,
-        })) !== null && _a !== void 0 ? _a : (_b = cellDataChangedInfo === null || cellDataChangedInfo === void 0 ? void 0 : cellDataChangedInfo.column) === null || _b === void 0 ? void 0 : _b.friendlyName);
+        })) !== null && _a !== void 0 ? _a : (_b = cellDataChangedInfo === null || cellDataChangedInfo === void 0 ? void 0 : cellDataChangedInfo.column) === null || _b === void 0 ? void 0 : _b.friendlyName;
+        try {
+            message = cellDataChangedInfo ? this.annotateAlertText(message, anotationContext) : message;
+        }
+        catch (e) {
+            this.logError('Error in getAlertMessageHeader', e);
+        }
+        return message;
+    }
+    getAlertMessageForGridDataChange(alertDefinition, gridDataChangedInfo) {
+        const rowAdded = gridDataChangedInfo.rowTrigger === 'Add';
+        const numberOfChangedRows = gridDataChangedInfo.rowNodes.length;
+        const actionName = rowAdded ? 'Added' : 'Removed';
+        const defaultMessage = numberOfChangedRows > 1
+            ? `${numberOfChangedRows} rows were ${actionName.toLowerCase()}`
+            : `${numberOfChangedRows} row was ${actionName.toLowerCase()}`;
+        const customMessage = this.getCustomAlertDescription(alertDefinition, {
+            gridDataChangedInfo,
+        });
+        let alertMessage = alertDefinition.MessageText
+            ? alertDefinition.MessageText
+            : customMessage !== null && customMessage !== void 0 ? customMessage : defaultMessage;
+        try {
+            alertMessage = this.annotateAlertText(alertMessage, {
+                numberOfRows: numberOfChangedRows,
+                timestamp: gridDataChangedInfo.changedAt,
+                trigger: gridDataChangedInfo.rowTrigger,
+            });
+        }
+        catch (e) {
+            this.logError('Error in getAlertMessageForGridDataChange', e);
+        }
+        return alertMessage;
+    }
+    getAlertHeaderForGridDataChange(alertDefinition, gridDataChangedInfo) {
+        const rowAdded = gridDataChangedInfo.rowTrigger === 'Add';
+        const numberOfChangedRows = gridDataChangedInfo.rowNodes.length;
+        const actionName = rowAdded ? 'Added' : 'Removed';
+        const customHeader = this.getCustomAlertMessageHeader(alertDefinition, {
+            gridDataChangedInfo,
+        });
+        const alertHeader = numberOfChangedRows > 1 ? `${actionName} Rows` : `${actionName} Row `;
+        let header = customHeader !== null && customHeader !== void 0 ? customHeader : alertHeader;
+        try {
+            header = this.annotateAlertText(header, {
+                numberOfRows: numberOfChangedRows,
+                timestamp: gridDataChangedInfo.changedAt,
+                trigger: gridDataChangedInfo.rowTrigger,
+            });
+        }
+        catch (e) {
+            this.logError('Error in getAlertHeaderForGridDataChange', e);
+        }
+        return header;
     }
     /**
      * Returns custom description for alert using the 'alertMessageText' property
@@ -454,6 +541,7 @@ class AlertInternalApi extends ApiBase_1.ApiBase {
                     }
                 }
             });
+            ``;
         }
         return triggeredAlerts;
     }
@@ -470,7 +558,6 @@ class AlertInternalApi extends ApiBase_1.ApiBase {
     }
     isAlertPredicateTriggered(alert, dataChangedEvent, defaultNoPredicateReturn = false) {
         var _a;
-        const adapatableApi = this.getAdaptableApi();
         const predicateDefHandlerContext = Object.assign({ value: dataChangedEvent.newValue, oldValue: dataChangedEvent.oldValue, 
             // TODO send real display value
             displayValue: null, node: dataChangedEvent.rowNode, column: dataChangedEvent.column }, this.getAdaptableApi().internalApi.buildBaseContext());
@@ -484,7 +571,7 @@ class AlertInternalApi extends ApiBase_1.ApiBase {
         if ((0, IAlertService_1.isCellDataChangedInfo)(dataChangedInfo)) {
             alertDefinitions.forEach((alertDefinition) => {
                 if (this.shouldFireAlertOnClient(alertDefinition)) {
-                    const alert = ObjectFactory_1.default.CreateCellChangedAlert(this.getAlertMessageHeader(alertDefinition, dataChangedInfo), this.getAlertDescription(alertDefinition, dataChangedInfo), alertDefinition, dataChangedInfo);
+                    const alert = ObjectFactory_1.default.CreateCellChangedAlert(this.getAlertMessageHeaderForDataChange(alertDefinition, dataChangedInfo), this.getAlertDescriptionForDataChange(alertDefinition, dataChangedInfo), alertDefinition, dataChangedInfo);
                     this.getAdaptableApi().alertApi.showAdaptableAlert(alert);
                 }
             });
@@ -494,25 +581,9 @@ class AlertInternalApi extends ApiBase_1.ApiBase {
         }
     }
     showAlertsForGridDataChanges(gridDataChangedInfo, alertDefinitions) {
-        const rowAdded = gridDataChangedInfo.rowTrigger === 'Add';
-        const numberOfChangedRows = gridDataChangedInfo.rowNodes.length;
-        const actionName = rowAdded ? 'Added' : 'Removed';
-        const alertHeader = numberOfChangedRows > 1 ? `${actionName} Rows` : `${actionName} Row `;
-        const defaultMessage = numberOfChangedRows > 1
-            ? `${numberOfChangedRows} rows were ${actionName.toLowerCase()}`
-            : `${numberOfChangedRows} row was ${actionName.toLowerCase()}`;
         alertDefinitions === null || alertDefinitions === void 0 ? void 0 : alertDefinitions.forEach((alertDefinition) => {
             if (this.shouldFireAlertOnClient(alertDefinition)) {
-                const customMessage = this.getCustomAlertDescription(alertDefinition, {
-                    gridDataChangedInfo,
-                });
-                const customHeader = this.getCustomAlertMessageHeader(alertDefinition, {
-                    gridDataChangedInfo,
-                });
-                const alertMessage = alertDefinition.MessageText
-                    ? alertDefinition.MessageText
-                    : customMessage !== null && customMessage !== void 0 ? customMessage : defaultMessage;
-                const alert = ObjectFactory_1.default.CreateRowChangedAlert(customHeader !== null && customHeader !== void 0 ? customHeader : alertHeader, alertMessage, alertDefinition, gridDataChangedInfo);
+                const alert = ObjectFactory_1.default.CreateRowChangedAlert(this.getAlertHeaderForGridDataChange(alertDefinition, gridDataChangedInfo), this.getAlertMessageForGridDataChange(alertDefinition, gridDataChangedInfo), alertDefinition, gridDataChangedInfo);
                 this.getAlertApi().showAdaptableAlert(alert);
             }
         });
@@ -545,5 +616,105 @@ class AlertInternalApi extends ApiBase_1.ApiBase {
             ],
         };
     }
+    /**
+     * Supported tokens:
+     * - column-that-changed-name -> [column]
+     * - rowData.newValue -> [rowData.newValue]
+     * - rowData.oldValue -> [rowData.oldValue]
+     * - primaryKey -> [primaryKeyValue]
+     * - timestamp -> [timestamp]
+     * - trigger -> [trigger]
+     */
+    annotateAlertText(text, context) {
+        var _a, _b, _c;
+        if (!text) {
+            return text;
+        }
+        if (!context) {
+            return text;
+        }
+        if (context === null || context === void 0 ? void 0 : context.newValue) {
+            text = this.replaceAll(text, '[newValue]', context.newValue);
+        }
+        if (context === null || context === void 0 ? void 0 : context.oldValue) {
+            text = this.replaceAll(text, '[oldValue]', context.oldValue);
+        }
+        if (context === null || context === void 0 ? void 0 : context.primaryKeyValue) {
+            text = this.replaceAll(text, '[primaryKeyValue]', context.primaryKeyValue);
+        }
+        if (context === null || context === void 0 ? void 0 : context.timestamp) {
+            text = this.replaceAll(text, '[timestamp]', context.timestamp + '');
+        }
+        if (context === null || context === void 0 ? void 0 : context.numberOfRows) {
+            text = this.replaceAll(text, '[numberOfRows]', context.numberOfRows + '');
+        }
+        if (context === null || context === void 0 ? void 0 : context.trigger) {
+            const dataChangeTriggerMap = {
+                edit: 'Edit',
+                tick: 'Tick',
+                undo: 'Undo',
+                aggChange: 'AggChange',
+            };
+            const rowChangeTriggerMap = {
+                Add: 'Added',
+                Edit: 'Edited',
+                Delete: 'Deleted',
+                Load: 'Loaded',
+            };
+            const mappedTrigger = 
+            // @ts-ignore
+            (_a = (dataChangeTriggerMap[context.trigger] || rowChangeTriggerMap[context.trigger])) !== null && _a !== void 0 ? _a : context.trigger;
+            text = this.replaceAll(text, '[trigger]', mappedTrigger);
+        }
+        if ((context === null || context === void 0 ? void 0 : context.column) && (context === null || context === void 0 ? void 0 : context.rowNode)) {
+            text = this.replaceAll(text, '[column]', this.getGridApi().getRawValueFromRowNode(context.rowNode, context.column.columnId));
+        }
+        if (context === null || context === void 0 ? void 0 : context.rowNode) {
+            const columns = this.extractColsFromText(text);
+            for (const column of columns) {
+                if (this.getColumnApi().getColumnWithColumnId(column)) {
+                    text = this.replaceAll(text, `[rowData.${column}]`, this.getGridApi().getRawValueFromRowNode(context.rowNode, column));
+                }
+            }
+        }
+        if (text.indexOf('[context') !== -1) {
+            const agGridContext = (_c = (_b = this.adaptable.agGridAdapter).getGridOption) === null || _c === void 0 ? void 0 : _c.call(_b, 'context');
+            const agGridContextKeys = this.extractContextKeysFromText(text);
+            for (const key of agGridContextKeys) {
+                if (agGridContext[key]) {
+                    text = this.replaceAll(text, `[context.${key}]`, agGridContext[key]);
+                }
+            }
+        }
+        return text;
+    }
+    replaceAll(text, toReplace, replaceWith) {
+        if (!text) {
+            return text;
+        }
+        // fails for []
+        toReplace = toReplace.replace('[', '\\[').replace(']', '\\]');
+        return text.replace(new RegExp(toReplace, 'g'), replaceWith);
+    }
+    extractColsFromText(text) {
+        // rowData.columnName => columnName
+        const regex = /\[rowData\.(.*?)\]/g;
+        let m;
+        const cols = [];
+        while ((m = regex.exec(text)) !== null) {
+            cols.push(m[1]);
+        }
+        return cols;
+    }
+    extractContextKeysFromText(text) {
+        // context.columnName => columnName
+        const regex = /\[context\.(.*?)\]/g;
+        let m;
+        const contextKeys = [];
+        while ((m = regex.exec(text)) !== null) {
+            contextKeys.push(m[1]);
+        }
+        return contextKeys;
+    }
 }
 exports.AlertInternalApi = AlertInternalApi;

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

@@ -6,6 +6,7 @@ import { ColumnFilter } from '../../PredefinedConfig/Common/ColumnFilter';
 import { IRowNode } from '@ag-grid-community/core';
 import { LayoutColumnFilterAction } from '../../Redux/ActionsReducers/LayoutRedux';
 import * as Redux from 'redux';
+import { ColumnValuesFilterPredicate } from '../../AdaptableOptions/ColumnFilterOptions';
 export declare class ColumnFilterInternalApi extends ApiBase {
     /**
      * Returns Predicate Definition for given Column and Quick Filter shortcut
@@ -58,4 +59,5 @@ export declare class ColumnFilterInternalApi extends ApiBase {
     areColumnFiltersDifferent(oldFilters: ColumnFilter[], newFilters: ColumnFilter[]): boolean;
     getPredicateDefShortcuts(predicateDef: AdaptablePredicateDef): string[];
     getFilterValuesMaxNumberOfItems(column: AdaptableColumn): number | undefined;
+    getValuesFitlerPredicateIds(column: AdaptableColumn): ColumnValuesFilterPredicate[];
 }

package/src/Api/Internal/ColumnFilterInternalApi.js

@@ -210,5 +210,25 @@ class ColumnFilterInternalApi extends ApiBase_1.ApiBase {
             return maxFilterValues;
         }
     }
+    getValuesFitlerPredicateIds(column) {
+        var _a, _b;
+        const valuesFilterPredicateOptions = (_b = (_a = this.getOptions().columnFilterOptions) === null || _a === void 0 ? void 0 : _a.valuesFilterOptions) === null || _b === void 0 ? void 0 : _b.valuesFilterPredicateOptions;
+        const availablePredicates = this.getPredicateApi().getPredicateDefsByModuleScope('columnFilter');
+        let predicateIds = [];
+        if (typeof (valuesFilterPredicateOptions === null || valuesFilterPredicateOptions === void 0 ? void 0 : valuesFilterPredicateOptions.predicates) === 'function') {
+            const columnFilterContext = Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { column: column });
+            predicateIds = valuesFilterPredicateOptions.predicates(columnFilterContext);
+        }
+        else if (Array.isArray(valuesFilterPredicateOptions === null || valuesFilterPredicateOptions === void 0 ? void 0 : valuesFilterPredicateOptions.predicates)) {
+            predicateIds = valuesFilterPredicateOptions.predicates;
+        }
+        return predicateIds.filter((predicateId) => {
+            const predicate = availablePredicates.find((p) => p.id === predicateId);
+            if (!predicate) {
+                return false;
+            }
+            return this.getColumnScopeApi().isColumnInScope(column, predicate.columnScope);
+        });
+    }
 }
 exports.ColumnFilterInternalApi = ColumnFilterInternalApi;

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

@@ -3,7 +3,7 @@ import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChang
 import { Report } from '../../PredefinedConfig/ExportState';
 import { AdaptableColumnType } from '../../PredefinedConfig/Common/Types';
 import { ExcelDataType, ExcelStyle } from '@ag-grid-community/core';
-import { AdaptableColumnDataType } from '../../PredefinedConfig/Common/AdaptableColumn';
+import { AdaptableColumn, AdaptableColumnDataType } from '../../PredefinedConfig/Common/AdaptableColumn';
 import { DataFormatType } from '../../AdaptableOptions/ExportOptions';
 export declare class ExportInternalApi extends ApiBase {
     /**
@@ -14,8 +14,8 @@ export declare class ExportInternalApi extends ApiBase {
     isDataChangeInReport(cellDataChangedInfo: CellDataChangedInfo, report: Report): boolean;
     getExcelDataType(adaptableColumnType: string | string[] | AdaptableColumnType | AdaptableColumnType[]): ExcelDataType;
     isVisualDataExportInProgress(): boolean;
-    isDateCellExportedAsFormattedValue(): boolean;
-    getCellExportFormatType(columnDataType: AdaptableColumnDataType): DataFormatType;
+    isDateCellExportedAsFormattedValue(abColumn: AdaptableColumn): boolean;
+    getCellExportFormatType(column: AdaptableColumn, columnDataType: AdaptableColumnDataType): DataFormatType;
     isDestinationEnabled(destination: string): boolean;
     getExcelStylesForVisualDataExport(original_excelStyles: ExcelStyle[]): ExcelStyle[];
 }

package/src/Api/Internal/ExportInternalApi.js

@@ -97,28 +97,42 @@ class ExportInternalApi extends ApiBase_1.ApiBase {
     isVisualDataExportInProgress() {
         return this.getAdaptableState().System.Export.visualDataExportInProgress;
     }
-    isDateCellExportedAsFormattedValue() {
+    isDateCellExportedAsFormattedValue(abColumn) {
         return (!!this.getExportOptions().exportDateFormat ||
-            this.getCellExportFormatType('Date') === 'formattedValue');
+            this.getCellExportFormatType(abColumn, 'Date') === 'formattedValue');
     }
-    getCellExportFormatType(columnDataType) {
+    getCellExportFormatType(column, columnDataType) {
         const exportOptions = this.getExportOptions();
-        if (exportOptions.exportFormatType === 'rawValue' ||
-            exportOptions.exportFormatType === 'formattedValue') {
-            return exportOptions.exportFormatType;
+        const exportFormatType = exportOptions.exportFormatType;
+        // First check if a function was provided and return the result
+        if (exportFormatType != null && typeof exportFormatType === 'function') {
+            const context = Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { column: column });
+            return exportFormatType(context);
         }
-        // format is customized based on column data type
-        switch (columnDataType) {
-            case 'String':
-                return exportOptions.exportFormatType.string;
-            case 'Number':
-                return exportOptions.exportFormatType.number;
-            case 'Date':
-                return exportOptions.exportFormatType.date;
-            default:
-                // default to rawValue for all other column types
-                return 'rawValue';
+        // Next Check if a "hard-coded" value has been provided and return that
+        if (exportFormatType === 'rawValue') {
+            return 'rawValue';
         }
+        if (exportFormatType === 'formattedValue') {
+            return 'formattedValue';
+        }
+        // Finally test if a DataType object has been provided and return the relevant property
+        const dataFormatDataType = exportFormatType;
+        if (dataFormatDataType) {
+            // format is customized based on column data type
+            switch (columnDataType) {
+                case 'String':
+                    return dataFormatDataType.string;
+                case 'Number':
+                    return dataFormatDataType.number;
+                case 'Date':
+                    return dataFormatDataType.date;
+                default:
+                    // default to rawValue for all other column types
+                    return 'rawValue';
+            }
+        }
+        return 'rawValue';
     }
     isDestinationEnabled(destination) {
         if (destination === 'Table' && this.getLayoutApi().internalApi.isLayoutGrouped()) {

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

@@ -1,6 +1,6 @@
 import { ApiBase } from '../Implementation/ApiBase';
 import { AdaptableQLModule } from '../../PredefinedConfig/Common/Types';
-import { AdaptableObject, AdaptablePredicate } from '../../types';
+import { AdaptableField, AdaptableObject, AdaptablePredicate } from '../../types';
 export declare class ExpressionInternalApi extends ApiBase {
     /**
      * Checks if a column is referenced in a given Expression
@@ -10,4 +10,8 @@ export declare class ExpressionInternalApi extends ApiBase {
     isColumnReferencedInExpression(columnId: string, expression: string): boolean;
     evaluateExpressionInAdaptableQL(module: AdaptableQLModule, object?: AdaptableObject, expression?: string): boolean;
     evaluatePredicatesInAdaptableQL(module: AdaptableQLModule, object?: AdaptableObject, predicates?: AdaptablePredicate[]): boolean;
+    private getFieldsFromOptions;
+    getAvailableFields(data?: Record<string, any>): AdaptableField[];
+    getFieldType(field: string): AdaptableField['dataType'];
+    getFieldsOfType(type?: AdaptableField['dataType']): AdaptableField[];
 }

package/src/Api/Internal/ExpressionInternalApi.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExpressionInternalApi = void 0;
+const tslib_1 = require("tslib");
 const ApiBase_1 = require("../Implementation/ApiBase");
+const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/ArrayExtensions"));
 class ExpressionInternalApi extends ApiBase_1.ApiBase {
     /**
      * Checks if a column is referenced in a given Expression
@@ -48,5 +50,83 @@ class ExpressionInternalApi extends ApiBase_1.ApiBase {
         }
         return !evaluateExpressionExternallyFn(context);
     }
+    // Used later, when we extend to support inferring fields from data
+    // private getFieldsFromData<T extends Record<string, any>>(data: T): string[] {
+    //   if (!data) {
+    //     return [];
+    //   }
+    //   if (typeof data !== 'object' || Number.isNaN(data)) {
+    //     return [];
+    //   }
+    //   const keys: string[] = [];
+    //   for (const key in Object.keys(data)) {
+    //     const candidate = data[key];
+    //     if (
+    //       typeof candidate === 'number' ||
+    //       typeof candidate === 'string' ||
+    //       typeof candidate === 'boolean' ||
+    //       candidate instanceof Date
+    //     ) {
+    //       keys.push(key);
+    //       continue;
+    //     }
+    //     // no support for arrays
+    //     // for objects we go one level deep
+    //     if (typeof candidate === 'object' && candidate !== null && !Array.isArray(candidate)) {
+    //       const childKeys = this.getFieldsFromData(candidate);
+    //       for (const childKey of childKeys) {
+    //         keys.push(`${key}.${childKey}`);
+    //       }
+    //     }
+    //   }
+    //   return keys;
+    // }
+    getFieldsFromOptions() {
+        const fields = this.adaptable.api.optionsApi.getExpressionOptions().fields;
+        if (fields != null && typeof fields === 'function') {
+            return fields(this.getAdaptableApi().internalApi.buildBaseContext());
+        }
+        else {
+            let arr = fields;
+            if (arr && ArrayExtensions_1.default.IsNotNullOrEmpty(arr)) {
+                return arr;
+            }
+        }
+    }
+    getAvailableFields(data) {
+        var _a, _b;
+        const optionFields = (_b = ((_a = this.getFieldsFromOptions()) !== null && _a !== void 0 ? _a : [])) === null || _b === void 0 ? void 0 : _b.map((field) => (Object.assign(Object.assign({}, field), { label: field.label || field.name })));
+        // const existingFields = new Set<string>();
+        // Exclude fields already in options
+        // optionFields.forEach((field) => existingFields.add(field.value));
+        // const queriableColumns = this.getColumnApi().getQueryableColumns();
+        // Exclude queriable columns
+        // queriableColumns.forEach((column) => existingFields.add(column.field));
+        // const dataFields = this.getFieldsFromData(data).reduce<AdaptableField[]>((acc, field) => {
+        //   if (!existingFields.has(field)) {
+        //     acc.push({
+        //       label: field,
+        //       value: field,
+        //     });
+        //   }
+        //   return acc;
+        // }, []);
+        return optionFields;
+    }
+    getFieldType(field) {
+        var _a;
+        const fieldDef = (_a = this.getFieldsFromOptions()) === null || _a === void 0 ? void 0 : _a.find((f) => f.name === field);
+        if (fieldDef) {
+            return fieldDef.dataType;
+        }
+        return 'String';
+    }
+    getFieldsOfType(type) {
+        var _a, _b, _c;
+        if (!type) {
+            return (_a = this.getAvailableFields()) !== null && _a !== void 0 ? _a : [];
+        }
+        return (_c = (_b = this.getAvailableFields()) === null || _b === void 0 ? void 0 : _b.filter((f) => f.dataType === type)) !== null && _c !== void 0 ? _c : [];
+    }
 }
 exports.ExpressionInternalApi = ExpressionInternalApi;

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

@@ -1,32 +1,30 @@
 import { ApiBase } from '../Implementation/ApiBase';
-import { Fdc3ContextType, Fdc3Context, Fdc3StandardContextType } from '../../PredefinedConfig/Common/Fdc3Context';
 import { ColDef, IRowNode } from '@ag-grid-community/core';
-import { AppIdentifier, Context, IntentResolution } from '@finos/fdc3';
+import { AppIdentifier, Context, ContextType, Intent, IntentResolution, StandardContextType, StandardIntent } from '@finos/fdc3';
 import { BroadcastConfig, RaiseIntentConfig } from '../../AdaptableOptions/Fdc3Options';
-import { Fdc3IntentType, Fdc3StandardIntentType } from '../../PredefinedConfig/Common/Fdc3Intent';
 import { AdaptableButton } from '../../PredefinedConfig/Common/AdaptableButton';
 import { ActionColumnContext } from '../../AdaptableOptions/ActionColumnOptions';
 import { AdaptableIcon } from '../../PredefinedConfig/Common/AdaptableIcon';
 export type WithContext<K> = K & {
-    contextType: Fdc3ContextType;
+    contextType: ContextType;
 };
 export type WithIntent<K> = K & {
-    intentType: Fdc3IntentType;
+    intentType: Intent;
 };
 export declare class Fdc3InternalApi extends ApiBase {
-    mapRowToContextData(contextType: Fdc3ContextType, rowNode: IRowNode): Fdc3Context;
+    mapRowToContextData(contextType: ContextType, rowNode: IRowNode): Context;
     getFdc3ActionColDefs(): ColDef[];
     getButtonsForFdc3MainActionColumn(): AdaptableButton<ActionColumnContext<any>>[];
     getButtonsForFdc3StandaloneActionColumn(columnId: string): AdaptableButton<ActionColumnContext<any>>[];
     isFdc3MainActionColumn(columnId: string): boolean;
     isFdc3StandaloneActionColumn(columnId: string, columnType: string | string[]): boolean;
     handleIntentResolution(intentResolution: IntentResolution, context: Context, raisedIntent: string, app?: AppIdentifier): void;
-    isStandardContextType(contextType: string): contextType is Fdc3StandardContextType;
-    isStandardIntentType(intentType: string): intentType is Fdc3StandardIntentType;
+    isStandardContextType(contextType: string): contextType is StandardContextType;
+    isStandardIntentType(intentType: string): intentType is StandardIntent;
     getAllRaiseIntentConfigs(): WithIntent<RaiseIntentConfig>[];
     getAllBroadcastContextConfigs(): WithContext<BroadcastConfig>[];
-    getDefaultIconForIntent(intentType: Fdc3IntentType): AdaptableIcon;
-    getDefaultIconForContext(contextType: Fdc3ContextType): AdaptableIcon;
+    getDefaultIconForIntent(intentType: Intent): AdaptableIcon;
+    getDefaultIconForContext(contextType: ContextType): AdaptableIcon;
     private mapRowValueToContextData;
     private isAtLeastOneActionButtonConfigured;
     private getIntentConfigsWithActionButtons;

package/src/Api/Internal/Fdc3InternalApi.js

@@ -2,19 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Fdc3InternalApi = void 0;
 const ApiBase_1 = require("../Implementation/ApiBase");
-const Fdc3Context_1 = require("../../PredefinedConfig/Common/Fdc3Context");
 const fdc3_1 = require("@finos/fdc3");
 const Fdc3Options_1 = require("../../AdaptableOptions/Fdc3Options");
-const Fdc3Intent_1 = require("../../PredefinedConfig/Common/Fdc3Intent");
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 const ActionColumnRenderer_1 = require("../../agGrid/ActionColumnRenderer");
 class Fdc3InternalApi extends ApiBase_1.ApiBase {
     mapRowToContextData(contextType, rowNode) {
         var _a, _b, _c;
-        if (contextType === fdc3_1.ContextTypes.Nothing) {
-            return { type: fdc3_1.ContextTypes.Nothing };
+        if (contextType === 'fdc3.nothing') {
+            return { type: contextType };
         }
-        const mappedContextData = this.mapRowValueToContextData(rowNode, this.isStandardContextType(contextType) && contextType !== fdc3_1.ContextTypes.Nothing
+        const mappedContextData = this.mapRowValueToContextData(rowNode, this.isStandardContextType(contextType) && contextType !== 'fdc3.nothing'
             ? (_a = this.getFdc3Options().gridDataContextMapping) === null || _a === void 0 ? void 0 : _a[contextType]
             : (_c = (_b = this.getFdc3Options().gridDataContextMapping) === null || _b === void 0 ? void 0 : _b.custom) === null || _c === void 0 ? void 0 : _c[contextType]);
         const contextMappedFromGridData = Object.assign({ type: contextType }, mappedContextData);
@@ -157,12 +155,10 @@ class Fdc3InternalApi extends ApiBase_1.ApiBase {
         }
     }
     isStandardContextType(contextType) {
-        // @ts-ignore
-        return Fdc3Context_1.StandardContextTypes.includes(contextType);
+        return (0, fdc3_1.isStandardContextType)(contextType);
     }
     isStandardIntentType(intentType) {
-        // @ts-ignore
-        return Fdc3Intent_1.Fdc3StandardIntents.includes(intentType);
+        return (0, fdc3_1.isStandardIntent)(intentType);
     }
     getAllRaiseIntentConfigs() {
         var _a;