@adaptabletools/adaptable 18.0.0-canary.9 → 18.0.0

package/src/Strategy/AdaptableModuleBase.js

@@ -71,13 +71,14 @@ export class AdaptableModuleBase {
             .getEntitlementService()
             .getEntitlementAccessLevelForModule(this.moduleInfo.ModuleName);
     }
-    addModuleMenuItem(source) {
+    createModuleMenuItem(source) {
         if (this.isModuleAvailable() && this.moduleInfo.Popup) {
             const moduleParams = {
                 source: source,
                 maxWidth: this.getPopupMaxWidth(),
             };
             return this.createMainMenuItemShowPopup({
+                Name: '_navbar',
                 Label: this.moduleInfo.FriendlyName,
                 ComponentName: this.moduleInfo.Popup,
                 Icon: this.moduleInfo.Glyph,
@@ -85,33 +86,29 @@ export class AdaptableModuleBase {
             });
         }
     }
-    addModuleButtonMenuItem() {
+    createColumnMenuItems(column) {
         // base class implementation which is empty
         return undefined;
     }
-    addColumnMenuItems(column) {
+    createContextMenuItems(menuContext) {
         // base class implementation which is empty
         return undefined;
     }
-    addContextMenuItems(menuContext) {
-        // base class implementation which is empty
-        return undefined;
-    }
-    // creates the menu items in the main dropdown
-    createMainMenuItemShowPopup({ Label, ComponentName, Icon, PopupParams, }) {
-        return new MenuItemShowPopup(Label, this.moduleInfo.ModuleName, ComponentName, Icon, true, PopupParams);
+    // creates the module menu items in the navbar
+    createMainMenuItemShowPopup({ Name, Label, ComponentName, Icon, PopupParams, }) {
+        return new 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 MenuItemDoClickFunction(Label, this.moduleInfo.ModuleName, ClickFunction, Icon, true);
+    createMenuItemClickFunction(Name, Label, Icon, ClickFunction) {
+        return new 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 MenuItemDoReduxAction(Label, this.moduleInfo.ModuleName, Action, Icon, true);
+    createMenuItemReduxAction(Name, Label, Icon, Action) {
+        return new 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 MenuItemShowPopup(Label, this.moduleInfo.ModuleName, ComponentName, Icon, true, PopupParams);
+    createMenuItemShowPopup(Name, Label, ComponentName, Icon, PopupParams) {
+        return new MenuItemShowPopup(Name, Label, this.moduleInfo.ModuleName, ComponentName, Icon, true, PopupParams);
     }
     getTeamSharingAction() {
         return undefined;

package/src/Strategy/AlertModule.d.ts

@@ -1,8 +1,9 @@
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { AlertDefinition } from '../PredefinedConfig/AlertState';
 import { AdaptableAlert } from '../PredefinedConfig/Common/AdaptableAlert';
-import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
+import { ContextMenuContext } from '../PredefinedConfig/Common/Menu';
 import { TeamSharingImportInfo } from '../PredefinedConfig/TeamSharingState';
+import { MenuItemShowPopup } from '../Utilities/MenuItem';
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { AdaptableModuleView, AdaptableObjectCompactView, AdaptableObjectView, IModule } from './Interface/IModule';
 import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
@@ -14,7 +15,7 @@ export declare class AlertModule extends AdaptableModuleBase implements IModule
     }): AdaptableObject[];
     getExplicitlyReferencedColumnIds(alertDefinition: AlertDefinition): string[];
     getReferencedNamedQueryNames(alertDefinition: AlertDefinition): string[];
-    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
+    createContextMenuItems(menuContext: ContextMenuContext): MenuItemShowPopup<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "grid-group" | "grid-info-show" | "layout-edit" | "settings-panel-open" | "system-status-show" | "menu-group" | "alert-clear" | "bulk-update-apply" | "column-filter-on-cell-value" | "comment-add" | "comment-remove" | "edit-group" | "export-group" | "export-visual-data" | "export-visual-data-excel" | "export-all-data-excel" | "export-all-data" | "export-all-data-csv" | "export-all-data-clipboard" | "export-all-data-json" | "export-all-data-table" | "export-current-data" | "export-current-data-excel" | "export-current-data-csv" | "export-current-data-clipboard" | "export-current-data-json" | "export-current-data-table" | "export-selected-cells" | "export-selected-cells-excel" | "export-selected-cells-csv" | "export-selected-cells-clipboard" | "export-selected-cells-json" | "export-selected-cells-table" | "export-selected-rows" | "export-selected-rows-excel" | "export-selected-rows-csv" | "export-selected-rows-clipboard" | "export-selected-rows-json" | "export-selected-rows-table" | "fdc3-broadcast" | "fdc3-raise-intent" | "flashing-cell-clear" | "flashing-row-clear" | "layout-aggregated-view" | "layout-auto-size" | "layout-clear-selection" | "layout-select-all" | "note-add" | "note-remove" | "smart-edit-apply">[];
     private handleCellDataChanged;
     private handleGridDataChanged;
     private handleReactiveAlertTriggered;

package/src/Strategy/AlertModule.js

@@ -57,8 +57,8 @@ export class AlertModule extends AdaptableModuleBase {
         if (queryExpression) {
             return this.api.expressionApi.getColumnsFromExpression(queryExpression);
         }
-        else if (this.api.scopeApi.scopeHasColumns(alertDefinition.Scope)) {
-            return this.api.scopeApi
+        else if (this.api.columnScopeApi.scopeHasColumns(alertDefinition.Scope)) {
+            return this.api.columnScopeApi
                 .getColumnsForScope(alertDefinition.Scope)
                 .map((adaptableColumn) => adaptableColumn.columnId);
         }
@@ -71,7 +71,7 @@ export class AlertModule extends AdaptableModuleBase {
         }
         return this.api.namedQueryApi.internalApi.getReferencedNamedQueryNames(queryExpression);
     }
-    addContextMenuItems(menuContext) {
+    createContextMenuItems(menuContext) {
         const items = [];
         if (!menuContext.isRowGroupColumn && this.isModuleAvailable()) {
             if (menuContext.adaptableColumn && menuContext.rowNode) {
@@ -83,7 +83,7 @@ export class AlertModule extends 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.createMenuItemReduxAction('alert-clear', 'Clear Alert', this.moduleInfo.Glyph, SystemRedux.SystemAlertDelete(relevantAlert)));
                 }
             }
         }

package/src/Strategy/BulkUpdateModule.d.ts

@@ -1,12 +1,13 @@
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { BulkUpdateValidationResult, IBulkUpdateModule } from './Interface/IBulkUpdateModule';
 import { PreviewInfo } from '../Utilities/Interface/Preview';
-import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
+import { MenuItemShowPopup } from '../Utilities/MenuItem';
+import { ContextMenuContext } from '../PredefinedConfig/Common/Menu';
 import { AccessLevel, AdaptableApi } from '../types';
 export declare class BulkUpdateModule extends AdaptableModuleBase implements IBulkUpdateModule {
     constructor(api: AdaptableApi);
     getViewAccessLevel(): AccessLevel;
-    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
+    createContextMenuItems(menuContext: ContextMenuContext): MenuItemShowPopup<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "grid-group" | "grid-info-show" | "layout-edit" | "settings-panel-open" | "system-status-show" | "menu-group" | "alert-clear" | "bulk-update-apply" | "column-filter-on-cell-value" | "comment-add" | "comment-remove" | "edit-group" | "export-group" | "export-visual-data" | "export-visual-data-excel" | "export-all-data-excel" | "export-all-data" | "export-all-data-csv" | "export-all-data-clipboard" | "export-all-data-json" | "export-all-data-table" | "export-current-data" | "export-current-data-excel" | "export-current-data-csv" | "export-current-data-clipboard" | "export-current-data-json" | "export-current-data-table" | "export-selected-cells" | "export-selected-cells-excel" | "export-selected-cells-csv" | "export-selected-cells-clipboard" | "export-selected-cells-json" | "export-selected-cells-table" | "export-selected-rows" | "export-selected-rows-excel" | "export-selected-rows-csv" | "export-selected-rows-clipboard" | "export-selected-rows-json" | "export-selected-rows-table" | "fdc3-broadcast" | "fdc3-raise-intent" | "flashing-cell-clear" | "flashing-row-clear" | "layout-aggregated-view" | "layout-auto-size" | "layout-clear-selection" | "layout-select-all" | "note-add" | "note-remove" | "smart-edit-apply">[];
     checkCorrectCellSelection(): BulkUpdateValidationResult;
     buildPreviewValues(bulkUpdateValue: any): PreviewInfo;
 }

package/src/Strategy/BulkUpdateModule.js

@@ -11,7 +11,7 @@ export class BulkUpdateModule extends AdaptableModuleBase {
     getViewAccessLevel() {
         return 'Full';
     }
-    addContextMenuItems(menuContext) {
+    createContextMenuItems(menuContext) {
         let menuItemShowPopup = undefined;
         if (!menuContext.isRowGroupColumn && this.isModuleEditable()) {
             if (menuContext.adaptableColumn &&
@@ -23,6 +23,7 @@ export class BulkUpdateModule extends AdaptableModuleBase {
                     source: 'ContextMenu',
                 };
                 menuItemShowPopup = this.createMainMenuItemShowPopup({
+                    Name: 'bulk-update-apply',
                     Label: 'Apply Bulk Update',
                     ComponentName: this.moduleInfo.Popup,
                     Icon: this.moduleInfo.Glyph,

package/src/Strategy/CalculatedColumnModule.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
-import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
+import { ContextMenuContext } from '../PredefinedConfig/Common/Menu';
 import * as CalculatedColumnRedux from '../Redux/ActionsReducers/CalculatedColumnRedux';
 import { TeamSharingImportInfo } from '../PredefinedConfig/TeamSharingState';
 import { CalculatedColumn } from '../PredefinedConfig/CalculatedColumnState';
@@ -16,9 +16,8 @@ export declare class CalculatedColumnModule extends AdaptableModuleBase implemen
     getExplicitlyReferencedColumnIds(calculatedColumn: CalculatedColumn): string[];
     getReferencedNamedQueryNames(calculatedColumn: CalculatedColumn): string[];
     private isCalculatedColumn;
-    addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
-    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
-    createEditCalculatedColumnMenuItem(column: AdaptableColumn): AdaptableMenuItem[];
+    createColumnMenuItems(column: AdaptableColumn): import("../Utilities/MenuItem").MenuItemShowPopup<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-bar-hide" | "column-filter-bar-show" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "custom-sort-add" | "custom-sort-edit" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "flashing-cell-add" | "flashing-cell-delete" | "format-column-add" | "format-column-edit" | "free-text-column-edit" | "grid-group" | "grid-info-show" | "layout-column-caption-change" | "layout-column-hide" | "layout-edit" | "layout-column-select" | "layout-column-select-preserve" | "layout-column-select-reset" | "layout-grid-select" | "plus-minus-add" | "settings-panel-open" | "styling-group" | "styled-column-badge-add" | "styled-column-badge-edit" | "styled-column-gradient-add" | "styled-column-gradient-edit" | "styled-column-percent-bar-add" | "styled-column-percent-bar-edit" | "styled-column-sparkline-add" | "styled-column-sparkline-edit" | "system-status-show" | "_navbar">[];
+    createContextMenuItems(menuContext: ContextMenuContext): import("../Utilities/MenuItem").MenuItemShowPopup<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "grid-group" | "grid-info-show" | "layout-edit" | "settings-panel-open" | "system-status-show" | "menu-group" | "alert-clear" | "bulk-update-apply" | "column-filter-on-cell-value" | "comment-add" | "comment-remove" | "edit-group" | "export-group" | "export-visual-data" | "export-visual-data-excel" | "export-all-data-excel" | "export-all-data" | "export-all-data-csv" | "export-all-data-clipboard" | "export-all-data-json" | "export-all-data-table" | "export-current-data" | "export-current-data-excel" | "export-current-data-csv" | "export-current-data-clipboard" | "export-current-data-json" | "export-current-data-table" | "export-selected-cells" | "export-selected-cells-excel" | "export-selected-cells-csv" | "export-selected-cells-clipboard" | "export-selected-cells-json" | "export-selected-cells-table" | "export-selected-rows" | "export-selected-rows-excel" | "export-selected-rows-csv" | "export-selected-rows-clipboard" | "export-selected-rows-json" | "export-selected-rows-table" | "fdc3-broadcast" | "fdc3-raise-intent" | "flashing-cell-clear" | "flashing-row-clear" | "layout-aggregated-view" | "layout-auto-size" | "layout-clear-selection" | "layout-select-all" | "note-add" | "note-remove" | "smart-edit-apply">[];
     getTeamSharingAction(): TeamSharingImportInfo<CalculatedColumn>;
     toView(calculateColumn: CalculatedColumn): {
         items: AdaptableObjectItemView[];

package/src/Strategy/CalculatedColumnModule.js

@@ -34,12 +34,19 @@ export class CalculatedColumnModule extends AdaptableModuleBase {
                 .getCalculatedColumns()
                 .find((cc) => cc.ColumnId == column.columnId)));
     }
-    addColumnMenuItems(column) {
+    createColumnMenuItems(column) {
         if (this.isModuleEditable() && this.isCalculatedColumn(column)) {
-            return this.createEditCalculatedColumnMenuItem(column);
+            const popupParam = {
+                column: column,
+                action: 'Edit',
+                source: 'ColumnMenu',
+            };
+            return [
+                this.createMenuItemShowPopup('calculated-column-edit', 'Edit Calculated Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam),
+            ];
         }
     }
-    addContextMenuItems(menuContext) {
+    createContextMenuItems(menuContext) {
         if (!this.isModuleAvailable()) {
             return;
         }
@@ -47,19 +54,16 @@ export class CalculatedColumnModule extends AdaptableModuleBase {
             this.isCalculatedColumn(menuContext.adaptableColumn) &&
             !menuContext.isRowGroupColumn &&
             menuContext.isSingleSelectedCell) {
-            return this.createEditCalculatedColumnMenuItem(menuContext.adaptableColumn);
+            const popupParam = {
+                column: menuContext.adaptableColumn,
+                action: 'Edit',
+                source: 'ContextMenu',
+            };
+            return [
+                this.createMenuItemShowPopup('calculated-column-edit', 'Edit Calculated Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam),
+            ];
         }
     }
-    createEditCalculatedColumnMenuItem(column) {
-        let popupParam = {
-            column: column,
-            action: 'Edit',
-            source: 'ColumnMenu',
-        };
-        return [
-            this.createColumnMenuItemShowPopup('Edit Calculated Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam),
-        ];
-    }
     getTeamSharingAction() {
         return {
             ModuleEntities: this.api.calculatedColumnApi.getCalculatedColumns(),

package/src/Strategy/CellSummaryModule.d.ts

@@ -1,20 +1,20 @@
 /// <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 { 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);
     getViewAccessLevel(): AccessLevel;
-    addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
-    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
-    private createCellSummaryMenuItem;
+    createColumnMenuItems(column: AdaptableColumn): import("../Utilities/MenuItem").MenuItemShowPopup<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-bar-hide" | "column-filter-bar-show" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "custom-sort-add" | "custom-sort-edit" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "flashing-cell-add" | "flashing-cell-delete" | "format-column-add" | "format-column-edit" | "free-text-column-edit" | "grid-group" | "grid-info-show" | "layout-column-caption-change" | "layout-column-hide" | "layout-edit" | "layout-column-select" | "layout-column-select-preserve" | "layout-column-select-reset" | "layout-grid-select" | "plus-minus-add" | "settings-panel-open" | "styling-group" | "styled-column-badge-add" | "styled-column-badge-edit" | "styled-column-gradient-add" | "styled-column-gradient-edit" | "styled-column-percent-bar-add" | "styled-column-percent-bar-edit" | "styled-column-sparkline-add" | "styled-column-sparkline-edit" | "system-status-show" | "_navbar">[];
+    createContextMenuItems(menuContext: ContextMenuContext): import("../Utilities/MenuItem").MenuItemShowPopup<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "grid-group" | "grid-info-show" | "layout-edit" | "settings-panel-open" | "system-status-show" | "menu-group" | "alert-clear" | "bulk-update-apply" | "column-filter-on-cell-value" | "comment-add" | "comment-remove" | "edit-group" | "export-group" | "export-visual-data" | "export-visual-data-excel" | "export-all-data-excel" | "export-all-data" | "export-all-data-csv" | "export-all-data-clipboard" | "export-all-data-json" | "export-all-data-table" | "export-current-data" | "export-current-data-excel" | "export-current-data-csv" | "export-current-data-clipboard" | "export-current-data-json" | "export-current-data-table" | "export-selected-cells" | "export-selected-cells-excel" | "export-selected-cells-csv" | "export-selected-cells-clipboard" | "export-selected-cells-json" | "export-selected-cells-table" | "export-selected-rows" | "export-selected-rows-excel" | "export-selected-rows-csv" | "export-selected-rows-clipboard" | "export-selected-rows-json" | "export-selected-rows-table" | "fdc3-broadcast" | "fdc3-raise-intent" | "flashing-cell-clear" | "flashing-row-clear" | "layout-aggregated-view" | "layout-auto-size" | "layout-clear-selection" | "layout-select-all" | "note-add" | "note-remove" | "smart-edit-apply">[];
     createCellSummary(selectedCellInfo: SelectedCellInfo): CellSummmary;
+    private getWeightedAverageCellSummary;
     getViewProperties(): {
         getStatusBarPanelProps(): {
             view: () => JSX.Element;

package/src/Strategy/CellSummaryModule.js

@@ -1,8 +1,10 @@
-import { AdaptableModuleBase } from './AdaptableModuleBase';
 import * as ModuleConstants from '../Utilities/Constants/ModuleConstants';
 import { ArrayExtensions } from '../Utilities/Extensions/ArrayExtensions';
 import { Helper } from '../Utilities/Helpers/Helper';
+import ObjectFactory from '../Utilities/ObjectFactory';
+import { AggregatedScalarLiveValue } from '../Utilities/Services/AggregatedScalarLiveValue';
 import { CellSummaryStatusPanel } from '../View/CellSummary/CellSummaryStatusPanel';
+import { AdaptableModuleBase } from './AdaptableModuleBase';
 export class CellSummaryModule extends AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.CellSummaryModuleId, ModuleConstants.CellSummaryFriendlyName, 'cells', 'CellSummaryPopup', 'See summary information on a group of cells using multiple summary operations', api);
@@ -11,138 +13,125 @@ export class CellSummaryModule extends AdaptableModuleBase {
     getViewAccessLevel() {
         return 'Full';
     }
-    addColumnMenuItems(column) {
+    createColumnMenuItems(column) {
         if (!this.isModuleAvailable()) {
             return;
         }
         return [
-            this.createCellSummaryMenuItem({
-                source: 'ColumnMenu',
-                column,
+            this.createMainMenuItemShowPopup({
+                Name: 'cell-summary-show',
+                Label: 'See Cell Summary',
+                ComponentName: this.moduleInfo.Popup,
+                Icon: this.moduleInfo.Glyph,
+                PopupParams: {
+                    source: 'ColumnMenu',
+                    column,
+                },
             }),
         ];
     }
-    addContextMenuItems(menuContext) {
+    createContextMenuItems(menuContext) {
         if (!this.isModuleAvailable()) {
             return;
         }
         if (menuContext.adaptableColumn && menuContext.isSelectedCell) {
             return [
-                this.createCellSummaryMenuItem({
-                    source: 'ContextMenu',
+                this.createMainMenuItemShowPopup({
+                    Name: 'cell-summary-show',
+                    Label: 'See Cell Summary',
+                    ComponentName: this.moduleInfo.Popup,
+                    Icon: this.moduleInfo.Glyph,
+                    PopupParams: {
+                        source: 'ContextMenu',
+                    },
                 }),
             ];
         }
     }
-    createCellSummaryMenuItem(popUpParams) {
-        return this.createMainMenuItemShowPopup({
-            Label: 'See Cell Summary',
-            ComponentName: this.moduleInfo.Popup,
-            Icon: this.moduleInfo.Glyph,
-            PopupParams: popUpParams,
-        });
-    }
     createCellSummary(selectedCellInfo) {
         if (this.cachedCellSummary.has(selectedCellInfo)) {
             return this.cachedCellSummary.get(selectedCellInfo);
         }
-        let selectedCellSummary;
-        if (selectedCellInfo && ArrayExtensions.IsNotNullOrEmpty(selectedCellInfo.columns)) {
-            let numericValues = [];
-            let allValues = [];
-            let numericColumns = [];
-            selectedCellInfo.columns.map((c) => {
-                if (c && c.dataType == 'Number') {
-                    numericColumns.push(c.columnId);
-                }
-            });
-            selectedCellInfo.gridCells.forEach((selectedCell) => {
-                let value = selectedCell.rawValue;
-                allValues.push(value);
-                if (!selectedCell.column) {
-                    // GridCell.column may be undefined for cells from synthetic columns created by AG Grid (ex. autoGroup columns)
-                    return;
-                }
-                if (ArrayExtensions.ContainsItem(numericColumns, selectedCell.column.columnId)) {
-                    let valueAsNumber = Number(value);
-                    // possible that its not a number despite it being a numeric column
-                    if (!isNaN(Number(valueAsNumber))) {
-                        numericValues.push(valueAsNumber);
+        let selectedCellSummary = ObjectFactory.CreateEmptyCellSummmary();
+        if (selectedCellInfo && ArrayExtensions.GetLength(selectedCellInfo.columns) === 1) {
+            const selectedColumn = selectedCellInfo.columns[0];
+            if (selectedColumn) {
+                const isNumericColumn = selectedColumn.dataType === 'Number';
+                const isDateColumn = selectedColumn.dataType === 'Date';
+                const rowNodes = selectedCellInfo.gridCells.map((gc) => gc.rowNode);
+                const handleExpression = (functionName) => {
+                    const aggScalarValue = new AggregatedScalarLiveValue({
+                        aggregatedScalarExpression: `${functionName}([${selectedColumn.columnId}])`,
+                    }, ModuleConstants.CellSummaryModuleId, this.api, () => rowNodes);
+                    let value = aggScalarValue.getGlobalAggregatedValue();
+                    if (typeof value === 'number' && !isNaN(value)) {
+                        value = Helper.roundNumber(value, 2);
                     }
-                }
-            });
-            // copying so that we keep the order - needed for others
-            const newNumericValues = [...numericValues];
-            let hasNumericColumns = numericValues.length > 0;
-            if (selectedCellInfo.columns.length > 1) {
-                return {
-                    Sum: null,
-                    Average: null,
-                    Median: null,
-                    Mode: null,
-                    Distinct: null,
-                    Max: null,
-                    Min: null,
-                    Count: null,
-                    Std_Deviation: null,
-                    Only: '',
+                    return value;
                 };
-            }
-            const handleExpression = (functionName) => {
-                const columnId = selectedCellInfo.columns[0].columnId;
-                const rowNodes = selectedCellInfo.gridCells.map((gc) => gc.rowNode);
-                return this.api.internalApi.getAdaptableInstance().SummaryService.evaluateExpressionValue({
-                    expression: {
-                        function: functionName,
-                    },
-                    columnId: columnId,
-                    getRowNodes: () => rowNodes,
-                }, ModuleConstants.CellSummaryModuleId);
-            };
-            const sumValue = hasNumericColumns ? handleExpression('SUM') : null;
-            const avgValue = hasNumericColumns ? Helper.roundNumber(handleExpression('AVG'), 2) : null;
-            const modeValue = hasNumericColumns ? handleExpression('MODE') : null;
-            const medianValue = hasNumericColumns ? handleExpression('MEDIAN') : null;
-            const distinctValue = handleExpression('DISTINCT');
-            const maxValue = hasNumericColumns ? handleExpression('MAX') : null;
-            const minValue = hasNumericColumns ? handleExpression('MIN') : null;
-            const stdDeviation = hasNumericColumns
-                ? Helper.roundNumberTo4dp(handleExpression('STD_DEVIATION'))
-                : null;
-            selectedCellSummary = {
-                Sum: sumValue,
-                Average: avgValue,
-                Median: medianValue,
-                Mode: modeValue,
-                Distinct: distinctValue,
-                Max: maxValue,
-                Min: minValue,
-                Count: allValues.length,
-                Std_Deviation: stdDeviation,
-                Only: distinctValue == 1 ? JSON.stringify(allValues[0]) : '',
-            };
-            numericValues = [...newNumericValues];
-            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 = {
-                        selectedCellInfo,
-                        distinctCount: distinctValue,
-                        allValues,
-                        numericValues,
-                        numericColumns,
-                        adaptableApi: this.api,
-                        userName: this.api.optionsApi.getUserName(),
-                        adaptableId: this.api.optionsApi.getAdaptableId(),
-                    };
-                    selectedCellSummary[operation.operationName] = operation.operationFunction(cellSummaryOperationContext);
+                const sumValue = isNumericColumn ? handleExpression('SUM') : null;
+                const avgValue = isNumericColumn ? Helper.roundNumber(handleExpression('AVG'), 2) : null;
+                const modeValue = isNumericColumn ? handleExpression('MODE') : null;
+                const medianValue = isNumericColumn ? handleExpression('MEDIAN') : null;
+                const distinctValue = handleExpression('DISTINCT');
+                const maxValue = isNumericColumn ? handleExpression('MAX') : null;
+                const minValue = isNumericColumn ? handleExpression('MIN') : null;
+                const oldestValue = isDateColumn ? handleExpression('OLDEST') : null;
+                const newestValue = isDateColumn ? handleExpression('NEWEST') : null;
+                const stdDeviation = isNumericColumn
+                    ? Helper.roundNumberTo4dp(handleExpression('STD_DEVIATION'))
+                    : null;
+                selectedCellSummary = {
+                    Sum: sumValue,
+                    Average: avgValue,
+                    Median: medianValue,
+                    Mode: modeValue,
+                    Distinct: distinctValue,
+                    Max: maxValue,
+                    Min: minValue,
+                    Count: selectedCellInfo.gridCells.length,
+                    Oldest: oldestValue,
+                    Newest: newestValue,
+                    Std_Deviation: stdDeviation,
+                    Only: distinctValue == 1 ? JSON.stringify(selectedCellInfo.gridCells[0].rawValue) : '',
+                };
+                const weightedAverage = this.getWeightedAverageCellSummary(selectedColumn.columnId, rowNodes);
+                if (weightedAverage !== null) {
+                    selectedCellSummary.Weighted_Average = weightedAverage;
                 }
-            });
+                const operationDefinitions = this.api.cellSummaryApi.getCellSummaryOperationDefinitions();
+                operationDefinitions === null || operationDefinitions === void 0 ? void 0 : operationDefinitions.forEach((operation) => {
+                    if (operation.operationFunction) {
+                        const cellSummaryOperationContext = Object.assign({ selectedCellInfo,
+                            selectedColumn }, this.api.internalApi.buildBaseContext());
+                        selectedCellSummary[operation.operationName] = operation.operationFunction(cellSummaryOperationContext);
+                    }
+                });
+                this.cachedCellSummary.set(selectedCellInfo, selectedCellSummary);
+            }
         }
-        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({
+            aggregatedScalarExpression: expression,
+        }, ModuleConstants.CellSummaryModuleId, this.api, () => rowNodes);
+        let value = aggScalarValue.getGlobalAggregatedValue();
+        if (typeof value === 'number' && !isNaN(value)) {
+            value = Helper.roundNumber(value, 2);
+        }
+        return value;
+    }
     getViewProperties() {
         return {
             getStatusBarPanelProps() {

package/src/Strategy/ColumnFilterModule.d.ts

@@ -1,6 +1,6 @@
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
-import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
+import { AdaptableContextMenuItemName, AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
 import { TeamSharingImportInfo } from '../PredefinedConfig/TeamSharingState';
 import { AdaptableModuleView, AdaptableObjectCompactView, AdaptableObjectView, IModule } from './Interface/IModule';
 import { AdaptableApi } from '../Api/AdaptableApi';
@@ -13,8 +13,8 @@ export declare class ColumnFilterModule extends AdaptableModuleBase implements I
     getExplicitlyReferencedColumnIds(columnFilter: ColumnFilter): string[];
     hasNamedQueryReferences(): boolean;
     onAdaptableReady(): void;
-    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
-    addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
+    createColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-bar-hide" | "column-filter-bar-show" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "custom-sort-add" | "custom-sort-edit" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "flashing-cell-add" | "flashing-cell-delete" | "format-column-add" | "format-column-edit" | "free-text-column-edit" | "grid-group" | "grid-info-show" | "layout-column-caption-change" | "layout-column-hide" | "layout-edit" | "layout-column-select" | "layout-column-select-preserve" | "layout-column-select-reset" | "layout-grid-select" | "plus-minus-add" | "settings-panel-open" | "styling-group" | "styled-column-badge-add" | "styled-column-badge-edit" | "styled-column-gradient-add" | "styled-column-gradient-edit" | "styled-column-percent-bar-add" | "styled-column-percent-bar-edit" | "styled-column-sparkline-add" | "styled-column-sparkline-edit" | "system-status-show" | "_navbar">[];
+    createContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem<AdaptableContextMenuItemName>[] | undefined;
     private getExistingColumnFilter;
     getTeamSharingAction(): TeamSharingImportInfo<ColumnFilter>;
     toViewCompact(filter: ColumnFilter): AdaptableObjectCompactView;