@adaptabletools/adaptable 14.0.0 → 14.0.1-canary.1

package/src/View/Components/Charting/ChartingViewPanel.js

@@ -3,76 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ChartingViewPanel = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
-const react_redux_1 = require("react-redux");
 const rebass_1 = require("rebass");
-const DropdownButton_1 = tslib_1.__importDefault(require("../../../components/DropdownButton"));
-const SimpleButton_1 = tslib_1.__importDefault(require("../../../components/SimpleButton"));
-const ChartingRedux = tslib_1.__importStar(require("../../../Redux/ActionsReducers/ChartingRedux"));
-const AdaptableHelper_1 = tslib_1.__importDefault(require("../../../Utilities/Helpers/AdaptableHelper"));
-const AdaptableContext_1 = require("../../AdaptableContext");
-const useChartState_1 = require("./useChartState");
-const DeleteChartButton_1 = require("./DeleteChartButton");
-const EditChartButton_1 = require("./EditChartButton");
+const useChartingElements_1 = require("./useChartingElements");
 const ChartingViewPanel = (props) => {
-    var _a, _b, _c;
-    const adaptable = (0, AdaptableContext_1.useAdaptable)();
-    const chartDefinitions = (0, react_redux_1.useSelector)(ChartingRedux.ChartingGetChartModels);
-    const chartContainers = (_b = (_a = adaptable.adaptableOptions) === null || _a === void 0 ? void 0 : _a.chartingOptions) === null || _b === void 0 ? void 0 : _b.chartContainers;
-    const [selectedChartId, setSelectedChartId] = React.useState(() => {
-        // ID is kept in state becaus that does not change, the definition might change
-        return chartDefinitions.length > 0 ? chartDefinitions[0].Uuid : null;
-    });
-    const selectedChart = chartDefinitions.find((chart) => chart.Uuid === selectedChartId);
-    const accessLevel = AdaptableHelper_1.default.getAppropriateAccessLevel(selectedChart, props.accessLevel);
-    const [selectedContainer, setSelectedContainer] = React.useState(null);
-    const { isOpen, showChart, closeChart } = (0, useChartState_1.useChartState)(selectedChart);
-    const options = chartDefinitions.map((chartDefinition) => ({
-        label: chartDefinition.Name,
-        value: chartDefinition.Uuid,
-        onClick: () => {
-            setSelectedChartId(chartDefinition.Uuid);
-        },
-    }));
-    const hasCharts = options.length > 0;
-    const isSelectedChart = hasCharts && selectedChart != null;
-    let content = '';
-    if (hasCharts && selectedChart) {
-        content = (_c = chartDefinitions.find((chart) => chart.Uuid === selectedChart.Uuid)) === null || _c === void 0 ? void 0 : _c.Name;
-    }
-    else if (hasCharts) {
-        content = 'Select Chart';
-    }
-    else {
-        content = 'No Charts';
-    }
     const elementType = props.viewType === 'Toolbar' ? 'DashboardToolbar' : 'ToolPanel';
-    React.useEffect(() => {
-        // select first
-        if (!selectedChart && chartDefinitions.length > 0) {
-            setSelectedChartId(chartDefinitions[0].Uuid);
-        }
-    }, [chartDefinitions]);
-    const containerOptions = [
-        {
-            label: 'Ag Grid Window',
-            onClick: () => {
-                setSelectedContainer(null);
-            },
-        },
-        ...(chartContainers
-            ? chartContainers === null || chartContainers === void 0 ? void 0 : chartContainers.map((contianerDef) => ({
-                label: contianerDef.name,
-                onClick: () => {
-                    setSelectedContainer(contianerDef);
-                },
-            }))
-            : []),
-    ];
-    const chartSelector = (React.createElement(DropdownButton_1.default, { width: "100%", columns: ['label'], className: `ab-${elementType}__Chart__select`, items: options, disabled: !hasCharts }, content));
-    const containerSelector = Boolean(chartContainers === null || chartContainers === void 0 ? void 0 : chartContainers.length) && (React.createElement(DropdownButton_1.default, { width: "100%", columns: ['label'], items: containerOptions, disabled: !isSelectedChart }, (selectedContainer === null || selectedContainer === void 0 ? void 0 : selectedContainer.name) || 'Ag Grid Window'));
-    const chartButton = (React.createElement(SimpleButton_1.default, { mr: 1, onClick: () => (isOpen ? closeChart() : showChart(selectedContainer)), disabled: !Boolean(selectedChart), variant: 'outlined', tone: 'neutral' }, isOpen ? 'Close' : 'Open'));
-    const deleteButton = React.createElement(DeleteChartButton_1.DeleteChartButton, { chart: selectedChart, accessLevel: accessLevel });
-    const editButton = (React.createElement(EditChartButton_1.EditChartButton, { chart: selectedChart, accessLevel: accessLevel, isOpen: isOpen }));
+    const { chartSelector, containerSelector, chartButton, deleteButton, editButton } = (0, useChartingElements_1.useChartingElements)({ elementType, accessLevel: props.accessLevel });
     if (elementType === 'DashboardToolbar') {
         return (React.createElement(rebass_1.Flex, { width: "100%", alignItems: "center" },
             React.createElement(rebass_1.Box, null, chartSelector),

package/src/View/Components/Charting/DeleteChartButton.d.ts

@@ -3,5 +3,6 @@ import { AccessLevel, ChartDefinition } from '../../../types';
 export interface ButtonDeleteProps {
     chart: ChartDefinition;
     accessLevel: AccessLevel;
+    iconSize?: number;
 }
 export declare const DeleteChartButton: React.FunctionComponent<ButtonDeleteProps>;

package/src/View/Components/Charting/DeleteChartButton.js

@@ -7,6 +7,6 @@ const ButtonDelete_1 = require("../Buttons/ButtonDelete");
 const ChartingRedux = tslib_1.__importStar(require("../../../Redux/ActionsReducers/ChartingRedux"));
 const DeleteChartButton = (props) => {
     var _a;
-    return (React.createElement(ButtonDelete_1.ButtonDelete, { disabled: !props.chart, ConfirmAction: ChartingRedux.ChartingDeleteChart((_a = props.chart) === null || _a === void 0 ? void 0 : _a.Name), ConfirmationMsg: `Are you sure you want to delete this Charts?`, ConfirmationTitle: 'Delete Charts', accessLevel: props.accessLevel }));
+    return (React.createElement(ButtonDelete_1.ButtonDelete, { iconSize: props.iconSize, disabled: !props.chart, ConfirmAction: ChartingRedux.ChartingDeleteChart((_a = props.chart) === null || _a === void 0 ? void 0 : _a.Name), ConfirmationMsg: `Are you sure you want to delete this Charts?`, ConfirmationTitle: 'Delete Charts', accessLevel: props.accessLevel }));
 };
 exports.DeleteChartButton = DeleteChartButton;

package/src/View/Components/Charting/EditChartButton.d.ts

@@ -4,5 +4,6 @@ export interface EditChartButtonProps {
     chart: ChartDefinition;
     accessLevel: AccessLevel;
     isOpen: boolean;
+    iconSize?: number;
 }
 export declare const EditChartButton: React.FunctionComponent<EditChartButtonProps>;

package/src/View/Components/Charting/EditChartButton.js

@@ -9,7 +9,7 @@ const ModuleConstants = tslib_1.__importStar(require("../../../Utilities/Constan
 const react_redux_1 = require("react-redux");
 const EditChartButton = (props) => {
     const dispatch = (0, react_redux_1.useDispatch)();
-    return (React.createElement(ButtonEdit_1.ButtonEdit, { tooltip: "Edit Chart", 
+    return (React.createElement(ButtonEdit_1.ButtonEdit, { iconSize: props.iconSize, tooltip: "Edit Chart", 
         // It gets complicated when a chart is both open and opened in edit wizard
         // There an be conflicts between the two open charts (preview and main) and the changes to the active chart may not be syncronized correctly.
         disabled: !props.chart || props.isOpen, accessLevel: props.accessLevel, onClick: () => dispatch(PopupRedux.PopupShowScreen(ModuleConstants.ChartingModuleId, 'Chart', {

package/src/View/Components/Charting/useChartingElements.d.ts

@@ -0,0 +1,14 @@
+/// <reference types="react" />
+import { AccessLevel, ChartDefinition } from '../../../types';
+export declare const useChartingElements: ({ elementType, accessLevel, size, }: {
+    elementType: string;
+    accessLevel: AccessLevel;
+    size?: 'small' | 'normal';
+}) => {
+    chartSelector: JSX.Element;
+    containerSelector: JSX.Element;
+    chartButton: JSX.Element;
+    deleteButton: JSX.Element;
+    editButton: JSX.Element;
+    selectedChart: ChartDefinition;
+};

package/src/View/Components/Charting/useChartingElements.js

@@ -0,0 +1,90 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useChartingElements = void 0;
+const tslib_1 = require("tslib");
+const React = tslib_1.__importStar(require("react"));
+const react_redux_1 = require("react-redux");
+const AdaptableContext_1 = require("../../AdaptableContext");
+const DropdownButton_1 = tslib_1.__importDefault(require("../../../components/DropdownButton"));
+const SimpleButton_1 = tslib_1.__importDefault(require("../../../components/SimpleButton"));
+const ChartingRedux = tslib_1.__importStar(require("../../../Redux/ActionsReducers/ChartingRedux"));
+const AdaptableHelper_1 = tslib_1.__importDefault(require("../../../Utilities/Helpers/AdaptableHelper"));
+const useChartState_1 = require("./useChartState");
+const DeleteChartButton_1 = require("./DeleteChartButton");
+const EditChartButton_1 = require("./EditChartButton");
+const useChartingElements = ({ elementType, accessLevel, size = 'normal', }) => {
+    var _a, _b, _c;
+    const adaptable = (0, AdaptableContext_1.useAdaptable)();
+    const chartDefinitions = (0, react_redux_1.useSelector)(ChartingRedux.ChartingGetChartModels);
+    const chartContainers = (_b = (_a = adaptable.adaptableOptions) === null || _a === void 0 ? void 0 : _a.chartingOptions) === null || _b === void 0 ? void 0 : _b.chartContainers;
+    const [selectedChartId, setSelectedChartId] = React.useState(() => {
+        // ID is kept in state becaus that does not change, the definition might change
+        return chartDefinitions.length > 0 ? chartDefinitions[0].Uuid : null;
+    });
+    const selectedChart = chartDefinitions.find((chart) => chart.Uuid === selectedChartId);
+    const chartAccessLevel = AdaptableHelper_1.default.getAppropriateAccessLevel(selectedChart, accessLevel);
+    const [selectedContainer, setSelectedContainer] = React.useState(null);
+    const { isOpen, showChart, closeChart } = (0, useChartState_1.useChartState)(selectedChart);
+    const options = chartDefinitions.map((chartDefinition) => ({
+        label: chartDefinition.Name,
+        value: chartDefinition.Uuid,
+        onClick: () => {
+            setSelectedChartId(chartDefinition.Uuid);
+        },
+    }));
+    const hasCharts = options.length > 0;
+    const isSelectedChart = hasCharts && selectedChart != null;
+    let content = '';
+    if (hasCharts && selectedChart) {
+        content = (_c = chartDefinitions.find((chart) => chart.Uuid === selectedChart.Uuid)) === null || _c === void 0 ? void 0 : _c.Name;
+    }
+    else if (hasCharts) {
+        content = 'Select Chart';
+    }
+    else {
+        content = 'No Charts';
+    }
+    React.useEffect(() => {
+        // select first
+        if (!selectedChart && chartDefinitions.length > 0) {
+            setSelectedChartId(chartDefinitions[0].Uuid);
+        }
+    }, [chartDefinitions]);
+    const containerOptions = [
+        {
+            label: 'Ag Grid Window',
+            onClick: () => {
+                setSelectedContainer(null);
+            },
+        },
+        ...(chartContainers
+            ? chartContainers === null || chartContainers === void 0 ? void 0 : chartContainers.map((contianerDef) => ({
+                label: contianerDef.name,
+                onClick: () => {
+                    setSelectedContainer(contianerDef);
+                },
+            }))
+            : []),
+    ];
+    const style = {};
+    let iconSize;
+    if (size === 'small') {
+        style.padding = 2;
+        style.fontSize = 'small';
+        iconSize = 15;
+    }
+    const chartSelector = (React.createElement(DropdownButton_1.default, { style: style, width: "100%", columns: ['label'], className: `ab-${elementType}__Chart__select`, items: options, disabled: !hasCharts }, content));
+    const containerSelector = Boolean(chartContainers === null || chartContainers === void 0 ? void 0 : chartContainers.length) && (React.createElement(DropdownButton_1.default, { style: style, width: "100%", columns: ['label'], items: containerOptions, disabled: !isSelectedChart }, (selectedContainer === null || selectedContainer === void 0 ? void 0 : selectedContainer.name) || 'Ag Grid Window'));
+    const chartButton = (React.createElement(SimpleButton_1.default, { style: style, mr: 1, onClick: () => (isOpen ? closeChart() : showChart(selectedContainer)), disabled: !Boolean(selectedChart), variant: 'outlined', tone: 'neutral' }, isOpen ? 'Close' : 'Open'));
+    const deleteButton = (React.createElement(DeleteChartButton_1.DeleteChartButton, { iconSize: iconSize, chart: selectedChart, accessLevel: chartAccessLevel }));
+    const editButton = (React.createElement(EditChartButton_1.EditChartButton, { iconSize: iconSize, chart: selectedChart, accessLevel: chartAccessLevel, isOpen: isOpen }));
+    return {
+        chartSelector,
+        containerSelector,
+        chartButton,
+        deleteButton,
+        editButton,
+        selectedChart,
+    };
+};
+exports.useChartingElements = useChartingElements;

package/src/View/Components/Popups/AdaptablePopupConfirmation.js

@@ -53,7 +53,7 @@ const AdaptablePopupConfirmation = (props) => {
                 React.createElement(rebass_1.Box, { pl: 2 },
                     React.createElement(CheckBox_1.CheckBox, { checked: disableDeleteConfirmation, onChange: () => {
                             setDisableDeleteConfirmation(!disableDeleteConfirmation);
-                        } }, "Do not show this again.")),
+                        } }, "Do not show this again")),
                 props.showInputBox && (React.createElement(rebass_1.Box, { padding: 2, "data-name": "body" },
                     React.createElement("p", null, "Please enter a comment to confirm"),
                     React.createElement(Input_1.default, { marginTop: 2, width: '100%', value: promptText, type: "string", placeholder: "Enter text", onChange: (e) => changeContent(e) }))),

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

@@ -34,7 +34,7 @@ const renderFreeTextColumnSummary = (data) => {
             React.createElement(Tag_1.Tag, null, (_a = data.FriendlyName) !== null && _a !== void 0 ? _a : data.ColumnId))) : null,
         React.createElement(rebass_1.Box, { mt: 3 },
             "Data Type: ",
-            React.createElement(Tag_1.Tag, null, data.DataType)),
+            React.createElement(Tag_1.Tag, null, data.FreeTextColumnSettings.DataType)),
         data.DefaultValue !== undefined ? (React.createElement(rebass_1.Box, { mt: 3 },
             "Default Value: ",
             React.createElement(Tag_1.Tag, null, data.DefaultValue))) : null,
@@ -53,7 +53,7 @@ const isValidFreeTextColumn = (data, api) => {
     if (hasAlreadyExistingId) {
         return 'A Column already exists with that id';
     }
-    if (!data.DataType) {
+    if (!data.FreeTextColumnSettings.DataType) {
         return 'No data type specified for column';
     }
     return true;
@@ -93,14 +93,16 @@ const FreeTextColumnSettingsWizardSection = (props) => {
     const handleDefaultValueChange = (event) => {
         let e = event.target;
         let DefaultValue = e.value;
-        if (data.DataType === 'Date') {
+        if (data.FreeTextColumnSettings.DataType === 'Date') {
             DefaultValue = (0, FormatHelper_1.DateFormatter)(DefaultValue, {
                 Pattern,
             });
         }
         props.onChange(Object.assign(Object.assign({}, data), { DefaultValue }));
     };
-    const handleSpecialColumnSettingsChange = (settings) => {
+    const handleSpecialColumnSettingsChange = (
+    //  settings: SpecialColumnSettings
+    settings) => {
         props.onChange(Object.assign(Object.assign({}, data), { FreeTextColumnSettings: Object.assign(Object.assign({}, data === null || data === void 0 ? void 0 : data.FreeTextColumnSettings), settings) }));
     };
     return (React.createElement(React.Fragment, null,
@@ -119,22 +121,28 @@ const FreeTextColumnSettingsWizardSection = (props) => {
                         whiteSpace: 'normal',
                         overflow: 'hidden',
                         maxWidth: 'inherit',
-                    }, placeholder: "Select Data Type", showClearButton: !!data.DataType, onClear: () => handleDataTypeChange(null), columns: ['label'], items: options.map((item) => ({
+                    }, placeholder: "Select Data Type", showClearButton: !!data.FreeTextColumnSettings.DataType, onClear: () => handleDataTypeChange(null), columns: ['label'], items: options.map((item) => ({
                         value: item.value,
                         label: item.label,
                         onClick: () => handleDataTypeChange(item.value),
-                    })) }, data.DataType ? data.DataType : 'Select Data Type')),
-            React.createElement(FormLayout_1.FormRow, { label: "Default Value" }, data.DataType === 'Boolean' ? (React.createElement(CheckBox_1.CheckBox, { "data-name": "column-default-value-checkbox", checked: !!data.DefaultValue, onChange: (DefaultValue) => {
+                    })) }, data.FreeTextColumnSettings.DataType
+                    ? data.FreeTextColumnSettings.DataType
+                    : 'Select Data Type')),
+            React.createElement(FormLayout_1.FormRow, { label: "Default Value" }, data.FreeTextColumnSettings.DataType === 'Boolean' ? (React.createElement(CheckBox_1.CheckBox, { "data-name": "column-default-value-checkbox", checked: !!data.DefaultValue, onChange: (DefaultValue) => {
                     props.onChange(Object.assign(Object.assign({}, data), { DefaultValue }));
-                } })) : (React.createElement(AdaptableInput_1.default, { "data-name": "column-default-value", value: data.DataType === 'Date' && data.DefaultValue
+                } })) : (React.createElement(AdaptableInput_1.default, { "data-name": "column-default-value", value: data.FreeTextColumnSettings.DataType === 'Date' && data.DefaultValue
                     ? (0, DateHelper_1.parseToISO)(data.DefaultValue, Pattern) || ''
-                    : data.DefaultValue || '', style: { width: '100%', maxWidth: 500 }, type: data.DataType === 'Number' ? 'number' : data.DataType === 'Date' ? 'date' : 'text', placeholder: "Default Column Value (not required)", onChange: (e) => handleDefaultValueChange(e) }))),
+                    : data.DefaultValue || '', style: { width: '100%', maxWidth: 500 }, type: data.FreeTextColumnSettings.DataType === 'Number'
+                    ? 'number'
+                    : data.FreeTextColumnSettings.DataType === 'Date'
+                        ? 'date'
+                        : 'text', placeholder: "Default Column Value (not required)", onChange: (e) => handleDefaultValueChange(e) }))),
             React.createElement(FormLayout_1.FormRow, { label: "Header Tooltip" },
                 React.createElement(Input_1.default, { "data-name": "header-tooltip", type: "text", style: { width: '100%', maxWidth: 500 }, value: ((_a = data.FreeTextColumnSettings) === null || _a === void 0 ? void 0 : _a.HeaderToolTip) || '', onChange: (e) => handleSpecialColumnSettingsChange({
                         HeaderToolTip: e.target.value,
                     }) })),
             ' ',
-            data.DataType == 'String' && (React.createElement(FormLayout_1.FormRow, { label: "Editor Type" },
+            data.FreeTextColumnSettings.DataType == 'String' && (React.createElement(FormLayout_1.FormRow, { label: "Editor Type" },
                 React.createElement(Radio_1.default, { "data-name": "inline-editor", value: "Inline", checked: data.TextEditor == 'Inline', onChange: (_, e) => onDynamicSelectChanged(e), marginRight: 2 }, "Inline Editor"),
                 React.createElement(Radio_1.default, { "data-name": "large-editor", value: "Large", checked: data.TextEditor == 'Large', onChange: (_, e) => onDynamicSelectChanged(e) }, "Large Editor")))),
         ErrorMessage ? (React.createElement(ErrorBox_1.default, { mt: 2, mb: 2 }, ErrorMessage)) : null,

package/src/View/TeamSharing/SharedEntityObjectView.js

@@ -54,14 +54,15 @@ const getSharedEntityActiveStatusObjectView = (isDependency) => (props) => {
             if (isStaleAndActive) {
                 statusInfo = (React.createElement(rebass_1.Box, { ml: 1, style: { color: 'var(--ab-color-warn)' } }, ` (Rev. ${newRevision} available)`));
             }
-            activeInfo = (React.createElement(React.Fragment, null,
-                `Imported Rev. ${activeRevision} ${isStaleAndActive ? 'is stale' : ''} `,
-                " ",
+            activeInfo = activeRevision && (React.createElement(React.Fragment, null,
+                activeRevision &&
+                    `Imported Rev. ${activeRevision} ${isStaleAndActive ? 'is stale' : ''} `,
+                ' ',
                 statusInfo));
         }
         else {
             // snapshot
-            activeInfo = React.createElement(React.Fragment, null, `Imported Rev. ${activeRevision}`);
+            activeInfo = activeRevision && React.createElement(React.Fragment, null, `Imported Rev. ${activeRevision}`);
         }
     }
     const sharedValue = `by ${sharedEntity.UserName} at ${new Date(sharedEntity.Timestamp).toLocaleString()}`;

package/src/agGrid/Adaptable.d.ts

@@ -250,7 +250,6 @@ export declare class Adaptable implements IAdaptable {
     private getColDefsForSpecialColumns;
     getColDefsForFreeTextColumns(): ColDef<any>[];
     setupColumnValueGetter({ col }: ColumnSetupInfo): void;
-    setupColumnAggFunc({ col }: ColumnSetupInfo): void;
     private getColDefsForRowEditColumns;
     getColDefsForActionColumns(): ColDef<any>[];
     updateColDefsForSpecialColumns(): void;

package/src/agGrid/Adaptable.js

@@ -351,7 +351,7 @@ class Adaptable {
     // the 'old' constructor which takes an Adaptable adaptable object
     // this is still used internally but should not be used externally as a preference
     async init(adaptableOptions, runtimeConfig, _staticInit) {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         if (runtimeConfig) {
             this.supressReact18RenderWarning = !!runtimeConfig.supressReact18RenderWarning;
             if (runtimeConfig.renderReactRoot) {
@@ -459,6 +459,8 @@ class Adaptable {
             abColDefObject: (_e = this.gridOptions.columnTypes.abColDefObject) !== null && _e !== void 0 ? _e : {},
             abColDefCustom: (_f = this.gridOptions.columnTypes.abColDefCustom) !== null && _f !== void 0 ? _f : {},
             abColDefNumberArray: (_g = this.gridOptions.columnTypes.abColDefNumberArray) !== null && _g !== void 0 ? _g : {},
+            abColDefTupleNumberArray: (_h = this.gridOptions.columnTypes.abColDefTupleNumberArray) !== null && _h !== void 0 ? _h : {},
+            abColDefObjectNumberArray: (_j = this.gridOptions.columnTypes.abColDefObjectNumberArray) !== null && _j !== void 0 ? _j : {},
         });
         if (this.gridOptions.columnTypes.abColDefNumber.cellEditor === undefined) {
             this.gridOptions.columnTypes.abColDefNumber.cellEditor =
@@ -603,7 +605,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
@@ -611,9 +612,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 || {};
@@ -1446,9 +1444,12 @@ class Adaptable {
             shouldUpdateHeaders = this.setupColumnHeader(colSetupInfo) || shouldUpdateHeaders;
         });
         isChanged = isChanged || shouldUpdateHeaders;
-        if (ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(layout.ColumnFilters)) {
-            this.gridOptions.api.onFilterChanged();
-        }
+        // this is NOT really needed?!
+        // without it everything seem to still work as expected
+        // and the setLayout() execution time is shorter, so a double win
+        // if (ArrayExtensions.IsNotNullOrEmpty(layout.ColumnFilters)) {
+        //   this.gridOptions.api!.onFilterChanged();
+        // }
         if (isChanged) {
             // it's important we set pivot mode
             // before we set column state
@@ -2191,14 +2192,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);
@@ -2225,7 +2226,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),
@@ -2243,16 +2244,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)) {
@@ -3098,7 +3089,6 @@ class Adaptable {
             this.setupColumnCellClass(colSetupInfo);
             this.setupColumnTooltipValueGetter(colSetupInfo);
             this.setupColumnValueGetter(colSetupInfo);
-            this.setupColumnAggFunc(colSetupInfo);
             this.setupColumnFilter(colSetupInfo);
             this.setupColumnFloatingFilter(colSetupInfo);
             this.setupColumnValueFormatter(colSetupInfo);
@@ -4749,7 +4739,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/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',
-    },
 ];