@adaptabletools/adaptable-cjs 18.0.0-canary.16 → 18.0.0-canary.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable-cjs",
-  "version": "18.0.0-canary.16",
+  "version": "18.0.0-canary.17",
   "description": "Powerful data-agnostic HTML5 AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
   "keywords": [
     "web-components",

package/src/AdaptableInterfaces/IAdaptable.d.ts

@@ -31,7 +31,6 @@ import { AgGridAdapter } from '../agGrid/AgGridAdapter';
 import { AgGridColumnAdapter } from '../agGrid/AgGridColumnAdapter';
 import { AgGridMenuAdapter } from '../agGrid/AgGridMenuAdapter';
 import { RowEditService } from '../Utilities/Services/RowEditService';
-import { ISummaryService } from '../Utilities/Services/Interface/ISummaryService';
 /**
  * Contains AG Grid Options and Modules - used when instantiating AdapTable vanilla
  */
@@ -91,7 +90,6 @@ export interface IAdaptable {
     RowEditService: RowEditService;
     Fdc3Service: Fdc3Service;
     CellPopupService: CellPopupService;
-    SummaryService: ISummaryService;
     /**
      * INTERNAL ADAPTABLE EVENTS
      * These are not called externally - for that we use eventapi

package/src/AdaptableOptions/ColumnFilterOptions.d.ts

@@ -103,9 +103,10 @@ export interface ColumnFilterOptions<TData = any> {
      */
     showSuspendFilterButton?: boolean;
     /**
-     * Wether to show Date Picker or only Date Input
-     *
-     * @default true
+     * Show Date Picker (or Date Input) in Filter controls
+     * @gridInfoItem
+     * @noCodeItem
+     * @defaultValue true
      */
     showDatePicker?: boolean;
 }

package/src/Api/GridApi.d.ts

@@ -524,5 +524,5 @@ export interface GridApi {
     /**
      * Opens a window with a transposed view of Grid
      */
-    showTransposedView(transposeConfig: TransposeConfig): void;
+    showTransposedView(transposeConfig?: TransposeConfig): void;
 }

package/src/Api/Implementation/CellSummaryApiImpl.d.ts

@@ -9,9 +9,4 @@ export declare class CellSummaryApiImpl extends ApiBase implements CellSummaryAp
     setCurrentCellSummaryOperation(operation: SummaryOperation | string): void;
     getCellSummaryOperationValue(operation: SummaryOperation | string): any;
     getCurrentCellSummaryOperationValue(): any;
-    /**
-     * Weighted average is availabe only if the current layout has at leat a Weighted Average aggregation defined.
-     */
-    private isWeightedAverageCellSummaryAvailable;
-    private getWeightedAverageCellSummaryOperation;
 }

package/src/Api/Implementation/CellSummaryApiImpl.js

@@ -6,7 +6,6 @@ const ApiBase_1 = require("./ApiBase");
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 const SystemRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/SystemRedux"));
 const Enums_1 = require("../../PredefinedConfig/Common/Enums");
-const weightedAverage_1 = require("../../agGrid/weightedAverage");
 class CellSummaryApiImpl extends ApiBase_1.ApiBase {
     openCellSummaryPopupSettingsPanel() {
         this.showModulePopup(ModuleConstants.CellSummaryModuleId);
@@ -17,12 +16,6 @@ class CellSummaryApiImpl extends ApiBase_1.ApiBase {
     getCellSummaryOperationDefinitions() {
         var _a;
         let cellSummaryOperations = (_a = this.getCellSummaryOptions().cellSummaryOperations) !== null && _a !== void 0 ? _a : [];
-        if (this.isWeightedAverageCellSummaryAvailable()) {
-            cellSummaryOperations = [
-                ...cellSummaryOperations,
-                this.getWeightedAverageCellSummaryOperation(),
-            ];
-        }
         return cellSummaryOperations;
     }
     setCurrentCellSummaryOperation(operation) {
@@ -54,6 +47,8 @@ class CellSummaryApiImpl extends ApiBase_1.ApiBase {
                 return cellSummary.Std_Deviation;
             case Enums_1.SummaryOperation.Only:
                 return cellSummary.Only;
+            case Enums_1.SummaryOperation.Weighted_Average:
+                return cellSummary.Weighted_Average;
             default:
                 return cellSummary[operation];
         }
@@ -65,21 +60,5 @@ class CellSummaryApiImpl extends ApiBase_1.ApiBase {
             : cellSummaryOperation.operationName;
         return this.getCellSummaryOperationValue(summaryOperation);
     }
-    /**
-     * Weighted average is availabe only if the current layout has at leat a Weighted Average aggregation defined.
-     */
-    isWeightedAverageCellSummaryAvailable() {
-        const currentLayout = this.getAdaptableApi().layoutApi.getCurrentLayout();
-        if (currentLayout.AggregationColumns == undefined) {
-            return false;
-        }
-        return Object.values(currentLayout.AggregationColumns).some((aggCol) => typeof aggCol === 'object' && aggCol.type === 'weightedAverage');
-    }
-    getWeightedAverageCellSummaryOperation() {
-        return {
-            operationName: 'Weighted Avg',
-            operationFunction: weightedAverage_1.cellSummaryWeightedAverage,
-        };
-    }
 }
 exports.CellSummaryApiImpl = CellSummaryApiImpl;

package/src/Api/Implementation/GridApiImpl.d.ts

@@ -132,5 +132,5 @@ export declare class GridApiImpl extends ApiBase implements GridApi {
     openGridInfoSettingsPanel(): void;
     getAgGridRowModelType(): RowModelType;
     getVisibleRowCount(): number;
-    showTransposedView(transposeConfig: TransposeConfig): void;
+    showTransposedView(transposeConfig?: TransposeConfig): void;
 }

package/src/Api/Implementation/GridApiImpl.js

@@ -529,7 +529,7 @@ class GridApiImpl extends ApiBase_1.ApiBase {
         (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'GridApi', 'getVisibleRowCount', 'getRowCount');
         return this.getRowCount();
     }
-    showTransposedView(transposeConfig) {
+    showTransposedView(transposeConfig = {}) {
         var _a, _b, _c, _d;
         const transposedColumnId = (_a = transposeConfig.transposedColumnId) !== null && _a !== void 0 ? _a : this.getAdaptableApi().optionsApi.getPrimaryKey();
         const hideTransposedColumn = (_b = transposeConfig.hideTransposedColumn) !== null && _b !== void 0 ? _b : true;

package/src/Api/Internal/AdaptableInternalApi.d.ts

@@ -27,7 +27,6 @@ import { AdaptableObjectTag, AdaptableObjectWithScope } from '../../PredefinedCo
 import { Fdc3Service } from '../../Utilities/Services/Fdc3Service';
 import { CellPopupService } from '../../Utilities/Services/CellPopupService';
 import { RowEditService } from '../../Utilities/Services/RowEditService';
-import { ISummaryService } from '../../Utilities/Services/Interface/ISummaryService';
 export declare class AdaptableInternalApi extends ApiBase {
     getSystemState(): SystemState;
     showPopupConfirmation(confirmation: UIConfirmation): void;
@@ -61,7 +60,6 @@ export declare class AdaptableInternalApi extends ApiBase {
     getReportService(): IReportService;
     getCalculatedColumnExpressionService(): ICalculatedColumnExpressionService;
     getEntitlementService(): IEntitlementService;
-    getSummaryService(): ISummaryService;
     getQueryLanguageService(): IQueryLanguageService;
     getAlertService(): IAlertService;
     getTeamSharingService(): ITeamSharingService;

package/src/Api/Internal/AdaptableInternalApi.js

@@ -106,9 +106,6 @@ class AdaptableInternalApi extends ApiBase_1.ApiBase {
     getEntitlementService() {
         return this.adaptable.EntitlementService;
     }
-    getSummaryService() {
-        return this.adaptable.SummaryService;
-    }
     getQueryLanguageService() {
         return this.adaptable.QueryLanguageService;
     }

package/src/PredefinedConfig/Common/Enums.d.ts

@@ -60,7 +60,8 @@ export declare enum SummaryOperation {
     Min = "Min",
     Count = "Count",
     Std_Deviation = "Std Deviation",
-    Only = "Only"
+    Only = "Only",
+    Weighted_Average = "Weighted Avg"
 }
 export declare enum FilterOnDataChangeOptions {
     Always = "Always",

package/src/PredefinedConfig/Common/Enums.js

@@ -78,6 +78,7 @@ var SummaryOperation;
     SummaryOperation["Count"] = "Count";
     SummaryOperation["Std_Deviation"] = "Std Deviation";
     SummaryOperation["Only"] = "Only";
+    SummaryOperation["Weighted_Average"] = "Weighted Avg";
 })(SummaryOperation = exports.SummaryOperation || (exports.SummaryOperation = {}));
 var FilterOnDataChangeOptions;
 (function (FilterOnDataChangeOptions) {

package/src/PredefinedConfig/Common/Menu.d.ts

@@ -5,12 +5,21 @@ import { SelectedCellInfo } from '../Selection/SelectedCellInfo';
 import { SelectedRowInfo } from '../Selection/SelectedRowInfo';
 import { Column, IRowNode } from '@ag-grid-community/core';
 import { AdaptableIcon, BaseContext } from '../../types';
+/**
+ * List of Shipped Adaptable Menu Items
+ */
+export declare const ADAPTABLE_MENU_ITEMS: readonly ["alert-clear", "bulk-update-apply", "calculated-column-edit", "cell-summary-show", "column-info", "comment-add", "comment-remove", "custom-sort-add", "custom-sort-edit", "dashboard", "dashboard-collapse", "dashboard-configure", "dashboard-dock", "dashboard-expand", "dashboard-float", "dashboard-hide", "dashboard-show", "data-import", "export", "export-clipboard", "export-csv", "export-excel", "export-json", "export-table", "export-custom-destination", "fdc3", "fdc3-broadcast", "fdc3-raise-intent", "filter", "filter-bar-visbility", "filter-clear", "filter-suspend", "filter-cell-value", "flashing-cell-add", "flashing-cell-clear", "flashing-cell-delete", "flashing-row-clear", "format-column", "format-column-add", "format-column-edit", "free-text-column-edit", "grid-info", "layout-aggregated-view", "layout-auto-size", "layout-clear-selection", "layout-column-caption-change", "layout-column-hide", "layout-column-select", "layout-column-select-preserve", "layout-column-select-reset", "layout-edit", "layout-grid", "layout-select", "layout-select-all", "note-add", "note-remove", "plus-minus-add", "smart-edit-apply", "settings-panel-open", "styled-column-badge", "styled-column", "styled-column-gradient", "styled-column-percent-bar", "styled-column-sparkline", "system-status-show", "internal"];
+export type AdaptableMenuItemName = typeof ADAPTABLE_MENU_ITEMS[number];
 /**
  * Menu item used by Adaptable in both Column and Context Menus
  */
 export interface AdaptableMenuItem {
     /**
-     * Name that appears in the menu
+     * Unique name for the Menu Item
+     */
+    name: AdaptableMenuItemName;
+    /**
+     * Text that appears in the menu
      */
     label: string;
     /**

package/src/PredefinedConfig/Common/Menu.js

@@ -1,2 +1,74 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ADAPTABLE_MENU_ITEMS = void 0;
+/**
+ * List of Shipped Adaptable Menu Items
+ */
+exports.ADAPTABLE_MENU_ITEMS = [
+    'alert-clear',
+    'bulk-update-apply',
+    'calculated-column-edit',
+    'cell-summary-show',
+    'column-info',
+    'comment-add',
+    'comment-remove',
+    'custom-sort-add',
+    'custom-sort-edit',
+    'dashboard',
+    'dashboard-collapse',
+    'dashboard-configure',
+    'dashboard-dock',
+    'dashboard-expand',
+    'dashboard-float',
+    'dashboard-hide',
+    'dashboard-show',
+    'data-import',
+    'export',
+    'export-clipboard',
+    'export-csv',
+    'export-excel',
+    'export-json',
+    'export-table',
+    'export-custom-destination',
+    'fdc3',
+    'fdc3-broadcast',
+    'fdc3-raise-intent',
+    'filter',
+    'filter-bar-visbility',
+    'filter-clear',
+    'filter-suspend',
+    'filter-cell-value',
+    'flashing-cell-add',
+    'flashing-cell-clear',
+    'flashing-cell-delete',
+    'flashing-row-clear',
+    'format-column',
+    'format-column-add',
+    'format-column-edit',
+    'free-text-column-edit',
+    'grid-info',
+    'layout-aggregated-view',
+    'layout-auto-size',
+    'layout-clear-selection',
+    'layout-column-caption-change',
+    'layout-column-hide',
+    'layout-column-select',
+    'layout-column-select-preserve',
+    'layout-column-select-reset',
+    'layout-edit',
+    'layout-grid',
+    'layout-select',
+    'layout-select-all',
+    'note-add',
+    'note-remove',
+    'plus-minus-add',
+    'smart-edit-apply',
+    'settings-panel-open',
+    'styled-column-badge',
+    'styled-column',
+    'styled-column-gradient',
+    'styled-column-percent-bar',
+    'styled-column-sparkline',
+    'system-status-show',
+    'internal' // used by AdapTable in Settings Panel
+];

package/src/PredefinedConfig/Common/RowSummary.d.ts

@@ -1,5 +1,7 @@
-import { SummarySupportedExpression } from "../../Utilities/Services/Interface/ISummaryService";
 export declare const ROW_SUMMARY_ROW_ID = "__ROW_SUMMARY_ROW_ID";
+export declare const WEIGHTED_AVERAGE_AGGREATED_FUNCTION = "WEIGHTED_AVERAGE";
+export declare const summarySupportedExpressions: readonly ["SUM", "AVG", "MIN", "MAX", "COUNT", "MEDIAN", "MODE", "DISTINCT", "ONLY", "STD_DEVIATION", "OLDEST", "YOUNGEST", "WEIGHTED_AVERAGE"];
+export type SummarySupportedExpression = (typeof summarySupportedExpressions)[number];
 /**
  * Position of Row Summary - 'Top' or 'Bottom'
  */

package/src/PredefinedConfig/Common/RowSummary.js

@@ -1,4 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ROW_SUMMARY_ROW_ID = void 0;
+exports.summarySupportedExpressions = exports.WEIGHTED_AVERAGE_AGGREATED_FUNCTION = exports.ROW_SUMMARY_ROW_ID = void 0;
 exports.ROW_SUMMARY_ROW_ID = '__ROW_SUMMARY_ROW_ID';
+exports.WEIGHTED_AVERAGE_AGGREATED_FUNCTION = 'WEIGHTED_AVERAGE';
+exports.summarySupportedExpressions = [
+    'SUM',
+    'AVG',
+    'MIN',
+    'MAX',
+    'COUNT',
+    'MEDIAN',
+    'MODE',
+    'DISTINCT',
+    'ONLY',
+    'STD_DEVIATION',
+    'OLDEST',
+    'YOUNGEST',
+    exports.WEIGHTED_AVERAGE_AGGREATED_FUNCTION,
+];

package/src/Strategy/AdaptableModuleBase.d.ts

@@ -3,7 +3,7 @@ import { Action } from 'redux';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
 import { ModuleParams } from '../View/Components/SharedProps/ModuleViewPopupProps';
 import { MenuItemShowPopup, MenuItemDoReduxAction, MenuItemDoClickFunction } from '../Utilities/MenuItem';
-import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
+import { AdaptableMenuItem, AdaptableMenuItemName, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
 import { AdaptableModule } from '../PredefinedConfig/Common/Types';
 import { TeamSharingImportInfo } from '../PredefinedConfig/TeamSharingState';
 import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
@@ -40,15 +40,16 @@ export declare abstract class AdaptableModuleBase implements IModule {
     addModuleButtonMenuItem(): AdaptableMenuItem | undefined;
     addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
     addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
-    createMainMenuItemShowPopup({ Label, ComponentName, Icon, PopupParams, }: {
+    createMainMenuItemShowPopup({ Name, Label, ComponentName, Icon, PopupParams, }: {
+        Name: AdaptableMenuItemName;
         Label: string;
         ComponentName: string;
         Icon: AdaptableSystemIconName;
         PopupParams?: ModuleParams;
     }): MenuItemShowPopup;
-    createColumnMenuItemClickFunction(Label: string, Icon: AdaptableSystemIconName, ClickFunction: () => void): MenuItemDoClickFunction;
-    createColumnMenuItemReduxAction(Label: string, Icon: AdaptableSystemIconName, Action: Action): MenuItemDoReduxAction;
-    createColumnMenuItemShowPopup(Label: string, ComponentName: string, Icon: AdaptableSystemIconName, PopupParams?: ModuleParams): MenuItemShowPopup;
+    createColumnMenuItemClickFunction(Name: AdaptableMenuItemName, Label: string, Icon: AdaptableSystemIconName, ClickFunction: () => void): MenuItemDoClickFunction;
+    createColumnMenuItemReduxAction(Name: AdaptableMenuItemName, Label: string, Icon: AdaptableSystemIconName, Action: Action): MenuItemDoReduxAction;
+    createColumnMenuItemShowPopup(Name: AdaptableMenuItemName, Label: string, ComponentName: string, Icon: AdaptableSystemIconName, PopupParams?: ModuleParams): MenuItemShowPopup;
     getTeamSharingAction(): TeamSharingImportInfo<AdaptableObject> | undefined;
     getModuleNamedQueryReferences(): string[];
     getModuleCalculatedColumnReferences(): CalculatedColumn[];

package/src/Strategy/AdaptableModuleBase.js

@@ -82,6 +82,7 @@ class AdaptableModuleBase {
                 maxWidth: this.getPopupMaxWidth(),
             };
             return this.createMainMenuItemShowPopup({
+                Name: 'internal',
                 Label: this.moduleInfo.FriendlyName,
                 ComponentName: this.moduleInfo.Popup,
                 Icon: this.moduleInfo.Glyph,
@@ -102,20 +103,20 @@ class AdaptableModuleBase {
         return undefined;
     }
     // creates the menu items in the main dropdown
-    createMainMenuItemShowPopup({ Label, ComponentName, Icon, PopupParams, }) {
-        return new MenuItem_1.MenuItemShowPopup(Label, this.moduleInfo.ModuleName, ComponentName, Icon, true, PopupParams);
+    createMainMenuItemShowPopup({ Name, Label, ComponentName, Icon, PopupParams, }) {
+        return new MenuItem_1.MenuItemShowPopup(Name, Label, this.moduleInfo.ModuleName, ComponentName, Icon, true, PopupParams);
     }
     // creates a menu item for the column menu to perform a function
-    createColumnMenuItemClickFunction(Label, Icon, ClickFunction) {
-        return new MenuItem_1.MenuItemDoClickFunction(Label, this.moduleInfo.ModuleName, ClickFunction, Icon, true);
+    createColumnMenuItemClickFunction(Name, Label, Icon, ClickFunction) {
+        return new MenuItem_1.MenuItemDoClickFunction(Name, Label, this.moduleInfo.ModuleName, ClickFunction, Icon, true);
     }
     // creates a menu item for the column menu to enact a Redux action
-    createColumnMenuItemReduxAction(Label, Icon, Action) {
-        return new MenuItem_1.MenuItemDoReduxAction(Label, this.moduleInfo.ModuleName, Action, Icon, true);
+    createColumnMenuItemReduxAction(Name, Label, Icon, Action) {
+        return new MenuItem_1.MenuItemDoReduxAction(Name, Label, this.moduleInfo.ModuleName, Action, Icon, true);
     }
     // popups called by the column menu - invisible if module is hidden or readonly
-    createColumnMenuItemShowPopup(Label, ComponentName, Icon, PopupParams) {
-        return new MenuItem_1.MenuItemShowPopup(Label, this.moduleInfo.ModuleName, ComponentName, Icon, true, PopupParams);
+    createColumnMenuItemShowPopup(Name, Label, ComponentName, Icon, PopupParams) {
+        return new MenuItem_1.MenuItemShowPopup(Name, Label, this.moduleInfo.ModuleName, ComponentName, Icon, true, PopupParams);
     }
     getTeamSharingAction() {
         return undefined;

package/src/Strategy/AlertModule.js

@@ -87,7 +87,7 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     relevantAlert = this.api.alertApi.internalApi.getAdaptableAlertWithHighlightRow(menuContext.rowNode);
                 }
                 if (relevantAlert) {
-                    items.push(this.createColumnMenuItemReduxAction('Clear Alert', this.moduleInfo.Glyph, SystemRedux.SystemAlertDelete(relevantAlert)));
+                    items.push(this.createColumnMenuItemReduxAction('alert-clear', 'Clear Alert', this.moduleInfo.Glyph, SystemRedux.SystemAlertDelete(relevantAlert)));
                 }
             }
         }

package/src/Strategy/BulkUpdateModule.js

@@ -26,7 +26,7 @@ class BulkUpdateModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 let popUpParams = {
                     source: 'ContextMenu',
                 };
-                menuItemShowPopup = this.createMainMenuItemShowPopup({
+                menuItemShowPopup = this.createMainMenuItemShowPopup({ Name: 'bulk-update-apply',
                     Label: 'Apply Bulk Update',
                     ComponentName: this.moduleInfo.Popup,
                     Icon: this.moduleInfo.Glyph,

package/src/Strategy/CalculatedColumnModule.js

@@ -61,7 +61,7 @@ class CalculatedColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             source: 'ColumnMenu',
         };
         return [
-            this.createColumnMenuItemShowPopup('Edit Calculated Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam),
+            this.createColumnMenuItemShowPopup('calculated-column-edit', 'Edit Calculated Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam),
         ];
     }
     getTeamSharingAction() {

package/src/Strategy/CellSummaryModule.d.ts

@@ -1,12 +1,12 @@
 /// <reference types="react" />
-import { AdaptableModuleBase } from './AdaptableModuleBase';
-import { ICellSummaryModule } from './Interface/ICellSummaryModule';
-import { SelectedCellInfo } from '../PredefinedConfig/Selection/SelectedCellInfo';
-import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
 import { AdaptableApi } from '../Api/AdaptableApi';
-import { AccessLevel } from '../PredefinedConfig/Common/Entitlement';
-import { CellSummmary } from '../PredefinedConfig/Common/CellSummary';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
+import { CellSummmary } from '../PredefinedConfig/Common/CellSummary';
+import { AccessLevel } from '../PredefinedConfig/Common/Entitlement';
+import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
+import { SelectedCellInfo } from '../PredefinedConfig/Selection/SelectedCellInfo';
+import { AdaptableModuleBase } from './AdaptableModuleBase';
+import { ICellSummaryModule } from './Interface/ICellSummaryModule';
 export declare class CellSummaryModule extends AdaptableModuleBase implements ICellSummaryModule {
     cachedCellSummary: WeakMap<SelectedCellInfo<any>, CellSummmary>;
     constructor(api: AdaptableApi);
@@ -15,6 +15,7 @@ export declare class CellSummaryModule extends AdaptableModuleBase implements IC
     addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     private createCellSummaryMenuItem;
     createCellSummary(selectedCellInfo: SelectedCellInfo): CellSummmary;
+    private getWeightedAverageCellSummary;
     getViewProperties(): {
         getStatusBarPanelProps(): {
             view: () => JSX.Element;

package/src/Strategy/CellSummaryModule.js

@@ -2,11 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CellSummaryModule = void 0;
 const tslib_1 = require("tslib");
-const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
 const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
 const ArrayExtensions_1 = require("../Utilities/Extensions/ArrayExtensions");
 const Helper_1 = require("../Utilities/Helpers/Helper");
+const AggregatedScalarLiveValue_1 = require("../Utilities/Services/AggregatedScalarLiveValue");
 const CellSummaryStatusPanel_1 = require("../View/CellSummary/CellSummaryStatusPanel");
+const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
 class CellSummaryModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.CellSummaryModuleId, ModuleConstants.CellSummaryFriendlyName, 'cells', 'CellSummaryPopup', 'See summary information on a group of cells using multiple summary operations', api);
@@ -40,6 +41,7 @@ class CellSummaryModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     createCellSummaryMenuItem(popUpParams) {
         return this.createMainMenuItemShowPopup({
+            Name: 'cell-summary-show',
             Label: 'See Cell Summary',
             ComponentName: this.moduleInfo.Popup,
             Icon: this.moduleInfo.Glyph,
@@ -92,17 +94,17 @@ class CellSummaryModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     Only: '',
                 };
             }
+            const columnId = selectedCellInfo.columns[0].columnId;
+            const rowNodes = selectedCellInfo.gridCells.map((gc) => gc.rowNode);
             const handleExpression = (functionName) => {
-                const columnId = selectedCellInfo.columns[0].columnId;
-                const rowNodes = selectedCellInfo.gridCells.map((gc) => gc.rowNode);
-                return this.api.internalApi
-                    .getSummaryService().evaluateExpressionValue({
-                    expression: {
-                        function: functionName,
-                    },
-                    columnId: columnId,
-                    getRowNodes: () => rowNodes,
-                }, ModuleConstants.CellSummaryModuleId);
+                const aggScalarValue = new AggregatedScalarLiveValue_1.AggregatedScalarLiveValue({
+                    aggregatedScalarExpression: `${functionName}([${columnId}])`,
+                }, ModuleConstants.CellSummaryModuleId, this.api, () => rowNodes);
+                let value = aggScalarValue.getGlobalAggregatedValue();
+                if (typeof value === 'number' && !isNaN(value)) {
+                    value = Helper_1.Helper.roundNumber(value, 2);
+                }
+                return value;
             };
             const sumValue = hasNumericColumns ? handleExpression('SUM') : null;
             const avgValue = hasNumericColumns ? Helper_1.Helper.roundNumber(handleExpression('AVG'), 2) : null;
@@ -127,8 +129,11 @@ class CellSummaryModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 Only: distinctValue == 1 ? JSON.stringify(allValues[0]) : '',
             };
             numericValues = [...newNumericValues];
+            const weightedAverage = this.getWeightedAverageCellSummary(columnId, rowNodes);
+            if (weightedAverage !== null) {
+                selectedCellSummary.Weighted_Average = weightedAverage;
+            }
             const operationDefinitions = this.api.cellSummaryApi.getCellSummaryOperationDefinitions();
-            const api = this.api;
             operationDefinitions === null || operationDefinitions === void 0 ? void 0 : operationDefinitions.forEach((operation) => {
                 if (operation.operationFunction) {
                     const cellSummaryOperationContext = {
@@ -148,6 +153,26 @@ class CellSummaryModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         this.cachedCellSummary.set(selectedCellInfo, selectedCellSummary);
         return selectedCellSummary;
     }
+    getWeightedAverageCellSummary(columnId, rowNodes) {
+        const currentLayout = this.api.layoutApi.getCurrentLayout();
+        if (currentLayout.AggregationColumns == undefined) {
+            return false;
+        }
+        const weightedAverageConfig = Object.entries(currentLayout.AggregationColumns).find(([colId, aggCol]) => typeof aggCol === 'object' && aggCol.type === 'weightedAverage' && colId === columnId);
+        if (!weightedAverageConfig) {
+            return null;
+        }
+        const { weightedColumnId } = weightedAverageConfig[1];
+        const expression = `AVG([${columnId}], WEIGHT([${weightedColumnId}]))`;
+        const aggScalarValue = new AggregatedScalarLiveValue_1.AggregatedScalarLiveValue({
+            aggregatedScalarExpression: expression,
+        }, ModuleConstants.CellSummaryModuleId, this.api, () => rowNodes);
+        let value = aggScalarValue.getGlobalAggregatedValue();
+        if (typeof value === 'number' && !isNaN(value)) {
+            value = Helper_1.Helper.roundNumber(value, 2);
+        }
+        return value;
+    }
     getViewProperties() {
         return {
             getStatusBarPanelProps() {

package/src/Strategy/ColumnFilterModule.js

@@ -61,13 +61,13 @@ class ColumnFilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                             this.api.columnFilterApi.internalApi.createEqualityColumnFilterForCell(menuContext.selectedCellInfo.gridCells[0]);
                         };
                     return [
-                        this.createColumnMenuItemClickFunction(isMultiple ? 'Filter on Cell Values' : 'Filter on Cell Value', this.moduleInfo.Glyph, clickFunction),
+                        this.createColumnMenuItemClickFunction('filter-cell-value', isMultiple ? 'Filter on Cell Values' : 'Filter on Cell Value', this.moduleInfo.Glyph, clickFunction),
                     ];
                 }
                 else {
                     let filterSubMenuItems = [];
-                    filterSubMenuItems.push(this.createColumnMenuItemReduxAction('Clear Filter', 'close', LayoutRedux.LayoutColumnFilterClear(existingColumnFilter)));
-                    filterSubMenuItems.push(this.createColumnMenuItemClickFunction(existingColumnFilter.IsSuspended ? 'Unsuspend Filter' : 'Suspend Filter', existingColumnFilter.IsSuspended ? 'resume' : 'pause', existingColumnFilter.IsSuspended
+                    filterSubMenuItems.push(this.createColumnMenuItemReduxAction('filter-clear', 'Clear Filter', 'close', LayoutRedux.LayoutColumnFilterClear(existingColumnFilter)));
+                    filterSubMenuItems.push(this.createColumnMenuItemClickFunction('filter-suspend', existingColumnFilter.IsSuspended ? 'Unsuspend Filter' : 'Suspend Filter', existingColumnFilter.IsSuspended ? 'resume' : 'pause', existingColumnFilter.IsSuspended
                         ? () => {
                             this.api.columnFilterApi.unSuspendColumnFilter(existingColumnFilter);
                         }
@@ -75,7 +75,7 @@ class ColumnFilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                             this.api.columnFilterApi.suspendColumnFilter(existingColumnFilter);
                         }));
                     return [
-                        {
+                        { name: 'filter',
                             label: this.moduleInfo.FriendlyName,
                             isVisible: true,
                             module: this.moduleInfo.ModuleName,
@@ -98,21 +98,22 @@ class ColumnFilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 const isFilterVisible = this.api.columnFilterApi.isQuickFilterVisible();
                 if (this.isModuleEditable() &&
                     this.api.optionsApi.getColumnFilterOptions().useAdaptableColumnFiltering) {
-                    filterSubMenuItems.push(this.createColumnMenuItemReduxAction(isFilterVisible ? 'Hide Filter Bar' : 'Show Filter Bar', isFilterVisible ? 'unchecked' : 'check', isFilterVisible
+                    filterSubMenuItems.push(this.createColumnMenuItemReduxAction('filter-bar-visbility', isFilterVisible ? 'Hide Filter Bar' : 'Show Filter Bar', isFilterVisible ? 'unchecked' : 'check', isFilterVisible
                         ? SystemRedux.SystemQuickFilterBarHide()
                         : SystemRedux.SystemQuickFilterBarShow()));
                 }
             }
             const existingColumnFilter = this.getExistingColumnFilter(column);
             if (existingColumnFilter) {
-                filterSubMenuItems.push(this.createColumnMenuItemReduxAction('Clear Filter', 'close', LayoutRedux.LayoutColumnFilterClear(existingColumnFilter)));
-                filterSubMenuItems.push(this.createColumnMenuItemReduxAction(existingColumnFilter.IsSuspended ? 'Unsuspend Filter' : 'Suspend Filter', existingColumnFilter.IsSuspended ? 'resume' : 'pause', existingColumnFilter.IsSuspended
+                filterSubMenuItems.push(this.createColumnMenuItemReduxAction('filter-clear', 'Clear Filter', 'close', LayoutRedux.LayoutColumnFilterClear(existingColumnFilter)));
+                filterSubMenuItems.push(this.createColumnMenuItemReduxAction('filter-suspend', existingColumnFilter.IsSuspended ? 'Unsuspend Filter' : 'Suspend Filter', existingColumnFilter.IsSuspended ? 'resume' : 'pause', existingColumnFilter.IsSuspended
                     ? LayoutRedux.LayoutColumnFilterUnSuspend(existingColumnFilter)
                     : LayoutRedux.LayoutColumnFilterSuspend(existingColumnFilter)));
             }
             if (ArrayExtensions_1.default.IsNotNullOrEmpty(filterSubMenuItems)) {
                 return [
                     {
+                        name: 'filter',
                         label: this.moduleInfo.FriendlyName,
                         isVisible: true,
                         module: this.moduleInfo.ModuleName,

package/src/Strategy/ColumnInfoModule.js

@@ -19,6 +19,7 @@ class ColumnInfoModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             };
             return [
                 this.createMainMenuItemShowPopup({
+                    Name: 'column-info',
                     Label: 'Column Info',
                     ComponentName: this.moduleInfo.Popup,
                     Icon: this.moduleInfo.Glyph,
@@ -35,6 +36,7 @@ class ColumnInfoModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             };
             return [
                 this.createMainMenuItemShowPopup({
+                    Name: 'column-info',
                     Label: 'Column Info',
                     ComponentName: this.moduleInfo.Popup,
                     Icon: this.moduleInfo.Glyph,

package/src/Strategy/CommentModule.js

@@ -62,12 +62,12 @@ class CommentModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             return items;
         }
         if (comments) {
-            items.push(this.createColumnMenuItemClickFunction('Remove Comments', this.moduleInfo.Glyph, () => {
+            items.push(this.createColumnMenuItemClickFunction('comment-remove', 'Remove Comment', this.moduleInfo.Glyph, () => {
                 this.api.commentApi.deleteCommentThread(cellAddress);
             }));
         }
         else {
-            items.push(this.createColumnMenuItemClickFunction('Add Comment', this.moduleInfo.Glyph, () => {
+            items.push(this.createColumnMenuItemClickFunction('comment-add', 'Add Comment', this.moduleInfo.Glyph, () => {
                 // add an empty one
                 this.api.commentApi.addCommentThread(Object.assign(Object.assign({}, cellAddress), { Comments: [] }));
                 requestAnimationFrame(() => {

package/src/Strategy/CustomSortModule.js

@@ -38,8 +38,9 @@ class CustomSortModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 action: customSort ? 'Edit' : 'New',
                 source: 'ColumnMenu',
             };
+            let name = customSort ? 'custom-sort-edit' : 'custom-sort-add';
             return [
-                this.createColumnMenuItemShowPopup(label + 'Custom Sort', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam),
+                this.createColumnMenuItemShowPopup(name, label + 'Custom Sort', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam),
             ];
         }
     }