@adaptabletools/adaptable-cjs 19.2.4 → 20.0.0-canary.1

package/src/Api/Internal/ExpressionInternalApi.js

@@ -15,30 +15,34 @@ class ExpressionInternalApi extends ApiBase_1.ApiBase {
         return colIds.some((c) => c === columnId);
     }
     evaluateExpressionInAdaptableQL(module, object, expression) {
-        var _a;
-        const evaluateExpressionExternallyFn = (_a = this.getExpressionOptions()) === null || _a === void 0 ? void 0 : _a.evaluateAdaptableQLExternally;
+        const evaluateExpressionExternallyFn = this.getExpressionOptions()?.evaluateAdaptableQLExternally;
         if (typeof evaluateExpressionExternallyFn !== 'function') {
             return true;
         }
-        const context = Object.assign(Object.assign({}, this.getAdaptableInternalApi().buildBaseContext()), { module });
+        const context = {
+            ...this.getAdaptableInternalApi().buildBaseContext(),
+            module,
+        };
         if (object) {
             context.object = object;
         }
         if (expression) {
             context.expression = expression;
-            context.referencedColumns = this.getAdaptableApi()
-                .expressionApi.getColumnsFromExpression(expression)
+            context.referencedColumns = this.getExpressionApi()
+                .getColumnsFromExpression(expression)
                 .map((columnId) => this.getColumnApi().getColumnWithColumnId(columnId));
         }
         return !evaluateExpressionExternallyFn(context);
     }
     evaluatePredicatesInAdaptableQL(module, object, predicates) {
-        var _a;
-        const evaluateExpressionExternallyFn = (_a = this.getExpressionOptions()) === null || _a === void 0 ? void 0 : _a.evaluateAdaptableQLExternally;
+        const evaluateExpressionExternallyFn = this.getExpressionOptions()?.evaluateAdaptableQLExternally;
         if (typeof evaluateExpressionExternallyFn !== 'function') {
             return true;
         }
-        const context = Object.assign(Object.assign({}, this.getAdaptableInternalApi().buildBaseContext()), { module });
+        const context = {
+            ...this.getAdaptableInternalApi().buildBaseContext(),
+            module,
+        };
         if (object) {
             context.object = object;
         }
@@ -46,7 +50,7 @@ class ExpressionInternalApi extends ApiBase_1.ApiBase {
             context.predicates = predicates;
             // need to find a way to get the columns in the predicates
             // cand do later
-            //        this.getAdaptableApi().columnScopeApi.getColumnsForScope();
+            //        this.getAdaptableApi().columnScopeApi.getColumnsInScope();
         }
         return !evaluateExpressionExternallyFn(context);
     }
@@ -94,8 +98,10 @@ class ExpressionInternalApi extends ApiBase_1.ApiBase {
         }
     }
     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 optionFields = (this.getFieldsFromOptions() ?? [])?.map((field) => ({
+            ...field,
+            label: field.label || field.name,
+        }));
         // const existingFields = new Set<string>();
         // Exclude fields already in options
         // optionFields.forEach((field) => existingFields.add(field.value));
@@ -114,19 +120,17 @@ class ExpressionInternalApi extends ApiBase_1.ApiBase {
         return optionFields;
     }
     getFieldType(field) {
-        var _a;
-        const fieldDef = (_a = this.getFieldsFromOptions()) === null || _a === void 0 ? void 0 : _a.find((f) => f.name === field);
+        const fieldDef = this.getFieldsFromOptions()?.find((f) => f.name === field);
         if (fieldDef) {
             return fieldDef.dataType;
         }
-        return 'String';
+        return 'text';
     }
     getFieldsOfType(type) {
-        var _a, _b, _c;
         if (!type) {
-            return (_a = this.getAvailableFields()) !== null && _a !== void 0 ? _a : [];
+            return this.getAvailableFields() ?? [];
         }
-        return (_c = (_b = this.getAvailableFields()) === null || _b === void 0 ? void 0 : _b.filter((f) => f.dataType === type)) !== null && _c !== void 0 ? _c : [];
+        return this.getAvailableFields()?.filter((f) => f.dataType === type) ?? [];
     }
 }
 exports.ExpressionInternalApi = ExpressionInternalApi;

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

@@ -1,5 +1,5 @@
 import { ApiBase } from '../Implementation/ApiBase';
-import { ColDef, IRowNode } from '@ag-grid-community/core';
+import { ColDef, IRowNode } from 'ag-grid-enterprise';
 import { AppIdentifier, Context, ContextType, Intent, IntentResolution, StandardContextType, StandardIntent } from '@finos/fdc3';
 import { BroadcastConfig, RaiseIntentConfig } from '../../AdaptableOptions/Fdc3Options';
 import { AdaptableButton } from '../../PredefinedConfig/Common/AdaptableButton';
@@ -13,11 +13,12 @@ export type WithIntent<K> = K & {
 };
 export declare class Fdc3InternalApi extends ApiBase {
     mapRowToContextData(contextType: ContextType, rowNode: IRowNode): Context;
+    getFdc3ColumnIds(): string[];
     getFdc3ActionColDefs(): ColDef[];
     getButtonsForFdc3MainActionColumn(): AdaptableButton<ActionColumnContext<any>>[];
     getButtonsForFdc3StandaloneActionColumn(columnId: string): AdaptableButton<ActionColumnContext<any>>[];
     isFdc3MainActionColumn(columnId: string): boolean;
-    isFdc3StandaloneActionColumn(columnId: string, columnType: string | string[]): boolean;
+    isFdc3StandaloneActionColumn(columnId: string): boolean;
     handleIntentResolution(intentResolution: IntentResolution, context: Context, raisedIntent: string, app?: AppIdentifier): void;
     isStandardContextType(contextType: string): contextType is StandardContextType;
     isStandardIntentType(intentType: string): intentType is StandardIntent;

package/src/Api/Internal/Fdc3InternalApi.js

@@ -4,28 +4,47 @@ exports.Fdc3InternalApi = void 0;
 const ApiBase_1 = require("../Implementation/ApiBase");
 const fdc3_1 = require("@finos/fdc3");
 const Fdc3Options_1 = require("../../AdaptableOptions/Fdc3Options");
-const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
-const ActionColumnRenderer_1 = require("../../agGrid/ActionColumnRenderer");
+const ActionColumnRenderer_1 = require("../../agGrid/cellRenderers/ActionColumnRenderer");
+const AdaptableColumn_1 = require("../../PredefinedConfig/Common/AdaptableColumn");
 class Fdc3InternalApi extends ApiBase_1.ApiBase {
     mapRowToContextData(contextType, rowNode) {
-        var _a, _b, _c;
         if (contextType === 'fdc3.nothing') {
             return { type: contextType };
         }
         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);
+            ? this.getFdc3Options().gridDataContextMapping?.[contextType]
+            : this.getFdc3Options().gridDataContextMapping?.custom?.[contextType]);
+        const contextMappedFromGridData = {
+            type: contextType,
+            ...mappedContextData,
+        };
         const resolveContextDataFn = this.getFdc3Options().resolveContextData;
         if (typeof resolveContextDataFn === 'function') {
-            return resolveContextDataFn(Object.assign(Object.assign({}, this.getAdaptableInternalApi().buildBaseContext()), { contextType,
+            return resolveContextDataFn({
+                ...this.getAdaptableInternalApi().buildBaseContext(),
+                contextType,
                 contextMappedFromGridData,
-                rowNode, rowData: rowNode.data, primaryKeyValue: this.getGridApi().getPrimaryKeyValueForRowNode(rowNode) }));
+                rowNode,
+                rowData: rowNode.data,
+                primaryKeyValue: this.getGridApi().getPrimaryKeyValueForRowNode(rowNode),
+            });
         }
         else {
             return contextMappedFromGridData;
         }
     }
+    getFdc3ColumnIds() {
+        const fdc3ColumnIds = [];
+        if (this.isAtLeastOneActionButtonConfigured()) {
+            fdc3ColumnIds.push(this.getFdc3Options().actionColumnDefaultConfiguration.columnId);
+        }
+        [...this.getAllRaiseIntentConfigs(), ...this.getAllBroadcastContextConfigs()].forEach((config) => {
+            if (config.actionColumn) {
+                fdc3ColumnIds.push(config.actionColumn.columnId);
+            }
+        });
+        return fdc3ColumnIds;
+    }
     getFdc3ActionColDefs() {
         const actionColDefs = [];
         if (this.isAtLeastOneActionButtonConfigured()) {
@@ -46,7 +65,7 @@ class Fdc3InternalApi extends ApiBase_1.ApiBase {
                 sortable: false,
                 enableRowGroup: false,
                 cellRenderer: this.getAdaptableVariant() === 'react' ? ActionColumnRenderer_1.ReactActionColumnRenderer : ActionColumnRenderer_1.ActionColumnRenderer,
-                type: [GeneralConstants_1.AB_SPECIAL_COLUMN, GeneralConstants_1.AB_FDC3_COLUMN, 'abColDefObject'],
+                type: [AdaptableColumn_1.FDC3_COLUMN_TYPE],
             });
         }
         const buildColDef = (actionColumnConfig) => {
@@ -66,7 +85,7 @@ class Fdc3InternalApi extends ApiBase_1.ApiBase {
                 sortable: false,
                 enableRowGroup: false,
                 cellRenderer: this.getAdaptableVariant() === 'react' ? ActionColumnRenderer_1.ReactActionColumnRenderer : ActionColumnRenderer_1.ActionColumnRenderer,
-                type: [GeneralConstants_1.AB_SPECIAL_COLUMN, GeneralConstants_1.AB_FDC3_COLUMN, 'abColDefObject'],
+                type: [AdaptableColumn_1.FDC3_COLUMN_TYPE],
             };
         };
         this.getAllRaiseIntentConfigs().forEach((intentConfig) => {
@@ -115,8 +134,7 @@ class Fdc3InternalApi extends ApiBase_1.ApiBase {
     getButtonsForFdc3StandaloneActionColumn(columnId) {
         const buttons = [];
         this.getAllRaiseIntentConfigs().forEach((intentConfig) => {
-            var _a;
-            if (((_a = intentConfig.actionColumn) === null || _a === void 0 ? void 0 : _a.columnId) === columnId) {
+            if (intentConfig.actionColumn?.columnId === columnId) {
                 buttons.push(this.mapFdc3ButtonConfigToAdaptableButton(intentConfig.actionColumn.button, {
                     action: 'raiseIntent',
                     intent: intentConfig.intentType,
@@ -125,8 +143,7 @@ class Fdc3InternalApi extends ApiBase_1.ApiBase {
             }
         });
         this.getAllBroadcastContextConfigs().forEach((contextConfig) => {
-            var _a;
-            if (((_a = contextConfig.actionColumn) === null || _a === void 0 ? void 0 : _a.columnId) === columnId) {
+            if (contextConfig.actionColumn?.columnId === columnId) {
                 buttons.push(this.mapFdc3ButtonConfigToAdaptableButton(contextConfig.actionColumn.button, {
                     action: 'broadcastContext',
                     contextType: contextConfig.contextType,
@@ -138,20 +155,25 @@ class Fdc3InternalApi extends ApiBase_1.ApiBase {
     isFdc3MainActionColumn(columnId) {
         return columnId === this.getFdc3Options().actionColumnDefaultConfiguration.columnId;
     }
-    isFdc3StandaloneActionColumn(columnId, columnType) {
-        const types = typeof columnType === 'string' ? [columnType] : columnType;
-        return types.includes(GeneralConstants_1.AB_FDC3_COLUMN) && !this.isFdc3MainActionColumn(columnId);
+    isFdc3StandaloneActionColumn(columnId) {
+        const allFdc3ColumnIds = this.getFdc3ColumnIds();
+        return allFdc3ColumnIds.includes(columnId) && !this.isFdc3MainActionColumn(columnId);
     }
     handleIntentResolution(intentResolution, context, raisedIntent, app) {
-        var _a, _b;
         const relevantRaiseIntentConfig = this.getAllRaiseIntentConfigs().find((config) => config.intentType === raisedIntent && config.contextType === context.type);
-        if (typeof (relevantRaiseIntentConfig === null || relevantRaiseIntentConfig === void 0 ? void 0 : relevantRaiseIntentConfig.handleIntentResolution) === 'function') {
+        if (typeof relevantRaiseIntentConfig?.handleIntentResolution === 'function') {
             // call intent specific resolution handler
-            relevantRaiseIntentConfig.handleIntentResolution(Object.assign(Object.assign({}, this.getAdaptableInternalApi().buildBaseContext()), { intentResolution }));
+            relevantRaiseIntentConfig.handleIntentResolution({
+                ...this.getAdaptableInternalApi().buildBaseContext(),
+                intentResolution,
+            });
         }
         else {
             // call global resolution handler (if any)
-            (_b = (_a = this.getFdc3Options().intents) === null || _a === void 0 ? void 0 : _a.handleIntentResolution) === null || _b === void 0 ? void 0 : _b.call(_a, Object.assign(Object.assign({}, this.getAdaptableInternalApi().buildBaseContext()), { intentResolution }));
+            this.getFdc3Options().intents?.handleIntentResolution?.({
+                ...this.getAdaptableInternalApi().buildBaseContext(),
+                intentResolution,
+            });
         }
     }
     isStandardContextType(contextType) {
@@ -161,10 +183,12 @@ class Fdc3InternalApi extends ApiBase_1.ApiBase {
         return (0, fdc3_1.isStandardIntent)(intentType);
     }
     getAllRaiseIntentConfigs() {
-        var _a;
         const result = [];
-        const mapConfig = (intentType, intentConfigs) => intentConfigs.map((intentConfig) => (Object.assign(Object.assign({}, intentConfig), { intentType })));
-        const raiseIntentConfiguration = ((_a = this.getFdc3Options().intents) === null || _a === void 0 ? void 0 : _a.raises) || {};
+        const mapConfig = (intentType, intentConfigs) => intentConfigs.map((intentConfig) => ({
+            ...intentConfig,
+            intentType,
+        }));
+        const raiseIntentConfiguration = this.getFdc3Options().intents?.raises || {};
         Object.keys(raiseIntentConfiguration).forEach((intentType) => {
             if (intentType === 'custom') {
                 const customIntentConfigs = raiseIntentConfiguration[intentType];
@@ -180,10 +204,9 @@ class Fdc3InternalApi extends ApiBase_1.ApiBase {
         return result;
     }
     getAllBroadcastContextConfigs() {
-        var _a;
         const result = [];
-        const mapConfig = (contextType, contextConfig) => (Object.assign(Object.assign({}, contextConfig), { contextType }));
-        const broadcastContextConfiguration = ((_a = this.getFdc3Options().contexts) === null || _a === void 0 ? void 0 : _a.broadcasts) || {};
+        const mapConfig = (contextType, contextConfig) => ({ ...contextConfig, contextType });
+        const broadcastContextConfiguration = this.getFdc3Options().contexts?.broadcasts || {};
         Object.keys(broadcastContextConfiguration).forEach((contextType) => {
             if (contextType === 'custom') {
                 const customContextConfigs = broadcastContextConfiguration[contextType];
@@ -199,19 +222,21 @@ class Fdc3InternalApi extends ApiBase_1.ApiBase {
         return result;
     }
     getDefaultIconForIntent(intentType) {
-        var _a, _b;
-        const defaultConfig = this.getAdaptableInternalApi().getFdc3Service().getUiControlsDefaultConfiguration();
+        const defaultConfig = this.getAdaptableInternalApi()
+            .getFdc3Service()
+            .getUiControlsDefaultConfiguration();
         // @ts-ignore
-        const intentIcon = (_b = (_a = defaultConfig === null || defaultConfig === void 0 ? void 0 : defaultConfig.intents[intentType]) === null || _a === void 0 ? void 0 : _a.icon) !== null && _b !== void 0 ? _b : {
+        const intentIcon = defaultConfig?.intents[intentType]?.icon ?? {
             name: 'fdc3',
         };
         return intentIcon;
     }
     getDefaultIconForContext(contextType) {
-        var _a, _b;
-        const defaultConfig = this.getAdaptableInternalApi().getFdc3Service().getUiControlsDefaultConfiguration();
+        const defaultConfig = this.getAdaptableInternalApi()
+            .getFdc3Service()
+            .getUiControlsDefaultConfiguration();
         // @ts-ignore
-        const contextIcon = (_b = (_a = defaultConfig === null || defaultConfig === void 0 ? void 0 : defaultConfig.contexts[contextType]) === null || _a === void 0 ? void 0 : _a.icon) !== null && _b !== void 0 ? _b : {
+        const contextIcon = defaultConfig?.contexts[contextType]?.icon ?? {
             name: 'fdc3',
         };
         return contextIcon;
@@ -264,7 +289,14 @@ class Fdc3InternalApi extends ApiBase_1.ApiBase {
     }
     mapFdc3ButtonConfigToAdaptableButton(fdc3AdaptableButton, fdcInfo) {
         const buildFdc3Context = (context) => {
-            return Object.assign({ context: this.mapRowToContextData(fdcInfo.contextType, context.rowNode), intent: fdcInfo.action === 'raiseIntent' ? fdcInfo.intent : null, rowNode: context.rowNode, rowData: context.data, primaryKeyValue: context.primaryKeyValue }, this.getAdaptableInternalApi().buildBaseContext());
+            return {
+                context: this.mapRowToContextData(fdcInfo.contextType, context.rowNode),
+                intent: fdcInfo.action === 'raiseIntent' ? fdcInfo.intent : null,
+                rowNode: context.rowNode,
+                rowData: context.data,
+                primaryKeyValue: context.primaryKeyValue,
+                ...this.getAdaptableInternalApi().buildBaseContext(),
+            };
         };
         return {
             onClick: (_button, context) => {

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

@@ -0,0 +1,3 @@
+import { ApiBase } from '../Implementation/ApiBase';
+export declare class FilterInternalApi extends ApiBase {
+}

package/src/Api/Internal/FilterInternalApi.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FilterInternalApi = void 0;
+const ApiBase_1 = require("../Implementation/ApiBase");
+class FilterInternalApi extends ApiBase_1.ApiBase {
+}
+exports.FilterInternalApi = FilterInternalApi;

package/src/Api/Internal/FlashingCellInternalApi.js

@@ -36,16 +36,15 @@ class FlashingCellInternalApi extends ApiBase_1.ApiBase {
         return flashingCellDefinition;
     }
     getAdaptableFlashingCellFor(primaryKey, columnId) {
-        var _a;
         const flashingCellService = this.getAdaptableInternalApi().getFlashingCellService();
         const AdaptableFlashingAlerts = flashingCellService.gridCellsCurrentlyFlashing;
         const AdaptableFlashingAlertsMap = flashingCellService.flashingCellsMapping;
-        const forPrimaryKey = (_a = AdaptableFlashingAlerts[primaryKey]) !== null && _a !== void 0 ? _a : {};
-        const toFlashingAlert = (uuid) => { var _a; return uuid ? (_a = AdaptableFlashingAlertsMap[uuid]) !== null && _a !== void 0 ? _a : null : null; };
+        const forPrimaryKey = AdaptableFlashingAlerts[primaryKey] ?? {};
+        const toFlashingAlert = (uuid) => uuid ? AdaptableFlashingAlertsMap[uuid] ?? null : null;
         const adaptableFlashingCell = columnId
             ? toFlashingAlert(forPrimaryKey[columnId])
             : toFlashingAlert(forPrimaryKey[FlashingCellService_1.FLASHING_CELL_ROW_KEY]);
-        if ((adaptableFlashingCell === null || adaptableFlashingCell === void 0 ? void 0 : adaptableFlashingCell.flashingCellDefinition) &&
+        if (adaptableFlashingCell?.flashingCellDefinition &&
             !this.getLayoutApi().internalApi.isObjectAvailableInLayout(adaptableFlashingCell.flashingCellDefinition, 'FlashingCell', this.getLayoutApi().getCurrentLayout())) {
             return;
         }

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

@@ -1,6 +1,6 @@
 import { AdaptableColumn, AdaptableFormat, AdaptablePredicateDef, ColumnScope, FormatColumn, StringFormatterOptions } from '../../types';
 import { ApiBase } from '../Implementation/ApiBase';
-import { IRowNode } from '@ag-grid-community/core';
+import { IRowNode } from 'ag-grid-enterprise';
 export declare class FormatColumnInternalApi extends ApiBase {
     /**
      * Retrieves all Format Columns in Adaptable State with the `Style` property set

package/src/Api/Internal/FormatColumnInternalApi.js

@@ -7,6 +7,7 @@ const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Exte
 const FormatHelper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/FormatHelper"));
 const ObjectFactory_1 = tslib_1.__importDefault(require("../../Utilities/ObjectFactory"));
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
+const AdaptableLogger_1 = require("../../agGrid/AdaptableLogger");
 class FormatColumnInternalApi extends ApiBase_1.ApiBase {
     /**
      * Retrieves all Format Columns in Adaptable State with the `Style` property set
@@ -51,7 +52,7 @@ class FormatColumnInternalApi extends ApiBase_1.ApiBase {
      * @returns list of FormatColumn
      */
     getFormatColumnsWithStyleForColumn(column, config) {
-        const formatColumns = this.getAllFormatColumnWithStyleAndCellAlignment().filter((formatColumn) => (config === null || config === void 0 ? void 0 : config.includeSuspended) || !formatColumn.IsSuspended);
+        const formatColumns = this.getAllFormatColumnWithStyleAndCellAlignment().filter((formatColumn) => config?.includeSuspended || !formatColumn.IsSuspended);
         return this.getFormatColumnWithColumnInScope(formatColumns, column);
     }
     /**
@@ -60,7 +61,7 @@ class FormatColumnInternalApi extends ApiBase_1.ApiBase {
      * @returns format columns
      */
     getFormatColumnWithStyleClassNameForColumn(column, config) {
-        return this.getFormatColumnsWithStyleForColumn(column, config).filter((formatColumn) => { var _a; return StringExtensions_1.default.IsNotNullOrEmpty((_a = formatColumn === null || formatColumn === void 0 ? void 0 : formatColumn.Style) === null || _a === void 0 ? void 0 : _a.ClassName); });
+        return this.getFormatColumnsWithStyleForColumn(column, config).filter((formatColumn) => StringExtensions_1.default.IsNotNullOrEmpty(formatColumn?.Style?.ClassName));
     }
     getFormatColumnWithColumnInScope(formatColumns, column) {
         return this.getFormatColumnInColumnScope(formatColumns).filter((scopedFormatColumn) => this.getColumnScopeApi().isColumnInScope(column, scopedFormatColumn.Scope));
@@ -86,7 +87,7 @@ class FormatColumnInternalApi extends ApiBase_1.ApiBase {
      * @returns list of FormatColumn
      */
     getFormatColumnsWithDisplayFormatForColumn(column, config) {
-        const formatColumns = this.getAllFormatColumnWithDisplayFormat().filter((formatColumn) => (config === null || config === void 0 ? void 0 : config.includeSuspended) || !formatColumn.IsSuspended);
+        const formatColumns = this.getAllFormatColumnWithDisplayFormat().filter((formatColumn) => config?.includeSuspended || !formatColumn.IsSuspended);
         return this.getFormatColumnWithColumnInScope(formatColumns, column);
     }
     /**
@@ -124,12 +125,11 @@ class FormatColumnInternalApi extends ApiBase_1.ApiBase {
             : preparedValue;
     }
     applyCustomFormatters(value, node, abColumn, options) {
-        var _a, _b, _c;
-        const columnCustomFormatters = (_a = options === null || options === void 0 ? void 0 : options.CustomDisplayFormats) !== null && _a !== void 0 ? _a : [];
-        if (!(columnCustomFormatters === null || columnCustomFormatters === void 0 ? void 0 : columnCustomFormatters.length)) {
+        const columnCustomFormatters = options?.CustomDisplayFormats ?? [];
+        if (!columnCustomFormatters?.length) {
             return value;
         }
-        const customFormattersFromOptions = (_c = (_b = this.getFormatColumnOptions()) === null || _b === void 0 ? void 0 : _b.customDisplayFormatters) !== null && _c !== void 0 ? _c : [];
+        const customFormattersFromOptions = this.getFormatColumnOptions()?.customDisplayFormatters ?? [];
         // formatters are applied in the order they are defined in the options
         const customFormatters = customFormattersFromOptions.filter((customFormatterOption) => columnCustomFormatters.includes(customFormatterOption.id));
         const customDisplayFormatterContext = ObjectFactory_1.default.CreateCustomDisplayFormatterContext(value, node, abColumn, this.getAdaptableApi());
@@ -157,7 +157,6 @@ class FormatColumnInternalApi extends ApiBase_1.ApiBase {
      * @param params
      */
     formatColumnShouldRender(formatColumn, column, rowNode, cellValue) {
-        var _a, _b, _c, _d, _e;
         // suspended is important to be first
         if (formatColumn.IsSuspended) {
             return false;
@@ -166,17 +165,17 @@ class FormatColumnInternalApi extends ApiBase_1.ApiBase {
         const isGroupedRowNode = this.getGridApi().isGroupRowNode(rowNode);
         // For Summary Rows cannot be excluded
         if (isSummaryNode) {
-            if ((_a = formatColumn.RowScope) === null || _a === void 0 ? void 0 : _a.ExcludeSummaryRows) {
+            if (formatColumn.RowScope?.ExcludeSummaryRows) {
                 return false;
             }
         }
         else if (isGroupedRowNode) {
-            if ((_b = formatColumn.RowScope) === null || _b === void 0 ? void 0 : _b.ExcludeGroupRows) {
+            if (formatColumn.RowScope?.ExcludeGroupRows) {
                 return false;
             }
         }
         else {
-            if ((_c = formatColumn.RowScope) === null || _c === void 0 ? void 0 : _c.ExcludeDataRows) {
+            if (formatColumn.RowScope?.ExcludeDataRows) {
                 return false;
             }
         }
@@ -184,8 +183,15 @@ class FormatColumnInternalApi extends ApiBase_1.ApiBase {
             return true;
         }
         // first run the predicate
-        if (formatColumn.Rule.Predicates && ((_e = (_d = formatColumn.Rule) === null || _d === void 0 ? void 0 : _d.Predicates) === null || _e === void 0 ? void 0 : _e.length)) {
-            const predicateDefHandlerContext = Object.assign({ value: cellValue, oldValue: null, displayValue: cellValue, node: rowNode, column: column }, this.getAdaptableInternalApi().buildBaseContext());
+        if (formatColumn.Rule.Predicates && formatColumn.Rule?.Predicates?.length) {
+            const predicateDefHandlerContext = {
+                value: cellValue,
+                oldValue: null,
+                displayValue: cellValue,
+                node: rowNode,
+                column: column,
+                ...this.getAdaptableInternalApi().buildBaseContext(),
+            };
             return this.evaluatePredicate(formatColumn, predicateDefHandlerContext);
         } // then run the Expression
         else if (formatColumn.Rule.BooleanExpression) {
@@ -195,15 +201,20 @@ class FormatColumnInternalApi extends ApiBase_1.ApiBase {
         return false;
     }
     evaluatePredicate(formatColumn, predicateDefHandlerContext) {
-        var _a;
-        return this.getPredicateApi().handleColumnPredicates((_a = formatColumn.Rule) === null || _a === void 0 ? void 0 : _a.Predicates, predicateDefHandlerContext, false);
+        return this.getPredicateApi().handleColumnPredicates(formatColumn.Rule?.Predicates, predicateDefHandlerContext, false);
     }
     evaluateExpression(formatColumn, node) {
-        const isValidExpression = this.getAdaptableApi().expressionApi.isValidBooleanExpression(formatColumn.Rule.BooleanExpression, ModuleConstants.FormatColumnModuleId, `Invalid format column rule '${formatColumn.Rule.BooleanExpression}'`);
-        return (isValidExpression &&
-            this.getAdaptableApi()
-                .internalApi.getQueryLanguageService()
-                .evaluateBooleanExpression(formatColumn.Rule.BooleanExpression, ModuleConstants.FormatColumnModuleId, node));
+        const isValidExpression = this.getExpressionApi().isValidBooleanExpression(formatColumn.Rule.BooleanExpression, ModuleConstants.FormatColumnModuleId, `Invalid format column rule '${formatColumn.Rule.BooleanExpression}'`);
+        try {
+            return (isValidExpression &&
+                this.getAdaptableApi()
+                    .internalApi.getQueryLanguageService()
+                    .evaluateBooleanExpression(formatColumn.Rule.BooleanExpression, ModuleConstants.FormatColumnModuleId, node));
+        }
+        catch (error) {
+            (0, AdaptableLogger_1.errorOnce)(error.message);
+            return false;
+        }
     }
     /**
      * Extract from the given FormatColumns only the ones which are relevant for a given cell (intersection of given AdaptableColumn and RowNode)
@@ -232,12 +243,12 @@ class FormatColumnInternalApi extends ApiBase_1.ApiBase {
     getFormatColumnsWithExpression() {
         return this.getFormatColumnApi()
             .getFormatColumns()
-            .filter((fc) => { var _a; return !!((_a = fc.Rule) === null || _a === void 0 ? void 0 : _a.BooleanExpression); });
+            .filter((fc) => !!fc.Rule?.BooleanExpression);
     }
     getFormatColumnsDependentOnColumns(columnSet) {
         return this.getFormatColumnApi()
             .getFormatColumns()
-            .filter((fc) => { var _a, _b; return (_b = (_a = fc.Rule) === null || _a === void 0 ? void 0 : _a.Predicates) === null || _b === void 0 ? void 0 : _b.some((p) => columnSet.has(p.ColumnId)); });
+            .filter((fc) => fc.Rule?.Predicates?.some((p) => columnSet.has(p.ColumnId)));
     }
     /**
      * Retrieves the columns that need rerendering based on format column predicates.
@@ -253,7 +264,7 @@ class FormatColumnInternalApi extends ApiBase_1.ApiBase {
         const columnsThatNeedRefresh = new Set();
         this.getFormatColumnsDependentOnColumns(impactedColumnIds).forEach((formatColumn) => {
             this.getAdaptableApi()
-                .columnScopeApi.getColumnsForScope(formatColumn.Scope)
+                .columnScopeApi.getColumnsInScope(formatColumn.Scope)
                 .forEach((col) => {
                 columnsThatNeedRefresh.add(col.columnId);
             });

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

@@ -1,7 +1,7 @@
 import { ApiBase } from '../Implementation/ApiBase';
 import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
 import { FreeTextColumn } from '../../PredefinedConfig/FreeTextColumnState';
-import { ColDef } from '@ag-grid-community/core';
+import { ColDef } from 'ag-grid-enterprise';
 export declare class FreeTextColumnInternalApi extends ApiBase {
     /**
      * Checks if a User Edit was in a Free Text Column
@@ -14,4 +14,5 @@ export declare class FreeTextColumnInternalApi extends ApiBase {
      */
     getFreeTextColumnModuleReferences(freeTextColumn: FreeTextColumn): string[];
     getColDefsForFreeTextColumns(): ColDef<any, any>[];
+    validateDeletedFreeTextColumn(freeTextColumn: FreeTextColumn): boolean;
 }

package/src/Api/Internal/FreeTextColumnInternalApi.js

@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FreeTextColumnInternalApi = void 0;
 const tslib_1 = require("tslib");
 const ApiBase_1 = require("../Implementation/ApiBase");
-const ObjectFactory_1 = require("../../Utilities/ObjectFactory");
+const ObjectFactory_1 = tslib_1.__importStar(require("../../Utilities/ObjectFactory"));
 const AdaptableNumberEditor_1 = require("../../agGrid/editors/AdaptableNumberEditor");
 const AdaptableDateEditor_1 = require("../../agGrid/editors/AdaptableDateEditor");
-const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/ArrayExtensions"));
+const AdaptableColumn_1 = require("../../PredefinedConfig/Common/AdaptableColumn");
 class FreeTextColumnInternalApi extends ApiBase_1.ApiBase {
     /**
      * Checks if a User Edit was in a Free Text Column
@@ -23,13 +23,6 @@ class FreeTextColumnInternalApi extends ApiBase_1.ApiBase {
                 FreeText: cellDataChangedInfo.newValue,
             };
             this.getFreeTextColumnApi().setStoredValue(freeTextColumn.ColumnId, freeTextStoredValue);
-            var colsToRefresh = [cellDataChangedInfo.column.columnId];
-            const refencedCalcColumns = this.getAdaptableApi().calculatedColumnApi.internalApi.getCalculatedColumnsReferencingColumnId(cellDataChangedInfo.column.columnId);
-            refencedCalcColumns.forEach((calculatedColumn) => {
-                colsToRefresh.push(calculatedColumn.ColumnId);
-            });
-            const suppressFlash = false;
-            this.getGridApi().refreshCells([cellDataChangedInfo.rowNode], colsToRefresh, suppressFlash);
         }
     }
     /**
@@ -55,18 +48,17 @@ class FreeTextColumnInternalApi extends ApiBase_1.ApiBase {
         return this.getFreeTextColumnApi()
             .getFreeTextColumns()
             .map((freeTextColumn) => {
-            var _a;
-            const freeTextColumnSettings = Object.assign(Object.assign({}, defaultFreeTextColumnSettings), freeTextColumn.FreeTextColumnSettings);
-            const dataTypeEditor = freeTextColumnSettings.DataType === 'Number'
+            const freeTextColumnSettings = {
+                ...defaultFreeTextColumnSettings,
+                ...freeTextColumn.FreeTextColumnSettings,
+            };
+            const dataTypeEditor = freeTextColumnSettings.DataType === 'number'
                 ? AdaptableNumberEditor_1.AdaptableNumberEditor
-                : freeTextColumnSettings.DataType === 'Date'
+                : freeTextColumnSettings.DataType === 'date'
                     ? AdaptableDateEditor_1.AdaptableDateEditor
                     : null;
-            const columnTypes = [
-                GeneralConstants_1.AB_SPECIAL_COLUMN,
-                this.getGridApi().internalApi.getAgGridDataType(freeTextColumnSettings.DataType),
-            ];
-            if (ArrayExtensions_1.default.IsNotNullOrEmpty((_a = freeTextColumn === null || freeTextColumn === void 0 ? void 0 : freeTextColumn.FreeTextColumnSettings) === null || _a === void 0 ? void 0 : _a.ColumnTypes)) {
+            const columnTypes = [AdaptableColumn_1.FREE_TEXT_COLUMN_TYPE];
+            if (ArrayExtensions_1.default.IsNotNullOrEmpty(freeTextColumn?.FreeTextColumnSettings?.ColumnTypes)) {
                 columnTypes.push(...freeTextColumn.FreeTextColumnSettings.ColumnTypes);
             }
             const newColDef = {
@@ -84,25 +76,39 @@ class FreeTextColumnInternalApi extends ApiBase_1.ApiBase {
                 enablePivot: freeTextColumnSettings.Pivotable,
                 suppressHeaderMenuButton: freeTextColumnSettings.SuppressMenu,
                 suppressMovable: freeTextColumnSettings.SuppressMovable,
-                cellEditor: dataTypeEditor !== null && dataTypeEditor !== void 0 ? dataTypeEditor : (freeTextColumn.TextEditor && freeTextColumn.TextEditor == 'Large'
-                    ? 'agLargeTextCellEditor'
-                    : 'agTextCellEditor'),
+                cellEditor: dataTypeEditor ??
+                    (freeTextColumn.TextEditor && freeTextColumn.TextEditor == 'Large'
+                        ? 'agLargeTextCellEditor'
+                        : 'agTextCellEditor'),
                 type: columnTypes,
                 valueSetter: (params) => {
                     return (params.data[freeTextColumn.ColumnId] = params.newValue);
                 },
-                // use a Boolean Cell Data Type if the Free Text Column is boolean
-                cellDataType: freeTextColumnSettings.DataType && freeTextColumnSettings.DataType == 'Boolean'
-                    ? 'boolean'
-                    : undefined,
+                cellDataType: freeTextColumnSettings.DataType,
                 valueGetter: (params) => this.getFreeTextColumnApi().getFreeTextColumnValueForRowNode(freeTextColumn, params.node),
             };
             if (freeTextColumnSettings.HeaderToolTip) {
                 newColDef.headerTooltip = freeTextColumnSettings.HeaderToolTip;
             }
-            this.getAdaptableApi().logInfo('Setting up FreeText Column: ' + freeTextColumn.ColumnId);
+            this.logInfo('Setting up FreeText Column: ' + freeTextColumn.ColumnId);
             return newColDef;
         });
     }
+    validateDeletedFreeTextColumn(freeTextColumn) {
+        const freeTextColumnReferences = this.getFreeTextColumnModuleReferences(freeTextColumn);
+        if (freeTextColumnReferences.length) {
+            const alert = {
+                alertType: 'generic',
+                header: 'FreeTextColumn could not be deleted',
+                message: `It is still referenced in the following modules: ${freeTextColumnReferences.join(', ')}`,
+                alertDefinition: ObjectFactory_1.default.CreateInternalAlertDefinitionForMessages('Error'),
+            };
+            this.getAlertApi().displayAdaptableAlertNotification(alert);
+            return false;
+        }
+        else {
+            return true;
+        }
+    }
 }
 exports.FreeTextColumnInternalApi = FreeTextColumnInternalApi;

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

@@ -1,7 +1,6 @@
 import { ApiBase } from '../Implementation/ApiBase';
 import { GridFilter } from '../../types';
 export declare class GridFilterInternalApi extends ApiBase {
-    fireGridFilterAppliedEvent(): void;
     /**
      * Compares to Grid Filter to see if they are identical
      */