@adaptabletools/adaptable 16.0.9 → 16.0.10-canary.0

package/src/View/StyledColumn/Wizard/StyledColumnWizard.js

@@ -23,11 +23,25 @@ const StyledColumnWizard = (props) => {
     const popupDefaultCurrentSectionName = (_e = (_d = (_c = props === null || props === void 0 ? void 0 : props.popupParams) === null || _c === void 0 ? void 0 : _c.config) === null || _d === void 0 ? void 0 : _d.defaultCurrentSectionName) !== null && _e !== void 0 ? _e : undefined;
     const defaultCurrentSectionName = (_f = props.defaultCurrentSectionName) !== null && _f !== void 0 ? _f : popupDefaultCurrentSectionName;
     const [styledColumn, setStyledColumn] = (0, react_1.useState)(() => {
+        var _a, _b;
         if (data) {
             return (0, Helper_1.cloneObject)(data);
         }
         const newData = ObjectFactory_1.default.CreateEmptyStyledColumn();
         newData.GradientStyle = {};
+        if (((_a = props.popupParams) === null || _a === void 0 ? void 0 : _a.column) && ((_b = props.popupParams) === null || _b === void 0 ? void 0 : _b.action) === 'New') {
+            newData.ColumnId = props.popupParams.column.columnId;
+            if (props.popupParams.column.dataType === 'String') {
+                newData.BadgeStyle = {
+                    Badges: [ObjectFactory_1.default.CreateDefaultStyledColumnBadge()],
+                };
+                delete newData.GradientStyle;
+            }
+            else if (props.popupParams.column.dataType.includes('Array')) {
+                newData.SparkLineStyle = {};
+                delete newData.GradientStyle;
+            }
+        }
         return newData;
     });
     const dispatch = (0, react_redux_1.useDispatch)();

package/src/agGrid/Adaptable.d.ts

@@ -183,7 +183,7 @@ export declare class Adaptable implements IAdaptable {
     private getAlertRowClass;
     private getAlertRowStyle;
     private getFlashingCellStyle;
-    private getCommentCellClassName;
+    private getNoteCellClassName;
     private getFlashingCellClass;
     private getCellHighlightStyle;
     private getRowHighlightStyle;

package/src/agGrid/Adaptable.js

@@ -509,9 +509,9 @@ class Adaptable {
                 this.logger.error('Failed to Init Modules : ', e);
                 // for now we initialize the grid even if initialising Modules has failed (perhaps revisit this?)
                 this.initInternalGridLogic();
-                this.api.internalApi.hideLoadingScreen(); // doesnt really help but at least clears the screen
+                this.api.userInterfaceApi.hideLoadingScreen(); // doesnt really help but at least clears the screen
             }).then(async () => {
-                this.api.internalApi.hideLoadingScreen();
+                this.api.userInterfaceApi.hideLoadingScreen();
                 this.isInitialised = true;
                 this._adaptableReady = true;
             });
@@ -1154,19 +1154,19 @@ class Adaptable {
                 ? flashingCell.flashingCellDefinition.DownChangeStyle
                 : flashingCell.flashingCellDefinition.NeutralChangeStyle)) !== null && _a !== void 0 ? _a : {});
     }
-    getCommentCellClassName(col, params) {
-        if (!this.api.internalApi.getModuleService().isModuleAvailable('Comments')) {
+    getNoteCellClassName(col, params) {
+        if (!this.api.internalApi.getModuleService().isModuleAvailable('Notes')) {
             return;
         }
         const cellPosition = {
             PrimaryKeyValue: this.getPrimaryKeyValueFromRowNode(params.node),
             ColumnId: col.columnId,
         };
-        const cellComments = this.api.commentsApi.getCellComments(cellPosition);
-        if (!(cellComments === null || cellComments === void 0 ? void 0 : cellComments.length)) {
+        const cellNotes = this.api.notesApi.getCellNotes(cellPosition);
+        if (!(cellNotes === null || cellNotes === void 0 ? void 0 : cellNotes.length)) {
             return undefined;
         }
-        return 'ab-Cell-Comment';
+        return 'ab-Cell-Note';
     }
     getFlashingCellClass(col, params) {
         var _a, _b, _c;
@@ -1271,22 +1271,32 @@ class Adaptable {
         return isCellReadonly ? readonlyCellStyle.ClassName : null;
     }
     isQuickSearchActive(abColumn, params) {
-        var _a;
+        const isPivotColumn = this.api.columnApi.isAutoPivotColumn(
+        // abColumn is the column that is based on, not the actual column
+        params.column.getColId());
         if (abColumn.isExcludedFromQuickSearch) {
             return false;
         }
         if (!params.node) {
             return false;
         }
-        if (!this.api.optionsApi.getQuickSearchOptions().runQuickSearchOnRowGroups &&
+        if (!isPivotColumn &&
+            !this.api.optionsApi.getQuickSearchOptions().runQuickSearchOnRowGroups &&
             params.node.group) {
             return false;
         }
+        if (!this.api.optionsApi.getQuickSearchOptions().runQuickSearchOnPivotColumns &&
+            isPivotColumn) {
+            return false;
+        }
         let quickSearchValue = this.api.quickSearchApi.getQuickSearchValue();
         if (StringExtensions_1.StringExtensions.IsNullOrEmpty(quickSearchValue)) {
             return false;
         }
-        const displayValue = (_a = this.api.gridApi.getDisplayValueFromRowNode(params.node, abColumn.columnId)) !== null && _a !== void 0 ? _a : '';
+        let displayValue = this.api.gridApi.getDisplayValueFromRowNode(params.node, abColumn.columnId);
+        if (this.api.optionsApi.getQuickSearchOptions().runQuickSearchOnPivotColumns && isPivotColumn) {
+            displayValue = params.value;
+        }
         const ignoreCase = !this.adaptableOptions.quickSearchOptions.runQuickSearchWithCaseSensitivity;
         const v = ignoreCase ? String(displayValue).toLocaleLowerCase() : String(displayValue);
         const i = ignoreCase ? String(quickSearchValue).toLocaleLowerCase() : String(quickSearchValue);
@@ -2707,9 +2717,10 @@ class Adaptable {
     getFirstRowNode() {
         let startIndex = 0;
         let firstRowNode = this.gridOptions.api.getDisplayedRowAtIndex(startIndex);
-        while (firstRowNode && firstRowNode.group) {
-            startIndex++;
-            firstRowNode = this.gridOptions.api.getDisplayedRowAtIndex(startIndex);
+        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];
         }
         if (!firstRowNode) {
             firstRowNode = this.gridOptions.api.getDisplayedRowAtIndex(0);
@@ -3439,7 +3450,7 @@ class Adaptable {
                 const flashingClassName = this.getFlashingCellClass(abColumn, params);
                 const styledColumn = this.api.styledColumnApi.getStyledColumnForColumnId(colId);
                 const hasStyledColumn = !!styledColumn && !styledColumn.IsSuspended;
-                const commentClassName = this.getCommentCellClassName(abColumn, params);
+                const noteClassName = this.getNoteCellClassName(abColumn, params);
                 const returnValue = [
                     typeof userCellClass === 'function' ? userCellClass(params) : userCellClass,
                     !hasStyledColumn && formatColumns.length
@@ -3450,7 +3461,7 @@ class Adaptable {
                     readonlyClassName,
                     highlightAlertClassName,
                     flashingClassName,
-                    commentClassName,
+                    noteClassName,
                 ]
                     // we flatten the array because some rules ('userCellClass' etc)  might return a string[]
                     .flat()
@@ -3641,7 +3652,8 @@ class Adaptable {
                 resultHeaderName = layoutCustomHeader;
             }
             // required here for the initial layout rendering
-            abColumn.friendlyName = resultHeaderName;
+            // Removed by JW, 3 october 2023; i don't think we need it and it overrides stuff unnecessarily
+            //  abColumn.friendlyName = resultHeaderName;
             return resultHeaderName;
         });
         const newColumnHeader = (_b = col === null || col === void 0 ? void 0 : col.getColDef()) === null || _b === void 0 ? void 0 : _b.headerName;

package/src/agGrid/agGridHelper.d.ts

@@ -3,9 +3,9 @@ import { IAdaptable } from '../AdaptableInterfaces/IAdaptable';
 import { AdaptableColumn, AdaptableColumnDataType, AdaptableColumnGroup } from '../PredefinedConfig/Common/AdaptableColumn';
 import { AdaptableNodeComparerFunction } from '../PredefinedConfig/Common/AdaptableComparerFunction';
 import { AdaptableColumnType, AdaptableModule } from '../PredefinedConfig/Common/Types';
+import { StyledColumn } from '../PredefinedConfig/StyledColumnState';
 import { IModule } from '../Strategy/Interface/IModule';
 import { IPPStyle } from '../Utilities/Interface/IPPStyle';
-import { StyledColumn } from '../PredefinedConfig/StyledColumnState';
 /**
  * Adaptable AG Grid implementation is getting really big and unwieldy
  * So lets put some of the more obvious 'Helper' functions here
@@ -34,7 +34,7 @@ export declare class agGridHelper {
     fireSelectionChangedEvent(): void;
     private isColumnReadonly;
     private isColumnSortable;
-    private isColumnGroupable;
+    private isColumnRowGroupable;
     private isColumnPivotable;
     private isColumnAggregetable;
     private getColumnAggregationFunctions;
@@ -45,7 +45,7 @@ export declare class agGridHelper {
     private isColumnFilterable;
     private getColumnPinnedPosition;
     private isColumnFixed;
-    private isColumnGrouped;
+    private isColumnRowGrouped;
     private isColumnSparkline;
     private getColumnDataType;
     private getAbColDefValue;

package/src/agGrid/agGridHelper.js

@@ -7,11 +7,17 @@ const AlertModule_1 = require("../Strategy/AlertModule");
 const BulkUpdateModule_1 = require("../Strategy/BulkUpdateModule");
 const CalculatedColumnModule_1 = require("../Strategy/CalculatedColumnModule");
 const CellSummaryModule_1 = require("../Strategy/CellSummaryModule");
+const ChartingModule_1 = require("../Strategy/ChartingModule");
+const ColumnInfoModule_1 = require("../Strategy/ColumnInfoModule");
+const NotesModule_1 = require("../Strategy/NotesModule");
 const CustomSortModule_1 = require("../Strategy/CustomSortModule");
 const DashboardModule_1 = require("../Strategy/DashboardModule");
+const DataChangeHistoryModule_1 = require("../Strategy/DataChangeHistoryModule");
 const DataSetModule_1 = require("../Strategy/DataSetModule");
 const ExportModule_1 = require("../Strategy/ExportModule");
+const Fdc3Module_1 = require("../Strategy/Fdc3Module");
 const FilterModule_1 = require("../Strategy/FilterModule");
+const FlashingCellModule_1 = require("../Strategy/FlashingCellModule");
 const FormatColumnModule_1 = require("../Strategy/FormatColumnModule");
 const FreeTextColumnModule_1 = require("../Strategy/FreeTextColumnModule");
 const GridInfoModule_1 = require("../Strategy/GridInfoModule");
@@ -20,31 +26,26 @@ const PlusMinusModule_1 = require("../Strategy/PlusMinusModule");
 const QueryModule_1 = require("../Strategy/QueryModule");
 const QuickSearchModule_1 = require("../Strategy/QuickSearchModule");
 const ScheduleModule_1 = require("../Strategy/ScheduleModule");
+const SettingsPanelModule_1 = require("../Strategy/SettingsPanelModule");
 const ShortcutModule_1 = require("../Strategy/ShortcutModule");
 const SmartEditModule_1 = require("../Strategy/SmartEditModule");
 const StateManagementModule_1 = require("../Strategy/StateManagementModule");
+const StatusBarModule_1 = require("../Strategy/StatusBarModule");
+const StyledColumnModule_1 = require("../Strategy/StyledColumnModule");
 const SystemStatusModule_1 = require("../Strategy/SystemStatusModule");
 const TeamSharingModule_1 = require("../Strategy/TeamSharingModule");
 const ThemeModule_1 = require("../Strategy/ThemeModule");
 const ToolPanelModule_1 = require("../Strategy/ToolPanelModule");
+const GeneralConstants = tslib_1.__importStar(require("../Utilities/Constants/GeneralConstants"));
+const GeneralConstants_1 = require("../Utilities/Constants/GeneralConstants");
 const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
 const ArrayExtensions_1 = require("../Utilities/Extensions/ArrayExtensions");
 const StringExtensions_1 = require("../Utilities/Extensions/StringExtensions");
-const CheckboxRenderer_1 = require("./CheckboxRenderer");
-const DataChangeHistoryModule_1 = require("../Strategy/DataChangeHistoryModule");
-const FlashingCellModule_1 = require("../Strategy/FlashingCellModule");
-const SettingsPanelModule_1 = require("../Strategy/SettingsPanelModule");
-const ChartingModule_1 = require("../Strategy/ChartingModule");
-const CommentsModule_1 = require("../Strategy/CommentsModule");
-const PercentBarRenderer_1 = require("./PercentBarRenderer");
-const BadgeRenderer_1 = require("./BadgeRenderer");
 const Helper_1 = require("../Utilities/Helpers/Helper");
-const StatusBarModule_1 = require("../Strategy/StatusBarModule");
-const GeneralConstants = tslib_1.__importStar(require("../Utilities/Constants/GeneralConstants"));
-const GeneralConstants_1 = require("../Utilities/Constants/GeneralConstants");
 const UIHelper_1 = tslib_1.__importDefault(require("../View/UIHelper"));
-const StyledColumnModule_1 = require("../Strategy/StyledColumnModule");
-const Fdc3Module_1 = require("../Strategy/Fdc3Module");
+const BadgeRenderer_1 = require("./BadgeRenderer");
+const CheckboxRenderer_1 = require("./CheckboxRenderer");
+const PercentBarRenderer_1 = require("./PercentBarRenderer");
 const tinycolor = require('tinycolor2');
 /**
  * Adaptable AG Grid implementation is getting really big and unwieldy
@@ -102,10 +103,11 @@ class agGridHelper {
         modules.set(ModuleConstants.SystemStatusModuleId, new SystemStatusModule_1.SystemStatusModule(api));
         modules.set(ModuleConstants.ThemeModuleId, new ThemeModule_1.ThemeModule(api));
         modules.set(ModuleConstants.GridInfoModuleId, new GridInfoModule_1.GridInfoModule(api));
+        modules.set(ModuleConstants.ColumnInfoModuleId, new ColumnInfoModule_1.ColumnInfoModule(api));
         modules.set(ModuleConstants.SettingsPanelModuleId, new SettingsPanelModule_1.SettingsPanelModule(api));
         modules.set(ModuleConstants.StatusBarModuleId, new StatusBarModule_1.StatusBarModule(api));
         modules.set(ModuleConstants.ChartingModuleId, new ChartingModule_1.ChartingModule(api));
-        modules.set(ModuleConstants.CommentsModuleId, new CommentsModule_1.CommentsModule(api));
+        modules.set(ModuleConstants.NotesModuleId, new NotesModule_1.NotesModule(api));
         modules.set(ModuleConstants.StyledColumnModuleId, new StyledColumnModule_1.StyledColumnModule(api));
         modules.set(ModuleConstants.Fdc3ModuleId, new Fdc3Module_1.Fdc3Module(api));
         return modules;
@@ -176,23 +178,47 @@ class agGridHelper {
     createAdaptableColumnFromAgGridColumn(agGridColumn, colsToGroups) {
         const colId = agGridColumn.getColId();
         const colDef = agGridColumn.getColDef();
+        const ColumnId = colId;
+        const pkColumn = this.adaptable.adaptableOptions.primaryKey;
+        const ColumnGroup = colsToGroups === null || colsToGroups === void 0 ? void 0 : colsToGroups[ColumnId];
+        const isRealColumnGroup = ColumnGroup
+            ? ColumnGroup.columnGroupId !== ColumnGroup.friendlyName
+            : false;
         const isActionRowButtonColumn = this.adaptable.api.columnApi.internalApi.isActionRowButtonColumn(colId);
         const isFdc3MainActionColumn = this.adaptable.api.fdc3Api.internalApi.isFdc3MainActionColumn(colId);
-        const columnFriendlyName = this.adaptable.adaptableOptions.columnOptions.columnFriendlyName;
-        const customFriendlyName = typeof columnFriendlyName === 'function'
-            ? columnFriendlyName({ colId: colId, agColumn: agGridColumn })
-            : null;
-        const friendlyName = customFriendlyName !== null && customFriendlyName !== void 0 ? customFriendlyName : (isActionRowButtonColumn
-            ? GeneralConstants_1.ADAPTABLE_ROW_ACTION_BUTTONS_FRIENDLY_NAME
-            : isFdc3MainActionColumn
-                ? GeneralConstants_1.ADAPTABLE_FDC3_ACTION_COLUMN_FRIENDLY_NAME
-                : this.gridOptions.columnApi.getDisplayNameForColumn(agGridColumn, 'header'));
+        let friendlyName;
+        const colExists = this.adaptable.api.columnApi.doesColumnExist(ColumnId);
+        if (colExists) {
+            friendlyName = this.adaptable.api.columnApi.getFriendlyNameForColumnId(ColumnId);
+        }
+        else {
+            const displayName = this.gridOptions.columnApi.getDisplayNameForColumn(agGridColumn, 'header');
+            const columnFriendlyName = this.adaptable.adaptableOptions.columnOptions.columnFriendlyName;
+            const customFriendlyName = typeof columnFriendlyName === 'function'
+                ? columnFriendlyName({
+                    colId: colId,
+                    agColumn: agGridColumn,
+                    columnGroup: isRealColumnGroup ? ColumnGroup : undefined,
+                    displayName: displayName,
+                })
+                : null;
+            friendlyName =
+                customFriendlyName !== null && customFriendlyName !== void 0 ? customFriendlyName : (isActionRowButtonColumn
+                    ? GeneralConstants_1.ADAPTABLE_ROW_ACTION_BUTTONS_FRIENDLY_NAME
+                    : isFdc3MainActionColumn
+                        ? GeneralConstants_1.ADAPTABLE_FDC3_ACTION_COLUMN_FRIENDLY_NAME
+                        : displayName);
+            // Add Column Group;s friendlyname to the Column Friendly Name if its in a legitimate Column Group
+            if (this.adaptable.adaptableOptions.columnOptions.addColumnGroupToColumnFriendlyName &&
+                colDef.columnGroupShow &&
+                ColumnGroup &&
+                ColumnGroup.columnGroupId !== ColumnGroup.friendlyName) {
+                friendlyName += ' [' + ColumnGroup.friendlyName + ']';
+            }
+        }
         if (!this.initialAgGridColDefs[colId]) {
             this.initialAgGridColDefs[colId] = Object.assign({}, agGridColumn.getUserProvidedColDef());
         }
-        const ColumnId = colId;
-        const pkColumn = this.adaptable.adaptableOptions.primaryKey;
-        let ColumnGroup = colsToGroups === null || colsToGroups === void 0 ? void 0 : colsToGroups[ColumnId];
         const dataType = this.getColumnDataType(agGridColumn, false);
         const abColumn = {
             Uuid: (0, Uuid_1.createUuid)(),
@@ -206,7 +232,7 @@ class agGridHelper {
             columnGroup: ColumnGroup,
             sortable: this.isColumnSortable(colDef),
             filterable: this.isColumnFilterable(colDef),
-            groupable: this.isColumnGroupable(colDef),
+            groupable: this.isColumnRowGroupable(colDef),
             pivotable: this.isColumnPivotable(colDef),
             aggregatable: this.isColumnAggregetable(colDef),
             availableAggregationFunctions: null,
@@ -215,7 +241,7 @@ class agGridHelper {
             hideable: this.isColumnHideable(colDef),
             queryable: this.isColumnQueryable(colDef, ColumnId, friendlyName, dataType),
             exportable: this.isColumnExportable(colDef, ColumnId, friendlyName, dataType),
-            isGrouped: this.isColumnGrouped(colDef),
+            isGrouped: this.isColumnRowGrouped(colDef),
             isFixed: this.isColumnFixed(colDef),
             pinned: this.getColumnPinnedPosition(colDef),
             isExcludedFromQuickSearch: false,
@@ -297,7 +323,7 @@ class agGridHelper {
         }
         return false;
     }
-    isColumnGroupable(colDef) {
+    isColumnRowGroupable(colDef) {
         if (colDef && colDef.enableRowGroup != null) {
             return colDef.enableRowGroup;
         }
@@ -391,7 +417,7 @@ class agGridHelper {
         }
         return false;
     }
-    isColumnGrouped(colDef) {
+    isColumnRowGrouped(colDef) {
         if (!colDef) {
             return false;
         }

package/src/agGrid/agGridMenuHelper.js

@@ -171,10 +171,11 @@ class agGridMenuHelper {
     createAgGridColumnMenuDefFromUserMenu(menuItem, menuContext) {
         const fn = menuItem.onClick;
         const disabled = menuItem.disabled && menuItem.disabled(menuContext);
+        const icon = typeof menuItem.icon === 'function' ? menuItem.icon(menuContext) : menuItem.icon;
         return {
             name: this.getLabelFromUserColumnMenuItem(menuItem, menuContext),
             action: () => (fn ? fn(menuContext) : null),
-            icon: this.mapAdaptableIconToAgGridIcon(menuItem.icon, {
+            icon: this.mapAdaptableIconToAgGridIcon(icon, {
                 fill: 'var(--ab-color-text-on-primary)',
             }),
             disabled: disabled,
@@ -188,10 +189,11 @@ class agGridMenuHelper {
     createAgGridContextMenuDefFromUserMenu(menuItem, menuContext) {
         const fn = menuItem.onClick;
         const disabled = menuItem.disabled && menuItem.disabled(menuContext);
+        const icon = typeof menuItem.icon === 'function' ? menuItem.icon(menuContext) : menuItem.icon;
         return {
             name: this.getLabelFromUserContextMenuItem(menuItem, menuContext),
             action: () => (fn ? fn(menuContext) : null),
-            icon: this.mapAdaptableIconToAgGridIcon(menuItem.icon, {
+            icon: this.mapAdaptableIconToAgGridIcon(icon, {
                 fill: 'var(--ab-color-text-on-primary)',
             }),
             disabled: disabled,

package/src/components/ExpressionEditor/EditorInput.d.ts

@@ -2,7 +2,7 @@
 import { AdaptableApi } from '../../Api/AdaptableApi';
 import { AdaptableModule } from '../../PredefinedConfig/Common/Types';
 interface EditorInputProps {
-    type: 'boolean' | 'scalar' | 'aggregatedScalar' | 'cumulativeAggregatedScalar';
+    type: 'boolean' | 'scalar' | 'aggregatedScalar' | 'cumulativeAggregatedScalar' | 'quantileAggregatedScalar';
     module: AdaptableModule;
     value: string;
     onChange: (value: string) => void;

package/src/components/ExpressionEditor/EditorInput.js

@@ -2,22 +2,25 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
+const react_1 = require("react");
 const BaseEditorInput_1 = require("./BaseEditorInput");
 const editorButtonsSearch_1 = require("./editorButtonsSearch");
 const EditorContext_1 = require("./EditorContext");
 const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
 const editorButtonsAggregatedScalar_1 = require("./editorButtonsAggregatedScalar");
-const react_1 = require("react");
 const aggregatedScalarExpressionFunctions_1 = require("../../Utilities/ExpressionFunctions/aggregatedScalarExpressionFunctions");
 const editorButtonsCumulativeAggregatedScalar_1 = require("./editorButtonsCumulativeAggregatedScalar");
+const editorButtonsQuantileAggregatedScalar_1 = require("./editorButtonsQuantileAggregatedScalar");
 function EditorInput(props) {
     const moduleExpressionFunctions = props.api.internalApi
         .getQueryLanguageService()
         .getModuleExpressionFunctionsMap(props.module);
     const getFilteredAggregatedExpressionFunctions = (availableAggregatedExpressionFunctions, type) => {
-        const sourceExpressionFunctions = type === 'aggregatedScalar'
-            ? aggregatedScalarExpressionFunctions_1.aggregatedExpressionFunctions
-            : aggregatedScalarExpressionFunctions_1.cumulativeAggregatedExpressionFunctions;
+        const sourceExpressionFunctions = type === 'cumulativeAggregatedScalar'
+            ? aggregatedScalarExpressionFunctions_1.cumulativeAggregatedExpressionFunctions
+            : type === 'quantileAggregatedScalar'
+                ? aggregatedScalarExpressionFunctions_1.quantileAggregatedExpressionFunctions
+                : aggregatedScalarExpressionFunctions_1.aggregatedExpressionFunctions;
         return Object.keys(availableAggregatedExpressionFunctions)
             .filter((key) => sourceExpressionFunctions.includes(key))
             .reduce((obj, key) => {
@@ -26,7 +29,9 @@ function EditorInput(props) {
         }, {});
     };
     const expressionFunctions = (0, react_1.useMemo)(() => {
-        return props.type === 'aggregatedScalar' || props.type === 'cumulativeAggregatedScalar'
+        return props.type === 'aggregatedScalar' ||
+            props.type === 'cumulativeAggregatedScalar' ||
+            props.type === 'quantileAggregatedScalar'
             ? getFilteredAggregatedExpressionFunctions(moduleExpressionFunctions.aggregatedScalarFunctions, props.type)
             : Object.assign(Object.assign({}, moduleExpressionFunctions.booleanFunctions), moduleExpressionFunctions.scalarFunctions);
     }, [props.type]);
@@ -36,6 +41,10 @@ function EditorInput(props) {
             ? editorButtonsAggregatedScalar_1.editorButtonsAggregatedScalar
             : props.type === 'cumulativeAggregatedScalar'
                 ? editorButtonsCumulativeAggregatedScalar_1.editorButtonsCumulativeAggregatedScalar
-                : editorButtonsSearch_1.editorButtonsSearch, testData: props.testData, isFullExpression: props.isFullExpression, hideResultPreview: props.type === 'aggregatedScalar' || props.type === 'cumulativeAggregatedScalar', api: props.api }));
+                : props.type === 'quantileAggregatedScalar'
+                    ? editorButtonsQuantileAggregatedScalar_1.editorButtonsQuantileAggregatedScalar
+                    : editorButtonsSearch_1.editorButtonsSearch, testData: props.testData, isFullExpression: props.isFullExpression, hideResultPreview: props.type === 'aggregatedScalar' ||
+            props.type === 'cumulativeAggregatedScalar' ||
+            props.type === 'quantileAggregatedScalar', api: props.api }));
 }
 exports.default = EditorInput;

package/src/components/ExpressionEditor/editorButtonsAggregatedScalar.js

@@ -12,11 +12,6 @@ exports.editorButtonsAggregatedScalar = [
         data: 'PERCENTAGE()',
         text: 'Percentage',
     },
-    {
-        functionName: 'AVG',
-        data: 'AVG()',
-        text: 'Average',
-    },
     {
         functionName: 'MIN',
         data: 'MIN()',
@@ -27,16 +22,16 @@ exports.editorButtonsAggregatedScalar = [
         data: 'MAX()',
         text: 'Max',
     },
-    {
-        functionName: 'QUANT',
-        data: 'QUANT()',
-        text: 'Quantile',
-    },
     {
         functionName: 'COUNT',
         data: 'COUNT()',
         text: 'Count',
     },
+    {
+        functionName: 'AVG',
+        data: 'AVG()',
+        text: 'Average',
+    },
     {
         functionName: 'WEIGHT',
         data: 'WEIGHT()',

package/src/components/ExpressionEditor/editorButtonsCumulativeAggregatedScalar.js

@@ -22,11 +22,6 @@ exports.editorButtonsCumulativeAggregatedScalar = [
         data: 'PERCENTAGE()',
         text: 'Percentage',
     },
-    {
-        functionName: 'AVG',
-        data: 'AVG()',
-        text: 'Average',
-    },
     {
         functionName: 'MIN',
         data: 'MIN()',
@@ -37,6 +32,11 @@ exports.editorButtonsCumulativeAggregatedScalar = [
         data: 'MAX()',
         text: 'Max',
     },
+    {
+        functionName: 'AVG',
+        data: 'AVG()',
+        text: 'Average',
+    },
     {
         functionName: 'WEIGHT',
         data: 'WEIGHT()',

package/src/components/ExpressionEditor/editorButtonsQuantileAggregatedScalar.d.ts

@@ -0,0 +1,2 @@
+import { OperatorEditorButton } from './BaseEditorInput';
+export declare const editorButtonsQuantileAggregatedScalar: OperatorEditorButton[];

package/src/components/ExpressionEditor/editorButtonsQuantileAggregatedScalar.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.editorButtonsQuantileAggregatedScalar = void 0;
+exports.editorButtonsQuantileAggregatedScalar = [
+    {
+        functionName: 'QUANT',
+        data: 'QUANT()',
+        text: 'Quantile',
+    },
+    {
+        functionName: 'QUARTILE',
+        data: 'QUARTILE()',
+        text: 'Quartile',
+    },
+    {
+        functionName: 'PERCENTILE',
+        data: 'PERCENTILE()',
+        text: 'Percentile',
+    },
+    {
+        functionName: 'GROUP_BY',
+        data: 'GROUP_BY()',
+        text: 'GroupBy',
+    },
+];

package/src/components/ExpressionEditor/index.d.ts

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { AdaptableApi, AdaptableColumn, AdaptableModule } from '../../types';
 import { NamedQuery } from '../../PredefinedConfig/QueryState';
-declare type ExpressionEditorType = 'boolean' | 'scalar' | 'observable' | 'aggregatedBoolean' | 'aggregatedScalar' | 'cumulativeAggregatedScalar';
+export declare type ExpressionEditorType = 'boolean' | 'scalar' | 'observable' | 'aggregatedBoolean' | 'aggregatedScalar' | 'cumulativeAggregatedScalar' | 'quantileAggregatedScalar';
 interface ExpressionEditorProps {
     value: string;
     onChange: (value: string) => void;

package/src/components/ExpressionEditor/index.js

@@ -41,7 +41,7 @@ function ExpressionEditor(props) {
             setExpressionText(value);
             props.onChange(value);
         }, testData: data, api: props.api })) : (
-    // 'boolean','scalar' or 'aggregatedScalar'/'cumulativeAggregatedScalar'
+    // 'boolean','scalar','aggregatedScalar'/'cumulativeAggregatedScalar'/'quantileAggregatedScalar'
     React.createElement(EditorInput_1.default, { type: type, module: module, value: props.value, onChange: (value) => {
             setExpressionText(value);
             props.onChange(value);
@@ -234,4 +234,5 @@ const queryDocumentationLinks = {
     aggregatedBoolean: DocumentationLinkConstants_1.AggregatedBooleanQueryDocsLink,
     aggregatedScalar: DocumentationLinkConstants_1.AggregatedScalarQueryDocsLink,
     cumulativeAggregatedScalar: DocumentationLinkConstants_1.CumulativeAggregatedScalarQueryDocsLink,
+    quantileAggregatedScalar: DocumentationLinkConstants_1.QuantileAggregatedScalarQueryDocsLink,
 };

package/src/components/icons/index.js

@@ -153,6 +153,7 @@ const interactions_1 = tslib_1.__importDefault(require("./interactions"));
 const money_1 = tslib_1.__importDefault(require("./money"));
 const order_1 = tslib_1.__importDefault(require("./order"));
 const contact_1 = tslib_1.__importDefault(require("./contact"));
+const note_1 = tslib_1.__importDefault(require("./note"));
 const Icon_1 = require("../Icon");
 const AdaptableLogger_1 = require("../../agGrid/AdaptableLogger");
 exports.allIcons = {
@@ -306,6 +307,7 @@ exports.allIcons = {
     money: money_1.default,
     order: order_1.default,
     contact: contact_1.default,
+    note: note_1.default,
 };
 Object.keys(exports.allIcons).forEach((name) => {
     const ReactCmp = exports.allIcons[name];

package/src/components/icons/note.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="react" />
+declare const _default: (props: any) => JSX.Element;
+export default _default;

package/src/components/icons/note.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const React = tslib_1.__importStar(require("react"));
+const DefaultIcon_1 = tslib_1.__importDefault(require("./DefaultIcon"));
+exports.default = (props) => (React.createElement(DefaultIcon_1.default, Object.assign({}, props, { viewBox: "0 -960 960 960" }),
+    React.createElement("path", { d: "M440-240h80v-120h120v-80H520v-120h-80v120H320v80h120v120ZM240-80q-33 0-56.5-23.5T160-160v-640q0-33 23.5-56.5T240-880h320l240 240v480q0 33-23.5 56.5T720-80H240Zm280-520v-200H240v640h480v-440H520ZM240-800v200-200 640-640Z" })));