@adaptabletools/adaptable 12.1.7 → 12.1.8-canary.0

package/src/View/Layout/Wizard/sections/AggregationsSection.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AggregationsSection = exports.AggregationsSectionSummary = void 0;
+exports.AggregationsSection = exports.AggregationsSectionSummary = exports.isAggregationsSectionValid = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const rebass_1 = require("rebass");
@@ -14,6 +14,17 @@ const AdaptableContext_1 = require("../../../AdaptableContext");
 const ValueSelector_1 = require("../../../Components/ValueSelector");
 const OnePageAdaptableWizard_1 = require("../../../Wizard/OnePageAdaptableWizard");
 const Utilities_1 = require("./Utilities");
+const WEIGHTED_AVERAGE_AGG_FN_NAME = 'weightedAvg';
+const isAggregationsSectionValid = (data) => {
+    const weightedAvg = data.AggregationColumns
+        ? Object.values(data.AggregationColumns).find((agg) => typeof agg === 'object' && agg.type === 'weightedAverage')
+        : null;
+    if (weightedAvg && !weightedAvg.weightedColumnId) {
+        return 'Weighted Average aggregation requires a weighted column';
+    }
+    return true;
+};
+exports.isAggregationsSectionValid = isAggregationsSectionValid;
 const AggregationsSectionSummary = () => {
     const adaptable = AdaptableContext_1.useAdaptable();
     const { data: layout } = OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext();
@@ -32,8 +43,13 @@ const AggregationsSectionSummary = () => {
 exports.AggregationsSectionSummary = AggregationsSectionSummary;
 const ColumnRow = (props) => {
     var _a, _b;
+    const adaptable = AdaptableContext_1.useAdaptable();
     const aggValue = (_b = (_a = props.layout) === null || _a === void 0 ? void 0 : _a.AggregationColumns) === null || _b === void 0 ? void 0 : _b[props.column.columnId];
-    const aggOptions = props.column.availableAggregationFunctions.map((fnName) => {
+    const adaptableAggFunctions = [];
+    if (props.column.dataType === 'Number') {
+        adaptableAggFunctions.push(WEIGHTED_AVERAGE_AGG_FN_NAME);
+    }
+    const aggOptions = [...props.column.availableAggregationFunctions, ...adaptableAggFunctions].map((fnName) => {
         return {
             label: fnName,
             onClick: () => {
@@ -41,14 +57,51 @@ const ColumnRow = (props) => {
                 if (!aggCols) {
                     return;
                 }
-                aggCols[props.column.columnId] = fnName;
+                if (fnName === WEIGHTED_AVERAGE_AGG_FN_NAME) {
+                    aggCols[props.column.columnId] = {
+                        type: 'weightedAverage',
+                        weightedColumnId: null,
+                    };
+                }
+                else {
+                    aggCols[props.column.columnId] = fnName;
+                }
                 props.onChangeAggFunction(aggCols);
             },
         };
     });
-    return (React.createElement(rebass_1.Box, null,
+    const numericColumnsOptions = props.numberColumns
+        .filter((col) => col.columnId !== props.column.columnId)
+        .map((col) => {
+        return {
+            label: col.friendlyName,
+            onClick: () => {
+                const aggCols = Object.assign({}, props.layout.AggregationColumns);
+                if (!aggCols) {
+                    return;
+                }
+                aggCols[props.column.columnId] = {
+                    type: 'weightedAverage',
+                    weightedColumnId: col.columnId,
+                };
+                props.onChangeAggFunction(aggCols);
+            },
+        };
+    });
+    const currentAggFnName = props.aggregationColumnsMap[props.column.columnId];
+    let weightName = null;
+    if (typeof aggValue === 'object' && aggValue.type === 'weightedAverage') {
+        weightName = aggValue.weightedColumnId
+            ? adaptable.api.columnApi.getFriendlyNameFromColumnId(aggValue.weightedColumnId)
+            : 'Select Weight';
+    }
+    return (React.createElement(rebass_1.Flex, { alignItems: "center" },
         props.column.friendlyName,
-        aggValue && (React.createElement(DropdownButton_1.default, { columns: ['label'], items: aggOptions, ml: 2 }, props.aggregationColumnsMap[props.column.columnId]))));
+        aggValue && (React.createElement(DropdownButton_1.default, { columns: ['label'], items: aggOptions, ml: 2 }, currentAggFnName)),
+        currentAggFnName === WEIGHTED_AVERAGE_AGG_FN_NAME && (React.createElement(rebass_1.Flex, { backgroundColor: "primary", ml: 3, alignItems: "center" },
+            React.createElement(rebass_1.Text, null, "Weight"),
+            ' ',
+            React.createElement(DropdownButton_1.default, { columns: ['label'], items: numericColumnsOptions, ml: 2 }, weightName)))));
 };
 const AggregationsSection = (props) => {
     var _a, _b;
@@ -56,6 +109,7 @@ const AggregationsSection = (props) => {
     const { data: layout } = OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext();
     const allAggregableColumns = adaptable.api.columnApi.getAggregetableColumns();
     const allColumns = adaptable.api.columnApi.getColumns();
+    const numberColumns = adaptable.api.columnApi.getNumericColumns();
     const sortedAggregableColumns = React.useMemo(() => {
         var _a, _b;
         return sortWithOrder_1.sortWithOrderArray(allAggregableColumns.map((col) => col.columnId), (_b = Object.keys((_a = layout.AggregationColumns) !== null && _a !== void 0 ? _a : {})) !== null && _b !== void 0 ? _b : [], { sortUnorderedItems: false }).map((colId) => adaptable.api.columnApi.getColumnFromId(colId));
@@ -79,10 +133,17 @@ const AggregationsSection = (props) => {
         return Object.keys(layout.AggregationColumns || {}).reduce((acc, colId) => {
             var _a;
             let fn = (_a = layout.AggregationColumns) === null || _a === void 0 ? void 0 : _a[colId];
+            let fnName = '';
             if (typeof fn === 'boolean') {
-                fn = allColumnsMap[colId].aggregationFunction;
+                fnName = allColumnsMap[colId].aggregationFunction;
+            }
+            if (typeof fn === 'object' && fn.type === 'weightedAverage') {
+                fnName = WEIGHTED_AVERAGE_AGG_FN_NAME;
+            }
+            else if (typeof fn === 'string') {
+                fnName = fn;
             }
-            acc[colId] = fn;
+            acc[colId] = fnName;
             return acc;
         }, {});
     }, [layout]);
@@ -95,7 +156,7 @@ const AggregationsSection = (props) => {
             React.createElement(rebass_1.Flex, null,
                 React.createElement(FormLayout_1.default, null,
                     React.createElement(CheckBox_1.CheckBox, { checked: layout.SuppressAggFuncInHeader, onChange: handleSuppressAggFuncInHeader }, "Suppress Aggregation Function in Header"))),
-            React.createElement(ValueSelector_1.ValueSelector, { showFilterInput: true, showSelectedOnlyPosition: "top", filter: Utilities_1.columnFilter, toIdentifier: (option) => `${option.columnId}`, toLabel: (option) => { var _a; return (_a = option.friendlyName) !== null && _a !== void 0 ? _a : option.columnId; }, toListLabel: (column) => (React.createElement(ColumnRow, { onChangeAggFunction: handleAggregationChange, layout: layout, column: column, aggregationColumnsMap: aggregationColumnsMap })), options: sortedAggregableColumns, value: (_b = Object.keys((_a = layout.AggregationColumns) !== null && _a !== void 0 ? _a : {})) !== null && _b !== void 0 ? _b : [], allowReorder: () => false, xSelectedLabel: () => {
+            React.createElement(ValueSelector_1.ValueSelector, { showFilterInput: true, showSelectedOnlyPosition: "top", filter: Utilities_1.columnFilter, toIdentifier: (option) => `${option.columnId}`, toLabel: (option) => { var _a; return (_a = option.friendlyName) !== null && _a !== void 0 ? _a : option.columnId; }, toListLabel: (column) => (React.createElement(ColumnRow, { onChangeAggFunction: handleAggregationChange, layout: layout, column: column, aggregationColumnsMap: aggregationColumnsMap, numberColumns: numberColumns })), options: sortedAggregableColumns, value: (_b = Object.keys((_a = layout.AggregationColumns) !== null && _a !== void 0 ? _a : {})) !== null && _b !== void 0 ? _b : [], allowReorder: () => false, xSelectedLabel: () => {
                     return `Active aggregations:`;
                 }, onChange: handleColumnsSelectionChange }))));
 };

package/src/View/Layout/Wizard/sections/ColumnsSection.js

@@ -16,11 +16,11 @@ const sortWithOrder_1 = require("../../../../Utilities/sortWithOrder");
 const AdaptableContext_1 = require("../../../AdaptableContext");
 const ValueSelector_1 = require("../../../Components/ValueSelector");
 const OnePageAdaptableWizard_1 = require("../../../Wizard/OnePageAdaptableWizard");
-const ColumnLabels_1 = require("../LayoutEditor/ColumnLabels");
 const Utilities_1 = require("./Utilities");
 const icons_1 = require("../../../../components/icons");
 const CheckBox_1 = require("../../../../components/CheckBox");
 const Helper_1 = require("../../../../Utilities/Helpers/Helper");
+const ColumnLabels_1 = require("../Components/ColumnLabels");
 const PropertyOrderText = (props) => (React.createElement(rebass_1.Text, { fontWeight: 600, fontSize: 2 }, props.children));
 const ColumnsSectionSummary = () => {
     const adaptable = AdaptableContext_1.useAdaptable();

package/src/View/Query/QueryViewPanel.js

@@ -88,7 +88,7 @@ class QueryViewPanelComponent extends React.Component {
         const renderTextInput = () => {
             return this.props.viewType === 'Toolbar' ? (React.createElement(FieldWrap_1.default, { marginRight: 1, width: 600 },
                 React.createElement(ButtonExpand_1.ButtonExpand, { variant: "text", tone: "neutral", onClick: () => this.props.api.queryApi.expandCurrentQuery(this.state.expression), tooltip: "Expand", marginLeft: 1 }),
-                React.createElement(Input_1.default, { type: "text", placeholder: "Query", spellCheck: false, value: this.state.expression, onChange: (x) => this.setState({ expression: x.target.value }), style: { fontFamily: 'monospace', fontSize: 12 } }),
+                React.createElement(Input_1.default, { type: "text", "data-name": "query-input", placeholder: "Query", spellCheck: false, value: this.state.expression, onChange: (x) => this.setState({ expression: x.target.value }), style: { fontFamily: 'monospace', fontSize: 12 } }),
                 isExpressionValid ? (React.createElement(ButtonPlay_1.ButtonPlay, { onClick: () => this.runQuery(), tooltip: '', accessLevel: 'Full', variant: "text", tone: "neutral", disabled: this.state.expression == '' || this.state.expression == this.props.CurrentQuery, marginRight: 1 })) : (React.createElement(ButtonInvalid_1.ButtonInvalid, { variant: "text", tone: "neutral", tooltip: "Invalid Query", marginRight: 1 })),
                 ' ',
                 this.props.CurrentQuery !== '' && (React.createElement(ButtonClear_1.ButtonClear, { onClick: () => this.clearQuery(), tooltip: "Clear Query", accessLevel: 'Full' })))) : (React.createElement(Input_1.default, { type: "text", placeholder: "Query", spellCheck: false, value: this.state.expression, onChange: (x) => this.setState({ expression: x.target.value }), style: { width: '100%' } }));

package/src/agGrid/Adaptable.d.ts

@@ -201,6 +201,7 @@ export declare class Adaptable implements IAdaptable {
     getVisibleRowNodes(): RowNode[];
     getAllRowNodes(config?: {
         includeGroupRows?: boolean;
+        filterFn?: (rowNode: RowNode) => boolean;
     }): RowNode[];
     getRowsInViewport(): RowNode[];
     selectNodes(rowNodes: RowNode[], clearSelection: boolean): void;
@@ -225,12 +226,11 @@ export declare class Adaptable implements IAdaptable {
     private mapColumnDefs;
     private getColDefsForSpecialColumns;
     getColDefsForFreeTextColumns(): ColDef[];
-    setupColumnValueGetter({ col }: ColumnSetupInfo): void;
+    setupColumnValueGetter({ col, abColumn }: ColumnSetupInfo): void;
     setupColumnAggFunc({ col }: ColumnSetupInfo): void;
     private getColDefsForRowEditColumns;
     getColDefsForActionColumns(): ColDef[];
     updateColDefsForSpecialColumns(): void;
-    private cleanupFloatingFilters_WORKAROUND;
     private getColDefsForCalculatedColumns;
     private isRegularColDef;
     private isGroupColDef;
@@ -253,6 +253,7 @@ export declare class Adaptable implements IAdaptable {
     buildStandaloneColumnHeader(adaptableColumn: AdaptableColumn): AdaptableMenuItem[];
     prepareGrid(): void;
     setupColumns(): void;
+    revertGridOptionsPropertiesToUserValue<T extends keyof GridOptions>(propertyNames: T[]): void;
     setGridOptionsProperty<T extends keyof GridOptions>(propertyName: T, propertyGetter: (userPropertyValue: GridOptions[T]) => GridOptions[T] | undefined): void;
     setColDefProperty<T extends keyof ColDef>(col: Column, propertyName: T, propertyGetter: (userPropertyValue: ColDef[T]) => ColDef[T] | undefined): void;
     private getUserColDefProperty;
@@ -263,6 +264,7 @@ export declare class Adaptable implements IAdaptable {
     setupColumnCellRenderer({ col, colId, abColumn }: ColumnSetupInfo): void;
     setupColumnTooltipValueGetter({ col, colId, abColumn }: ColumnSetupInfo): void;
     setupColumnQuickFilerText({ col, abColumn }: ColumnSetupInfo): void;
+    setupAllowedAggFuncs({ col, abColumn }: ColumnSetupInfo): void;
     setupColumnHeader({ col, abColumn }: ColumnSetupInfo): boolean;
     setupColumnFilter({ col, colDef }: ColumnSetupInfo): void;
     setupColumnFloatingFilter({ col, colDef }: ColumnSetupInfo): void;
@@ -271,7 +273,6 @@ export declare class Adaptable implements IAdaptable {
     setupColumnValueSetter({ col, colId, abColumn }: ColumnSetupInfo): void;
     setupColumnComparator({ col, colId, abColumn }: ColumnSetupInfo): void;
     private applyCurrentTheme;
-    private getInitialGroupOrderComparator;
     private applyFinalRendering;
     private isModulePresent;
     private getPreviousColDefInfo;
@@ -361,6 +362,12 @@ export declare class Adaptable implements IAdaptable {
     initLicenseService(): LicenseService;
     showCharts(charts: ChartModel[]): ChartRef[];
     getChartModels(): ChartModel[];
+    private getActiveAdaptableAggFuncForCol;
+    private registerAdaptableAggFuncs;
+    /**
+     * When reading the state from the grid, we have to make sure 'avg' is not overriden with the 'avg' string.
+     */
+    private handleUpdateWeightedAvgFromGrid;
 }
 export declare class AdaptableNoCodeWizard implements IAdaptableNoCodeWizard {
     private init;