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

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),
             ];
         }
     }

package/src/Strategy/DashboardModule.js

@@ -31,28 +31,29 @@ class DashboardModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (this.isModuleAvailable()) {
             let menuItems = [];
             if (this.isModuleEditable()) {
-                menuItems.push(this.createColumnMenuItemClickFunction('Configure', 'settings', () => this.api.dashboardApi.openDashboardSettingsPanel()));
+                menuItems.push(this.createColumnMenuItemClickFunction('dashboard-configure', 'Configure', 'settings', () => this.api.dashboardApi.openDashboardSettingsPanel()));
             }
             if (this.api.dashboardApi.getDashboardState().IsCollapsed) {
-                menuItems.push(this.createColumnMenuItemReduxAction('Expand', 'expand', DashboardRedux.DashboardSetIsCollapsed(false)));
+                menuItems.push(this.createColumnMenuItemReduxAction('dashboard-expand', 'Expand', 'expand', DashboardRedux.DashboardSetIsCollapsed(false)));
             }
             else {
-                menuItems.push(this.createColumnMenuItemReduxAction('Collapse', 'collapse', DashboardRedux.DashboardSetIsCollapsed(true)));
+                menuItems.push(this.createColumnMenuItemReduxAction('dashboard-collapse', 'Collapse', 'collapse', DashboardRedux.DashboardSetIsCollapsed(true)));
             }
             if (this.api.dashboardApi.getDashboardState().IsFloating) {
-                menuItems.push(this.createColumnMenuItemReduxAction('Dock', 'dock', DashboardRedux.DashboardSetIsFloating(false)));
+                menuItems.push(this.createColumnMenuItemReduxAction('dashboard-dock', 'Dock', 'dock', DashboardRedux.DashboardSetIsFloating(false)));
             }
             else if (this.api.optionsApi.getDashboardOptions().canFloat) {
-                menuItems.push(this.createColumnMenuItemReduxAction('Float', 'dock', DashboardRedux.DashboardSetIsFloating(true)));
+                menuItems.push(this.createColumnMenuItemReduxAction('dashboard-float', 'Float', 'dock', DashboardRedux.DashboardSetIsFloating(true)));
             }
             if (this.api.dashboardApi.getDashboardState().IsHidden) {
-                menuItems.push(this.createColumnMenuItemReduxAction('Show', 'visibility-on-bold', DashboardRedux.DashboardSetIsHidden(false)));
+                menuItems.push(this.createColumnMenuItemReduxAction('dashboard-show', 'Show', 'visibility-on-bold', DashboardRedux.DashboardSetIsHidden(false)));
             }
             else {
-                menuItems.push(this.createColumnMenuItemReduxAction('Hide', 'visibility-off-bold', DashboardRedux.DashboardSetIsHidden(true)));
+                menuItems.push(this.createColumnMenuItemReduxAction('dashboard-hide', 'Hide', 'visibility-off-bold', DashboardRedux.DashboardSetIsHidden(true)));
             }
             return [
                 {
+                    name: 'dashboard',
                     label: this.moduleInfo.FriendlyName,
                     isVisible: true,
                     module: this.moduleInfo.ModuleName,

package/src/Strategy/DataImportModule.d.ts

@@ -7,5 +7,5 @@ export declare class DataImportModule extends AdaptableModuleBase implements IMo
     addModuleMenuItem(source: 'ModuleMenu' | 'ModuleButton'): AdaptableMenuItem | undefined;
     addContextMenuItems(): AdaptableMenuItem[] | undefined;
     addColumnMenuItems(): AdaptableMenuItem[] | undefined;
-    private getOpenPopupMenuItem;
+    private createDataImportMenuItem;
 }

package/src/Strategy/DataImportModule.js

@@ -10,27 +10,27 @@ class DataImportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     addModuleMenuItem(source) {
         if (this.isModuleAvailable()) {
-            return this.getOpenPopupMenuItem(source);
+            return this.createDataImportMenuItem(source);
         }
     }
     addContextMenuItems() {
         if (this.isModuleAvailable()) {
-            return [this.getOpenPopupMenuItem('ContextMenu')];
+            return [this.createDataImportMenuItem('ContextMenu')];
         }
         return undefined;
     }
     addColumnMenuItems() {
         if (this.isModuleAvailable()) {
-            return [this.getOpenPopupMenuItem('ColumnMenu')];
+            return [this.createDataImportMenuItem('ColumnMenu')];
         }
     }
-    getOpenPopupMenuItem(source) {
+    createDataImportMenuItem(source) {
         const moduleParams = {
             action: 'New',
             source: source,
             maxWidth: this.getPopupMaxWidth(),
         };
-        return this.createColumnMenuItemShowPopup('Import Data', this.moduleInfo.Popup, this.moduleInfo.Glyph, moduleParams);
+        return this.createColumnMenuItemShowPopup('data-import', 'Import Data', this.moduleInfo.Popup, this.moduleInfo.Glyph, moduleParams);
     }
 }
 exports.DataImportModule = DataImportModule;

package/src/Strategy/ExportModule.d.ts

@@ -15,6 +15,7 @@ export declare class ExportModule extends AdaptableModuleBase implements IExport
     addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     private buildReportMenuItems;
     private buildExportMenuItem;
+    private getMenuName;
     export(report: Report, exportDestination: ExportDestination | string): Promise<void>;
     private preProcessExport;
     private isCustomDestination;

package/src/Strategy/ExportModule.js

@@ -90,15 +90,16 @@ class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     buildReportMenuItems(report) {
         const menuItems = [];
         for (const destination of this.api.exportApi.getAvailableExportDestinations()) {
-            menuItems.push(this.createColumnMenuItemClickFunction(destination, this.moduleInfo.Glyph, () => this.export(report, destination)));
+            menuItems.push(this.createColumnMenuItemClickFunction(this.getMenuName(destination), destination, this.moduleInfo.Glyph, () => this.export(report, destination)));
         }
         for (const customDestination of this.api.exportApi.getCustomDestinations()) {
-            menuItems.push(this.createColumnMenuItemClickFunction(customDestination.name, this.moduleInfo.Glyph, () => this.export(report, customDestination.name)));
+            menuItems.push(this.createColumnMenuItemClickFunction('export-custom-destination', customDestination.name, this.moduleInfo.Glyph, () => this.export(report, customDestination.name)));
         }
         return menuItems;
     }
     buildExportMenuItem(label, subItems) {
         return {
+            name: 'export',
             label: label,
             module: this.moduleInfo.ModuleName,
             isVisible: true,
@@ -106,6 +107,20 @@ class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             subItems: subItems,
         };
     }
+    getMenuName(exportDestination) {
+        switch (exportDestination) {
+            case Enums_1.ExportDestination.CSV:
+                return 'export-csv';
+            case Enums_1.ExportDestination.Clipboard:
+                return 'export-clipboard';
+            case Enums_1.ExportDestination.Excel:
+                return 'export-excel';
+            case Enums_1.ExportDestination.JSON:
+                return 'export-json';
+            case Enums_1.ExportDestination.Table:
+                return 'export-table';
+        }
+    }
     async export(report, exportDestination) {
         var _a;
         const cleanupExportProcess = () => {

package/src/Strategy/Fdc3Module.js

@@ -31,6 +31,7 @@ class Fdc3Module extends AdaptableModuleBase_1.AdaptableModuleBase {
             contextMenuItems.sort((a, b) => a.label.localeCompare(b.label));
             if (contextMenuItems.length > 1) {
                 const groupMenuItem = {
+                    name: 'fdc3',
                     module: this.moduleInfo.ModuleName,
                     label: 'FDC3',
                     icon: {
@@ -48,6 +49,7 @@ class Fdc3Module extends AdaptableModuleBase_1.AdaptableModuleBase {
         var _a, _b, _c;
         const { intentType, contextType } = intentConfig;
         const menuItem = {
+            name: 'fdc3-raise-intent',
             label: `Raise ${intentType}`,
             onClick: () => {
                 this.getFdc3Api().raiseIntentFromRow(rowNode, intentType, contextType);
@@ -67,6 +69,7 @@ class Fdc3Module extends AdaptableModuleBase_1.AdaptableModuleBase {
         var _a, _b, _c;
         const { contextType } = contextConfig;
         const menuItem = {
+            name: 'fdc3-broadcast',
             label: `Broadcast ${this.getFdc3Api().getContextLabel(contextType)}`,
             onClick: () => {
                 this.getFdc3Api().broadcastFromRow(rowNode, contextType);

package/src/Strategy/FlashingCellModule.js

@@ -73,11 +73,11 @@ class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 });
                 if (flashingCellForCurrentColumn) {
                     return [
-                        this.createColumnMenuItemReduxAction('Remove Flashing Cell', this.moduleInfo.Glyph, FlashingCellRedux.FlashingCellDefinitionDelete(flashingCellForCurrentColumn)),
+                        this.createColumnMenuItemReduxAction('flashing-cell-delete', 'Delete Flashing Cell', this.moduleInfo.Glyph, FlashingCellRedux.FlashingCellDefinitionDelete(flashingCellForCurrentColumn)),
                     ];
                 }
                 return [
-                    this.createColumnMenuItemReduxAction('Add Flashing Cell', this.moduleInfo.Glyph, FlashingCellRedux.FlashingCellDefinitionAdd({
+                    this.createColumnMenuItemReduxAction('flashing-cell-add', 'Add Flashing Cell', this.moduleInfo.Glyph, FlashingCellRedux.FlashingCellDefinitionAdd({
                         Scope: {
                             ColumnIds: [column.columnId],
                         },
@@ -99,11 +99,11 @@ class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     if (flashingCellForRow.flashTarget === 'row' ||
                         (Array.isArray(flashingCellForRow === null || flashingCellForRow === void 0 ? void 0 : flashingCellForRow.flashTarget) &&
                             flashingCellForRow.flashTarget.includes('row'))) {
-                        items.push(this.createColumnMenuItemReduxAction('Clear Flashing Row', this.moduleInfo.Glyph, SystemRedux.SystemFlashingCellDelete(flashingCellForRow)));
+                        items.push(this.createColumnMenuItemReduxAction('flashing-row-clear', 'Clear Flashing Row', this.moduleInfo.Glyph, SystemRedux.SystemFlashingCellDelete(flashingCellForRow)));
                     }
                 }
                 else if (flashingCellForCell && flashingCellForCell.flashTarget === 'cell') {
-                    items.push(this.createColumnMenuItemReduxAction('Clear Flashing Cell', this.moduleInfo.Glyph, SystemRedux.SystemFlashingCellDelete(flashingCellForCell)));
+                    items.push(this.createColumnMenuItemReduxAction('flashing-cell-clear', 'Clear Flashing Cell', this.moduleInfo.Glyph, SystemRedux.SystemFlashingCellDelete(flashingCellForCell)));
                 }
             }
         }

package/src/Strategy/FormatColumnModule.js

@@ -49,12 +49,12 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 action: 'New',
                 source: 'ColumnMenu',
             };
-            const createFormatColumnMenuItem = this.createColumnMenuItemShowPopup('Create', this.moduleInfo.Popup, 'plus', createPopupParam);
+            const createFormatColumnMenuItem = this.createColumnMenuItemShowPopup('format-column-add', 'Create', this.moduleInfo.Popup, 'plus', createPopupParam);
             const formatColumnsForColumn = this.api.formatColumnApi.getFormatColumnsForColumnId(column.columnId);
             //  .filter((fc) => this.api.scopeApi.isSingleColumnScope(fc.Scope));
             // if no formats then just show Create
             if (ArrayExtensions_1.default.IsNullOrEmpty(formatColumnsForColumn)) {
-                returnColumnMenuItems.push(this.createColumnMenuItemShowPopup('Create Format Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, createPopupParam));
+                returnColumnMenuItems.push(this.createColumnMenuItemShowPopup('format-column-add', 'Create Format Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, createPopupParam));
                 // if 1 format then show a Create and an Edit
             }
             else if (formatColumnsForColumn.length == 1) {
@@ -64,8 +64,9 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     value: formatColumnsForColumn[0],
                     source: 'ColumnMenu',
                 };
-                const editFormatColumnMenuItem = this.createColumnMenuItemShowPopup('Edit', this.moduleInfo.Popup, 'edit', editPopupParam);
+                const editFormatColumnMenuItem = this.createColumnMenuItemShowPopup('format-column-edit', 'Edit', this.moduleInfo.Popup, 'edit', editPopupParam);
                 returnColumnMenuItems.push({
+                    name: 'format-column',
                     label: 'Format Column',
                     module: this.moduleInfo.ModuleName,
                     isVisible: true,
@@ -80,8 +81,9 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 const moduleInfo = this.api.internalApi
                     .getModuleService()
                     .getModuleInfoByModule('FormatColumn');
-                const editFormatColumnMenuItem = this.createColumnMenuItemReduxAction('Show Current', this.moduleInfo.Glyph, PopupRedux.PopupShowScreen('FormatColumn', moduleInfo.Popup));
+                const editFormatColumnMenuItem = this.createColumnMenuItemReduxAction('format-column-edit', 'Show Current', this.moduleInfo.Glyph, PopupRedux.PopupShowScreen('FormatColumn', moduleInfo.Popup));
                 returnColumnMenuItems.push({
+                    name: 'format-column',
                     label: 'Format Column',
                     module: this.moduleInfo.ModuleName,
                     isVisible: true,

package/src/Strategy/FreeTextColumnModule.js

@@ -32,7 +32,7 @@ class FreeTextColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     source: 'ColumnMenu',
                 };
                 return [
-                    this.createColumnMenuItemShowPopup('Edit Free Text Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam),
+                    this.createColumnMenuItemShowPopup('free-text-column-edit', 'Edit Free Text Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam),
                 ];
             }
         }

package/src/Strategy/GridInfoModule.js

@@ -15,6 +15,7 @@ class GridInfoModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (this.isModuleAvailable()) {
             return [
                 this.createMainMenuItemShowPopup({
+                    Name: 'grid-info',
                     Label: 'Grid Info',
                     ComponentName: this.moduleInfo.Popup,
                     Icon: this.moduleInfo.Glyph,
@@ -26,6 +27,7 @@ class GridInfoModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (this.isModuleAvailable()) {
             return [
                 this.createMainMenuItemShowPopup({
+                    Name: 'grid-info',
                     Label: 'Grid Info',
                     ComponentName: this.moduleInfo.Popup,
                     Icon: this.moduleInfo.Glyph,

package/src/Strategy/LayoutModule.js

@@ -19,6 +19,7 @@ const windowFactory_1 = require("../View/Components/Popups/WindowPopups/windowFa
 const flattenDeep_1 = tslib_1.__importDefault(require("lodash/flattenDeep"));
 const StringExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/StringExtensions"));
 const getGridFilterPreview_1 = require("../View/Layout/Wizard/getGridFilterPreview");
+const AggregatedScalarLiveValue_1 = require("../Utilities/Services/AggregatedScalarLiveValue");
 const SystemRedux_1 = require("../Redux/ActionsReducers/SystemRedux");
 const RowSummary_1 = require("../PredefinedConfig/Common/RowSummary");
 const Helper_1 = tslib_1.__importDefault(require("../Utilities/Helpers/Helper"));
@@ -148,7 +149,7 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (this.isModuleEditable()) {
             const isReadOnlyLayout = this.api.layoutApi.isCurrentLayoutReadOnly();
             if (!isReadOnlyLayout) {
-                returnColumnMenuItems.push(this.createColumnMenuItemShowPopup('Edit Layout', this.moduleInfo.Popup, this.moduleInfo.Glyph, {
+                returnColumnMenuItems.push(this.createColumnMenuItemShowPopup('layout-edit', 'Edit Layout', this.moduleInfo.Popup, this.moduleInfo.Glyph, {
                     action: 'Edit',
                     source: 'ColumnMenu',
                     value: this.api.layoutApi.getCurrentLayout(),
@@ -156,10 +157,10 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             }
             if (column) {
                 if (!isReadOnlyLayout) {
-                    returnColumnMenuItems.push(this.createColumnMenuItemClickFunction('Change Caption', 'edit', () => this.api.layoutApi.showChangeColumnCaption(column)));
+                    returnColumnMenuItems.push(this.createColumnMenuItemClickFunction('layout-column-caption-change', 'Change Caption', 'edit', () => this.api.layoutApi.showChangeColumnCaption(column)));
                 }
                 if (column.hideable) {
-                    returnColumnMenuItems.push(this.createColumnMenuItemClickFunction('Hide Column', 'visibility-off-bold', () => {
+                    returnColumnMenuItems.push(this.createColumnMenuItemClickFunction('layout-column-hide', 'Hide Column', 'visibility-off-bold', () => {
                         this.api.columnApi.hideColumn(column.columnId);
                     }));
                 }
@@ -168,23 +169,24 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             if (column) {
                 const hasExistingSelection = (_b = (_a = this.api.gridApi.getSelectedCellInfo()) === null || _a === void 0 ? void 0 : _a.gridCells) === null || _b === void 0 ? void 0 : _b.length;
                 if (hasExistingSelection) {
-                    selectMenuItems.push(this.createColumnMenuItemClickFunction('Column (Preserve Selection)', 'column-add', () => {
+                    selectMenuItems.push(this.createColumnMenuItemClickFunction('layout-column-select-preserve', 'Column (Preserve Selection)', 'column-add', () => {
                         this.api.columnApi.addColumnToSelection(column.columnId);
                     }));
-                    selectMenuItems.push(this.createColumnMenuItemClickFunction('Column (Reset Selection)', 'columns', () => {
+                    selectMenuItems.push(this.createColumnMenuItemClickFunction('layout-column-select-reset', 'Column (Reset Selection)', 'columns', () => {
                         this.api.columnApi.selectColumn(column.columnId);
                     }));
                 }
                 else {
-                    selectMenuItems.push(this.createColumnMenuItemClickFunction('Column', 'columns', () => {
+                    selectMenuItems.push(this.createColumnMenuItemClickFunction('layout-column-select', 'Column', 'columns', () => {
                         this.api.columnApi.selectColumn(column.columnId);
                     }));
                 }
             }
-            selectMenuItems.push(this.createColumnMenuItemClickFunction('Whole Grid', this.moduleInfo.Glyph, () => {
+            selectMenuItems.push(this.createColumnMenuItemClickFunction('layout-select-all', 'Whole Grid', this.moduleInfo.Glyph, () => {
                 this.api.gridApi.selectAll();
             }));
             returnColumnMenuItems.push({
+                name: 'layout-select',
                 label: 'Select',
                 isVisible: true,
                 module: this.moduleInfo.ModuleName,
@@ -199,7 +201,7 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     addContextMenuItems(menuContext) {
         let returnColumnMenuItems = [];
         if (this.isModuleEditable() && !this.api.layoutApi.isCurrentLayoutReadOnly()) {
-            returnColumnMenuItems.push(this.createColumnMenuItemShowPopup('Edit Layout', this.moduleInfo.Popup, this.moduleInfo.Glyph, {
+            returnColumnMenuItems.push(this.createColumnMenuItemShowPopup('layout-edit', 'Edit Layout', this.moduleInfo.Popup, this.moduleInfo.Glyph, {
                 action: 'Edit',
                 source: 'ColumnMenu',
             }));
@@ -211,18 +213,19 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             let clickFunction = () => {
                 this.api.gridApi.deselectAll();
             };
-            returnColumnMenuItems.push(this.createColumnMenuItemClickFunction('Clear Selected Cells', 'undo', clickFunction));
+            returnColumnMenuItems.push(this.createColumnMenuItemClickFunction('layout-clear-selection', 'Clear Selected Cells', 'undo', clickFunction));
             if (this.isModuleAvailable()) {
                 let gridMenuItems = [];
                 let autoSizeFunction = () => {
                     this.api.columnApi.autosizeAllColumns();
                 };
-                gridMenuItems.push(this.createColumnMenuItemClickFunction('Auto Size', 'arrow-expand', autoSizeFunction));
+                gridMenuItems.push(this.createColumnMenuItemClickFunction('layout-auto-size', 'Auto Size', 'arrow-expand', autoSizeFunction));
                 let clickFunction = () => {
                     this.api.gridApi.selectAll();
                 };
-                gridMenuItems.push(this.createColumnMenuItemClickFunction('Select', 'tab-unselected', clickFunction));
+                gridMenuItems.push(this.createColumnMenuItemClickFunction('layout-select-all', 'Select', 'tab-unselected', clickFunction));
                 returnColumnMenuItems.push({
+                    name: 'layout-grid',
                     label: 'Grid',
                     module: this.moduleInfo.ModuleName,
                     isVisible: true,
@@ -294,6 +297,7 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             pivotColumnId,
         };
         return {
+            name: 'layout-aggregated-view',
             module: this.moduleInfo.ModuleName,
             isVisible: true,
             label: 'Expand Aggregated Value',
@@ -468,6 +472,7 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
      */
     evaluateRowSummary(reason) {
         var _a;
+        const currentLayout = this.api.layoutApi.getCurrentLayout();
         const rowSummaries = (_a = this.api.layoutApi.getCurrentLayout().RowSummaries) !== null && _a !== void 0 ? _a : [];
         const rowSummariesResults = rowSummaries.map(({ ColumnsMap, Position }) => {
             return {
@@ -486,17 +491,21 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     }
                     if (!expressionLiveValue) {
                         try {
-                            expressionLiveValue = this.api.internalApi
-                                .getAdaptableInstance()
-                                .SummaryService.evaluateScalarLiveValue({
-                                expression: {
-                                    function: expression,
-                                },
-                                columnId: columnId,
-                                getRowNodes: () => {
-                                    return this.api.gridApi.getVisibleRowNodes();
-                                },
-                            }, ModuleConstants.LayoutModuleId);
+                            let aggregatedScalarExpression = `${expression}([${columnId}])`;
+                            if (aggregatedScalarExpression.includes(RowSummary_1.WEIGHTED_AVERAGE_AGGREATED_FUNCTION) &&
+                                currentLayout.AggregationColumns[columnId] &&
+                                typeof currentLayout.AggregationColumns[columnId] === 'object') {
+                                const weight = currentLayout.AggregationColumns[columnId]
+                                    .weightedColumnId;
+                                if (weight) {
+                                    aggregatedScalarExpression = `AVG([${columnId}], WEIGHT([${weight}]))`;
+                                }
+                            }
+                            expressionLiveValue = new AggregatedScalarLiveValue_1.AggregatedScalarLiveValue({
+                                aggregatedScalarExpression,
+                            }, ModuleConstants.LayoutModuleId, this.api, () => {
+                                return this.api.gridApi.getVisibleRowNodes();
+                            });
                         }
                         catch (e) {
                             this.api.logError('Error evaluating row summary', e);

package/src/Strategy/NoteModule.js

@@ -45,12 +45,12 @@ class NoteModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             ColumnId: menuContext.adaptableColumn.columnId,
         })) !== null && _a !== void 0 ? _a : [];
         if (note) {
-            items.push(this.createColumnMenuItemClickFunction('Remove Note', this.moduleInfo.Glyph, () => {
+            items.push(this.createColumnMenuItemClickFunction('note-remove', 'Remove Note', this.moduleInfo.Glyph, () => {
                 this.api.noteApi.deleteNote(note);
             }));
         }
         else {
-            items.push(this.createColumnMenuItemClickFunction('Add Note', this.moduleInfo.Glyph, () => {
+            items.push(this.createColumnMenuItemClickFunction('note-add', 'Add Note', this.moduleInfo.Glyph, () => {
                 // add an empty one
                 this.api.noteApi.addNote('', menuContext.primaryKeyValue, menuContext.adaptableColumn.columnId);
                 this.api.internalApi.getCellPopupService().showPopup({