@adaptabletools/adaptable 11.2.2 → 11.2.4

package/src/View/FormatColumn/Wizard/FormatColumnFormatWizardSection.d.ts

@@ -3,6 +3,7 @@ import { FormatColumn } from '../../../PredefinedConfig/FormatColumnState';
 import { AdaptableFormat } from '../../../PredefinedConfig/Common/AdaptableFormat';
 import { AdaptableScope } from '../../../PredefinedConfig/Common/AdaptableScope';
 import { AdaptableApi } from '../../../Api/AdaptableApi';
+import { FormatColumnApi } from '../../../types';
 export declare type FormatColumnFormatWizardSectionProps = {
     onChange: (data: FormatColumn) => void;
 };
@@ -10,7 +11,7 @@ export interface FormatColumnFormatWizardState {
     DisplayFormat: AdaptableFormat;
     NumericFormat?: 'Percent' | 'Thousand' | 'Million' | 'Dollar' | 'Sterling' | undefined;
 }
-export declare const getFormatColumnFormatSummaryValue: (data: FormatColumn) => string;
-export declare const renderFormatColumnFormatSummary: (data: FormatColumn) => JSX.Element;
+export declare const getFormatColumnFormatSummaryValue: (data: FormatColumn, formattedColumnApi: FormatColumnApi) => string;
+export declare const renderFormatColumnFormatSummary: (data: FormatColumn, api: AdaptableApi) => JSX.Element;
 export declare const getFormatDisplayTypeForScope: (scope: AdaptableScope, api: AdaptableApi) => 'Number' | 'Date' | 'String' | undefined;
 export declare const FormatColumnFormatWizardSection: (props: FormatColumnFormatWizardSectionProps) => JSX.Element;

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

@@ -10,7 +10,6 @@ const HelpBlock_1 = tslib_1.__importDefault(require("../../../components/HelpBlo
 const Input_1 = tslib_1.__importDefault(require("../../../components/Input"));
 const SimpleButton_1 = tslib_1.__importDefault(require("../../../components/SimpleButton"));
 const CheckBox_1 = require("../../../components/CheckBox");
-const FormatHelper_1 = tslib_1.__importDefault(require("../../../Utilities/Helpers/FormatHelper"));
 const FormLayout_1 = tslib_1.__importStar(require("../../../components/FormLayout"));
 const AdaptableObjectRow_1 = require("../../Components/AdaptableObjectRow");
 const Radio_1 = tslib_1.__importDefault(require("../../../components/Radio"));
@@ -18,6 +17,7 @@ const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
 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 DOLLAR_OPTIONS = {
     FractionDigits: 2,
     FractionSeparator: '.',
@@ -77,26 +77,45 @@ const DateFormatPresets = [
     'yyyyMMdd',
     'HH:mm:ss',
 ];
-exports.getFormatColumnFormatSummaryValue = (data) => {
+exports.getFormatColumnFormatSummaryValue = (data, formattedColumnApi) => {
     let content = 'N/A';
     if (!data.DisplayFormat) {
         content = 'N/A';
     }
     else {
         if (data.DisplayFormat.Formatter === 'NumberFormatter') {
-            content = FormatHelper_1.default.NumberFormatter(12345.6789, data.DisplayFormat.Options);
+            content = formattedColumnApi.getNumberFormattedValue(12345.6789, data.DisplayFormat.Options);
         }
         if (data.DisplayFormat.Formatter === 'DateFormatter') {
-            content = FormatHelper_1.default.DateFormatter(new Date(), data.DisplayFormat.Options);
+            content = formattedColumnApi.getDateFormattedValue(new Date(), data.DisplayFormat.Options);
         }
         if (data.DisplayFormat.Formatter === 'StringFormatter') {
-            content = FormatHelper_1.default.StringFormatter('Hello World ', data.DisplayFormat.Options);
+            content = formattedColumnApi.getStringFormattedValue('Hello World ', data.DisplayFormat.Options);
         }
     }
     return content;
 };
-exports.renderFormatColumnFormatSummary = (data) => {
-    return React.createElement(Tag_1.Tag, null, exports.getFormatColumnFormatSummaryValue(data));
+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 },
+        React.createElement(CheckBox_1.CheckBox, { checked: (_c = (_b = data.DisplayFormat.Options.CustomDisplayFormats) === null || _b === void 0 ? void 0 : _b.some) === null || _c === void 0 ? void 0 : _c.call(_b, (item) => item.Id === customFormatter.id), onChange: (checked) => {
+                var _a, _b, _c;
+                let newCustomFormats = (_c = (_b = (_a = data === null || data === void 0 ? void 0 : data.DisplayFormat) === null || _a === void 0 ? void 0 : _a.Options) === null || _b === void 0 ? void 0 : _b.CustomDisplayFormats) !== null && _c !== void 0 ? _c : [];
+                if (checked) {
+                    newCustomFormats = [...newCustomFormats, { Id: customFormatter.id }];
+                }
+                else {
+                    newCustomFormats = newCustomFormats.filter((item) => item.Id !== customFormatter.id);
+                }
+                setFormatOption('CustomDisplayFormats', newCustomFormats);
+            } })));
+};
+exports.renderFormatColumnFormatSummary = (data, api) => {
+    return React.createElement(Tag_1.Tag, null, exports.getFormatColumnFormatSummaryValue(data, api.formatColumnApi));
 };
 exports.getFormatDisplayTypeForScope = (scope, api) => {
     if (scope == undefined) {
@@ -131,7 +150,7 @@ exports.getFormatDisplayTypeForScope = (scope, api) => {
     }
     return undefined;
 };
-const renderDateFormat = (data, _onChange, setFormatOption) => {
+const renderDateFormat = (data, _onChange, setFormatOption, customFormatters, formatColumnApi) => {
     if (data.DisplayFormat.Formatter !== 'DateFormatter') {
         return null;
     }
@@ -147,7 +166,8 @@ const renderDateFormat = (data, _onChange, setFormatOption) => {
                 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, FormatHelper_1.default.DateFormatter(new Date(), data.DisplayFormat.Options)))))),
+                        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(Tabs_1.Tabs.Tab, null, "Presets"),
             React.createElement(Tabs_1.Tabs.Content, null,
@@ -159,7 +179,7 @@ const renderDateFormat = (data, _onChange, setFormatOption) => {
                 DateFormatPresets.map((Pattern, index) => (React.createElement(AdaptableObjectRow_1.AdaptableObjectRow, { key: index, colItems: [
                         { Content: Pattern, Size: 1 },
                         {
-                            Content: FormatHelper_1.default.DateFormatter(new Date(), { Pattern }),
+                            Content: formatColumnApi.getDateFormattedValue(new Date(), { Pattern }),
                             Size: 1,
                         },
                         {
@@ -168,7 +188,7 @@ const renderDateFormat = (data, _onChange, setFormatOption) => {
                         },
                     ] })))))));
 };
-const renderNumberFormat = (data, onChange, setFormatOption) => {
+const renderNumberFormat = (data, onChange, setFormatOption, customFormatters, formatColumnApi) => {
     if (data.DisplayFormat.Formatter !== 'NumberFormatter') {
         return null;
     }
@@ -220,6 +240,7 @@ const renderNumberFormat = (data, onChange, setFormatOption) => {
         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"),
@@ -233,7 +254,8 @@ const renderNumberFormat = (data, onChange, setFormatOption) => {
                         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) }))),
+                            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(FormLayout_1.default, null,
                         React.createElement(FormLayout_1.FormRow, { label: "Fraction Digits" },
                             React.createElement(Input_1.default, { type: "number", min: "0", 
@@ -250,7 +272,8 @@ const renderNumberFormat = (data, onChange, setFormatOption) => {
                         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) })))))),
+                            React.createElement(CheckBox_1.CheckBox, { checked: data.DisplayFormat.Options.Truncate, onChange: (checked) => setFormatOption('Truncate', checked) })),
+                        rightCustomFormatters.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,
@@ -273,26 +296,26 @@ const renderNumberFormat = (data, onChange, setFormatOption) => {
                 React.createElement(AdaptableObjectRow_1.AdaptableObjectRow, { colItems: [
                         { Content: '12345.6789', Size: 1 },
                         {
-                            Content: FormatHelper_1.default.NumberFormatter(12345.6789, data.DisplayFormat.Options),
+                            Content: formatColumnApi.getNumberFormattedValue(12345.6789, data.DisplayFormat.Options),
                             Size: 1,
                         },
                     ] }),
                 React.createElement(AdaptableObjectRow_1.AdaptableObjectRow, { colItems: [
                         { Content: '-12345.6789', Size: 1 },
                         {
-                            Content: FormatHelper_1.default.NumberFormatter(-12345.6789, data.DisplayFormat.Options),
+                            Content: formatColumnApi.getNumberFormattedValue(-12345.6789, data.DisplayFormat.Options),
                             Size: 1,
                         },
                     ] }),
                 React.createElement(AdaptableObjectRow_1.AdaptableObjectRow, { colItems: [
                         { Content: '0.123', Size: 1 },
                         {
-                            Content: FormatHelper_1.default.NumberFormatter(0.123, data.DisplayFormat.Options),
+                            Content: formatColumnApi.getNumberFormattedValue(0.123, data.DisplayFormat.Options),
                             Size: 1,
                         },
                     ] })))));
 };
-const renderStringFormat = (data, _onChange, setFormatOption) => {
+const renderStringFormat = (data, _onChange, setFormatOption, customFormatters, formatColumnApi) => {
     if (data.DisplayFormat.Formatter !== 'StringFormatter') {
         return null;
     }
@@ -311,7 +334,8 @@ const renderStringFormat = (data, _onChange, setFormatOption) => {
                         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) })))))),
+                            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(Tabs_1.Tabs, { marginTop: 2, keyboardNavigation: false },
             React.createElement(Tabs_1.Tabs.Tab, null, "Example"),
             React.createElement(Tabs_1.Tabs.Content, null,
@@ -323,14 +347,18 @@ const renderStringFormat = (data, _onChange, setFormatOption) => {
                         { Content: '"Hello World "', Size: 1 },
                         {
                             Content: '"' +
-                                FormatHelper_1.default.StringFormatter('Hello World ', data.DisplayFormat.Options) +
+                                formatColumnApi.getStringFormattedValue('Hello World ', data.DisplayFormat.Options) +
                                 '"',
                             Size: 1,
                         },
                     ] })))));
 };
 exports.FormatColumnFormatWizardSection = (props) => {
+    var _a, _b, _c;
     const { data } = OnePageAdaptableWizard_1.useOnePageWizardContext();
+    const adaptable = AdaptableContext_1.useAdaptable();
+    const formatColumnApi = adaptable.api.formatColumnApi;
+    const customDisplayFormatters = (_c = (_b = (_a = adaptable.adaptableOptions) === null || _a === void 0 ? void 0 : _a.formatColumnOptions) === null || _b === void 0 ? void 0 : _b.customDisplayFormatters) !== null && _c !== void 0 ? _c : [];
     const update = (updated) => {
         props.onChange(Object.assign(Object.assign({}, data), updated));
     };
@@ -342,13 +370,16 @@ exports.FormatColumnFormatWizardSection = (props) => {
     };
     const Type = data.DisplayFormat && data.DisplayFormat.Formatter;
     if (Type === 'NumberFormatter') {
-        return renderNumberFormat(data, update, setFormatOption);
+        const customNumberFormatters = customDisplayFormatters.filter((displayFormatter) => displayFormatter.type === 'Number');
+        return renderNumberFormat(data, update, setFormatOption, customNumberFormatters, formatColumnApi);
     }
     if (Type === 'DateFormatter') {
-        return renderDateFormat(data, update, setFormatOption);
+        const customNumberFormatters = customDisplayFormatters.filter((displayFormatter) => displayFormatter.type === 'Date');
+        return renderDateFormat(data, update, setFormatOption, customNumberFormatters, formatColumnApi);
     }
     if (Type === 'StringFormatter') {
-        return renderStringFormat(data, update, setFormatOption);
+        const customNumberFormatters = customDisplayFormatters.filter((displayFormatter) => displayFormatter.type === 'String');
+        return renderStringFormat(data, update, setFormatOption, customNumberFormatters, formatColumnApi);
     }
     return (React.createElement(HelpBlock_1.default, { margin: 3 },
         "Setting a Display Format is only available if ",

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

@@ -72,9 +72,9 @@ const adjustFormatColumn = (formatColumn, api) => {
     return formatColumn;
 };
 function FormatColumnWizard(props) {
-    var _a;
+    var _a, _b;
     const { api } = AdaptableContext_1.useAdaptable();
-    const data = (_a = props.data) !== null && _a !== void 0 ? _a : props.popupParams.value;
+    const data = (_a = props.data) !== null && _a !== void 0 ? _a : (_b = props.popupParams) === null || _b === void 0 ? void 0 : _b.value;
     const [formatColumn, doSetFormatColumn] = react_1.useState(() => {
         var _a, _b, _c, _d;
         let formatColumn = data ? Helper_1.cloneObject(data) : ObjectFactory_1.default.CreateEmptyFormatColumn();
@@ -125,7 +125,7 @@ function FormatColumnWizard(props) {
             },
             {
                 title: 'Display Format',
-                renderSummary: FormatColumnFormatWizardSection_1.renderFormatColumnFormatSummary,
+                renderSummary: (data) => FormatColumnFormatWizardSection_1.renderFormatColumnFormatSummary(data, api),
                 render: () => {
                     return React.createElement(FormatColumnFormatWizardSection_1.FormatColumnFormatWizardSection, { onChange: setFormatColumn });
                 },

package/src/View/FreeTextColumn/Wizard/FreeTextColumnSettingsWizardSection.d.ts

@@ -2,7 +2,7 @@
 import { FreeTextColumn } from '../../../PredefinedConfig/FreeTextColumnState';
 import { AdaptableApi } from '../../../Api/AdaptableApi';
 export declare const renderFreeTextColumnSummary: (data: FreeTextColumn) => JSX.Element;
-export declare const isValidFreeTextColumn: (data: FreeTextColumn, api: AdaptableApi) => true | "Column id cannot be empty" | "No data type specified for column" | "A Column already exists with that id";
+export declare const isValidFreeTextColumn: (data: FreeTextColumn, api: AdaptableApi) => true | "Column Id cannot be empty" | "No data type specified for column" | "A Column already exists with that id";
 export declare type FreeTextColumnSettingsWizardSectionProps = {
     onChange: (data: FreeTextColumn) => void;
     isEdit: boolean;

package/src/View/FreeTextColumn/Wizard/FreeTextColumnSettingsWizardSection.js

@@ -46,7 +46,7 @@ exports.renderFreeTextColumnSummary = (data) => {
 exports.isValidFreeTextColumn = (data, api) => {
     const columns = api.columnApi.getColumns();
     if (!data.ColumnId) {
-        return 'Column id cannot be empty';
+        return 'Column Id cannot be empty';
     }
     const columnsWithSameIdCount = columns.filter((c) => c.columnId === data.ColumnId).length;
     const hasAlreadyExistingId = data.Uuid ? columnsWithSameIdCount > 1 : columnsWithSameIdCount > 0;

package/src/View/Layout/Wizard/LayoutEditorWizard.d.ts

@@ -43,7 +43,7 @@ export declare class LayoutEditorWizard extends React.Component<LayoutEditorWiza
         Uuid?: string;
         Source?: "Config" | "User";
         IsReadOnly?: boolean;
-        Tags?: import("../../../PredefinedConfig/Common/AdaptableObject").AdaptableObjectTag[];
+        Tags?: import("../../../types").AdaptableObjectTag[];
     };
     canNext(): boolean;
     canBack(): boolean;

package/src/View/Schedule/Wizard/ScheduleWizard.js

@@ -14,10 +14,10 @@ const react_redux_1 = require("react-redux");
 const ScheduleRedux = tslib_1.__importStar(require("../../../Redux/ActionsReducers/ScheduleRedux"));
 const ObjectTagsWizardSection_1 = require("../../Wizard/ObjectTagsWizardSection");
 exports.ScheduleWizard = (props) => {
-    var _a, _b, _c;
-    const data = (_a = props.data) !== null && _a !== void 0 ? _a : props.popupParams.value;
-    const isNew = ((_b = props.popupParams) === null || _b === void 0 ? void 0 : _b.action) ? props.popupParams.action === 'New' : !props.data;
-    const scheduleType = data ? data.ScheduleType : (_c = props === null || props === void 0 ? void 0 : props.abObjectType) === null || _c === void 0 ? void 0 : _c.name;
+    var _a, _b, _c, _d;
+    const data = (_a = props.data) !== null && _a !== void 0 ? _a : (_b = props.popupParams) === null || _b === void 0 ? void 0 : _b.value;
+    const isNew = ((_c = props.popupParams) === null || _c === void 0 ? void 0 : _c.action) ? props.popupParams.action === 'New' : !props.data;
+    const scheduleType = data ? data.ScheduleType : (_d = props === null || props === void 0 ? void 0 : props.abObjectType) === null || _d === void 0 ? void 0 : _d.name;
     const [schedule, setSchedule] = React.useState(() => {
         if (data) {
             return data;

package/src/agGrid/Adaptable.d.ts

@@ -195,6 +195,9 @@ export declare class Adaptable implements IAdaptable {
     forAllRowNodesDo(func: (rowNode: RowNode) => void): void;
     forAllVisibleRowNodesDo(func: (rowNode: RowNode, rowIndex: number) => void): void;
     getVisibleRowNodes(): RowNode[];
+    getAllRowNodes(config?: {
+        includeGroupRows?: boolean;
+    }): RowNode[];
     getRowsInViewport(): RowNode[];
     selectNodes(rowNodes: RowNode[], clearSelection: boolean): void;
     deSelectNodes(rowNodes: RowNode[], clearSelection: boolean): void;

package/src/agGrid/Adaptable.js

@@ -26,7 +26,7 @@ const AdaptableHelper_1 = tslib_1.__importDefault(require("../Utilities/Helpers/
 const FormatHelper_1 = tslib_1.__importDefault(require("../Utilities/Helpers/FormatHelper"));
 const Helper_1 = require("../Utilities/Helpers/Helper");
 const LoggingHelper_1 = require("../Utilities/Helpers/LoggingHelper");
-const ObjectFactory_1 = tslib_1.__importStar(require("../Utilities/ObjectFactory"));
+const ObjectFactory_1 = require("../Utilities/ObjectFactory");
 // services
 const CalculatedColumnExpressionService_1 = require("../Utilities/Services/CalculatedColumnExpressionService");
 const DataService_1 = require("../Utilities/Services/DataService");
@@ -1106,6 +1106,7 @@ class Adaptable {
         return isCellReadonly ? readonlyCellStyle.ClassName : null;
     }
     isQuickSearchActive(abColumn, params) {
+        var _a;
         if (abColumn.isExcludedFromQuickSearch) {
             return false;
         }
@@ -1116,8 +1117,11 @@ class Adaptable {
         if (StringExtensions_1.StringExtensions.IsNullOrEmpty(quickSearchValue)) {
             return false;
         }
-        const columnFilter = ObjectFactory_1.default.CreateColumnFilter(abColumn.columnId, 'Contains', [quickSearchValue]);
-        return this.api.filterApi.evaluateColumnFilter(columnFilter, params.node);
+        const displayValue = (_a = this.api.gridApi.getDisplayValueFromRowNode(params.node, abColumn.columnId)) !== null && _a !== void 0 ? _a : '';
+        const ignoreCase = !this.api.internalApi.isTextComparisonCaseSensitive();
+        const v = ignoreCase ? String(displayValue).toLocaleLowerCase() : String(displayValue);
+        const i = ignoreCase ? String(quickSearchValue).toLocaleLowerCase() : String(quickSearchValue);
+        return v.indexOf(i) !== -1;
     }
     getPrimaryKeyValueFromRowNode(rowNode) {
         var _a;
@@ -1807,7 +1811,7 @@ class Adaptable {
         const pkValue = this.getPrimaryKeyValueFromRowNode(rowNode);
         const rawValue = this.getRawValueFromRowNode(rowNode, columnId);
         const displayValue = this.getDisplayValueFromRawValue(columnId, rawValue);
-        const normalisedvalue = this.getNormalisedValueFromRowValue(rawValue, displayValue, abColumn);
+        const normalisedvalue = this.getNormalisedValueFromRowValue(rawValue, abColumn);
         return {
             rawValue: rawValue,
             displayValue: displayValue,
@@ -1872,35 +1876,28 @@ class Adaptable {
         };
         return formatterFn(params);
     }
-    getNormalisedValueFromRowValue(rawValue, displayValue, column) {
-        // not sure if the current implementation is correct:
-        // the returned "normalised value" is actually the displayed value in almost all cases?!
-        // ex. how to read the following: if 'rawValue' is NOT a number, return normalised version of rawValue, but if rawValue IS a number, return displayedValue of it (which will almost certainly will NOT be a number)
-        //   if (dataType === 'Number') {
-        //     return typeof rawValue !== 'number' ? Number(rawValue) : returnValue;
-        //   }
-        // anyway, it seems to work so far (as of v11.1.3), so I'm leaving it for now :)
+    getNormalisedValueFromRowValue(rawValue, column) {
         if (!column) {
             return rawValue;
         }
-        const returnValue = this.isCustomRenderedColumn(column) ? rawValue : displayValue;
-        if (returnValue === undefined || returnValue === null) {
+        // prevents from null
+        if (rawValue === undefined || rawValue === null) {
             return rawValue;
         }
         const dataType = column.dataType;
         if (dataType === 'String') {
-            return typeof rawValue !== 'string' ? String(rawValue) : returnValue;
+            return typeof rawValue !== 'string' ? String(rawValue) : rawValue;
         }
         if (dataType === 'Number') {
-            return typeof rawValue !== 'number' ? Number(rawValue) : returnValue;
+            return typeof rawValue !== 'number' ? Number(rawValue) : rawValue;
         }
         if (dataType === 'Boolean') {
-            return typeof rawValue !== 'boolean' ? Boolean(rawValue) : returnValue;
+            return typeof rawValue !== 'boolean' ? Boolean(rawValue) : rawValue;
         }
         if (dataType === 'Date') {
             return rawValue instanceof Date ? rawValue : DateHelper_1.parseDateValue(rawValue);
         }
-        return returnValue;
+        return rawValue;
     }
     getRawValueFromRowNode(rowNode, columnId) {
         if (rowNode == null) {
@@ -1950,7 +1947,7 @@ class Adaptable {
         return rowNodes;
     }
     forAllRowNodesDo(func) {
-        this.gridOptions.api.getModel().forEachNode((rowNode) => {
+        this.gridOptions.api.forEachNode((rowNode) => {
             func(rowNode);
         });
     }
@@ -1966,6 +1963,15 @@ class Adaptable {
         });
         return rowNodes;
     }
+    getAllRowNodes(config) {
+        let rowNodes = [];
+        this.gridOptions.api.forEachNode((rowNode, rowIndex) => {
+            if (!this.isGroupRowNode(rowNode) || (config === null || config === void 0 ? void 0 : config.includeGroupRows)) {
+                rowNodes.push(rowNode);
+            }
+        });
+        return rowNodes;
+    }
     getRowsInViewport() {
         return this.gridOptions.api.getRenderedNodes();
     }
@@ -3159,21 +3165,24 @@ class Adaptable {
                     // change the Number format - if the scope allows it
                     if (this.api.scopeApi.isColumnInNumericScope(abColumn, formatColumn.Scope)) {
                         const options = formatColumn.DisplayFormat.Options;
-                        valueFormatter = (params) => FormatHelper_1.default.NumberFormatter(params.value, options);
+                        valueFormatter = (params) => {
+                            let value = params.value;
+                            return this.api.formatColumnApi.getNumberFormattedValue(value, 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) => FormatHelper_1.default.DateFormatter(params.value, options);
+                        valueFormatter = (params) => this.api.formatColumnApi.getDateFormattedValue(params.value, options);
                     }
                 }
                 if (formatColumn.DisplayFormat.Formatter === 'StringFormatter') {
                     // change the Date format - if the scope allows it
                     if (this.api.scopeApi.isColumnInStringsScope(abColumn, formatColumn.Scope)) {
                         const options = formatColumn.DisplayFormat.Options;
-                        valueFormatter = (params) => FormatHelper_1.default.StringFormatter(params.value, options);
+                        valueFormatter = (params) => this.api.formatColumnApi.getStringFormattedValue(params.value, options);
                     }
                 }
                 return valueFormatter;

package/src/agGrid/agGridHelper.js

@@ -165,6 +165,7 @@ class agGridHelper {
         const abColumn = {
             Uuid: Uuid_1.createUuid(),
             columnId: ColumnId,
+            field: colDef.field,
             friendlyName: FriendlyName,
             isPrimaryKey: ColumnId === pkColumn,
             dataType: this.getColumnDataType(agGridColumn, false),

package/src/components/ExpressionEditor/BaseEditorInput.js

@@ -38,12 +38,19 @@ function BaseEditorInput(props) {
                 React.createElement("i", null, " (click for more details)")),
             React.createElement(rebass_1.Text, { marginLeft: 3, style: { fontStyle: 'italic' } }, parserExceptionDetails)));
     };
+    const testRowNode = react_1.useMemo(() => {
+        const firstRowNode = props.api.gridApi.getFirstRowNode();
+        // clone the class instance to still keep the prototype methods
+        return Object.assign(Object.create(Object.getPrototypeOf(firstRowNode)), firstRowNode);
+    }, []);
     try {
         // explicitly parsing & evaluating the expression because we need full control of the resulted AST
         const expr = parser.parse(props.value || '');
         try {
+            testRowNode.data = testData;
             result = expr.evaluate({
-                node: { data: testData },
+                // we need a fully-fledged rowNode as Adaptable accesses internal methods of it
+                node: testRowNode,
                 api: props.api,
                 functions: expressionFunctions,
             });

package/src/components/ExpressionEditor/index.js

@@ -48,6 +48,57 @@ function ExpressionEditor(props) {
     const queryableColumns = type === 'scalar' || type === 'boolean'
         ? props.columns
         : props.columns.filter((c) => !props.api.columnApi.isCalculatedColumn(c.columnId));
+    // borrowed from https://github.com/ag-grid/ag-grid/blob/v27.2.1/community-modules/core/src/ts/utils/object.ts#L205
+    const getColValue = (column) => {
+        var _a, _b;
+        const columnValueKey = (_a = column.field) !== null && _a !== void 0 ? _a : column.columnId;
+        const isColumnValueContainsDots = (_b = column.field) === null || _b === void 0 ? void 0 : _b.includes('.');
+        // if no '.', then it's not a deep value
+        if (!isColumnValueContainsDots) {
+            return data[columnValueKey];
+        }
+        // otherwise it is a deep value, so need to dig for it
+        const fields = columnValueKey.split('.');
+        let currentObject = data;
+        for (let i = 0; i < fields.length; i++) {
+            if (currentObject == null) {
+                return undefined;
+            }
+            currentObject = currentObject[fields[i]];
+        }
+        return currentObject;
+    };
+    // borrowed from https://github.com/ag-grid/ag-grid/blob/v27.2.1/community-modules/core/src/ts/valueService/valueService.ts#L217
+    const updateColValue = (rowData, column, newValue) => {
+        var _a, _b;
+        const columnValueKey = (_a = column.field) !== null && _a !== void 0 ? _a : column.columnId;
+        const isColumnValueContainsDots = (_b = column.field) === null || _b === void 0 ? void 0 : _b.includes('.');
+        // if no '.', then it's not a deep value
+        if (!isColumnValueContainsDots) {
+            rowData[columnValueKey] = newValue;
+        }
+        else {
+            // otherwise it is a deep value, so need to dig for it
+            const fieldPieces = columnValueKey.split('.');
+            let currentObject = rowData;
+            while (fieldPieces.length > 0 && currentObject) {
+                const fieldPiece = fieldPieces.shift();
+                if (fieldPieces.length === 0) {
+                    currentObject[fieldPiece] = newValue;
+                }
+                else {
+                    currentObject = currentObject[fieldPiece];
+                }
+            }
+        }
+        return Object.assign({}, rowData);
+    };
+    const getColDateValue = (column) => {
+        const colValue = getColValue(column);
+        return colValue && DateHelper_1.isValueValidDate(colValue)
+            ? new Date(colValue).toISOString().substr(0, 10)
+            : '';
+    };
     const dataTableEditor = (React.createElement(React.Fragment, null,
         React.createElement(rebass_1.Flex, { flexDirection: "column", alignItems: "start", style: { marginTop: 2 } },
             React.createElement(CheckBox_1.CheckBox, { checked: showColumnIds, onChange: (checked) => setShowColumnIds(checked), style: {
@@ -61,11 +112,9 @@ function ExpressionEditor(props) {
                     cursor: 'grab',
                     marginRight: 'var(--ab-space-1)',
                 }, data: `[${column.columnId}]`, "data-name": "column", icon: "drag" },
-                React.createElement(rebass_1.Flex, { flexDirection: "column", alignItems: "start" }, showColumnIds ? `[${column.columnId}]` : column.friendlyName)) }, column.dataType === 'Number' ? (React.createElement(Input_1.default, { type: "number", "data-name": "column-input", value: data[column.columnId], onChange: (e) => setData(Object.assign(Object.assign({}, data), { [column.columnId]: Number(e.target.value) })), width: "100%", disabled: column.readOnly })) : column.dataType === 'String' ? (React.createElement(Input_1.default, { type: "text", "data-name": "column-input", value: data[column.columnId], onChange: (e) => setData(Object.assign(Object.assign({}, data), { [column.columnId]: e.target.value })), width: "100%", disabled: column.readOnly })) : column.dataType === 'Date' ? (React.createElement(AdaptableInput_1.default, { type: "date", "data-name": "column-input", value: data[column.columnId] && DateHelper_1.isValueValidDate(data[column.columnId])
-                ? new Date(data[column.columnId]).toISOString().substr(0, 10)
-                : '', onChange: (e) => {
-                setData(Object.assign(Object.assign({}, data), { [column.columnId]: new Date(e.target.value) }));
-            }, style: { width: '100%' }, disabled: column.readOnly })) : column.dataType === 'Boolean' ? (React.createElement(CheckBox_1.CheckBox, { "data-name": "column-input", checked: data[column.columnId], onChange: (checked) => setData(Object.assign(Object.assign({}, data), { [column.columnId]: checked })), disabled: column.readOnly })) : null))))));
+                React.createElement(rebass_1.Flex, { flexDirection: "column", alignItems: "start" }, showColumnIds ? `[${column.columnId}]` : column.friendlyName)) }, column.dataType === 'Number' ? (React.createElement(Input_1.default, { type: "number", "data-name": "column-input", value: getColValue(column), onChange: (e) => setData(updateColValue(data, column, Number(e.target.value))), width: "100%", disabled: column.readOnly })) : column.dataType === 'String' ? (React.createElement(Input_1.default, { type: "text", "data-name": "column-input", value: getColValue(column), onChange: (e) => setData(updateColValue(data, column, e.target.value)), width: "100%", disabled: column.readOnly })) : column.dataType === 'Date' ? (React.createElement(AdaptableInput_1.default, { type: "date", "data-name": "column-input", value: getColDateValue(column), onChange: (e) => {
+                setData(updateColValue(data, column, new Date(e.target.value)));
+            }, style: { width: '100%' }, disabled: column.readOnly })) : column.dataType === 'Boolean' ? (React.createElement(CheckBox_1.CheckBox, { "data-name": "column-input", checked: getColValue(column), onChange: (checked) => setData(updateColValue(data, column, checked)), disabled: column.readOnly })) : null))))));
     const namedQueries = (React.createElement("div", null, props.namedQueries.map((namedQuery) => (React.createElement(rebass_1.Flex, { key: namedQuery.Uuid, flexDirection: "column", alignItems: "start", style: {
             padding: 3,
             marginTop: 'var(--ab-space-2)',