@adaptabletools/adaptable-cjs 18.1.7 → 18.1.9

package/src/Utilities/Helpers/FormatHelper.js

@@ -1,25 +1,39 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.StringFormatter = exports.DateFormatter = exports.NumberFormatter = exports.Format = void 0;
+exports.StringFormatter = exports.DateFormatter = exports.NumberFormatter = void 0;
 const tslib_1 = require("tslib");
 // TODO inspect why the following is erroring on angular build
 // import dateFnsFormat from 'date-fns/format';
 const format_1 = tslib_1.__importDefault(require("date-fns/format"));
 const sentence_case_1 = require("sentence-case");
 const GeneralConstants_1 = require("../Constants/GeneralConstants");
-function Format(input, format) {
-    if (format.Formatter === 'NumberFormatter') {
-        return NumberFormatter(input, format.Options);
+const FormatContentHelper_1 = tslib_1.__importDefault(require("./FormatContentHelper"));
+/*
+export function Format(input: any, format: AdaptableFormat) {
+  if (format.Formatter === 'NumberFormatter') {
+    return NumberFormatter(input, format.Options);
+  }
+  if (format.Formatter === 'DateFormatter') {
+    return DateFormatter(input, format.Options);
+  }
+  throw new Error('Unknown formatter');
+}
+*/
+function NumberFormatter(input, options = {}, rowNode, column, api) {
+    var _a;
+    let preparedInput;
+    if (options.Content) {
+        const context = {
+            column,
+            rowNode,
+            input,
+            api,
+        };
+        preparedInput = FormatContentHelper_1.default.resolvePlaceholders(options.Content.toString(), context);
     }
-    if (format.Formatter === 'DateFormatter') {
-        return DateFormatter(input, format.Options);
+    else {
+        preparedInput = input;
     }
-    throw new Error('Unknown formatter');
-}
-exports.Format = Format;
-function NumberFormatter(input, options = {}) {
-    var _a, _b;
-    let preparedInput = (_a = options.Content) !== null && _a !== void 0 ? _a : input;
     if (preparedInput == null || preparedInput == undefined) {
         return undefined;
     }
@@ -71,7 +85,7 @@ function NumberFormatter(input, options = {}) {
         digitsToUse = options.FractionDigits;
     }
     else {
-        let decimalCount = Math.floor(n) === n ? 0 : ((_b = n.toString().split(fractionsSepatator)[1]) === null || _b === void 0 ? void 0 : _b.length) || 0;
+        let decimalCount = Math.floor(n) === n ? 0 : ((_a = n.toString().split(fractionsSepatator)[1]) === null || _a === void 0 ? void 0 : _a.length) || 0;
         digitsToUse = decimalCount;
     }
     s = n.toLocaleString('en-US', {
@@ -114,8 +128,20 @@ function DateFormatter(input, options, strictFormatting = false) {
     }
 }
 exports.DateFormatter = DateFormatter;
-function StringFormatter(input, options = {}) {
-    let preparedInput = options.Content ? options.Content : input;
+function StringFormatter(input, options = {}, rowNode, column, api) {
+    let preparedInput;
+    if (options.Content) {
+        const context = {
+            column,
+            rowNode,
+            input,
+            api,
+        };
+        preparedInput = FormatContentHelper_1.default.resolvePlaceholders(options.Content, context);
+    }
+    else {
+        preparedInput = input;
+    }
     if (preparedInput == null || preparedInput == undefined) {
         return undefined;
     }

package/src/Utilities/Helpers/Helper.d.ts

@@ -18,6 +18,9 @@ export declare function meanNumberArray(numericValues: number[]): number;
 export declare function medianNumberArray(numericValues: number[]): number;
 export declare function modeNumberArray(numbers: number[]): number;
 export declare function clamp(value: any, boundOne: number, boundTwo: number): number;
+export declare function extractColsFromText(text: string): string[];
+export declare function replaceAll(text: string, toReplace: string, replaceWith: string): string;
+export declare function extractContextKeysFromText(text: string): string[];
 export declare const Helper: {
     objectExists: typeof objectExists;
     objectNotExists: typeof objectNotExists;
@@ -38,5 +41,8 @@ export declare const Helper: {
     medianNumberArray: typeof medianNumberArray;
     modeNumberArray: typeof modeNumberArray;
     clamp: typeof clamp;
+    extractColsFromText: typeof extractColsFromText;
+    replaceAll: typeof replaceAll;
+    extractContextKeysFromText: typeof extractContextKeysFromText;
 };
 export default Helper;

package/src/Utilities/Helpers/Helper.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Helper = exports.clamp = exports.modeNumberArray = exports.medianNumberArray = exports.meanNumberArray = exports.standardDeviationNumberArray = exports.sumNumberArray = exports.roundNumberTo4dp = exports.roundNumber = exports.isInputNotNullOrEmpty = exports.isInputNullOrEmpty = exports.returnItemCount = exports.copyToClipboard = exports.createDownloadedFile = exports.convertArrayToCsv = exports.arrayToKeyMap = exports.cloneObject = exports.getStringRepresentionFromKey = exports.objectHasKeys = exports.objectNotExists = exports.objectExists = void 0;
+exports.Helper = exports.extractContextKeysFromText = exports.replaceAll = exports.extractColsFromText = exports.clamp = exports.modeNumberArray = exports.medianNumberArray = exports.meanNumberArray = exports.standardDeviationNumberArray = exports.sumNumberArray = exports.roundNumberTo4dp = exports.roundNumber = exports.isInputNotNullOrEmpty = exports.isInputNullOrEmpty = exports.returnItemCount = exports.copyToClipboard = exports.createDownloadedFile = exports.convertArrayToCsv = exports.arrayToKeyMap = exports.cloneObject = exports.getStringRepresentionFromKey = exports.objectHasKeys = exports.objectNotExists = exports.objectExists = void 0;
 const StringExtensions_1 = require("../Extensions/StringExtensions");
 const AdaptableLogger_1 = require("../../agGrid/AdaptableLogger");
 function objectExists(item) {
@@ -250,6 +250,37 @@ function clamp(value, boundOne, boundTwo) {
     return value;
 }
 exports.clamp = clamp;
+function extractColsFromText(text) {
+    // rowData.columnName => columnName
+    const regex = /\[rowData\.(.*?)\]/g;
+    let m;
+    const cols = [];
+    while ((m = regex.exec(text)) !== null) {
+        cols.push(m[1]);
+    }
+    return cols;
+}
+exports.extractColsFromText = extractColsFromText;
+function replaceAll(text, toReplace, replaceWith) {
+    if (!text) {
+        return text;
+    }
+    // fails for []
+    toReplace = toReplace.replace('[', '\\[').replace(']', '\\]');
+    return text.replace(new RegExp(toReplace, 'g'), replaceWith);
+}
+exports.replaceAll = replaceAll;
+function extractContextKeysFromText(text) {
+    // context.columnName => columnName
+    const regex = /\[context\.(.*?)\]/g;
+    let m;
+    const contextKeys = [];
+    while ((m = regex.exec(text)) !== null) {
+        contextKeys.push(m[1]);
+    }
+    return contextKeys;
+}
+exports.extractContextKeysFromText = extractContextKeysFromText;
 exports.Helper = {
     objectExists,
     objectNotExists,
@@ -270,5 +301,8 @@ exports.Helper = {
     medianNumberArray,
     modeNumberArray,
     clamp,
+    extractColsFromText,
+    replaceAll,
+    extractContextKeysFromText,
 };
 exports.default = exports.Helper;

package/src/View/Alert/Wizard/AlertMessageWizardSection.js

@@ -25,6 +25,7 @@ const AlertMessageWizardSection = (props) => {
     const messageType = data.MessageType;
     const messageText = api.alertApi.internalApi.getAlertDescriptionForDataChange(data);
     const messageHeader = data.MessageHeader;
+    const showDocumentationLinks = api.internalApi.isDocumentationLinksDisplayed();
     const onMessageTextChange = (e) => {
         const { value } = e.target;
         props.onChange(Object.assign(Object.assign({}, data), { MessageText: value }));
@@ -47,7 +48,7 @@ const AlertMessageWizardSection = (props) => {
         React.createElement(Tabs_1.Tabs, { "data-name": "message-text", mt: 2, mb: 3, autoFocus: false },
             React.createElement(Tabs_1.Tabs.Tab, null, "Message Text"),
             React.createElement(Tabs_1.Tabs.Content, null,
-                React.createElement(rebass_1.Text, { fontSize: 2, mt: 3, mb: 2 }, "The text to display as the Alert Message (leave blank to show automated Message based on Alert Type)"),
+                React.createElement(rebass_1.Text, { fontSize: 2, mt: 3, mb: 2 }, "Text to display as the Alert Message (leave blank to show automated Message based on Alert Type)"),
                 ' ',
                 React.createElement(FormLayout_1.default, null,
                     React.createElement(FormLayout_1.FormRow, { label: "Header" },
@@ -56,11 +57,11 @@ const AlertMessageWizardSection = (props) => {
                             onChange: (e) => onMessageHeaderChange(e) })),
                     React.createElement(FormLayout_1.FormRow, { label: "Message" },
                         React.createElement(Textarea_1.default, { minWidth: 300, rows: 3, marginTop: 2, type: 'text', autoFocus: false, value: messageText !== null && messageText !== void 0 ? messageText : '', onChange: (e) => onMessageTextChange(e) }))),
-                React.createElement(HelpBlock_1.default, { "data-name": "alert-message-documentation", mt: 3, mb: 2, style: {
+                showDocumentationLinks && (React.createElement(HelpBlock_1.default, { "data-name": "alert-message-documentation", mt: 3, mb: 2, style: {
                         fontSize: 'var(--ab-font-size-3)',
                         padding: 0,
                     } },
                     React.createElement(ButtonInfo_1.ButtonInfo, { mr: 2, onClick: () => window.open(DocumentationLinkConstants_1.AlertMessageDocsLink, '_blank') }),
-                    "See Alert Message documentation for more details and examples")))));
+                    "See how to create dynamic Alert Messages using placeholders"))))));
 };
 exports.AlertMessageWizardSection = AlertMessageWizardSection;

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

@@ -21,6 +21,9 @@ const AdaptableContext_1 = require("../../AdaptableContext");
 const FormatHelper_1 = tslib_1.__importDefault(require("../../../Utilities/Helpers/FormatHelper"));
 const Toggle_1 = require("../../../components/Toggle");
 const GeneralConstants_1 = require("../../../Utilities/Constants/GeneralConstants");
+const Textarea_1 = tslib_1.__importDefault(require("../../../components/Textarea"));
+const ButtonInfo_1 = require("../../Components/Buttons/ButtonInfo");
+const DocumentationLinkConstants_1 = require("../../../Utilities/Constants/DocumentationLinkConstants");
 const DOLLAR_OPTIONS = {
     FractionDigits: 2,
     FractionSeparator: '.',
@@ -208,8 +211,8 @@ const renderDateFormat = (data, _onChange, setFormatOption, scopedCustomFormatte
                         },
                     ] })))))));
 };
-const renderNumberFormat = (data, onChange, setFormatOption, scopedCustomFormatters, formatColumnApi) => {
-    var _a, _b, _c, _d, _e;
+const renderNumberFormat = (data, onChange, setFormatOption, scopedCustomFormatters, api) => {
+    var _a, _b, _c, _d, _e, _f;
     if (data.DisplayFormat.Formatter !== 'NumberFormatter') {
         return null;
     }
@@ -261,6 +264,7 @@ const renderNumberFormat = (data, onChange, setFormatOption, scopedCustomFormatt
         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 showDocumentationLinks = api.internalApi.isDocumentationLinksDisplayed();
     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"),
@@ -268,7 +272,8 @@ const renderNumberFormat = (data, onChange, setFormatOption, scopedCustomFormatt
                 React.createElement(rebass_1.Flex, { flexDirection: "row" },
                     React.createElement(FormLayout_1.default, { mr: 3 },
                         React.createElement(FormLayout_1.FormRow, { label: "Fraction Separator" },
-                            React.createElement(Input_1.default, { "data-name": "fraction-separator", value: (_a = data.DisplayFormat.Options.FractionSeparator) !== null && _a !== void 0 ? _a : '', onChange: (e) => setFormatOption('FractionSeparator', e.currentTarget.value) })),
+                            React.createElement(Input_1.default, { "data-name": "fraction-separator", value: (_a = data.DisplayFormat.Options.FractionSeparator) !== null && _a !== void 0 ? _a : '', onChange: (e) => setFormatOption('FractionSeparator', e.currentTarget.value) }),
+                            ' '),
                         React.createElement(FormLayout_1.FormRow, { label: "Integer Separator" },
                             React.createElement(Input_1.default, { "data-name": "integer-separator", value: (_b = data.DisplayFormat.Options.IntegerSeparator) !== null && _b !== void 0 ? _b : '', onChange: (e) => setFormatOption('IntegerSeparator', e.currentTarget.value) })),
                         React.createElement(FormLayout_1.FormRow, { label: "Prefix" },
@@ -298,9 +303,6 @@ const renderNumberFormat = (data, onChange, setFormatOption, scopedCustomFormatt
                         React.createElement(FormLayout_1.FormRow, { label: "Multiplier" },
                             React.createElement(Input_1.default, { "data-name": "multiplier", type: "number", value: data.DisplayFormat.Options.Multiplier, onChange: (e) => setFormatOption('Multiplier', Number(e.currentTarget.value)) })),
                         ' ',
-                        React.createElement(FormLayout_1.FormRow, { label: "Content" },
-                            React.createElement(Input_1.default, { "data-name": "content", value: (_e = data.DisplayFormat.Options.Content) !== null && _e !== void 0 ? _e : '', onChange: (e) => setFormatOption('Content', e.currentTarget.value) })),
-                        ' ',
                         React.createElement(FormLayout_1.FormRow, { label: "Parentheses" },
                             React.createElement(CheckBox_1.CheckBox, { "data-name": "parentheses-checkbox", checked: data.DisplayFormat.Options.Parentheses, onChange: (checked) => setFormatOption('Parentheses', checked) })),
                         React.createElement(FormLayout_1.FormRow, { label: "Floor" },
@@ -324,6 +326,20 @@ const renderNumberFormat = (data, onChange, setFormatOption, scopedCustomFormatt
                             React.createElement(Radio_1.default, { "data-name": "preset-million", marginLeft: 3, checked: IS_MILLION, onChange: () => setDivideMillionPreset() }, "M (Million)"),
                             React.createElement(Radio_1.default, { "data-name": "preset-dollar", marginLeft: 3, checked: IS_DOLLAR, onChange: () => setDollarPreset() }, "Dollar"),
                             React.createElement(Radio_1.default, { "data-name": "preset-sterling", marginLeft: 3, checked: IS_STERLING, onChange: () => setSterlingPreset() }, "Sterling")))))),
+        React.createElement(Tabs_1.Tabs, { marginTop: 2, autoFocus: false, keyboardNavigation: false },
+            React.createElement(Tabs_1.Tabs.Tab, null, "Dynamic Content"),
+            React.createElement(Tabs_1.Tabs.Content, null,
+                React.createElement(rebass_1.Text, { padding: 2, fontSize: 2 }, "Provide dynamic content through the use of Placeholders"),
+                React.createElement(FormLayout_1.default, { margin: 2 },
+                    React.createElement(FormLayout_1.FormRow, { label: "" },
+                        React.createElement(Textarea_1.default, { minWidth: 300, rows: 3, placeholder: "", marginTop: 2, type: 'text', autoFocus: false, value: (_f = (_e = data.DisplayFormat.Options.Content) === null || _e === void 0 ? void 0 : _e.toString()) !== null && _f !== void 0 ? _f : '', onChange: (e) => setFormatOption('Content', e.currentTarget.value) }),
+                        showDocumentationLinks && (React.createElement(HelpBlock_1.default, { "data-name": "query-documentation", mt: 3, mb: 2, style: {
+                                fontSize: 'var(--ab-font-size-3)',
+                                padding: 0,
+                            } },
+                            React.createElement(ButtonInfo_1.ButtonInfo, { mr: 2, onClick: () => window.open(DocumentationLinkConstants_1.FormatColumnPlaceholderDocsLink, '_blank') }),
+                            "Learn more about using placeholders"))),
+                    ' '))),
         React.createElement(Tabs_1.Tabs, { marginTop: 2, autoFocus: false, keyboardNavigation: false },
             React.createElement(Tabs_1.Tabs.Tab, null, "Examples"),
             React.createElement(Tabs_1.Tabs.Content, null,
@@ -353,11 +369,12 @@ const renderNumberFormat = (data, onChange, setFormatOption, scopedCustomFormatt
                         },
                     ] })))));
 };
-const renderStringFormat = (data, _onChange, setFormatOption, scopedCustomFormatters, formatColumnApi) => {
+const renderStringFormat = (data, _onChange, setFormatOption, scopedCustomFormatters, api) => {
     var _a, _b, _c;
     if (data.DisplayFormat.Formatter !== 'StringFormatter') {
         return null;
     }
+    const showDocumentationLinks = api.internalApi.isDocumentationLinksDisplayed();
     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"),
@@ -376,7 +393,13 @@ const renderStringFormat = (data, _onChange, setFormatOption, scopedCustomFormat
                         React.createElement(FormLayout_1.FormRow, { label: "Suffix" },
                             React.createElement(Input_1.default, { "data-name": "suffix", value: (_b = data.DisplayFormat.Options.Suffix) !== null && _b !== void 0 ? _b : '', onChange: (e) => setFormatOption('Suffix', e.currentTarget.value) })),
                         React.createElement(FormLayout_1.FormRow, { label: "Content" },
-                            React.createElement(Input_1.default, { "data-name": "content", value: (_c = data.DisplayFormat.Options.Content) !== null && _c !== void 0 ? _c : '', onChange: (e) => setFormatOption('Content', e.currentTarget.value) })),
+                            React.createElement(Textarea_1.default, { minWidth: 300, rows: 3, placeholder: "", marginTop: 2, type: 'text', autoFocus: false, value: (_c = data.DisplayFormat.Options.Content) !== null && _c !== void 0 ? _c : '', onChange: (e) => setFormatOption('Content', e.currentTarget.value) }),
+                            showDocumentationLinks && (React.createElement(HelpBlock_1.default, { "data-name": "query-documentation", mt: 3, mb: 2, style: {
+                                    fontSize: 'var(--ab-font-size-3)',
+                                    padding: 0,
+                                } },
+                                React.createElement(ButtonInfo_1.ButtonInfo, { mr: 2, onClick: () => window.open(DocumentationLinkConstants_1.FormatColumnPlaceholderDocsLink, '_blank') }),
+                                "See how to create dynamic Display Format using placeholders"))),
                         React.createElement(FormLayout_1.FormRow, { label: "Empty" },
                             React.createElement(CheckBox_1.CheckBox, { "data-name": "empty-checkbox", checked: data.DisplayFormat.Options.Empty, onChange: (checked) => setFormatOption('Empty', checked) })))))),
         scopedCustomFormatters.length > 0 && (React.createElement(Tabs_1.Tabs, { marginTop: 2, keyboardNavigation: false },
@@ -419,13 +442,13 @@ const FormatColumnFormatWizardSection = (props) => {
     const Type = data.DisplayFormat && data.DisplayFormat.Formatter;
     const customScopedFormatters = customDisplayFormatters.filter((displayFormatter) => adaptable.api.columnScopeApi.isScopeInScope(data.Scope, displayFormatter.scope));
     if (Type === 'NumberFormatter') {
-        return renderNumberFormat(data, update, setFormatOption, customScopedFormatters, formatColumnApi);
+        return renderNumberFormat(data, update, setFormatOption, customScopedFormatters, adaptable.api);
     }
     if (Type === 'DateFormatter') {
         return renderDateFormat(data, update, setFormatOption, customScopedFormatters);
     }
     if (Type === 'StringFormatter') {
-        return renderStringFormat(data, update, setFormatOption, customScopedFormatters, formatColumnApi);
+        return renderStringFormat(data, update, setFormatOption, customScopedFormatters, adaptable.api);
     }
     return (React.createElement(HelpBlock_1.default, { margin: 3 },
         "Setting a Display Format is only possible if ",

package/src/agGrid/AdaptableAgGrid.d.ts

@@ -243,7 +243,8 @@ export declare class AdaptableAgGrid implements IAdaptable {
     private getDistinctGridCellsForColumn;
     private addDistinctColumnValue;
     private getUniqueGridCells;
-    getGridCellsForColumn(columnId: string, includeBlanks?: boolean, onlyVisibleRows?: boolean): GridCell[] | undefined;
+    getGridCellsForColumn(columnId: string, onlyVisibleRows?: boolean): GridCell[] | undefined;
+    getGridCellsForColumnTemp(columnId: string, onlyVisibleRows: boolean): GridCell[] | undefined;
     getRowNodesForPrimaryKeys(primaryKeyValues: any[]): any[];
     getRowNodeByIndex(index: number): IRowNode;
     getAgGridStatusPanels(): import("@ag-grid-community/core").StatusPanelDef[];

package/src/agGrid/AdaptableAgGrid.js

@@ -280,6 +280,7 @@ class AdaptableAgGrid {
         this.adaptableOptions = this.normalizeAdaptableOptions(this.adaptableOptions);
         const { showLoadingScreen, loadingScreenDelay, loadingScreenText, loadingScreenTitle } = this.adaptableOptions.userInterfaceOptions;
         if (showLoadingScreen) {
+            this.logger.info(`Show Loading Screen`);
             const portalElement = (0, Modal_1.ensurePortalElement)();
             if (portalElement) {
                 this.unmountLoadingScreen = this.renderReactRoot((0, react_1.createElement)(AdaptableLoadingScreen_1.AdaptableLoadingScreen, {
@@ -289,6 +290,9 @@ class AdaptableAgGrid {
                     loadingScreenTitle,
                 }), portalElement);
             }
+            else {
+                this.logger.consoleError(`Adaptable failed to show the loading screen!`);
+            }
         }
         this.forPlugins((plugin) => plugin.afterInitOptions(this, this.adaptableOptions));
         this.api = new AdaptableApiImpl_1.AdaptableApiImpl(this);
@@ -354,6 +358,7 @@ class AdaptableAgGrid {
             this.logger.consoleError(`Adaptable failed to initialize AG Grid!`);
             return Promise.reject('Adaptable failed to initialize AG Grid!');
         }
+        this.logger.info(`Hide Loading Screen`);
         (_b = this.unmountLoadingScreen) === null || _b === void 0 ? void 0 : _b.call(this);
         perfInitAgGrid.end();
         // we need to intercept several AG Grid Api methods and trigger Adaptale state changes
@@ -2360,17 +2365,33 @@ class AdaptableAgGrid {
         }
         return uniqueVals.slice(0, this.api.columnFilterApi.internalApi.getFilterValuesMaxNumberOfItems(column));
     }
-    getGridCellsForColumn(columnId, includeBlanks = false, onlyVisibleRows = false) {
+    getGridCellsForColumn(columnId, onlyVisibleRows = false) {
         let returnValues = [];
         const handler = (rowNode) => {
-            const gridCell = this.getGridCellFromRowNode(rowNode, columnId);
-            if (gridCell) {
-                if (gridCell.rawValue == undefined || gridCell.rawValue == null) {
-                    if (includeBlanks) {
-                        returnValues.push(gridCell);
-                    }
+            if (!this.isGroupRowNode(rowNode)) {
+                const gridCell = this.getGridCellFromRowNode(rowNode, columnId);
+                if (gridCell && gridCell.rawValue !== undefined && gridCell.rawValue !== null) {
+                    returnValues.push(gridCell);
                 }
-                else {
+            }
+        };
+        if (onlyVisibleRows) {
+            this.agGridAdapter.getAgGridApi().forEachNodeAfterFilter(handler);
+        }
+        else {
+            this.agGridAdapter.getAgGridApi().forEachNode(handler);
+        }
+        return returnValues;
+    }
+    // This horrible method is temporary until we can get rid of having predicates inside values which is coming soon
+    // We need it in case Blanks is requested
+    // once we go to the new multi predicate screen then we wont show blanks any more - which we should never have done
+    getGridCellsForColumnTemp(columnId, onlyVisibleRows) {
+        let returnValues = [];
+        const handler = (rowNode) => {
+            if (!this.isGroupRowNode(rowNode)) {
+                const gridCell = this.getGridCellFromRowNode(rowNode, columnId);
+                if (gridCell) {
                     returnValues.push(gridCell);
                 }
             }

package/src/agGrid/AgGridMenuAdapter.js

@@ -474,6 +474,20 @@ class AgGridMenuAdapter {
                 ...gridInfoMenuItems,
             ],
         };
+        /*
+            const calculatedColumnMenuItem: AdaptableMenuItem = {
+              name: 'calculated-column-group',
+              label: 'Calculated Column',
+              module: 'CalculatedColumn',
+              isVisible: true,
+              icon: {
+                name: 'columns',
+              },
+              subItems: [
+                ...calculatedColumnMenuItems,
+              ],
+            };
+            */
         const columnMenuItem = {
             name: 'column-group',
             label: 'Column',
@@ -484,7 +498,6 @@ class AgGridMenuAdapter {
             },
             subItems: [
                 ...columnActionGroup,
-                ...calculatedColumnMenuItems,
                 ...freeTextColumnMenuItems,
                 ...customSortMenuItems,
                 ...plusMinusMenuItems,
@@ -503,6 +516,7 @@ class AgGridMenuAdapter {
             subItems: [...formatColumnMenuItems, ...styledColumnMenuItems, ...flashingCellMenuItems],
         };
         return this.removeConsecutiveSeparators([
+            ...calculatedColumnMenuItems,
             ...settingsPanelMenuItems,
             ...dashboardMenuItems,
             ...columnFilterGroup,

package/src/agGrid/defaultAdaptableOptions.js

@@ -298,6 +298,7 @@ const DefaultAdaptableOptions = {
         activeByDefault: false,
         showDataChange: undefined,
         changeHistoryButton: undefined,
+        showLastDataChangeOnly: true
     },
     settingsPanelOptions: {
         popupType: 'window',

package/src/env.js

@@ -2,6 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = {
     INFINITE_TABLE_LICENSE_KEY: "StartDate=2021-06-29|EndDate=2030-01-01|Owner=Adaptable|Type=distribution|TS=1624971462479|C=137829811,1004007071,2756196225,1839832928,3994409405,636616862" || '',
-    PUBLISH_TIMESTAMP: 1720099774827 || Date.now(),
-    VERSION: "18.1.7" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1721129487775 || Date.now(),
+    VERSION: "18.1.9" || '--current-version--',
 };

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

@@ -2751,6 +2751,14 @@ export declare const ADAPTABLE_METAMODEL: {
             gridInfo: string;
             defVal: string;
             noCode?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt: boolean;
+            gridInfo?: undefined;
+            noCode?: undefined;
+            defVal?: undefined;
         })[];
     };
     DataFormatDataType: {