@adaptabletools/adaptable 18.1.6 → 18.1.8

package/src/Utilities/Helpers/Helper.js

@@ -227,6 +227,34 @@ export function clamp(value, boundOne, boundTwo) {
     }
     return value;
 }
+export 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;
+}
+export function replaceAll(text, toReplace, replaceWith) {
+    if (!text) {
+        return text;
+    }
+    // fails for []
+    toReplace = toReplace.replace('[', '\\[').replace(']', '\\]');
+    return text.replace(new RegExp(toReplace, 'g'), replaceWith);
+}
+export 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;
+}
 export const Helper = {
     objectExists,
     objectNotExists,
@@ -247,5 +275,8 @@ export const Helper = {
     medianNumberArray,
     modeNumberArray,
     clamp,
+    extractColsFromText,
+    replaceAll,
+    extractContextKeysFromText,
 };
 export default Helper;

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

@@ -17,6 +17,7 @@ import { useAdaptable } from '../../AdaptableContext';
 import FormatHelper from '../../../Utilities/Helpers/FormatHelper';
 import { Toggle, ToggleGroup } from '../../../components/Toggle';
 import { DEFAULT_DOUBLE_DISPLAY_VALUE, DEFAULT_STRING_DISPLAY_VALUE, } from '../../../Utilities/Constants/GeneralConstants';
+import Textarea from '../../../components/Textarea';
 const DOLLAR_OPTIONS = {
     FractionDigits: 2,
     FractionSeparator: '.',
@@ -369,7 +370,10 @@ const renderStringFormat = (data, _onChange, setFormatOption, scopedCustomFormat
                         React.createElement(FormRow, { label: "Suffix" },
                             React.createElement(Input, { "data-name": "suffix", value: (_b = data.DisplayFormat.Options.Suffix) !== null && _b !== void 0 ? _b : '', onChange: (e) => setFormatOption('Suffix', e.currentTarget.value) })),
                         React.createElement(FormRow, { label: "Content" },
-                            React.createElement(Input, { "data-name": "content", value: (_c = data.DisplayFormat.Options.Content) !== null && _c !== void 0 ? _c : '', onChange: (e) => setFormatOption('Content', e.currentTarget.value) })),
+                            React.createElement(Textarea, { 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(FormRow, { label: "Empty" },
                             React.createElement(CheckBox, { "data-name": "empty-checkbox", checked: data.DisplayFormat.Options.Empty, onChange: (checked) => setFormatOption('Empty', checked) })))))),
         scopedCustomFormatters.length > 0 && (React.createElement(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[];
@@ -296,7 +296,7 @@ export declare class AdaptableAgGrid implements IAdaptable {
     getAllGridColumns(): Column<any>[];
     clearRowGroupColumns(): void;
     expandAllRowGroups(): void;
-    closeAllRowGroups(): void;
+    collapseAllRowGroups(): void;
     expandRowGroupsForValues(columnValues: any[]): void;
     getExpandRowGroupsKeys(): any[];
     getAgGridColumnForColumnId(columnId: string): Column;

package/src/agGrid/AdaptableAgGrid.js

@@ -276,6 +276,7 @@ export 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 = ensurePortalElement();
             if (portalElement) {
                 this.unmountLoadingScreen = this.renderReactRoot(createElement(AdaptableLoadingScreen, {
@@ -285,6 +286,9 @@ export 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(this);
@@ -350,6 +354,7 @@ export 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
@@ -2037,8 +2042,10 @@ export class AdaptableAgGrid {
         let firstRowNode = this.getFirstDisplayedRowNode();
         if (firstRowNode === null || firstRowNode === void 0 ? void 0 : firstRowNode.group) {
             // all groups may be closed so it is safer to get first leaf node
-            // all groups must have at least one leafe node
-            firstRowNode = firstRowNode.allLeafChildren[0];
+            // all groups should have at least one leafe node (though not necessarily if using SSRM)
+            if (ArrayExtensions.IsNotNullOrEmpty(firstRowNode.allLeafChildren)) {
+                firstRowNode = firstRowNode.allLeafChildren[0];
+            }
         }
         return firstRowNode;
     }
@@ -2354,17 +2361,12 @@ export 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);
                 }
             }
@@ -2828,20 +2830,10 @@ export class AdaptableAgGrid {
             .removeRowGroupColumns(this.agGridAdapter.getAgGridApi().getRowGroupColumns());
     }
     expandAllRowGroups() {
-        this.agGridAdapter.getAgGridApi().forEachNode((node) => {
-            if (node.group) {
-                node.expanded = true;
-            }
-        });
-        this.agGridAdapter.getAgGridApi().onGroupExpandedOrCollapsed();
+        this.agGridAdapter.getAgGridApi().expandAll();
     }
-    closeAllRowGroups() {
-        this.agGridAdapter.getAgGridApi().forEachNode((node) => {
-            if (node.group) {
-                node.expanded = false;
-            }
-        });
-        this.agGridAdapter.getAgGridApi().onGroupExpandedOrCollapsed();
+    collapseAllRowGroups() {
+        this.agGridAdapter.getAgGridApi().collapseAll();
     }
     expandRowGroupsForValues(columnValues) {
         if (ArrayExtensions.IsNotNullOrEmpty(columnValues)) {
@@ -3759,6 +3751,7 @@ export class AdaptableAgGrid {
                 // same grid column state as a previous,
                 // so no need to update, as the layout has already been updated
                 // for this grid column state
+                console.log('same state as before');
                 return;
             }
             this.previousAgGridLayoutState = stringifiedLayoutState;

package/src/agGrid/editors/AdaptableDateEditor/index.d.ts

@@ -1,6 +1,9 @@
 import * as React from 'react';
 import { ICellEditorComp, ICellEditorParams } from '@ag-grid-community/core';
 import { IAdaptable } from '../../../AdaptableInterfaces/IAdaptable';
+/**
+ * Params used by the AdapTable Date Editor
+ */
 export interface AdaptableDateEditorParams extends ICellEditorParams {
     onValueChange?: (value: any) => void;
 }

package/src/components/Select/Select.d.ts

@@ -28,5 +28,6 @@ export type SelectProps<SelectValue extends unknown, IsMulti extends boolean = f
     onInputChange?: (value: string) => void;
     size?: 'small' | 'normal';
     isCreatable?: boolean;
+    menuPortalTarget?: HTMLElement;
 };
 export declare const Select: <SelectValue extends unknown, IsMulti extends boolean = false>(props: SelectProps<SelectValue, IsMulti>) => JSX.Element;

package/src/components/Select/Select.js

@@ -69,6 +69,11 @@ export const Select = function (props) {
             return (React.createElement(components.ValueContainer, Object.assign({}, inputProps, { innerProps: Object.assign({ 'data-name': 'value-container' }, inputProps.innerProps) })));
         };
     }, []);
+    const MenuComponent = React.useMemo(() => {
+        return (inputProps) => {
+            return (React.createElement(components.Menu, Object.assign({}, inputProps, { innerProps: Object.assign({ 'data-name': 'menu-container' }, inputProps.innerProps) })));
+        };
+    }, []);
     const SelectComponent = props.isCreatable ? CreatableSelect : ReactSelect;
     const ClearIndicator = React.useMemo(() => {
         return (clearIndicatorProps) => {
@@ -84,16 +89,17 @@ export const Select = function (props) {
     }, []);
     return (React.createElement(SelectComponent, { onInputChange: props.onInputChange, onFocus: props.onFocus, isLoading: props.isLoading, options: props.options, className: props.className, isDisabled: disabled, menuPlacement: (_g = props.menuPlacement) !== null && _g !== void 0 ? _g : 'auto', isSearchable: props.searchable, isMulti: props.isMulti, value: selectedOption, menuPosition: (_h = props.menuPosition) !== null && _h !== void 0 ? _h : 'absolute', 
         // This needed so the menu is not clipped by overflow: hidden
-        menuPortalTarget: document.body, isClearable: props.isClearable, onChange: (option) => {
+        menuPortalTarget: props.menuPortalTarget === undefined ? document.body : null, isClearable: props.isClearable, onChange: (option) => {
             if (props.isMulti) {
                 props.onChange(option.map((x) => x === null || x === void 0 ? void 0 : x.value));
             }
             else {
                 props.onChange(option === null || option === void 0 ? void 0 : option.value);
             }
-        }, placeholder: props.placeholder, components: {
+        }, placeholder: props.placeholder, createOptionPosition: 'first', components: {
             SelectContainer,
             ValueContainer,
+            Menu: MenuComponent,
             SingleValue: (singleValueProps) => {
                 return (React.createElement(components.SingleValue, Object.assign({}, singleValueProps), props.renderSingleValue
                     ? props.renderSingleValue(selectedOption)

package/src/components/icons/index.js

@@ -177,7 +177,7 @@ export const allIcons = {
     cells: CellSummary,
     columns: ColumnChooser,
     copy: Copy,
-    'chart-and-grid': CalculatedColumn,
+    'calculated-column': CalculatedColumn,
     laptop: Application,
     alert: Alert,
     building: Analysis,

package/src/env.js

@@ -1,5 +1,5 @@
 export 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: 1719402008840 || Date.now(),
-    VERSION: "18.1.6" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1720529546809 || Date.now(),
+    VERSION: "18.1.8" || '--current-version--',
 };

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

@@ -362,6 +362,11 @@ export declare const ADAPTABLE_METAMODEL: {
         kind: string;
         desc: string;
     };
+    AdaptableColumnMenuItemName: {
+        name: string;
+        kind: string;
+        desc: string;
+    };
     AdaptableColumnPredicate: {
         name: string;
         kind: string;
@@ -423,6 +428,11 @@ export declare const ADAPTABLE_METAMODEL: {
         kind: string;
         desc: string;
     };
+    AdaptableContextMenuItemName: {
+        name: string;
+        kind: string;
+        desc: string;
+    };
     AdaptableCoordinate: {
         name: string;
         kind: string;
@@ -453,6 +463,11 @@ export declare const ADAPTABLE_METAMODEL: {
         kind: string;
         desc: string;
     };
+    AdaptableDateEditorParams: {
+        name: string;
+        kind: string;
+        desc: string;
+    };
     AdaptableElementIcon: {
         name: string;
         kind: string;
@@ -487,6 +502,11 @@ export declare const ADAPTABLE_METAMODEL: {
             isOpt?: undefined;
         })[];
     };
+    AdaptableFieldContext: {
+        name: string;
+        kind: string;
+        desc: string;
+    };
     AdaptableFlashingCell: {
         name: string;
         kind: string;
@@ -1100,6 +1120,110 @@ export declare const ADAPTABLE_METAMODEL: {
             defVal: string;
         })[];
     };
+    AggregatedExpressionFilterRowContext: {
+        name: string;
+        kind: string;
+        desc: string;
+        props: ({
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt?: undefined;
+            ref?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt: boolean;
+            ref?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            desc: string;
+            ref: string;
+            isOpt?: undefined;
+        })[];
+    };
+    AggregatedExpressionFunction: {
+        name: string;
+        kind: string;
+        desc: string;
+        props: ({
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt: boolean;
+        } | {
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt?: undefined;
+        })[];
+    };
+    AggregatedExpressionPrepareRowValueContext: {
+        name: string;
+        kind: string;
+        desc: string;
+        props: ({
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt?: undefined;
+            ref?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt: boolean;
+            ref?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            desc: string;
+            ref: string;
+            isOpt?: undefined;
+        })[];
+    };
+    AggregatedExpressionProcessAggValueContext: {
+        name: string;
+        kind: string;
+        desc: string;
+        props: ({
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt: boolean;
+        })[];
+    };
+    AggregatedExpressionReducerContext: {
+        name: string;
+        kind: string;
+        desc: string;
+        props: ({
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt?: undefined;
+            ref?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt: boolean;
+            ref?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            desc: string;
+            ref: string;
+            isOpt?: undefined;
+        })[];
+    };
     AggregationColumns: {
         name: string;
         kind: string;
@@ -1369,6 +1493,11 @@ export declare const ADAPTABLE_METAMODEL: {
         kind: string;
         desc: string;
     };
+    AST: {
+        name: string;
+        kind: string;
+        desc: string;
+    };
     AutoGenerateTagsForLayoutsContext: {
         name: string;
         kind: string;
@@ -2017,6 +2146,11 @@ export declare const ADAPTABLE_METAMODEL: {
             ref: string;
         })[];
     };
+    ColumnValuesFilterPredicate: {
+        name: string;
+        kind: string;
+        desc: string;
+    };
     CommentableCellContext: {
         name: string;
         kind: string;
@@ -3590,6 +3724,11 @@ export declare const ADAPTABLE_METAMODEL: {
         kind: string;
         desc: string;
     };
+    GridFilterEditors: {
+        name: string;
+        kind: string;
+        desc: string;
+    };
     GridFilterOptions: {
         name: string;
         kind: string;
@@ -5271,6 +5410,11 @@ export declare const ADAPTABLE_METAMODEL: {
         kind: string;
         desc: string;
     };
+    Token: {
+        name: string;
+        kind: string;
+        desc: string;
+    };
     ToolPanelButtonContext: {
         name: string;
         kind: string;
@@ -5589,6 +5733,11 @@ export declare const ADAPTABLE_METAMODEL: {
             defVal: string;
         })[];
     };
+    VueFrameworkComponent: {
+        name: string;
+        kind: string;
+        desc: string;
+    };
     WeightedAverageAggregation: {
         name: string;
         kind: string;