@adaptabletools/adaptable 12.0.1 → 12.0.4

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: '.',
@@ -77,29 +78,25 @@ const DateFormatPresets = [
     'yyyyMMdd',
     'HH:mm:ss',
 ];
-const getFormatColumnFormatSummaryValue = (data, formattedColumnApi) => {
+const getFormatColumnFormatSummaryValue = (data, api) => {
     let content = 'N/A';
     if (!data.DisplayFormat) {
         content = 'N/A';
     }
     else {
         if (data.DisplayFormat.Formatter === 'NumberFormatter') {
-            content = formattedColumnApi.getNumberFormattedValue(12345.6789, data.DisplayFormat.Options);
+            content = FormatHelper_1.default.NumberFormatter(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(2022, 0, 1), 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);
         }
     }
     return content;
 };
 exports.getFormatColumnFormatSummaryValue = getFormatColumnFormatSummaryValue;
-function splitArrayInTwo(arr) {
-    const half = Math.floor(arr.length - 1 / 2);
-    return [arr.slice(0, half), arr.slice(half)];
-}
 const renderCustomFormatter = (data, customFormatter, setFormatOption) => {
     var _a, _b, _c;
     return (React.createElement(FormLayout_1.FormRow, { key: customFormatter.id, label: (_a = customFormatter.label) !== null && _a !== void 0 ? _a : customFormatter.id },
@@ -116,7 +113,7 @@ const renderCustomFormatter = (data, customFormatter, setFormatOption) => {
             } })));
 };
 const renderFormatColumnFormatSummary = (data, api) => {
-    return React.createElement(Tag_1.Tag, null, exports.getFormatColumnFormatSummaryValue(data, api.formatColumnApi));
+    return React.createElement(Tag_1.Tag, null, exports.getFormatColumnFormatSummaryValue(data, api));
 };
 exports.renderFormatColumnFormatSummary = renderFormatColumnFormatSummary;
 const getFormatDisplayTypeForScope = (scope, api) => {
@@ -153,7 +150,7 @@ const getFormatDisplayTypeForScope = (scope, api) => {
     return undefined;
 };
 exports.getFormatDisplayTypeForScope = getFormatDisplayTypeForScope;
-const renderDateFormat = (data, _onChange, setFormatOption, customFormatters, formatColumnApi) => {
+const renderDateFormat = (data, _onChange, setFormatOption, scopedCustomFormatters, formatColumnApi) => {
     if (data.DisplayFormat.Formatter !== 'DateFormatter') {
         return null;
     }
@@ -169,9 +166,12 @@ 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))),
-                    customFormatters.map((formatter) => renderCustomFormatter(data, formatter, setFormatOption))))),
-        React.createElement(Tabs_1.Tabs, { marginTop: 2 },
+                        React.createElement("span", null, FormatHelper_1.default.DateFormatter(new Date(), data.DisplayFormat.Options)))))),
+        scopedCustomFormatters.length > 0 && (React.createElement(Tabs_1.Tabs, { marginTop: 2, keyboardNavigation: false },
+            React.createElement(Tabs_1.Tabs.Tab, null, "Custom Formats"),
+            React.createElement(Tabs_1.Tabs.Content, null,
+                React.createElement(FormLayout_1.default, null, scopedCustomFormatters.map((formatter) => renderCustomFormatter(data, formatter, setFormatOption)))))),
+        React.createElement(Tabs_1.Tabs, { marginTop: 2, keyboardNavigation: false },
             React.createElement(Tabs_1.Tabs.Tab, null, "Presets"),
             React.createElement(Tabs_1.Tabs.Content, null,
                 React.createElement(AdaptableObjectRow_1.AdaptableObjectRow, { style: { fontWeight: 'bold' }, colItems: [
@@ -182,7 +182,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,
                         },
                         {
@@ -191,7 +191,7 @@ const renderDateFormat = (data, _onChange, setFormatOption, customFormatters, fo
                         },
                     ] })))))));
 };
-const renderNumberFormat = (data, onChange, setFormatOption, customFormatters, formatColumnApi) => {
+const renderNumberFormat = (data, onChange, setFormatOption, scopedCustomFormatters, formatColumnApi) => {
     if (data.DisplayFormat.Formatter !== 'NumberFormatter') {
         return null;
     }
@@ -243,7 +243,6 @@ const renderNumberFormat = (data, onChange, setFormatOption, customFormatters, f
         data.DisplayFormat.Options.Multiplier === MILLION_OPTIONS.Multiplier; //isEqual(data.DisplayFormat.Options, MILLION_OPTIONS);
     const IS_DOLLAR = data.DisplayFormat.Options.Prefix === '$'; //isEqual(data.DisplayFormat.Options, DOLLAR_OPTIONS);
     const IS_STERLING = data.DisplayFormat.Options.Prefix === '£'; //isEqual(data.DisplayFormat, STERLING_OPTIONS);
-    const [leftCustomFormatters, rightCustomFormatters] = splitArrayInTwo(customFormatters);
     return (React.createElement(rebass_1.Box, { "data-name": 'format-column-display-format', padding: 2 },
         React.createElement(Tabs_1.Tabs, null,
             React.createElement(Tabs_1.Tabs.Tab, null, "Format"),
@@ -257,8 +256,7 @@ const renderNumberFormat = (data, onChange, setFormatOption, customFormatters, f
                         React.createElement(FormLayout_1.FormRow, { label: "Prefix" },
                             React.createElement(Input_1.default, { value: data.DisplayFormat.Options.Prefix, onChange: (e) => setFormatOption('Prefix', e.currentTarget.value) })),
                         React.createElement(FormLayout_1.FormRow, { label: "Suffix" },
-                            React.createElement(Input_1.default, { value: data.DisplayFormat.Options.Suffix, onChange: (e) => setFormatOption('Suffix', e.currentTarget.value) })),
-                        leftCustomFormatters.map((formatter) => renderCustomFormatter(data, formatter, setFormatOption))),
+                            React.createElement(Input_1.default, { value: data.DisplayFormat.Options.Suffix, onChange: (e) => setFormatOption('Suffix', e.currentTarget.value) }))),
                     React.createElement(FormLayout_1.default, null,
                         React.createElement(FormLayout_1.FormRow, { label: "Fraction Digits" },
                             React.createElement(Input_1.default, { type: "number", min: "0", 
@@ -275,8 +273,12 @@ const renderNumberFormat = (data, onChange, setFormatOption, customFormatters, f
                         React.createElement(FormLayout_1.FormRow, { label: "Parentheses" },
                             React.createElement(CheckBox_1.CheckBox, { checked: data.DisplayFormat.Options.Parentheses, onChange: (checked) => setFormatOption('Parentheses', checked) })),
                         React.createElement(FormLayout_1.FormRow, { label: "Truncate" },
-                            React.createElement(CheckBox_1.CheckBox, { checked: data.DisplayFormat.Options.Truncate, onChange: (checked) => setFormatOption('Truncate', checked) })),
-                        rightCustomFormatters.map((formatter) => renderCustomFormatter(data, formatter, setFormatOption)))))),
+                            React.createElement(CheckBox_1.CheckBox, { checked: data.DisplayFormat.Options.Truncate, onChange: (checked) => setFormatOption('Truncate', checked) })))))),
+        scopedCustomFormatters.length > 0 && (React.createElement(Tabs_1.Tabs, { marginTop: 2, keyboardNavigation: false },
+            React.createElement(Tabs_1.Tabs.Tab, null, "Custom Formats"),
+            React.createElement(Tabs_1.Tabs.Content, null,
+                React.createElement(rebass_1.Flex, { flexDirection: "row" },
+                    React.createElement(FormLayout_1.default, null, scopedCustomFormatters.map((formatter) => renderCustomFormatter(data, formatter, setFormatOption))))))),
         React.createElement(Tabs_1.Tabs, { marginTop: 2, autoFocus: false, keyboardNavigation: false },
             React.createElement(Tabs_1.Tabs.Tab, null, "Presets"),
             React.createElement(Tabs_1.Tabs.Content, null,
@@ -299,29 +301,30 @@ 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,
                         },
                     ] })))));
 };
-const renderStringFormat = (data, _onChange, setFormatOption, customFormatters, formatColumnApi) => {
+const renderStringFormat = (data, _onChange, setFormatOption, scopedCustomFormatters, formatColumnApi) => {
     if (data.DisplayFormat.Formatter !== 'StringFormatter') {
         return null;
     }
+    console.log('formatters', scopedCustomFormatters);
     return (React.createElement(rebass_1.Box, { "data-name": 'format-column-display-format', padding: 2 },
         React.createElement(Tabs_1.Tabs, null,
             React.createElement(Tabs_1.Tabs.Tab, null, "Format"),
@@ -337,8 +340,12 @@ const renderStringFormat = (data, _onChange, setFormatOption, customFormatters,
                         React.createElement(FormLayout_1.FormRow, { label: "Prefix" },
                             React.createElement(Input_1.default, { value: data.DisplayFormat.Options.Prefix, onChange: (e) => setFormatOption('Prefix', e.currentTarget.value) })),
                         React.createElement(FormLayout_1.FormRow, { label: "Suffix" },
-                            React.createElement(Input_1.default, { value: data.DisplayFormat.Options.Suffix, onChange: (e) => setFormatOption('Suffix', e.currentTarget.value) })),
-                        customFormatters.map((formatter) => renderCustomFormatter(data, formatter, setFormatOption)))))),
+                            React.createElement(Input_1.default, { value: data.DisplayFormat.Options.Suffix, onChange: (e) => setFormatOption('Suffix', e.currentTarget.value) })))))),
+        scopedCustomFormatters.length > 0 && (React.createElement(Tabs_1.Tabs, { marginTop: 2, keyboardNavigation: false },
+            React.createElement(Tabs_1.Tabs.Tab, null, "Custom Formats"),
+            React.createElement(Tabs_1.Tabs.Content, null,
+                React.createElement(rebass_1.Flex, { flexDirection: "column" },
+                    React.createElement(FormLayout_1.default, { mr: 3 }, scopedCustomFormatters.map((formatter) => renderCustomFormatter(data, formatter, setFormatOption))))))),
         React.createElement(Tabs_1.Tabs, { marginTop: 2, keyboardNavigation: false },
             React.createElement(Tabs_1.Tabs.Tab, null, "Example"),
             React.createElement(Tabs_1.Tabs.Content, null,
@@ -350,7 +357,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,
                         },
@@ -372,15 +379,15 @@ const FormatColumnFormatWizardSection = (props) => {
         update({ DisplayFormat });
     };
     const Type = data.DisplayFormat && data.DisplayFormat.Formatter;
-    const customNumberFormatters = customDisplayFormatters.filter((displayFormatter) => adaptable.api.scopeApi.isScopeInScope(displayFormatter.scope, data.Scope));
+    const customScopedFormatters = customDisplayFormatters.filter((displayFormatter) => adaptable.api.scopeApi.isScopeInScope(displayFormatter.scope, data.Scope));
     if (Type === 'NumberFormatter') {
-        return renderNumberFormat(data, update, setFormatOption, customNumberFormatters, formatColumnApi);
+        return renderNumberFormat(data, update, setFormatOption, customScopedFormatters, formatColumnApi);
     }
     if (Type === 'DateFormatter') {
-        return renderDateFormat(data, update, setFormatOption, customNumberFormatters, formatColumnApi);
+        return renderDateFormat(data, update, setFormatOption, customScopedFormatters, formatColumnApi);
     }
     if (Type === 'StringFormatter') {
-        return renderStringFormat(data, update, setFormatOption, customNumberFormatters, formatColumnApi);
+        return renderStringFormat(data, update, setFormatOption, customScopedFormatters, formatColumnApi);
     }
     return (React.createElement(HelpBlock_1.default, { margin: 3 },
         "Setting a Display Format is only available if ",

package/src/View/Layout/LayoutViewPanel.d.ts

@@ -1,7 +1,7 @@
+import * as React from 'react';
 import { ViewPanelProps } from '../Components/SharedProps/ViewPanelProps';
-import * as LayoutRedux from '../../Redux/ActionsReducers/LayoutRedux';
 import { Layout } from '../../PredefinedConfig/LayoutState';
-import * as React from 'react';
+import * as LayoutRedux from '../../Redux/ActionsReducers/LayoutRedux';
 export declare const COMPONENT_LAYOUT_POPUP_NAME = "LayoutEditorStandalonePopup";
 export interface LayoutViewPanelComponentProps extends ViewPanelProps {
     onSelectLayout: (layoutName: string) => LayoutRedux.LayoutSelectAction;

package/src/View/Layout/LayoutViewPanel.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LayoutViewPanelControl = exports.COMPONENT_LAYOUT_POPUP_NAME = void 0;
 const tslib_1 = require("tslib");
-const LayoutRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/LayoutRedux"));
 const React = tslib_1.__importStar(require("react"));
+const react_redux_1 = require("react-redux");
 const AdaptableHelper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/AdaptableHelper"));
 const rebass_1 = require("rebass");
 const DropdownButton_1 = tslib_1.__importDefault(require("../../components/DropdownButton"));
@@ -13,8 +13,9 @@ const ButtonSave_1 = require("../Components/Buttons/ButtonSave");
 const ButtonEdit_1 = require("../Components/Buttons/ButtonEdit");
 const ButtonNew_1 = require("../Components/Buttons/ButtonNew");
 const ButtonDelete_1 = require("../Components/Buttons/ButtonDelete");
-const react_redux_1 = require("react-redux");
 const ButtonClone_1 = require("../Components/Buttons/ButtonClone");
+const GridRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/GridRedux"));
+const LayoutRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/LayoutRedux"));
 exports.COMPONENT_LAYOUT_POPUP_NAME = 'LayoutEditorStandalonePopup';
 class LayoutViewPanelComponent extends React.Component {
     render() {
@@ -54,8 +55,7 @@ function mapStateToProps(state, ownProps) {
         CurrentLayoutName,
         CurrentDraftLayout: state.Grid.CurrentLayout || selectedLayout,
         Layouts,
-        CanSave: state.Grid.CurrentLayout &&
-            !api.layoutApi.areLayoutsEqual(selectedLayout, state.Grid.CurrentLayout),
+        CanSave: state.Grid.CurrentLayout && !api.layoutApi.areDraftAndCurrentLayoutEqual(),
     };
 }
 function mapDispatchToProps(dispatch) {
@@ -63,7 +63,7 @@ function mapDispatchToProps(dispatch) {
         onSelectLayout: (layoutName) => dispatch(LayoutRedux.LayoutSelect(layoutName)),
         onSaveLayout: (layout) => {
             dispatch(LayoutRedux.LayoutSave(layout));
-            dispatch(LayoutRedux.LayoutUpdateCurrentDraft(null));
+            dispatch(GridRedux.LayoutUpdateCurrentDraft(null));
         },
     };
 }

package/src/View/Layout/SaveLayoutButton.d.ts

@@ -0,0 +1,2 @@
+import * as React from 'react';
+export declare const SaveLayoutButton: React.FunctionComponent;

package/src/View/Layout/SaveLayoutButton.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SaveLayoutButton = void 0;
+const tslib_1 = require("tslib");
+const React = tslib_1.__importStar(require("react"));
+const react_redux_1 = require("react-redux");
+const AdaptableContext_1 = require("../AdaptableContext");
+const ButtonSave_1 = require("../Components/Buttons/ButtonSave");
+const GridRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/GridRedux"));
+const LayoutRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/LayoutRedux"));
+const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
+const SaveLayoutButton = () => {
+    const adaptable = AdaptableContext_1.useAdaptable();
+    const accessLevel = adaptable.api.internalApi
+        .getEntitlementService()
+        .getEntitlementAccessLevelForModule(ModuleConstants.LayoutModuleId);
+    const dispatch = react_redux_1.useDispatch();
+    const currentDraftLayout = react_redux_1.useSelector((state) => state.Grid.CurrentLayout);
+    const isManualSaveLayout = !adaptable.api.layoutApi.shouldAutoSaveLayout(currentDraftLayout);
+    const handleSave = React.useCallback((layout) => {
+        dispatch(LayoutRedux.LayoutSave(layout));
+        dispatch(GridRedux.LayoutUpdateCurrentDraft(null));
+    }, []);
+    const isSaveEnabled = currentDraftLayout && !adaptable.api.layoutApi.areDraftAndCurrentLayoutEqual();
+    if (!isManualSaveLayout) {
+        return React.createElement(React.Fragment, null);
+    }
+    return (React.createElement(ButtonSave_1.ButtonSave, { ml: 1, variant: "text", iconSize: 15, onClick: () => handleSave(currentDraftLayout), tooltip: "Save Changes to Current Layout", disabled: !isSaveEnabled, accessLevel: accessLevel }));
+};
+exports.SaveLayoutButton = SaveLayoutButton;

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 {