@adaptabletools/adaptable-cjs 18.1.7 → 18.1.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable-cjs",
-  "version": "18.1.7",
+  "version": "18.1.8",
   "description": "Powerful data-agnostic HTML5 AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
   "keywords": [
     "web-components",

package/src/AdaptableInterfaces/IAdaptable.d.ts

@@ -177,7 +177,7 @@ export interface IAdaptable {
     getDisplayValueFromRowNode(rowNode: IRowNode, columnId: string): string | undefined;
     getDisplayValueFromRawValue(rowNode: IRowNode, columnId: string, rawValue: any): string | undefined;
     getNormalisedValueFromRawValue(rawValue: any, column: AdaptableColumn): string | number | boolean | Date | unknown;
-    getGridCellsForColumn(columnId: string, includeBlanks?: boolean, onlyVisibleRows?: boolean): GridCell[] | undefined;
+    getGridCellsForColumn(columnId: string, onlyVisibleRows?: boolean): GridCell[] | undefined;
     getRowNodesForPrimaryKeys(primaryKeyValues: any[]): IRowNode[];
     getRowNodeForPrimaryKey(primaryKeyValue: any): IRowNode;
     getRowNodeByIndex(index: number): IRowNode;

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

@@ -156,7 +156,4 @@ export declare class AlertInternalApi extends ApiBase {
      * - trigger -> [trigger]
      */
     private annotateAlertText;
-    private replaceAll;
-    private extractColsFromText;
-    private extractContextKeysFromText;
 }

package/src/Api/Internal/AlertInternalApi.js

@@ -9,6 +9,7 @@ const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Exten
 const ModuleConstants_1 = require("../../Utilities/Constants/ModuleConstants");
 const IAlertService_1 = require("../../Utilities/Services/Interface/IAlertService");
 const ObjectFactory_1 = tslib_1.__importDefault(require("../../Utilities/ObjectFactory"));
+const Helper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/Helper"));
 class AlertInternalApi extends ApiBase_1.ApiBase {
     getExpressionForAlertRule(alertRule) {
         var expression;
@@ -635,19 +636,19 @@ class AlertInternalApi extends ApiBase_1.ApiBase {
             return text;
         }
         if (context === null || context === void 0 ? void 0 : context.newValue) {
-            text = this.replaceAll(text, '[newValue]', context.newValue);
+            text = Helper_1.default.replaceAll(text, '[newValue]', context.newValue);
         }
         if (context === null || context === void 0 ? void 0 : context.oldValue) {
-            text = this.replaceAll(text, '[oldValue]', context.oldValue);
+            text = Helper_1.default.replaceAll(text, '[oldValue]', context.oldValue);
         }
         if (context === null || context === void 0 ? void 0 : context.primaryKeyValue) {
-            text = this.replaceAll(text, '[primaryKeyValue]', context.primaryKeyValue);
+            text = Helper_1.default.replaceAll(text, '[primaryKeyValue]', context.primaryKeyValue);
         }
         if (context === null || context === void 0 ? void 0 : context.timestamp) {
-            text = this.replaceAll(text, '[timestamp]', context.timestamp + '');
+            text = Helper_1.default.replaceAll(text, '[timestamp]', context.timestamp + '');
         }
         if (context === null || context === void 0 ? void 0 : context.numberOfRows) {
-            text = this.replaceAll(text, '[numberOfRows]', context.numberOfRows + '');
+            text = Helper_1.default.replaceAll(text, '[numberOfRows]', context.numberOfRows + '');
         }
         if (context === null || context === void 0 ? void 0 : context.trigger) {
             const dataChangeTriggerMap = {
@@ -665,57 +666,29 @@ class AlertInternalApi extends ApiBase_1.ApiBase {
             const mappedTrigger = 
             // @ts-ignore
             (_a = (dataChangeTriggerMap[context.trigger] || rowChangeTriggerMap[context.trigger])) !== null && _a !== void 0 ? _a : context.trigger;
-            text = this.replaceAll(text, '[trigger]', mappedTrigger);
+            text = Helper_1.default.replaceAll(text, '[trigger]', mappedTrigger);
         }
         if (context === null || context === void 0 ? void 0 : context.column) {
-            text = this.replaceAll(text, '[column]', this.getColumnApi().getFriendlyNameForColumnId(context.column.columnId));
+            text = Helper_1.default.replaceAll(text, '[column]', this.getColumnApi().getFriendlyNameForColumnId(context.column.columnId));
         }
         if (context === null || context === void 0 ? void 0 : context.rowNode) {
-            const columns = this.extractColsFromText(text);
+            const columns = Helper_1.default.extractColsFromText(text);
             for (const column of columns) {
                 if (this.getColumnApi().getColumnWithColumnId(column)) {
-                    text = this.replaceAll(text, `[rowData.${column}]`, this.getGridApi().getRawValueFromRowNode(context.rowNode, column));
+                    text = Helper_1.default.replaceAll(text, `[rowData.${column}]`, this.getGridApi().getRawValueFromRowNode(context.rowNode, column));
                 }
             }
         }
         if (text.indexOf('[context') !== -1) {
             const agGridContext = (_c = (_b = this.adaptable.agGridAdapter).getGridOption) === null || _c === void 0 ? void 0 : _c.call(_b, 'context');
-            const agGridContextKeys = this.extractContextKeysFromText(text);
+            const agGridContextKeys = Helper_1.default.extractContextKeysFromText(text);
             for (const key of agGridContextKeys) {
                 if (agGridContext[key]) {
-                    text = this.replaceAll(text, `[context.${key}]`, agGridContext[key]);
+                    text = Helper_1.default.replaceAll(text, `[context.${key}]`, agGridContext[key]);
                 }
             }
         }
         return text;
     }
-    replaceAll(text, toReplace, replaceWith) {
-        if (!text) {
-            return text;
-        }
-        // fails for []
-        toReplace = toReplace.replace('[', '\\[').replace(']', '\\]');
-        return text.replace(new RegExp(toReplace, 'g'), replaceWith);
-    }
-    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;
-    }
-    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.AlertInternalApi = AlertInternalApi;

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

@@ -56,14 +56,14 @@ export declare class FormatColumnInternalApi extends ApiBase {
      * @param customDisplayFormatterContext context that includes value to format
      * @param options formatter options
      */
-    getNumberFormattedValue(value: any, node: IRowNode, abColumn: AdaptableColumn, options: AdaptableFormat['Options']): any;
+    getNumberFormattedValue(value: any, node: IRowNode, column: AdaptableColumn, options: AdaptableFormat['Options']): any;
     /**
      * Format value according to format options.
      *
      * @param value  context that includes value to format
      * @param options formatter options
      */
-    getStringFormattedValue(value: any, node: IRowNode, abColumn: AdaptableColumn, options: StringFormatterOptions): string;
+    getStringFormattedValue(value: any, node: IRowNode, column: AdaptableColumn, options: StringFormatterOptions): string;
     /**
      * Format value according to format options.
      *

package/src/Api/Internal/FormatColumnInternalApi.js

@@ -95,9 +95,9 @@ class FormatColumnInternalApi extends ApiBase_1.ApiBase {
      * @param customDisplayFormatterContext context that includes value to format
      * @param options formatter options
      */
-    getNumberFormattedValue(value, node, abColumn, options) {
-        const preparedValue = this.applyCustomFormatters(value, node, abColumn, options);
-        return FormatHelper_1.default.NumberFormatter(preparedValue, options);
+    getNumberFormattedValue(value, node, column, options) {
+        const preparedValue = this.applyCustomFormatters(value, node, column, options);
+        return FormatHelper_1.default.NumberFormatter(preparedValue, options, node, column, this.getAdaptableApi());
     }
     /**
      * Format value according to format options.
@@ -105,9 +105,9 @@ class FormatColumnInternalApi extends ApiBase_1.ApiBase {
      * @param value  context that includes value to format
      * @param options formatter options
      */
-    getStringFormattedValue(value, node, abColumn, options) {
-        const preparedValue = this.applyCustomFormatters(value, node, abColumn, options);
-        return FormatHelper_1.default.StringFormatter(preparedValue, options);
+    getStringFormattedValue(value, node, column, options) {
+        const preparedValue = this.applyCustomFormatters(value, node, column, options);
+        return FormatHelper_1.default.StringFormatter(preparedValue, options, node, column, this.getAdaptableApi());
     }
     /**
      * Format value according to format options.

package/src/Api/Internal/GridInternalApi.js

@@ -88,7 +88,7 @@ class GridInternalApi extends ApiBase_1.ApiBase {
         const shouldShowValuesCount = this.shouldShowValuesCount(abColumn);
         let valueOptions = [];
         if (shouldShowValuesCount) {
-            const allGridCells = this.adaptable.getGridCellsForColumn(columnId, false, this.getColumnFilterOptions().valuesFilterOptions.showCurrentlyFilteredValuesCount);
+            const allGridCells = this.adaptable.getGridCellsForColumn(columnId, this.getColumnFilterOptions().valuesFilterOptions.showCurrentlyFilteredValuesCount);
             const allGridValues = allGridCells.map((gc) => gc.displayValue);
             const newsortedDistinctValues = sortedDistinctValues.filter((gc) => gc.displayValue != undefined && gc.displayValue != '' && gc.displayValue != null);
             valueOptions = newsortedDistinctValues.map((cv) => {
@@ -148,7 +148,7 @@ class GridInternalApi extends ApiBase_1.ApiBase {
     addPredicateValues(params) {
         var _a, _b, _c, _d;
         const { valueOptions, column, shouldShowValuesCount, visibleRowsOnly } = params;
-        const allGridCells = this.adaptable.getGridCellsForColumn(column.columnId, true, visibleRowsOnly);
+        const allGridCells = this.adaptable.getGridCellsForColumn(column.columnId, visibleRowsOnly);
         const adaptableApi = this.getAdaptableApi();
         const predicateIds = adaptableApi.columnFilterApi.internalApi.getValuesFitlerPredicateIds(column);
         if (ArrayExtensions_1.default.IsNullOrEmpty(predicateIds)) {

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

@@ -1,11 +1,30 @@
-import { NumberFormatterOptions, DateFormatterOptions, AdaptableFormat, StringFormatterOptions } from '../../PredefinedConfig/Common/AdaptableFormat';
-export declare function Format(input: any, format: AdaptableFormat): string;
-export declare function NumberFormatter(input: number | string, options?: NumberFormatterOptions): string;
+import { NumberFormatterOptions, DateFormatterOptions, StringFormatterOptions } from '../../PredefinedConfig/Common/AdaptableFormat';
+import { IRowNode } from '@ag-grid-community/core';
+import { AdaptableApi, AdaptableColumn } from '../../types';
+export declare function NumberFormatter(input: number, options?: NumberFormatterOptions, rowNode?: IRowNode, column?: AdaptableColumn, api?: AdaptableApi): string;
 export declare function DateFormatter(input: number | Date | string, options: DateFormatterOptions, strictFormatting?: boolean): string | undefined;
-export declare function StringFormatter(input: string, options?: StringFormatterOptions): string;
+export declare function StringFormatter(input: string, options?: StringFormatterOptions, rowNode?: IRowNode, column?: AdaptableColumn, api?: AdaptableApi): string;
+/**
+ * Supported tokens:
+ * - column -> [column]
+ * - input -> [value]
+ * - rowData.colId -> [rowData.colId]
+ */
+export declare function resolvePlaceholders(text: string, context: {
+    rowNode: IRowNode;
+    input: any;
+    column: AdaptableColumn<any>;
+    api: AdaptableApi;
+}): string;
+export declare const FormatContentHelper: {
+    resolvePlaceholders: typeof resolvePlaceholders;
+};
 declare const _default: {
     NumberFormatter: typeof NumberFormatter;
     DateFormatter: typeof DateFormatter;
     StringFormatter: typeof StringFormatter;
+    FormatContentHelper: {
+        resolvePlaceholders: typeof resolvePlaceholders;
+    };
 };
 export default _default;

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.FormatContentHelper = exports.resolvePlaceholders = 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 Helper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/Helper"));
+/*
+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 = exports.FormatContentHelper.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 = exports.FormatContentHelper.resolvePlaceholders(options.Content, context);
+    }
+    else {
+        preparedInput = input;
+    }
     if (preparedInput == null || preparedInput == undefined) {
         return undefined;
     }
@@ -146,4 +172,37 @@ function StringFormatter(input, options = {}) {
     return s;
 }
 exports.StringFormatter = StringFormatter;
-exports.default = { NumberFormatter, DateFormatter, StringFormatter };
+/**
+ * Supported tokens:
+ * - column -> [column]
+ * - input -> [value]
+ * - rowData.colId -> [rowData.colId]
+ */
+function resolvePlaceholders(text, context) {
+    if (!text) {
+        return text;
+    }
+    if (!context) {
+        return text;
+    }
+    if (context === null || context === void 0 ? void 0 : context.input) {
+        text = Helper_1.default.replaceAll(text, '[value]', context.input);
+    }
+    if (context === null || context === void 0 ? void 0 : context.column) {
+        text = Helper_1.default.replaceAll(text, '[column]', context.api.columnApi.getFriendlyNameForColumnId(context.column.columnId));
+    }
+    if (context === null || context === void 0 ? void 0 : context.rowNode) {
+        const columns = Helper_1.default.extractColsFromText(text);
+        for (const column of columns) {
+            if (context.api.columnApi.getColumnWithColumnId(column)) {
+                text = Helper_1.default.replaceAll(text, `[rowData.${column}]`, context.api.gridApi.getRawValueFromRowNode(context.rowNode, column));
+            }
+        }
+    }
+    return text;
+}
+exports.resolvePlaceholders = resolvePlaceholders;
+exports.FormatContentHelper = {
+    resolvePlaceholders,
+};
+exports.default = { NumberFormatter, DateFormatter, StringFormatter, FormatContentHelper: exports.FormatContentHelper };

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/FormatColumn/Wizard/FormatColumnFormatWizardSection.js

@@ -21,6 +21,7 @@ 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 DOLLAR_OPTIONS = {
     FractionDigits: 2,
     FractionSeparator: '.',
@@ -376,7 +377,10 @@ 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: "use defaults", marginTop: 2, type: 'text', autoFocus: false, value: (_c = data.DisplayFormat.Options.Content) !== null && _c !== void 0 ? _c : '', 
+                                // placeholder="defaults to column name"
+                                //    onChange={(e: any) => onMessageHeaderChange(e)}
+                                onChange: (e) => setFormatOption('Content', e.currentTarget.value) })),
                         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 },

package/src/agGrid/AdaptableAgGrid.d.ts

@@ -243,7 +243,7 @@ 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;
     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,12 @@ 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);
-                    }
-                }
-                else {
+            if (!this.isGroupRowNode(rowNode)) {
+                const gridCell = this.getGridCellFromRowNode(rowNode, columnId);
+                if (gridCell && gridCell.rawValue !== undefined && gridCell.rawValue !== null) {
                     returnValues.push(gridCell);
                 }
             }

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: 1720529578367 || Date.now(),
+    VERSION: "18.1.8" || '--current-version--',
 };