@adaptabletools/adaptable-cjs 18.0.0-canary.2 → 18.0.0-canary.20

package/src/Redux/Store/Interface/IAdaptableStore.d.ts

@@ -2,10 +2,16 @@ import * as Redux from 'redux';
 import { AdaptableState } from '../../../PredefinedConfig/AdaptableState';
 import { PredefinedConfig } from '../../../types';
 import { IAdaptable } from '../../../AdaptableInterfaces/IAdaptable';
+export interface LoadStoreConfig {
+    adaptable: IAdaptable;
+    adaptableStateKey: string;
+    predefinedConfig?: PredefinedConfig;
+    postLoadHook?: (state: AdaptableState) => AdaptableState;
+}
 export interface IAdaptableStore {
     TheStore: Redux.Store<AdaptableState>;
-    Load: PromiseLike<any>;
-    loadStore: (adaptable: IAdaptable, adaptableStateKey: string, predefinedConfig?: PredefinedConfig) => PromiseLike<any>;
+    Load: Promise<any>;
+    loadStore: (config: LoadStoreConfig) => Promise<any>;
     getCurrentStorageState: () => AdaptableState | void;
     saveStateNow: (adaptable: IAdaptable) => Promise<any>;
     on: (eventName: string, callback: (data?: any) => any) => () => void;

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, AdaptableContextMenuItemName, ContextMenuContext, AdaptableColumnMenuItemName } from '../PredefinedConfig/Common/Menu';
 import { AdaptableModule } from '../PredefinedConfig/Common/Types';
 import { TeamSharingImportInfo } from '../PredefinedConfig/TeamSharingState';
 import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
@@ -29,27 +29,27 @@ export declare abstract class AdaptableModuleBase implements IModule {
      */
     isModuleObjectsShareable(): boolean;
     isModuleEditable(): boolean;
-    updateOldConfig(): void;
     getModuleAdaptableObjects(): AdaptableObject[];
     getExplicitlyReferencedColumnIds(adaptableObject: AdaptableObject): string[];
     getReferencedNamedQueryNames(adaptableObject: AdaptableObject): string[];
     hasNamedQueryReferences(): boolean;
-    handleAdaptableReady(): void;
-    handleConfigReloaded(adaptableStateReloadedInfo: AdaptableStateReloadedInfo): void;
+    onAdaptableReady(): void;
+    onAdaptableStateReloaded(adaptableStateReloadedInfo: AdaptableStateReloadedInfo): void;
     setModuleEntitlement(): void;
     addModuleMenuItem(source: 'ModuleMenu' | 'ModuleButton'): AdaptableMenuItem | undefined;
     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: AdaptableColumnMenuItemName | AdaptableContextMenuItemName;
         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;
+    createMenuItemClickFunction(Name: AdaptableColumnMenuItemName | AdaptableContextMenuItemName, Label: string, Icon: AdaptableSystemIconName, ClickFunction: () => void): MenuItemDoClickFunction;
+    createMenuItemReduxAction(Name: AdaptableColumnMenuItemName | AdaptableContextMenuItemName, Label: string, Icon: AdaptableSystemIconName, Action: Action): MenuItemDoReduxAction;
+    createMenuItemShowPopup(Name: AdaptableColumnMenuItemName | AdaptableContextMenuItemName, Label: string, ComponentName: string, Icon: AdaptableSystemIconName, PopupParams?: ModuleParams): MenuItemShowPopup;
     getTeamSharingAction(): TeamSharingImportInfo<AdaptableObject> | undefined;
     getModuleNamedQueryReferences(): string[];
     getModuleCalculatedColumnReferences(): CalculatedColumn[];

package/src/Strategy/AdaptableModuleBase.js

@@ -20,11 +20,11 @@ class AdaptableModuleBase {
         };
         this.api = api;
         this.api.eventApi.on('AdaptableReady', () => {
-            this.handleAdaptableReady();
+            this.onAdaptableReady();
             this.api.configApi.dispatchStateReadyAction(this.moduleInfo.ModuleName);
         });
         this.api.eventApi.on('AdaptableStateReloaded', (adaptableStateReloadedInfo) => {
-            this.handleConfigReloaded(adaptableStateReloadedInfo);
+            this.onAdaptableStateReloaded(adaptableStateReloadedInfo);
         });
     }
     getViewAccessLevel() {
@@ -47,9 +47,6 @@ class AdaptableModuleBase {
     isModuleEditable() {
         return this.hasRequiredAccessLevel(this.getEditAccessLevel());
     }
-    updateOldConfig() {
-        // override where deprecated configs have to be migrated
-    }
     getModuleAdaptableObjects() {
         // override where necessary in base classes
         return [];
@@ -67,10 +64,10 @@ class AdaptableModuleBase {
         // this will skip the unnecessary evaluation of modules which do not have Named Query references
         return true;
     }
-    handleAdaptableReady() {
+    onAdaptableReady() {
         // override where necessary in base classes
     }
-    handleConfigReloaded(adaptableStateReloadedInfo) {
+    onAdaptableStateReloaded(adaptableStateReloadedInfo) {
         // override where necessary in base classes
     }
     setModuleEntitlement() {
@@ -85,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,
@@ -105,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);
+    createMenuItemClickFunction(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);
+    createMenuItemReduxAction(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);
+    createMenuItemShowPopup(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.d.ts

@@ -8,13 +8,12 @@ import { AdaptableModuleView, AdaptableObjectCompactView, AdaptableObjectView, I
 import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
 export declare class AlertModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
+    onAdaptableReady(): void;
     getModuleAdaptableObjects(config?: {
         includeLayoutNotAssociatedObjects?: boolean;
     }): AdaptableObject[];
     getExplicitlyReferencedColumnIds(alertDefinition: AlertDefinition): string[];
     getReferencedNamedQueryNames(alertDefinition: AlertDefinition): string[];
-    updateOldConfig(): void;
-    private updateAlertSingleToMultiplePredicates;
     addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     private handleCellDataChanged;
     private handleGridDataChanged;

package/src/Strategy/AlertModule.js

@@ -17,12 +17,12 @@ const AlertEmptyView_1 = require("../View/Alert/AlertEmptyView");
 const AlertStatusSubPanel_1 = require("../View/Alert/AlertStatusSubPanel");
 const ActiveAlertsPanelItemLabel_1 = require("../View/Alert/ActiveAlertsPanelItemLabel");
 const getObjectTagsViewItems_1 = require("./Utilities/getObjectTagsViewItems");
-const updateSingleToMultiplePredicates_1 = require("./Utilities/updateSingleToMultiplePredicates");
-const Helper_1 = require("../Utilities/Helpers/Helper");
 const getAlertType_1 = require("../View/Alert/Utilities/getAlertType");
 class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.AlertModuleId, ModuleConstants.AlertModuleFriendlyName, 'alert', 'AlertPopup', 'Get notified when things happen in Adaptable that you need to know about', api);
+    }
+    onAdaptableReady() {
         this.api.internalApi
             .getDataService()
             .on('CellDataChanged', (cellDataChangedInfo) => {
@@ -75,59 +75,6 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         }
         return this.api.namedQueryApi.internalApi.getReferencedNamedQueryNames(queryExpression);
     }
-    updateOldConfig() {
-        var _a;
-        this.updateAlertSingleToMultiplePredicates();
-        // 1. Make all (new) Flashing Cells have a Predicate if none exists
-        const alertState = this.api.alertApi.getAlertState();
-        const flashingAlertDefinitions = alertState.FlashingAlertDefinitions;
-        const flashingCellDefinitions = this.api.flashingCellApi.getFlashingCellDefinitions();
-        if (ArrayExtensions_1.ArrayExtensions.IsEmpty(flashingCellDefinitions) &&
-            ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(flashingAlertDefinitions)) {
-            this.api.flashingCellApi.setFlashingCellDefinitions(flashingAlertDefinitions);
-            // TODO: state does not clear
-            this.api.flashingCellApi.internalApi.clearFlashingCellState();
-        }
-        (_a = alertState.AlertDefinitions) === null || _a === void 0 ? void 0 : _a.forEach((alertDefinition) => {
-            // if ShowPopup then change to DisplayNotificate
-            if (alertDefinition.AlertProperties &&
-                alertDefinition.AlertProperties.ShowPopup &&
-                alertDefinition.AlertProperties.ShowPopup == true &&
-                !alertDefinition.AlertProperties.DisplayNotification) {
-                alertDefinition.AlertProperties.DisplayNotification = true;
-                alertDefinition.AlertProperties.ShowPopup = undefined;
-            }
-            // if no rule but a predicate then use that
-            if (!alertDefinition.Rule) {
-                if (alertDefinition.Predicate && alertDefinition.Predicate != undefined) {
-                    const predicate = alertDefinition.Predicate;
-                    alertDefinition.Rule = {
-                        Predicate: predicate,
-                    };
-                    alertDefinition.Predicate = undefined;
-                }
-            }
-            else {
-                //migrate alert definitions with `AggregationExpression` (now `AggregatedBooleanExpression`)
-                const obsoleteAggregationExpression = alertDefinition.Rule['AggregationExpression'];
-                if (obsoleteAggregationExpression) {
-                    alertDefinition.Rule.AggregatedBooleanExpression = obsoleteAggregationExpression;
-                }
-            }
-        });
-    }
-    updateAlertSingleToMultiplePredicates() {
-        const alertDefinitions = this.api.alertApi.getAlertDefinitions({
-            includeLayoutNotAssociatedObjects: true,
-        });
-        alertDefinitions.forEach((alertDefinition) => {
-            if (alertDefinition.Rule && 'Predicate' in alertDefinition.Rule) {
-                const preparedAlertDefinition = (0, Helper_1.cloneObject)(alertDefinition);
-                (0, updateSingleToMultiplePredicates_1.updateSingleToMultiplePredicates)(preparedAlertDefinition.Rule);
-                this.api.alertApi.editAlertDefinition(preparedAlertDefinition);
-            }
-        });
-    }
     addContextMenuItems(menuContext) {
         const items = [];
         if (!menuContext.isRowGroupColumn && this.isModuleAvailable()) {
@@ -140,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.createMenuItemReduxAction('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.d.ts

@@ -8,12 +8,11 @@ import { CalculatedColumn } from '../PredefinedConfig/CalculatedColumnState';
 import { AdaptableObjectItemView, IModule } from './Interface/IModule';
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
-import { AdaptableStateReloadedInfo } from '../Api/Events/AdaptableStateReloaded';
 export declare class CalculatedColumnModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
-    handleConfigReloaded(adaptableStateReloadedInfo: AdaptableStateReloadedInfo): void;
+    onAdaptableReady(): void;
+    onAdaptableStateReloaded(): void;
     getModuleAdaptableObjects(): AdaptableObject[];
-    updateOldConfig(): void;
     getExplicitlyReferencedColumnIds(calculatedColumn: CalculatedColumn): string[];
     getReferencedNamedQueryNames(calculatedColumn: CalculatedColumn): string[];
     private isCalculatedColumn;

package/src/Strategy/CalculatedColumnModule.js

@@ -15,35 +15,15 @@ class CalculatedColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.CalculatedColumnModuleId, ModuleConstants.CalculatedColumnFriendlyName, 'chart-and-grid', 'CalculatedColumnPopup', 'Create bespoke columns whose cell value is derived dynamically from an Expression', api);
     }
-    handleConfigReloaded(adaptableStateReloadedInfo) {
-        // re-dispatch the CalculatedColumnReady action to recreate all the aggregated scalar columns
-        this.api.internalApi.dispatchReduxAction(CalculatedColumnRedux.CalculatedColumnReady(this.api.calculatedColumnApi.getCalculatedColumnState()));
+    onAdaptableReady() {
+        this.api.calculatedColumnApi.refreshAggregatedCalculatedColumns();
+    }
+    onAdaptableStateReloaded() {
+        this.api.calculatedColumnApi.refreshAggregatedCalculatedColumns();
     }
     getModuleAdaptableObjects() {
         return this.api.calculatedColumnApi.getCalculatedColumns();
     }
-    updateOldConfig() {
-        const calcColumns = this.api.calculatedColumnApi.getCalculatedColumns();
-        let oldCalculatedColumns = [];
-        calcColumns.forEach((cc) => {
-            if (cc.ColumnExpression && !cc.Query) {
-                cc.Query = {
-                    ScalarExpression: cc.ColumnExpression,
-                };
-                cc.ColumnExpression = undefined;
-                oldCalculatedColumns.push(cc);
-                this.api.logWarn(`Updating incorrect Predefined Config for Calculated Column: ${cc.ColumnId}`);
-            }
-            if (!cc.CalculatedColumnSettings) {
-                cc.CalculatedColumnSettings = {
-                    DataType: 'Number',
-                };
-                oldCalculatedColumns.push(cc);
-                this.api.logWarn(`Updating incorrect Predefined Config for Calculated Column: ${cc.ColumnId}`);
-            }
-        });
-        oldCalculatedColumns.forEach((oldCalcCol) => this.api.calculatedColumnApi.editCalculatedColumn(oldCalcCol));
-    }
     getExplicitlyReferencedColumnIds(calculatedColumn) {
         var _a;
         return ((_a = this.api.expressionApi.getColumnsFromExpression(this.api.expressionApi.getAdaptableQueryExpression(calculatedColumn.Query))) !== null && _a !== void 0 ? _a : []);
@@ -81,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.createMenuItemShowPopup('calculated-column-edit', 'Edit Calculated Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam),
         ];
     }
     getTeamSharingAction() {

package/src/Strategy/CellSummaryModule.d.ts

@@ -1,19 +1,21 @@
 /// <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);
     getViewAccessLevel(): AccessLevel;
     addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
     addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     private createCellSummaryMenuItem;
     createCellSummary(selectedCellInfo: SelectedCellInfo): CellSummmary;
+    private getWeightedAverageCellSummary;
     getViewProperties(): {
         getStatusBarPanelProps(): {
             view: () => JSX.Element;

package/src/Strategy/CellSummaryModule.js

@@ -2,14 +2,16 @@
 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);
+        this.cachedCellSummary = new WeakMap();
     }
     getViewAccessLevel() {
         return 'Full';
@@ -39,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,
@@ -46,6 +49,9 @@ class CellSummaryModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         });
     }
     createCellSummary(selectedCellInfo) {
+        if (this.cachedCellSummary.has(selectedCellInfo)) {
+            return this.cachedCellSummary.get(selectedCellInfo);
+        }
         let selectedCellSummary;
         if (selectedCellInfo && ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(selectedCellInfo.columns)) {
             let numericValues = [];
@@ -74,37 +80,65 @@ class CellSummaryModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             // copying so that we keep the order - needed for others
             const newNumericValues = [...numericValues];
             let hasNumericColumns = numericValues.length > 0;
-            let distinctCount = ArrayExtensions_1.ArrayExtensions.RetrieveDistinct(allValues).length;
+            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: '',
+                };
+            }
+            const columnId = selectedCellInfo.columns[0].columnId;
+            const rowNodes = selectedCellInfo.gridCells.map((gc) => gc.rowNode);
+            const handleExpression = (functionName) => {
+                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;
+            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_1.Helper.roundNumberTo4dp(handleExpression('STD_DEVIATION'))
+                : null;
             selectedCellSummary = {
-                Sum: hasNumericColumns
-                    ? Helper_1.Helper.roundNumberTo4dp(Helper_1.Helper.sumNumberArray(numericValues))
-                    : undefined,
-                Average: hasNumericColumns
-                    ? Helper_1.Helper.roundNumberTo4dp(Helper_1.Helper.meanNumberArray(numericValues))
-                    : undefined,
-                Median: hasNumericColumns
-                    ? Helper_1.Helper.roundNumberTo4dp(Helper_1.Helper.medianNumberArray(numericValues))
-                    : undefined,
-                Mode: hasNumericColumns
-                    ? Helper_1.Helper.roundNumberTo4dp(Helper_1.Helper.modeNumberArray(numericValues))
-                    : undefined,
-                Distinct: distinctCount,
-                Max: hasNumericColumns ? Helper_1.Helper.roundNumberTo4dp(Math.max(...numericValues)) : undefined,
-                Min: hasNumericColumns ? Helper_1.Helper.roundNumberTo4dp(Math.min(...numericValues)) : undefined,
+                Sum: sumValue,
+                Average: avgValue,
+                Median: medianValue,
+                Mode: modeValue,
+                Distinct: distinctValue,
+                Max: maxValue,
+                Min: minValue,
                 Count: allValues.length,
-                Std_Deviation: hasNumericColumns
-                    ? Helper_1.Helper.roundNumberTo4dp(Helper_1.Helper.standardDeviationNumberArray(numericValues))
-                    : undefined,
-                Only: distinctCount == 1 ? JSON.stringify(allValues[0]) : '',
+                Std_Deviation: stdDeviation,
+                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 = {
                         selectedCellInfo,
-                        distinctCount,
+                        distinctCount: distinctValue,
                         allValues,
                         numericValues,
                         numericColumns,
@@ -115,9 +149,30 @@ class CellSummaryModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     selectedCellSummary[operation.operationName] = operation.operationFunction(cellSummaryOperationContext);
                 }
             });
+            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/ChartingModule.d.ts

@@ -5,7 +5,6 @@ import { ChartDefinition } from '../types';
 import { ExternalChartDefinition } from '../PredefinedConfig/ChartingState';
 export declare class ChartingModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
-    updateOldConfig(): void;
     isModuleAvailable(): boolean;
     getModuleAdaptableObjects(): (ChartDefinition | ExternalChartDefinition)[];
     toViewAll(): AdaptableObjectView[];

package/src/Strategy/ChartingModule.js

@@ -10,34 +10,14 @@ const ChartingRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/Cha
 const ChartingStatusBarPopover_1 = require("../View/Charting/ChartingStatusBarPopover");
 const getObjectTagsViewItems_1 = require("./Utilities/getObjectTagsViewItems");
 const ChartingState_1 = require("../PredefinedConfig/ChartingState");
+const Helper_1 = tslib_1.__importDefault(require("../Utilities/Helpers/Helper"));
 class ChartingModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.ChartingModuleId, ModuleConstants.ChartingFriendlyName, 'chart', 'ChartPopup', 'Create AG Grid Charts in order to see Adaptable Data visually', api);
     }
-    updateOldConfig() {
-        const allChartDefinitions = this.api.chartingApi.getChartDefinitions();
-        const chartDefinitionsToUpdate = allChartDefinitions
-            .filter((chartDefinition) => 'model' in chartDefinition || !('Name' in chartDefinition))
-            .map((charDefinition) => {
-            const newChartDefinition = Object.assign({}, charDefinition);
-            if ('model' in newChartDefinition) {
-                newChartDefinition.Model = charDefinition.model;
-                delete newChartDefinition.model;
-            }
-            if (!('Name' in newChartDefinition)) {
-                // default to chartId
-                // @ts-ignore possible because First iteration had no 'Name' and model was under 'model' key (lowercase)
-                newChartDefinition.Name = newChartDefinition.Model.chartId;
-            }
-            return newChartDefinition;
-        });
-        if (chartDefinitionsToUpdate.length > 0) {
-            chartDefinitionsToUpdate.forEach((chartDefinition) => this.api.chartingApi.editChartDefinition(chartDefinition));
-        }
-    }
     isModuleAvailable() {
         const agChartsAvailable = this.api.chartingApi.isChartingEnabled() && super.isModuleAvailable();
-        const externalChartsAvailable = this.api.optionsApi.getChartingOptions().externalChartingOptions;
+        const externalChartsAvailable = Helper_1.default.objectHasKeys(this.api.optionsApi.getChartingOptions().externalChartingOptions);
         return Boolean(agChartsAvailable || externalChartsAvailable);
     }
     getModuleAdaptableObjects() {

package/src/Strategy/ColumnFilterModule.d.ts

@@ -12,10 +12,9 @@ export declare class ColumnFilterModule extends AdaptableModuleBase implements I
     getModuleAdaptableObjects(): AdaptableObject[];
     getExplicitlyReferencedColumnIds(columnFilter: ColumnFilter): string[];
     hasNamedQueryReferences(): boolean;
-    updateOldConfig(): void;
-    handleAdaptableReady(): void;
-    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
+    onAdaptableReady(): void;
     addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
+    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     private getExistingColumnFilter;
     getTeamSharingAction(): TeamSharingImportInfo<ColumnFilter>;
     toViewCompact(filter: ColumnFilter): AdaptableObjectCompactView;