@adaptabletools/adaptable 14.0.0-canary.3 → 14.0.1-canary.0

package/src/agGrid/Adaptable.js

@@ -363,7 +363,10 @@ class Adaptable {
                         // but we might need to do this again in the future for some other components that are not native React
                         // captureReactWarnings();
                         if (typeof unmount === 'function') {
-                            unmount();
+                            // rAF is required, otherwise the unmount would be performed during the rendering phase and React doesn't like that
+                            requestAnimationFrame(() => {
+                                unmount();
+                            });
                         }
                         // releaseReactWarnings();
                     };
@@ -600,7 +603,6 @@ class Adaptable {
         }
     }
     initializeAgGrid() {
-        var _a;
         (0, LoggingHelper_1.LogAdaptableInfo)(`Initializing AG Grid...`);
         // set up whether we use the getRowNode method or loop when finding a rowNode (former is preferable)
         // can only do that here as the gridOptions not yet set up
@@ -608,9 +610,6 @@ class Adaptable {
         if (Array.isArray(this.gridOptions.columnDefs)) {
             this.gridOptions.columnDefs.forEach(assignColId);
         }
-        if ((_a = this.adaptableOptions.generalOptions) === null || _a === void 0 ? void 0 : _a.hideEmptyGroupRows) {
-            (0, LoggingHelper_1.ConsoleLogWarning)(`DEPRECATED: 'GeneralOptions.hideEmptyGroupRows' is deprecated and will no longer be evaluated!`);
-        }
         const adaptableSideBarDef = this.createAdaptableSideBarDef();
         if (!!adaptableSideBarDef) {
             this.gridOptions.components = this.gridOptions.components || {};
@@ -2188,14 +2187,14 @@ class Adaptable {
         return this.api.freeTextColumnApi.getFreeTextColumns().map((freeTextColumn) => {
             var _a;
             const freeTextColumnSettings = Object.assign(Object.assign({}, defaultFreeTextColumnSettings), freeTextColumn.FreeTextColumnSettings);
-            const dataTypeEditor = freeTextColumn.DataType === 'Number'
+            const dataTypeEditor = freeTextColumnSettings.DataType === 'Number'
                 ? AdaptableNumberEditor_1.AdaptableNumberEditor
-                : freeTextColumn.DataType === 'Date'
+                : freeTextColumnSettings.DataType === 'Date'
                     ? AdaptableDateEditor_1.AdaptableDateEditor
                     : null;
             const columnTypes = [
                 GeneralConstants_1.AB_SPECIAL_COLUMN,
-                this.agGridHelper.getAgGridDataType(freeTextColumn.DataType),
+                this.agGridHelper.getAgGridDataType(freeTextColumnSettings.DataType),
             ];
             if (ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty((_a = freeTextColumn === null || freeTextColumn === void 0 ? void 0 : freeTextColumn.FreeTextColumnSettings) === null || _a === void 0 ? void 0 : _a.ColumnTypes)) {
                 columnTypes.push(...freeTextColumn.FreeTextColumnSettings.ColumnTypes);
@@ -2222,7 +2221,7 @@ class Adaptable {
                 valueSetter: (params) => {
                     return (params.data[freeTextColumn.ColumnId] = params.newValue);
                 },
-                cellRenderer: freeTextColumn.DataType && freeTextColumn.DataType == 'Boolean'
+                cellRenderer: freeTextColumnSettings.DataType && freeTextColumnSettings.DataType == 'Boolean'
                     ? this.agGridHelper.createCheckboxRendererComp(freeTextColumn.ColumnId, false)
                     : undefined,
                 valueGetter: (params) => this.api.freeTextColumnApi.getFreeTextColumnValueForRowNode(freeTextColumn, params.node),
@@ -2240,16 +2239,6 @@ class Adaptable {
             return userValue;
         });
     }
-    setupColumnAggFunc({ col }) {
-        // need this here if we want plugins to intercept
-        const financeApi = this.api.pluginsApi.getFinancePluginApi();
-        // the 'aggFunc' slows significantly the init process, so we evaluate it only if it is really necessary: iff we have a weighted average defined
-        if (financeApi && !!financeApi.getPluginOptions().weightedAverageColumns) {
-            this.setColDefProperty(col, 'aggFunc', (userValue) => {
-                return userValue;
-            });
-        }
-    }
     getColDefsForRowEditColumns() {
         const actionRowButtons = this.api.actionApi.getActionRowButtons();
         if (!(actionRowButtons === null || actionRowButtons === void 0 ? void 0 : actionRowButtons.length)) {
@@ -3095,7 +3084,6 @@ class Adaptable {
             this.setupColumnCellClass(colSetupInfo);
             this.setupColumnTooltipValueGetter(colSetupInfo);
             this.setupColumnValueGetter(colSetupInfo);
-            this.setupColumnAggFunc(colSetupInfo);
             this.setupColumnFilter(colSetupInfo);
             this.setupColumnFloatingFilter(colSetupInfo);
             this.setupColumnValueFormatter(colSetupInfo);
@@ -4746,7 +4734,8 @@ import "@adaptabletools/adaptable/themes/${themeName}.css"`);
         let rawValue = rowNode.key;
         if (this.api.columnApi.getColumnDataTypeForColumnId(columnId) === 'Date' &&
             typeof rawValue === 'string' &&
-            !Number.isNaN(rawValue)) {
+            // rawValue is composed only of digits
+            /^\d+$/.test(rawValue)) {
             // AG-Grid converts the value to string, we have to reconvert it back
             const dateRawValue = parseInt(rawValue);
             if (dateRawValue != undefined) {

package/src/agGrid/agGridHelper.js

@@ -154,6 +154,9 @@ class agGridHelper {
         return (0, PercentBarRenderer_1.getPercentBarRendererForColumn)(styledColumn, abColumn, this.adaptable.api);
     }
     getCleanValue(value) {
+        if (typeof value === 'string') {
+            return value;
+        }
         if (value == null || value == 'null' || value == undefined || value == 'undefined') {
             return undefined;
         }

package/src/components/ExpressionEditor/BaseEditorInput.js

@@ -24,6 +24,28 @@ const ExpressionFunctionDocumentation_1 = require("./ExpressionFunctionDocumenta
 const Tag_1 = require("../Tag");
 const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
 const Radio_1 = tslib_1.__importDefault(require("../Radio"));
+const filterableCategories = [
+    'dates',
+    'logical',
+    'maths',
+    'strings',
+    'comparison',
+    'observable',
+    'aggregation',
+    'cumulative',
+];
+const getCategoryOrder = (category) => {
+    const predefinedOrder = {
+        special: 1,
+        conditional: 2,
+        logical: 3,
+        comparison: 4,
+        strings: 5,
+        maths: 6,
+        dates: 7,
+    };
+    return predefinedOrder[category] || 0;
+};
 const VarEditorButton = () => {
     var _a, _b;
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
@@ -59,18 +81,23 @@ const FunctionsDropdown = ({ expressionFunctions, baseClassName }) => {
             return acc;
         }, { noCategory: {} });
     }, [currentFunctionCategory]);
+    const orderedGroupNames = React.useMemo(() => {
+        return Object.keys(groupedFunctions).sort((first, second) => getCategoryOrder(first) - getCategoryOrder(second));
+    }, [groupedFunctions]);
     const handleFunctionCategoryChange = React.useCallback((type) => (event) => {
         setCurrentFunctionCategory(type);
     }, [currentFunctionCategory]);
     const categoryOptions = React.useMemo(() => {
         const categoryOptions = Object.keys(expressionFunctions)
             .reduce((acc, functionName) => {
-            const funcitonExpression = expressionFunctions[functionName];
-            if (!acc.includes(funcitonExpression.category)) {
-                acc.push(funcitonExpression.category);
+            const functionExpression = expressionFunctions[functionName];
+            if (!acc.includes(functionExpression.category)) {
+                acc.push(functionExpression.category);
             }
             return acc;
         }, [])
+            .filter((category) => filterableCategories.includes(category))
+            .sort((first, second) => getCategoryOrder(first) - getCategoryOrder(second))
             .map((category) => ({
             label: StringExtensions_1.default.Humanize(category),
             value: category,
@@ -87,23 +114,31 @@ const FunctionsDropdown = ({ expressionFunctions, baseClassName }) => {
      * - a function is inserted
      */
     return (React.createElement(OverlayTrigger_1.default, { ref: dropdownRef, showEvent: "mouseenter", hideEvent: "mouseleave", targetOffset: 5, render: () => (React.createElement(rebass_1.Flex, { className: `${baseClassName}__dropdown-functions-list-wrapper`, flexDirection: "column", onMouseLeave: () => hidePopup() },
-            React.createElement(rebass_1.Flex, { pl: 2, style: { gap: 10 } }, categoryOptions.map((option) => {
-                return (React.createElement(Radio_1.default, { onFocus: (event) => {
+            React.createElement(rebass_1.Flex, { pl: 2, style: { gap: 10 } }, categoryOptions.map((option, index) => {
+                return (React.createElement(Radio_1.default, { key: option.value, onFocus: (event) => {
                         event.preventDefault();
                         event.stopPropagation();
                     }, onClick: handleFunctionCategoryChange(option.value), checked: currentFunctionCategory === option.value }, option.label));
             })),
             React.createElement(rebass_1.Flex, null,
-                React.createElement(rebass_1.Flex, { className: `${baseClassName}__dropdown-functions-list`, "data-name": "expression-dropdown-fuctions-list", flexDirection: "column", p: 2, maxHeight: '50vh' }, Object.keys(groupedFunctions).map((groupName) => {
+                React.createElement(rebass_1.Flex, { className: `${baseClassName}__dropdown-functions-list`, "data-name": "expression-dropdown-fuctions-list", flexDirection: "column", p: 2, maxHeight: '50vh' }, orderedGroupNames
+                    .filter((groupName) => !!groupedFunctions[groupName])
+                    .map((groupName) => {
                     const functionsInGroup = Object.keys(groupedFunctions[groupName]);
                     if (functionsInGroup.length === 0) {
-                        return React.createElement(React.Fragment, null);
+                        return React.createElement(React.Fragment, { key: groupName });
                     }
                     const getEditorButtonData = (functionName) => {
                         // handle special cases
                         if (functionName === 'CASE') {
                             return `CASE <caseValue> WHEN <whenValue> THEN <thenValue> ELSE <defaultValue> END`;
                         }
+                        if (functionName === 'TRUE' || functionName === 'FALSE') {
+                            return functionName;
+                        }
+                        if (functionName === 'IF') {
+                            return `<condition_expr> ? <consequent_expr> : <alternative_expr>`;
+                        }
                         return `${functionName}()`;
                     };
                     return (React.createElement(rebass_1.Box, { mb: 2, key: groupName },

package/src/components/ExpressionEditor/editorButtonsCumulativeAggregatedScalar.js

@@ -7,6 +7,11 @@ exports.editorButtonsCumulativeAggregatedScalar = [
         data: 'CUMUL()',
         text: 'Cumulate',
     },
+    {
+        functionName: 'OVER',
+        data: 'OVER()',
+        text: 'Over',
+    },
     {
         functionName: 'SUM',
         data: 'SUM()',
@@ -32,11 +37,6 @@ exports.editorButtonsCumulativeAggregatedScalar = [
         data: 'MAX()',
         text: 'Max',
     },
-    {
-        functionName: 'OVER',
-        data: 'OVER()',
-        text: 'Over',
-    },
     {
         functionName: 'WEIGHT',
         data: 'WEIGHT()',

package/src/components/ExpressionEditor/editorButtonsSearch.js

@@ -2,6 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.editorButtonsSearch = void 0;
 exports.editorButtonsSearch = [
+    {
+        functionName: 'AND',
+        data: 'AND',
+    },
+    {
+        functionName: 'OR',
+        data: 'OR',
+    },
     {
         functionName: 'ADD',
         data: '+',
@@ -62,16 +70,4 @@ exports.editorButtonsSearch = [
         data: '>=',
         icon: 'greater-than-or-equal',
     },
-    {
-        functionName: 'AND',
-        data: 'AND',
-    },
-    {
-        functionName: 'OR',
-        data: 'OR',
-    },
-    {
-        functionName: 'IN',
-        data: 'IN',
-    },
 ];

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

@@ -119,6 +119,11 @@ export declare const ADAPTABLE_METAMODEL: {
             reference: string;
         }[];
     };
+    ActionRowButtonsContext: {
+        name: string;
+        kind: string;
+        description: string;
+    };
     ActionRowButtonType: {
         name: string;
         kind: string;
@@ -606,6 +611,16 @@ export declare const ADAPTABLE_METAMODEL: {
             noCode: string;
             defaultValue: string;
             reference?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            isOptional: boolean;
+            noCode: string;
+            reference: string;
+            gridInfo?: undefined;
+            defaultValue?: undefined;
         } | {
             name: string;
             kind: string;
@@ -616,6 +631,16 @@ export declare const ADAPTABLE_METAMODEL: {
             defaultValue: string;
             reference?: undefined;
             noCode?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            isOptional: boolean;
+            gridInfo: string;
+            noCode: string;
+            reference: string;
+            defaultValue?: undefined;
         } | {
             name: string;
             kind: string;
@@ -743,9 +768,9 @@ export declare const ADAPTABLE_METAMODEL: {
             description: string;
             uiLabel: string;
             isOptional: boolean;
+            noCode: string;
             defaultValue: string;
             gridInfo?: undefined;
-            noCode?: undefined;
             reference?: undefined;
         } | {
             name: string;
@@ -847,19 +872,12 @@ export declare const ADAPTABLE_METAMODEL: {
         name: string;
         kind: string;
         description: string;
-        properties: ({
-            name: string;
-            kind: string;
-            description: string;
-            uiLabel: string;
-            isOptional?: undefined;
-        } | {
+        properties: {
             name: string;
             kind: string;
             description: string;
             uiLabel: string;
-            isOptional: boolean;
-        })[];
+        }[];
     };
     AdaptableStateReloadedInfo: {
         name: string;
@@ -1083,6 +1101,7 @@ export declare const ADAPTABLE_METAMODEL: {
             isOptional: boolean;
             gridInfo?: undefined;
             defaultValue?: undefined;
+            noCode?: undefined;
         } | {
             name: string;
             kind: string;
@@ -1091,6 +1110,16 @@ export declare const ADAPTABLE_METAMODEL: {
             isOptional: boolean;
             gridInfo: string;
             defaultValue: string;
+            noCode?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            isOptional: boolean;
+            gridInfo: string;
+            noCode: string;
+            defaultValue: string;
         } | {
             name: string;
             kind: string;
@@ -1099,6 +1128,7 @@ export declare const ADAPTABLE_METAMODEL: {
             isOptional: boolean;
             defaultValue: string;
             gridInfo?: undefined;
+            noCode?: undefined;
         })[];
     };
     AlertProperties: {
@@ -1285,15 +1315,15 @@ export declare const ADAPTABLE_METAMODEL: {
             kind: string;
             description: string;
             uiLabel: string;
-            isOptional: boolean;
             reference: string;
+            isOptional?: undefined;
         } | {
             name: string;
             kind: string;
             description: string;
             uiLabel: string;
-            isOptional?: undefined;
             reference?: undefined;
+            isOptional?: undefined;
         } | {
             name: string;
             kind: string;
@@ -1301,13 +1331,6 @@ export declare const ADAPTABLE_METAMODEL: {
             uiLabel: string;
             isOptional: boolean;
             reference?: undefined;
-        } | {
-            name: string;
-            kind: string;
-            description: string;
-            uiLabel: string;
-            reference: string;
-            isOptional?: undefined;
         })[];
     };
     CalculatedColumnApi: {
@@ -1325,21 +1348,14 @@ export declare const ADAPTABLE_METAMODEL: {
         name: string;
         kind: string;
         description: string;
-        properties: ({
-            name: string;
-            kind: string;
-            description: string;
-            uiLabel: string;
-            isOptional?: undefined;
-            defaultValue?: undefined;
-        } | {
+        properties: {
             name: string;
             kind: string;
             description: string;
             uiLabel: string;
             isOptional: boolean;
             defaultValue: string;
-        })[];
+        }[];
     };
     CalculatedColumnState: {
         name: string;
@@ -1565,6 +1581,7 @@ export declare const ADAPTABLE_METAMODEL: {
             description: string;
             uiLabel: string;
             isOptional: boolean;
+            noCode?: undefined;
             defaultValue?: undefined;
         } | {
             name: string;
@@ -1572,6 +1589,7 @@ export declare const ADAPTABLE_METAMODEL: {
             description: string;
             uiLabel: string;
             isOptional: boolean;
+            noCode: string;
             defaultValue: string;
         })[];
     };
@@ -1702,6 +1720,7 @@ export declare const ADAPTABLE_METAMODEL: {
             uiLabel: string;
             isOptional: boolean;
             gridInfo: string;
+            noCode: string;
             defaultValue: string;
         } | {
             name: string;
@@ -1711,6 +1730,7 @@ export declare const ADAPTABLE_METAMODEL: {
             isOptional: boolean;
             defaultValue: string;
             gridInfo?: undefined;
+            noCode?: undefined;
         })[];
     };
     ColumnSort: {
@@ -2261,6 +2281,7 @@ export declare const ADAPTABLE_METAMODEL: {
             description: string;
             uiLabel: string;
             isOptional: boolean;
+            noCode: string;
             defaultValue: string;
             gridInfo?: undefined;
         } | {
@@ -2270,6 +2291,7 @@ export declare const ADAPTABLE_METAMODEL: {
             uiLabel: string;
             isOptional: boolean;
             gridInfo: string;
+            noCode: string;
             defaultValue: string;
         } | {
             name: string;
@@ -2277,6 +2299,7 @@ export declare const ADAPTABLE_METAMODEL: {
             description: string;
             uiLabel: string;
             isOptional: boolean;
+            noCode?: undefined;
             defaultValue?: undefined;
             gridInfo?: undefined;
         })[];
@@ -2375,6 +2398,7 @@ export declare const ADAPTABLE_METAMODEL: {
             uiLabel: string;
             isOptional: boolean;
             gridInfo: string;
+            noCode: string;
             defaultValue: string;
         } | {
             name: string;
@@ -2384,6 +2408,16 @@ export declare const ADAPTABLE_METAMODEL: {
             isOptional: boolean;
             defaultValue: string;
             gridInfo?: undefined;
+            noCode?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            isOptional: boolean;
+            gridInfo: string;
+            defaultValue: string;
+            noCode?: undefined;
         })[];
     };
     DataSet: {
@@ -2770,6 +2804,13 @@ export declare const ADAPTABLE_METAMODEL: {
         kind: string;
         description: string;
         properties: ({
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            isOptional: boolean;
+            reference: string;
+        } | {
             name: string;
             kind: string;
             description: string;
@@ -2961,16 +3002,6 @@ export declare const ADAPTABLE_METAMODEL: {
             gridInfo?: undefined;
             noCode?: undefined;
             reference?: undefined;
-        } | {
-            name: string;
-            kind: string;
-            description: string;
-            uiLabel: string;
-            isOptional: boolean;
-            reference: string;
-            gridInfo?: undefined;
-            noCode?: undefined;
-            defaultValue?: undefined;
         } | {
             name: string;
             kind: string;
@@ -3260,32 +3291,24 @@ export declare const ADAPTABLE_METAMODEL: {
             kind: string;
             description: string;
             uiLabel: string;
-            defaultValue?: undefined;
-            isOptional?: undefined;
-            reference?: undefined;
-        } | {
-            name: string;
-            kind: string;
-            description: string;
-            uiLabel: string;
-            defaultValue: string;
             isOptional?: undefined;
             reference?: undefined;
+            defaultValue?: undefined;
         } | {
             name: string;
             kind: string;
             description: string;
             uiLabel: string;
             isOptional: boolean;
-            defaultValue?: undefined;
             reference?: undefined;
+            defaultValue?: undefined;
         } | {
             name: string;
             kind: string;
             description: string;
             uiLabel: string;
-            isOptional: boolean;
             reference: string;
+            isOptional?: undefined;
             defaultValue?: undefined;
         } | {
             name: string;
@@ -3347,9 +3370,9 @@ export declare const ADAPTABLE_METAMODEL: {
             uiLabel: string;
             isOptional: boolean;
             defaultValue: string;
+            noCode?: undefined;
             gridInfo?: undefined;
             reference?: undefined;
-            noCode?: undefined;
         } | {
             name: string;
             kind: string;
@@ -3357,19 +3380,29 @@ export declare const ADAPTABLE_METAMODEL: {
             uiLabel: string;
             isOptional: boolean;
             defaultValue?: undefined;
+            noCode?: undefined;
             gridInfo?: undefined;
             reference?: undefined;
-            noCode?: undefined;
         } | {
             name: string;
             kind: string;
             description: string;
             uiLabel: string;
             isOptional: boolean;
-            gridInfo: string;
+            noCode: string;
             defaultValue: string;
+            gridInfo?: undefined;
             reference?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            isOptional: boolean;
+            gridInfo: string;
+            defaultValue: string;
             noCode?: undefined;
+            reference?: undefined;
         } | {
             name: string;
             kind: string;
@@ -3378,8 +3411,8 @@ export declare const ADAPTABLE_METAMODEL: {
             isOptional: boolean;
             defaultValue: string;
             reference: string;
-            gridInfo?: undefined;
             noCode?: undefined;
+            gridInfo?: undefined;
         } | {
             name: string;
             kind: string;
@@ -4738,6 +4771,7 @@ export declare const ADAPTABLE_METAMODEL: {
             isOptional: boolean;
             gridInfo: string;
             defaultValue: string;
+            noCode?: undefined;
         } | {
             name: string;
             kind: string;
@@ -4746,6 +4780,16 @@ export declare const ADAPTABLE_METAMODEL: {
             isOptional: boolean;
             defaultValue: string;
             gridInfo?: undefined;
+            noCode?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            isOptional: boolean;
+            gridInfo: string;
+            noCode: string;
+            defaultValue: string;
         })[];
     };
     SelectedCellInfo: {
@@ -4928,6 +4972,13 @@ export declare const ADAPTABLE_METAMODEL: {
             uiLabel: string;
             isOptional: boolean;
             defaultValue?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            isOptional?: undefined;
+            defaultValue?: undefined;
         })[];
     };
     StateOptions: {
@@ -5329,6 +5380,7 @@ export declare const ADAPTABLE_METAMODEL: {
             uiLabel: string;
             isOptional: boolean;
             gridInfo?: undefined;
+            noCode?: undefined;
             defaultValue?: undefined;
         } | {
             name: string;
@@ -5337,6 +5389,7 @@ export declare const ADAPTABLE_METAMODEL: {
             uiLabel: string;
             isOptional: boolean;
             gridInfo: string;
+            noCode: string;
             defaultValue: string;
         })[];
     };
@@ -5480,9 +5533,4 @@ export declare const ADAPTABLE_METAMODEL: {
             isOptional: boolean;
         }[];
     };
-    WeightedAverageColumn: {
-        name: string;
-        kind: string;
-        description: string;
-    };
 };