@adaptabletools/adaptable 12.0.1 → 12.0.2

package/src/Utilities/Helpers/FormatHelper.js

@@ -20,9 +20,12 @@ function NumberFormatter(input, options = {}) {
     if (input == null || input == undefined) {
         return undefined;
     }
+    if (typeof input === 'string') {
+        return input;
+    }
     let n = Number(input);
     if (isNaN(n)) {
-        return undefined;
+        return input.toString();
     }
     const fractionsSepatator = options.FractionSeparator ? options.FractionSeparator : '.';
     let multiplier = options.Multiplier ? options.Multiplier : 1;
@@ -72,13 +75,14 @@ function DateFormatter(input, options) {
         return undefined;
     }
     try {
+        // not sure if this is right if using a custom formatter...
         if (typeof input === 'string') {
             input = new Date(input);
         }
         return format_1.default(input, options.Pattern || '');
     }
     catch (error) {
-        return undefined;
+        return input;
     }
 }
 exports.DateFormatter = DateFormatter;

package/src/Utilities/ObjectFactory.d.ts

@@ -24,8 +24,10 @@ import { AdaptableMessageType } from '../PredefinedConfig/Common/AdaptableMessag
 import { SystemStatusMessageInfo } from '../PredefinedConfig/Common/SystemStatusMessageInfo';
 import { NotificationsOptions } from '../AdaptableOptions/NotificationsOptions';
 import { CellSummmary } from '../PredefinedConfig/Common/CellSummary';
-import { ColumnFilter, FlashingCellDefinition, GridDataChangedInfo, SystemFilterPredicateId } from '../types';
+import { ColumnFilter, CustomDisplayFormatterContext, FlashingCellDefinition, GridDataChangedInfo, SystemFilterPredicateId } from '../types';
 import { ToastOptions } from 'react-toastify';
+import { RowNode } from '@ag-grid-community/all-modules';
+import { AdaptableApi } from '../../types';
 export declare function CreateEmptyCustomSort(): CustomSort;
 export declare function CreateEmptyCalculatedColumn(isFilterable: boolean): CalculatedColumn;
 export declare function CreateEmptyNamedQuery(expression?: string): NamedQuery;
@@ -61,6 +63,7 @@ export declare function CreateEmptyStyle(): AdaptableStyle;
 export declare function CreateSystemStatusMessageInfo(message: string, type: AdaptableMessageType, furtherInfo?: string): SystemStatusMessageInfo;
 export declare function CreateEmptyCellSummmary(): CellSummmary;
 export declare function CreateColumnFilter(ColumnId: string, PredicateId: SystemFilterPredicateId, Inputs: any[]): ColumnFilter;
+export declare function CreateCustomDisplayFormatterContext(value: any, node: RowNode, abColumn: AdaptableColumn, api: AdaptableApi): CustomDisplayFormatterContext;
 export declare function CreateToastOptions(notificationsOptions: NotificationsOptions, { onClose, containerId }: {
     onClose?: VoidFunction;
     containerId: string;
@@ -100,5 +103,6 @@ export declare const ObjectFactory: {
     CreateEmptyGlue42Report: typeof CreateEmptyGlue42Report;
     CreateSystemStatusMessageInfo: typeof CreateSystemStatusMessageInfo;
     CreateToastOptions: typeof CreateToastOptions;
+    CreateCustomDisplayFormatterContext: typeof CreateCustomDisplayFormatterContext;
 };
 export default ObjectFactory;

package/src/Utilities/ObjectFactory.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ObjectFactory = exports.CreateToastOptions = exports.CreateColumnFilter = exports.CreateEmptyCellSummmary = exports.CreateSystemStatusMessageInfo = exports.CreateEmptyStyle = exports.CreateEmptyLayout = exports.CreateEmptyFreeTextColumn = exports.CreateEmptyFormatColumn = exports.CreateEmptyConditionalStyle = exports.CreateEmptyShortcut = exports.CreateEmptySchedule = exports.CreateReportSchedule = exports.CreateGlue42Schedule = exports.CreateIPushPullSchedule = exports.CreateEmptyOpenFinSchedule = exports.CreateEmptyGlue42Schedule = exports.CreateEmptyIPushPullSchedule = exports.CreateEmptyOpenFinReport = exports.CreateEmptyGlue42Report = exports.CreateEmptyIPushPullReport = exports.CreateEmptyReportSchedule = exports.CreateEmptyReminderSchedule = exports.CreateEmptyBaseSchedule = exports.CreateEmptyReport = exports.CreateInternalAlertDefinitionForMessages = exports.CreateEmptyFlashingCellDefinition = exports.CreateEmptyAlertDefinition = exports.CreateRowChangedAlert = exports.CreateCellChangedAlert = exports.CreateGenericAlert = exports.CreateEmptyPlusMinusNudge = exports.CreateEmptyNamedQuery = exports.CreateEmptyCalculatedColumn = exports.CreateEmptyCustomSort = void 0;
+exports.ObjectFactory = exports.CreateToastOptions = exports.CreateCustomDisplayFormatterContext = exports.CreateColumnFilter = exports.CreateEmptyCellSummmary = exports.CreateSystemStatusMessageInfo = exports.CreateEmptyStyle = exports.CreateEmptyLayout = exports.CreateEmptyFreeTextColumn = exports.CreateEmptyFormatColumn = exports.CreateEmptyConditionalStyle = exports.CreateEmptyShortcut = exports.CreateEmptySchedule = exports.CreateReportSchedule = exports.CreateGlue42Schedule = exports.CreateIPushPullSchedule = exports.CreateEmptyOpenFinSchedule = exports.CreateEmptyGlue42Schedule = exports.CreateEmptyIPushPullSchedule = exports.CreateEmptyOpenFinReport = exports.CreateEmptyGlue42Report = exports.CreateEmptyIPushPullReport = exports.CreateEmptyReportSchedule = exports.CreateEmptyReminderSchedule = exports.CreateEmptyBaseSchedule = exports.CreateEmptyReport = exports.CreateInternalAlertDefinitionForMessages = exports.CreateEmptyFlashingCellDefinition = exports.CreateEmptyAlertDefinition = exports.CreateRowChangedAlert = exports.CreateCellChangedAlert = exports.CreateGenericAlert = exports.CreateEmptyPlusMinusNudge = exports.CreateEmptyNamedQuery = exports.CreateEmptyCalculatedColumn = exports.CreateEmptyCustomSort = void 0;
 const Enums_1 = require("../PredefinedConfig/Common/Enums");
 const GeneralConstants_1 = require("./Constants/GeneralConstants");
 const Uuid_1 = require("../PredefinedConfig/Uuid");
@@ -355,6 +355,15 @@ function CreateColumnFilter(ColumnId, PredicateId, Inputs) {
     };
 }
 exports.CreateColumnFilter = CreateColumnFilter;
+function CreateCustomDisplayFormatterContext(value, node, abColumn, api) {
+    return {
+        adaptableColumn: abColumn,
+        cellValue: value,
+        rowNode: node,
+        adaptableApi: api,
+    };
+}
+exports.CreateCustomDisplayFormatterContext = CreateCustomDisplayFormatterContext;
 function CreateToastOptions(notificationsOptions, { onClose, containerId }) {
     const adaptableToastPosition = notificationsOptions.position;
     const position = getToastPosition(adaptableToastPosition);
@@ -443,5 +452,6 @@ exports.ObjectFactory = {
     CreateEmptyGlue42Report,
     CreateSystemStatusMessageInfo,
     CreateToastOptions,
+    CreateCustomDisplayFormatterContext,
 };
 exports.default = exports.ObjectFactory;

package/src/Utilities/Services/Interface/IReportService.d.ts

@@ -17,6 +17,6 @@ export interface IReportService extends IAdaptableService {
     getReportDataAsArray(report: Report, includePrimaryKey?: boolean): any[][];
     convertReportDataToArray(reportData: ReportData): any[][];
     getCellExportValueFromRowNode(rowNode: RowNode, columnId: string): any;
-    getCellExportValueFromRawValue(rawValue: any, columnId: string): any;
+    getCellExportValueFromRawValue(rowNode: RowNode, rawValue: any, columnId: string): any;
     getReportFileName(reportName: string): string;
 }

package/src/Utilities/Services/ReportService.d.ts

@@ -21,7 +21,7 @@ export declare class ReportService implements IReportService {
     getRowObjectForColumnIds(rowNode: RowNode, columnIds: string[]): Record<string, any>;
     PublishLiveLiveDataChangedEvent(reportDestination: 'ipushpull' | 'Glue42', liveDataTrigger: 'Connected' | 'Disconnected' | 'LiveDataStarted' | 'LiveDataStopped' | 'LiveDataUpdated', liveReport?: any): void;
     getCellExportValueFromRowNode(rowNode: RowNode, columnId: string): any;
-    getCellExportValueFromRawValue(cellRawValue: any, columnId: string): any;
+    getCellExportValueFromRawValue(rowNode: RowNode, cellRawValue: any, columnId: string): any;
     getReportFileName(reportName: string): string;
     destroy(): void;
     private getCustomExportDateFormat;

package/src/Utilities/Services/ReportService.js

@@ -300,9 +300,9 @@ class ReportService {
         this.adaptableApi.eventApi.emit('LiveDataChanged', liveDataChangedInfo);
     }
     getCellExportValueFromRowNode(rowNode, columnId) {
-        return this.getCellExportValueFromRawValue(this.adaptableApi.gridApi.getRawValueFromRowNode(rowNode, columnId), columnId);
+        return this.getCellExportValueFromRawValue(rowNode, this.adaptableApi.gridApi.getRawValueFromRowNode(rowNode, columnId), columnId);
     }
-    getCellExportValueFromRawValue(cellRawValue, columnId) {
+    getCellExportValueFromRawValue(rowNode, cellRawValue, columnId) {
         if (StringExtensions_1.default.IsNullOrEmpty(cellRawValue)) {
             return cellRawValue;
         }
@@ -316,7 +316,7 @@ class ReportService {
         }
         // otherwise check the general export format types
         let cellExportFormat = this.computeCellExportValueFormat(columnType);
-        return this.getCellExportValueFromRawValueByType(cellRawValue, columnId, cellExportFormat);
+        return this.getCellExportValueFromRawValueByType(rowNode, cellRawValue, columnId, cellExportFormat);
     }
     getReportFileName(reportName) {
         let fileName = StringExtensions_1.default.ReplaceEmptySpacesWithUnderscore(reportName);
@@ -333,13 +333,13 @@ class ReportService {
     getCustomExportDateFormat() {
         return this.adaptableApi.internalApi.getAdaptableOptions().exportOptions.exportDateFormat;
     }
-    getCellExportValueFromRawValueByType(cellRawValue, columnId, 
+    getCellExportValueFromRawValueByType(rowNode, cellRawValue, columnId, 
     // default to rawValue if, for some reason, the configs provide invalid values
     type = 'rawValue') {
         return type === 'rawValue'
             ? cellRawValue
             : // type === formattedValue
-                this.adaptableApi.gridApi.getFormattedValueFromRawValue(columnId, cellRawValue);
+                this.adaptableApi.gridApi.getFormattedValueFromRawValue(rowNode, columnId, cellRawValue);
     }
     computeCellExportValueFormat(columnDataType) {
         const exportOptions = this.adaptableApi.internalApi.getAdaptableOptions().exportOptions;

package/src/View/CalculatedColumn/Wizard/CalculatedColumnSettingsWizardSection.js

@@ -74,7 +74,7 @@ const CalculatedColumnSettingsWizardSection = (props) => {
     const ColumnName = data.FriendlyName;
     const ColumnId = data.ColumnId;
     let { DataType: dataType } = (_a = data.CalculatedColumnSettings) !== null && _a !== void 0 ? _a : {};
-    const { Width, ShowToolTip, HeaderToolTip, ExternallyEvaluatedExpression } = (_b = data.CalculatedColumnSettings) !== null && _b !== void 0 ? _b : {};
+    const { Width, ShowToolTip, HeaderToolTip } = (_b = data.CalculatedColumnSettings) !== null && _b !== void 0 ? _b : {};
     const handleSpecialColumnSettingsChange = (settings) => {
         props.onChange(Object.assign(Object.assign({}, data), { CalculatedColumnSettings: Object.assign(Object.assign({}, data.CalculatedColumnSettings), settings) }));
     };
@@ -119,14 +119,7 @@ const CalculatedColumnSettingsWizardSection = (props) => {
                                 }) })),
                         ' ',
                         React.createElement(FormLayout_1.FormRow, { label: "" },
-                            React.createElement(CheckBox_1.CheckBox, { "data-name": "column-show-tooltip", onChange: (checked) => handleSpecialColumnSettingsChange({ ShowToolTip: checked }), checked: ShowToolTip }, "Show Expression as Cell Tooltip")),
-                        React.createElement(FormLayout_1.FormRow, { label: "" },
-                            React.createElement(CheckBox_1.CheckBox, { "data-name": "column-external-expression-evaluation", onChange: (checked) => handleSpecialColumnSettingsChange({ ExternallyEvaluatedExpression: checked }), checked: ExternallyEvaluatedExpression }, "Suppress Expression Evaluation"),
-                            ExternallyEvaluatedExpression && (React.createElement(rebass_1.Box, { "data-name": "note-external-expression-evaluation", p: 2, style: {
-                                    background: 'var(--ab-color-primary)',
-                                    borderRadius: 'var(--ab__border-radius)',
-                                    whiteSpace: 'pre-wrap',
-                                } }, "The column value is loaded from the row data property with the same name as the ColumnId"))))))),
+                            React.createElement(CheckBox_1.CheckBox, { "data-name": "column-show-tooltip", onChange: (checked) => handleSpecialColumnSettingsChange({ ShowToolTip: checked }), checked: ShowToolTip }, "Show Expression as Cell Tooltip")))))),
         ErrorMessage ? React.createElement(ErrorBox_1.default, { marginTop: 2 }, ErrorMessage) : null,
         React.createElement(SpecialColumnSettingsWizardStep_1.SpecialColumnSettingsWizardStep, { isEditable: false, settings: data.CalculatedColumnSettings, onChange: handleSpecialColumnSettingsChange })));
 };

package/src/View/FormatColumn/Wizard/FormatColumnFormatWizardSection.js

@@ -18,6 +18,7 @@ const Tabs_1 = require("../../../components/Tabs");
 const StringExtensions_1 = tslib_1.__importDefault(require("../../../Utilities/Extensions/StringExtensions"));
 const Tag_1 = require("../../../components/Tag");
 const AdaptableContext_1 = require("../../AdaptableContext");
+const FormatHelper_1 = tslib_1.__importDefault(require("../../../Utilities/Helpers/FormatHelper"));
 const DOLLAR_OPTIONS = {
     FractionDigits: 2,
     FractionSeparator: '.',
@@ -84,13 +85,16 @@ const getFormatColumnFormatSummaryValue = (data, formattedColumnApi) => {
     }
     else {
         if (data.DisplayFormat.Formatter === 'NumberFormatter') {
-            content = formattedColumnApi.getNumberFormattedValue(12345.6789, data.DisplayFormat.Options);
+            content = FormatHelper_1.default.NumberFormatter(12345.6789, data.DisplayFormat.Options);
+            //formattedColumnApi.getNumberFormattedValue(12345.6789, data.DisplayFormat.Options);
         }
         if (data.DisplayFormat.Formatter === 'DateFormatter') {
-            content = formattedColumnApi.getDateFormattedValue(new Date(), data.DisplayFormat.Options);
+            content = FormatHelper_1.default.DateFormatter(new Date(), data.DisplayFormat.Options);
+            //formattedColumnApi.getDateFormattedValue(new Date(), data.DisplayFormat.Options);
         }
         if (data.DisplayFormat.Formatter === 'StringFormatter') {
-            content = formattedColumnApi.getStringFormattedValue('Hello World ', data.DisplayFormat.Options);
+            content = FormatHelper_1.default.StringFormatter('Hello World ', data.DisplayFormat.Options);
+            //formattedColumnApi.getStringFormattedValue('Hello World ', data.DisplayFormat.Options);
         }
     }
     return content;
@@ -169,7 +173,7 @@ const renderDateFormat = (data, _onChange, setFormatOption, customFormatters, fo
                 React.createElement(FormLayout_1.default, null,
                     React.createElement(FormLayout_1.FormRow, { label: "Pattern" },
                         React.createElement(Input_1.default, { value: data.DisplayFormat.Options.Pattern, onChange: (e) => setFormatOption('Pattern', e.currentTarget.value), mr: 2 }),
-                        React.createElement("span", null, formatColumnApi.getDateFormattedValue(new Date(), data.DisplayFormat.Options))),
+                        React.createElement("span", null, FormatHelper_1.default.DateFormatter(new Date(), data.DisplayFormat.Options))),
                     customFormatters.map((formatter) => renderCustomFormatter(data, formatter, setFormatOption))))),
         React.createElement(Tabs_1.Tabs, { marginTop: 2 },
             React.createElement(Tabs_1.Tabs.Tab, null, "Presets"),
@@ -182,7 +186,7 @@ const renderDateFormat = (data, _onChange, setFormatOption, customFormatters, fo
                 DateFormatPresets.map((Pattern, index) => (React.createElement(AdaptableObjectRow_1.AdaptableObjectRow, { key: index, colItems: [
                         { Content: Pattern, Size: 1 },
                         {
-                            Content: formatColumnApi.getDateFormattedValue(new Date(), { Pattern }),
+                            Content: FormatHelper_1.default.DateFormatter(new Date(), { Pattern }),
                             Size: 1,
                         },
                         {
@@ -299,21 +303,21 @@ const renderNumberFormat = (data, onChange, setFormatOption, customFormatters, f
                 React.createElement(AdaptableObjectRow_1.AdaptableObjectRow, { colItems: [
                         { Content: '12345.6789', Size: 1 },
                         {
-                            Content: formatColumnApi.getNumberFormattedValue(12345.6789, data.DisplayFormat.Options),
+                            Content: FormatHelper_1.default.NumberFormatter(12345.6789, data.DisplayFormat.Options),
                             Size: 1,
                         },
                     ] }),
                 React.createElement(AdaptableObjectRow_1.AdaptableObjectRow, { colItems: [
                         { Content: '-12345.6789', Size: 1 },
                         {
-                            Content: formatColumnApi.getNumberFormattedValue(-12345.6789, data.DisplayFormat.Options),
+                            Content: FormatHelper_1.default.NumberFormatter(-12345.6789, data.DisplayFormat.Options),
                             Size: 1,
                         },
                     ] }),
                 React.createElement(AdaptableObjectRow_1.AdaptableObjectRow, { colItems: [
                         { Content: '0.123', Size: 1 },
                         {
-                            Content: formatColumnApi.getNumberFormattedValue(0.123, data.DisplayFormat.Options),
+                            Content: FormatHelper_1.default.NumberFormatter(0.123, data.DisplayFormat.Options),
                             Size: 1,
                         },
                     ] })))));
@@ -350,7 +354,7 @@ const renderStringFormat = (data, _onChange, setFormatOption, customFormatters,
                         { Content: '"Hello World "', Size: 1 },
                         {
                             Content: '"' +
-                                formatColumnApi.getStringFormattedValue('Hello World ', data.DisplayFormat.Options) +
+                                FormatHelper_1.default.StringFormatter('Hello World ', data.DisplayFormat.Options) +
                                 '"',
                             Size: 1,
                         },

package/src/agGrid/Adaptable.d.ts

@@ -1,4 +1,4 @@
-import { ColDef, ColGroupDef, Column, ExcelStyle, GridOptions, Module, RowNode } from '@ag-grid-community/all-modules';
+import { ChartModel, ChartRef, ColDef, ColGroupDef, Column, ExcelStyle, GridOptions, Module, RowNode } from '@ag-grid-community/all-modules';
 import { AdaptableNoCodeWizardOptions, IAdaptableNoCodeWizard } from '../AdaptableInterfaces/AdaptableNoCodeWizard';
 import { IAdaptable } from '../AdaptableInterfaces/IAdaptable';
 import { AdaptableOptions } from '../AdaptableOptions/AdaptableOptions';
@@ -186,7 +186,7 @@ export declare class Adaptable implements IAdaptable {
     getDisplayValue(primaryKey: any, columnId: string): string | undefined;
     getGridCellFromRowNode(rowNode: RowNode, columnId: string): GridCell | undefined;
     getDisplayValueFromRowNode(rowNode: RowNode, columnId: string): string | undefined;
-    getDisplayValueFromRawValue(columnId: string, rawValue: any): string | undefined;
+    getDisplayValueFromRawValue(rowNode: RowNode, columnId: string, rawValue: any): string | undefined;
     private getFormattedValue;
     private getNormalisedValueFromRowValue;
     getRawValueFromRowNode(rowNode: RowNode, columnId: string): any;
@@ -354,6 +354,8 @@ export declare class Adaptable implements IAdaptable {
     private addSyntheticPrimaryKey;
     private addSyntheticPrimaryKeyIfMissing;
     initLicenseService(): LicenseService;
+    showCharts(charts: ChartModel[]): ChartRef[];
+    getChartModels(): ChartModel[];
 }
 export declare class AdaptableNoCodeWizard implements IAdaptableNoCodeWizard {
     private init;

package/src/agGrid/Adaptable.js

@@ -1860,7 +1860,7 @@ class Adaptable {
         const abColumn = this.api.columnApi.getColumnFromId(columnId);
         const pkValue = this.getPrimaryKeyValueFromRowNode(rowNode);
         const rawValue = this.getRawValueFromRowNode(rowNode, columnId);
-        const displayValue = this.getDisplayValueFromRawValue(columnId, rawValue);
+        const displayValue = this.getDisplayValueFromRawValue(rowNode, columnId, rawValue);
         const normalisedvalue = this.getNormalisedValueFromRowValue(rawValue, abColumn);
         return {
             rawValue: rawValue,
@@ -1876,15 +1876,15 @@ class Adaptable {
             return undefined;
         }
         const rawValue = this.getRawValueFromRowNode(rowNode, columnId);
-        return this.getDisplayValueFromRawValue(columnId, rawValue);
+        return this.getDisplayValueFromRawValue(rowNode, columnId, rawValue);
     }
-    getDisplayValueFromRawValue(columnId, rawValue) {
+    getDisplayValueFromRawValue(rowNode, columnId, rawValue) {
         const abColumn = this.api.columnApi.getColumnFromId(columnId);
         const isRenderedColumn = this.api.columnApi.isFormatNumericStyleColumn(abColumn);
         if (isRenderedColumn) {
             const colDef = this.gridOptions.api.getColumnDef(columnId);
             if (typeof colDef.valueFormatter == 'function') {
-                return this.getFormattedValue(rawValue, columnId, colDef, colDef.valueFormatter);
+                return this.getFormattedValue(rowNode, rawValue, columnId, colDef, colDef.valueFormatter);
             }
             return this.agGridHelper.getCleanValue(rawValue);
         }
@@ -1895,7 +1895,7 @@ class Adaptable {
         const colDef = this.gridOptions.api.getColumnDef(columnId);
         if (colDef) {
             if (typeof colDef.valueFormatter == 'function') {
-                const formattedValue = this.getFormattedValue(rawValue, columnId, colDef, colDef.valueFormatter);
+                const formattedValue = this.getFormattedValue(rowNode, rawValue, columnId, colDef, colDef.valueFormatter);
                 // Never use cellRenderer:
                 // - when a string, you never know if it is HTML or a normal string
                 // - when an object, cannot be used
@@ -1910,14 +1910,14 @@ class Adaptable {
         }
         return this.agGridHelper.getCleanValue(rawValue);
     }
-    getFormattedValue(rawValue, columnId, colDef, formatterFn) {
+    getFormattedValue(rowNode, rawValue, columnId, colDef, formatterFn) {
         const column = this.gridOptions.columnApi
             .getAllColumns()
             .find((c) => c.getColId() == columnId);
         const params = {
             value: rawValue,
-            node: null,
-            data: null,
+            node: rowNode,
+            data: rowNode.data,
             colDef,
             column,
             api: this.gridOptions.api,
@@ -2402,6 +2402,7 @@ class Adaptable {
             ? this.adaptableOptions.filterOptions.enableFilterOnSpecialColumns
             : true;
         const defaultCalculatedColumnSettings = ObjectFactory_1.CreateEmptyCalculatedColumn(specialColumnsAreFilterable).CalculatedColumnSettings;
+        const isExternalEvaluation = !this.api.internalApi.runModuleInAdaptableQL('CalculatedColumn');
         return this.api.calculatedColumnApi.getAllCalculatedColumn().map((calculatedColumn) => {
             const calculatedColumnSettings = Object.assign(Object.assign({}, defaultCalculatedColumnSettings), calculatedColumn.CalculatedColumnSettings);
             if (!calculatedColumnSettings.DataType) {
@@ -2434,9 +2435,9 @@ class Adaptable {
                 suppressMovable: calculatedColumnSettings.SuppressMovable,
                 type: columnTypes,
                 valueGetter: (params) => {
-                    var _a, _b;
-                    if ((_a = calculatedColumn.CalculatedColumnSettings) === null || _a === void 0 ? void 0 : _a.ExternallyEvaluatedExpression) {
-                        return (_b = params.data) === null || _b === void 0 ? void 0 : _b[calculatedColumn.ColumnId];
+                    var _a;
+                    if (isExternalEvaluation) {
+                        return (_a = params.data) === null || _a === void 0 ? void 0 : _a[calculatedColumn.ColumnId];
                     }
                     return this.CalculatedColumnExpressionService.evaluateCalculatedColumnQuery(calculatedColumn, params.node);
                 },
@@ -3309,28 +3310,29 @@ class Adaptable {
             }
             if (formatColumn.DisplayFormat) {
                 let valueFormatter;
+                const options = formatColumn.DisplayFormat.Options;
                 if (formatColumn.DisplayFormat.Formatter === 'NumberFormatter') {
                     // change the Number format - if the scope allows it
                     if (this.api.scopeApi.isColumnInNumericScope(abColumn, formatColumn.Scope)) {
-                        const options = formatColumn.DisplayFormat.Options;
                         valueFormatter = (params) => {
-                            let value = params.value;
-                            return this.api.formatColumnApi.getNumberFormattedValue(value, options);
+                            return this.api.formatColumnApi.getNumberFormattedValue(params.value, params.node, abColumn, options);
                         };
                     }
                 }
                 if (formatColumn.DisplayFormat.Formatter === 'DateFormatter') {
                     // change the Date format - if the scope allows it
                     if (this.api.scopeApi.isColumnInDateScope(abColumn, formatColumn.Scope)) {
-                        const options = formatColumn.DisplayFormat.Options;
-                        valueFormatter = (params) => this.api.formatColumnApi.getDateFormattedValue(params.value, options);
+                        valueFormatter = (params) => {
+                            return this.api.formatColumnApi.getDateFormattedValue(params.value, params.node, abColumn, options);
+                        };
                     }
                 }
                 if (formatColumn.DisplayFormat.Formatter === 'StringFormatter') {
-                    // change the Date format - if the scope allows it
+                    // change the String format - if the scope allows it
                     if (this.api.scopeApi.isColumnInStringsScope(abColumn, formatColumn.Scope)) {
-                        const options = formatColumn.DisplayFormat.Options;
-                        valueFormatter = (params) => this.api.formatColumnApi.getStringFormattedValue(params.value, options);
+                        valueFormatter = (params) => {
+                            return this.api.formatColumnApi.getStringFormattedValue(params.value, params.node, abColumn, options);
+                        };
                     }
                 }
                 return valueFormatter;
@@ -4533,7 +4535,7 @@ import "@adaptabletools/adaptable/themes/${themeName}.css"`);
                 rawValue = numericRawValue;
             }
         }
-        return this.ReportService.getCellExportValueFromRawValue(rawValue, columnId);
+        return this.ReportService.getCellExportValueFromRawValue(rowNode, rawValue, columnId);
     }
     hasAutogeneratedPrimaryKey() {
         return this.adaptableOptions.autogeneratePrimaryKey;
@@ -4560,6 +4562,20 @@ import "@adaptabletools/adaptable/themes/${themeName}.css"`);
             publishedAt: publishTimestamp_1.default,
         });
     }
+    showCharts(charts) {
+        if (!this.gridOptions.api) {
+            LoggingHelper_1.ConsoleLogError('Adaptable must be instantiated before calling showCharts');
+            return [];
+        }
+        return charts.map((chart) => this.gridOptions.api.restoreChart(chart));
+    }
+    getChartModels() {
+        if (!this.gridOptions.api) {
+            LoggingHelper_1.ConsoleLogError('Adaptable must be instantiated before calling getChartModels');
+            return [];
+        }
+        return this.gridOptions.api.getChartModels();
+    }
 }
 exports.Adaptable = Adaptable;
 class AdaptableNoCodeWizard {

package/src/metamodel/adaptable.metamodel.d.ts

@@ -1353,6 +1353,41 @@ export declare const ADAPTABLE_METAMODEL: {
         kind: string;
         description: string;
     };
+    ChartDefinition: {
+        name: string;
+        kind: string;
+        description: string;
+        properties: {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            reference: string;
+        }[];
+    };
+    ChartingApi: {
+        name: string;
+        kind: string;
+        description: string;
+        properties: {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+        }[];
+    };
+    ChartingState: {
+        name: string;
+        kind: string;
+        description: string;
+        properties: {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            isOptional: boolean;
+        }[];
+    };
     CheckboxColumnClickedInfo: {
         name: string;
         kind: string;
@@ -1796,6 +1831,29 @@ export declare const ADAPTABLE_METAMODEL: {
             isOptional?: undefined;
         })[];
     };
+    CustomDisplayFormatter: {
+        name: string;
+        kind: string;
+        description: string;
+    };
+    CustomDisplayFormatterContext: {
+        name: string;
+        kind: string;
+        description: string;
+        properties: ({
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            reference: string;
+        } | {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            reference?: undefined;
+        })[];
+    };
     CustomFDC3Column: {
         name: string;
         kind: string;
@@ -4257,7 +4315,7 @@ export declare const ADAPTABLE_METAMODEL: {
             description: string;
             uiLabel: string;
             isOptional: boolean;
-            defaultValue: string;
+            defaultValue?: undefined;
             reference?: undefined;
         } | {
             name: string;
@@ -4267,6 +4325,22 @@ export declare const ADAPTABLE_METAMODEL: {
             isOptional: boolean;
             defaultValue: string;
             reference: string;
+        } | {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            isOptional: boolean;
+            defaultValue: string;
+            reference?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            isOptional: boolean;
+            reference: string;
+            defaultValue?: undefined;
         })[];
     };
     StatusBarState: {