@adaptabletools/adaptable 19.2.3 → 20.0.0-canary.0

package/src/Strategy/AlertModule.d.ts

@@ -6,20 +6,25 @@ 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';
-export declare class AlertModule extends AdaptableModuleBase implements IModule {
+import { ICellDataChangeListenerModule } from './Interface/ICellDataChangeListenerModule';
+import { AdaptableModuleView, AdaptableObjectCompactView, AdaptableObjectView } from './Interface/IModule';
+export declare class AlertModule extends AdaptableModuleBase implements ICellDataChangeListenerModule {
+    private isListeningToCellDataChanges;
     constructor(api: AdaptableApi);
     onAdaptableReady(): void;
+    shouldListenToDataChanges(): boolean;
+    checkListenToCellDataChanged(): void;
+    setupCellDataChangeListener(): void;
     getModuleAdaptableObjects(config?: {
         includeLayoutNotAssociatedObjects?: boolean;
     }): AdaptableObject[];
     getExplicitlyReferencedColumnIds(alertDefinition: AlertDefinition): string[];
     getReferencedNamedQueryNames(alertDefinition: AlertDefinition): string[];
-    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">[];
+    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-all-data" | "export-all-data-excel-download" | "export-all-data-visualexcel-download" | "export-all-data-csv" | "export-all-data-csv-download" | "export-all-data-csv-clipboard" | "export-all-data-json" | "export-all-data-json-download" | "export-all-data-json-clipboard" | "export-current-layout" | "export-current-layout-excel-download" | "export-current-layout-visualexcel-download" | "export-current-layout-csv" | "export-current-layout-csv-download" | "export-current-layout-csv-clipboard" | "export-current-layout-json" | "export-current-layout-json-download" | "export-current-layout-json-clipboard" | "export-selected-data" | "export-selected-data-excel-download" | "export-selected-data-visualexcel-download" | "export-selected-data-csv" | "export-selected-data-csv-download" | "export-selected-data-csv-clipboard" | "export-selected-data-json" | "export-selected-data-json-download" | "export-selected-data-json-clipboard" | "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 handleRowDataChanged;
     private handleReactiveAlertTriggered;
-    private getAlertDefinitionsForGridDataChange;
+    private getAlertDefinitionsForRowDataChange;
     getTeamSharingAction(): TeamSharingImportInfo<AlertDefinition>;
     toViewCompact(alert: AdaptableAlert): AdaptableObjectCompactView;
     toView(alert: AlertDefinition): AdaptableObjectView;

package/src/Strategy/AlertModule.js

@@ -1,7 +1,11 @@
 import * as AlertRedux from '../Redux/ActionsReducers/AlertRedux';
-import * as SystemRedux from '../Redux/ActionsReducers/SystemRedux';
+import * as InternalRedux from '../Redux/ActionsReducers/InternalRedux';
+import { OBSERVABLE_EXPRESSION_ROW_ADDED, OBSERVABLE_EXPRESSION_ROW_REMOVED, } from '../Utilities/Constants/GeneralConstants';
 import * as ModuleConstants from '../Utilities/Constants/ModuleConstants';
 import { ArrayExtensions } from '../Utilities/Extensions/ArrayExtensions';
+import { getObjectTagsViewItems } from '../Utilities/getObjectTagsViewItems';
+import { getRuleViewItems } from '../Utilities/getRuleViewItems';
+import { getScopeViewItems } from '../Utilities/getScopeViewItems';
 import { ActiveAlertsPanelItemLabel } from '../View/Alert/ActiveAlertsPanelItemLabel';
 import { AlertEmptyView } from '../View/Alert/AlertEmptyView';
 import { AlertStatusPanel } from '../View/Alert/AlertStatusSubPanel';
@@ -11,18 +15,37 @@ import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { getAlertBehaviourViewItems } from './Utilities/Alert/getAlertBehaviourViewItems';
 import { getAlertPreviewViewItems } from './Utilities/Alert/getAlertPreviewViewItems';
 import { getAlertTypeViewItems } from './Utilities/Alert/getAlertTypeViewItems';
-import { getObjectTagsViewItems } from './Utilities/getObjectTagsViewItems';
-import { getRuleViewItems } from './Utilities/getRuleViewItems';
-import { getScopeViewItems } from './Utilities/getScopeViewItems';
 export class AlertModule extends AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.AlertModuleId, ModuleConstants.AlertModuleFriendlyName, 'alert', 'AlertPopup', 'Get notified when things happen in Adaptable that you need to know about', api);
+        this.isListeningToCellDataChanges = false;
     }
     onAdaptableReady() {
+        this.checkListenToCellDataChanged();
+    }
+    shouldListenToDataChanges() {
+        return ArrayExtensions.IsNotNullOrEmpty(this.api.alertApi.getActiveAlertDefinitions());
+    }
+    checkListenToCellDataChanged() {
+        if (!this.isListeningToCellDataChanges) {
+            if (this.shouldListenToDataChanges()) {
+                this.setupCellDataChangeListener();
+                this.isListeningToCellDataChanges = true;
+            }
+        }
+    }
+    setupCellDataChangeListener() {
         this.api.internalApi
             .getDataService()
             .on('CellDataChanged', (cellDataChangedInfo) => {
-            if (cellDataChangedInfo.trigger === 'undo' || cellDataChangedInfo.trigger === 'aggChange') {
+            let shouldIgnoreChange = false;
+            if (cellDataChangedInfo.trigger === 'undo') {
+                shouldIgnoreChange = true;
+            }
+            if (cellDataChangedInfo.trigger === 'aggChange') {
+                shouldIgnoreChange = !cellDataChangedInfo.column.isGeneratedPivotResultColumn;
+            }
+            if (shouldIgnoreChange) {
                 // do NOT handle reverted or aggregated changes
                 return;
             }
@@ -38,16 +61,19 @@ export class AlertModule extends AdaptableModuleBase {
             }
             this.handleCellDataChanged(cellDataChangedInfo);
         });
-        this.api.eventApi.on('GridDataChanged', (gridDataChangedInfo) => {
-            if (gridDataChangedInfo.rowTrigger === 'Update') {
+        this.api.internalApi
+            .getDataService()
+            .on('RowDataChanged', (rowDataChangedInfo) => {
+            if (rowDataChangedInfo.rowTrigger === 'Update') {
                 // changed row alerts should be handled by standard 'AnyChange' Predicate
                 return;
             }
-            this.handleGridDataChanged(gridDataChangedInfo);
+            this.handleRowDataChanged(rowDataChangedInfo);
         });
         this.api.internalApi
             .getAlertService()
             .onReactiveAlertTriggered((reactiveAlertInfo) => this.handleReactiveAlertTriggered(reactiveAlertInfo));
+        this.api.alertApi.internalApi.setUpReactiveAlerts();
     }
     getModuleAdaptableObjects(config) {
         return this.api.alertApi.getAlertDefinitions(config);
@@ -59,7 +85,7 @@ export class AlertModule extends AdaptableModuleBase {
         }
         else if (this.api.columnScopeApi.scopeHasColumns(alertDefinition.Scope)) {
             return this.api.columnScopeApi
-                .getColumnsForScope(alertDefinition.Scope)
+                .getColumnsInScope(alertDefinition.Scope)
                 .map((adaptableColumn) => adaptableColumn.columnId);
         }
         return [];
@@ -83,7 +109,7 @@ export class AlertModule extends AdaptableModuleBase {
                     relevantAlert = this.api.alertApi.internalApi.getAdaptableAlertWithHighlightRow(menuContext.rowNode);
                 }
                 if (relevantAlert) {
-                    items.push(this.createMenuItemReduxAction('alert-clear', 'Clear Alert', this.moduleInfo.Glyph, SystemRedux.SystemAlertDelete(relevantAlert)));
+                    items.push(this.createMenuItemReduxAction('alert-clear', 'Clear Alert', this.moduleInfo.Glyph, InternalRedux.AdaptableAlertDelete(relevantAlert)));
                 }
             }
         }
@@ -95,41 +121,39 @@ export class AlertModule extends AdaptableModuleBase {
             this.api.alertApi.internalApi.showAlertForDefinitions(cellDataChangedInfo, alertDefinitions);
         }
     }
-    handleGridDataChanged(gridDataChangedInfo) {
-        const alertDefinitions = this.getAlertDefinitionsForGridDataChange(gridDataChangedInfo);
-        this.api.alertApi.internalApi.showAlertsForGridDataChanges(gridDataChangedInfo, alertDefinitions);
+    handleRowDataChanged(rowDataChangedInfo) {
+        const alertDefinitions = this.getAlertDefinitionsForRowDataChange(rowDataChangedInfo);
+        this.api.alertApi.internalApi.showAlertsForRowDataChanges(rowDataChangedInfo, alertDefinitions);
     }
     handleReactiveAlertTriggered(reactiveAlertInfo) {
         // TODO  - suppress Notification if alert is not relevant for layout
-        var _a;
         if (reactiveAlertInfo.type === 'cellDataChangedAlert') {
             // the row node data is most probably stale because the reactive queries buffer the changed data
             // so we have to refresh it
             reactiveAlertInfo.cellChangeLogEntry.rowNode = this.api.gridApi.getRowNodeForPrimaryKey(reactiveAlertInfo.cellChangeLogEntry.primaryKeyValue);
             reactiveAlertInfo.cellChangeLogEntry.rowData =
-                (_a = reactiveAlertInfo.cellChangeLogEntry.rowNode) === null || _a === void 0 ? void 0 : _a.data;
+                reactiveAlertInfo.cellChangeLogEntry.rowNode?.data;
             this.api.alertApi.internalApi.showAlertForDefinitions(reactiveAlertInfo.cellChangeLogEntry, [
                 reactiveAlertInfo.alertDefinition,
             ]);
         }
         else {
-            // reactiveAlertInfo.type === gridDataChangedAlert'
+            // reactiveAlertInfo.type === rowDataChangedAlert'
             this.api.alertApi.internalApi.showAlertForDefinitions(reactiveAlertInfo.gridChangeLogEntry, [
                 reactiveAlertInfo.alertDefinition,
             ]);
         }
     }
-    getAlertDefinitionsForGridDataChange(gridDataChangedInfo) {
+    getAlertDefinitionsForRowDataChange(rowDataChangedInfo) {
         return this.api.alertApi.internalApi
             .getActiveNonReactiveAlertDefinitions()
             .filter((alertDefinition) => this.api.alertApi.internalApi.isAlertDefinitionForRowChangeEvent(alertDefinition))
             .filter((alertDefinition) => {
-            var _a, _b;
-            if (gridDataChangedInfo.rowTrigger === 'Add') {
-                return (_a = alertDefinition.Rule) === null || _a === void 0 ? void 0 : _a.Predicates.some((predicate) => (predicate === null || predicate === void 0 ? void 0 : predicate.PredicateId) === 'AddedRow');
+            if (rowDataChangedInfo.rowTrigger === 'Add') {
+                return alertDefinition.Rule?.ObservableExpression.includes(OBSERVABLE_EXPRESSION_ROW_ADDED);
             }
-            if (gridDataChangedInfo.rowTrigger === 'Delete') {
-                return (_b = alertDefinition.Rule) === null || _b === void 0 ? void 0 : _b.Predicates.some((predicate) => (predicate === null || predicate === void 0 ? void 0 : predicate.PredicateId) === 'RemovedRow');
+            if (rowDataChangedInfo.rowTrigger === 'Delete') {
+                return alertDefinition.Rule?.ObservableExpression.includes(OBSERVABLE_EXPRESSION_ROW_REMOVED);
             }
             return false;
         });
@@ -156,8 +180,12 @@ export class AlertModule extends AdaptableModuleBase {
         return {
             items: [
                 getAlertTypeViewItems(alert),
-                alertType === 'DataChange' && Object.assign(Object.assign({}, getScopeViewItems(alert.Scope, this.api)), { label: 'Trigger', name: 'Trigger' }),
-                Object.assign(Object.assign({}, getRuleViewItems(alert.Rule, this.api)), { label: 'Rule', name: 'Rule' }),
+                alertType === 'DataChange' && {
+                    ...getScopeViewItems(alert.Scope, this.api),
+                    label: 'Trigger',
+                    name: 'Trigger',
+                },
+                { ...getRuleViewItems(alert.Rule, this.api), label: 'Rule', name: 'Rule' },
                 getAlertBehaviourViewItems(this.api),
                 getAlertPreviewViewItems(alert, this.api),
                 getObjectTagsViewItems(alert, this.api),
@@ -178,10 +206,10 @@ export class AlertModule extends AdaptableModuleBase {
             getUnSuspendAction: AlertRedux.AlertDefinitionUnSuspend,
             getSuspendAllAction: AlertRedux.AlertDefinitionSuspendAll,
             getUnSuspendAllAction: AlertRedux.AlertDefinitionUnSuspendAll,
-            getCompactDeleteAction: SystemRedux.SystemAlertDelete,
+            getCompactDeleteAction: InternalRedux.AdaptableAlertDelete,
             getDeleteAllAction: () => {
-                const alerts = this.api.internalApi.getState().System.AdaptableAlerts;
-                return SystemRedux.SystemAlertDeleteAll(alerts);
+                const alerts = this.api.internalApi.getState().Internal.AdaptableAlerts;
+                return InternalRedux.AdaptableAlertDeleteAll(alerts);
             },
             emptyView: AlertEmptyView,
             getEditWizard: () => AlertWizard,

package/src/Strategy/BulkUpdateModule.d.ts

@@ -7,7 +7,7 @@ import { AccessLevel, AdaptableApi } from '../types';
 export declare class BulkUpdateModule extends AdaptableModuleBase implements IBulkUpdateModule {
     constructor(api: AdaptableApi);
     getViewAccessLevel(): AccessLevel;
-    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">[];
+    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-all-data" | "export-all-data-excel-download" | "export-all-data-visualexcel-download" | "export-all-data-csv" | "export-all-data-csv-download" | "export-all-data-csv-clipboard" | "export-all-data-json" | "export-all-data-json-download" | "export-all-data-json-clipboard" | "export-current-layout" | "export-current-layout-excel-download" | "export-current-layout-visualexcel-download" | "export-current-layout-csv" | "export-current-layout-csv-download" | "export-current-layout-csv-clipboard" | "export-current-layout-json" | "export-current-layout-json-download" | "export-current-layout-json-clipboard" | "export-selected-data" | "export-selected-data-excel-download" | "export-selected-data-visualexcel-download" | "export-selected-data-csv" | "export-selected-data-csv-download" | "export-selected-data-csv-clipboard" | "export-selected-data-json" | "export-selected-data-json-download" | "export-selected-data-json-clipboard" | "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

@@ -34,7 +34,7 @@ export class BulkUpdateModule extends AdaptableModuleBase {
     }
     checkCorrectCellSelection() {
         let selectedCellInfo = this.api.gridApi.getSelectedCellInfo();
-        if (this.api.internalApi.isGridInPivotMode()) {
+        if (this.api.layoutApi.isCurrentLayoutPivot()) {
             return {
                 IsValid: false,
                 Alert: {
@@ -89,23 +89,23 @@ export class BulkUpdateModule extends AdaptableModuleBase {
         }
         let selectedCellInfo = this.api.gridApi.getSelectedCellInfo();
         let column;
-        if (!this.api.internalApi.isGridInPivotMode()) {
+        if (!this.api.layoutApi.isCurrentLayoutPivot()) {
             if (selectedCellInfo != null && selectedCellInfo.columns.length > 0) {
                 column = this.api.columnApi.getColumnWithColumnId(selectedCellInfo.columns[0].columnId);
                 let typedBulkUpdateValue;
                 switch (column.dataType) {
-                    case 'Number':
+                    case 'number':
                         typedBulkUpdateValue = Number(bulkUpdateValue);
                         break;
-                    case 'String':
+                    case 'text':
                         typedBulkUpdateValue = bulkUpdateValue;
                         break;
-                    case 'Date':
+                    case 'date':
                         typedBulkUpdateValue = new Date(bulkUpdateValue);
                         break;
                 }
                 selectedCellInfo.gridCells.forEach((selectedCell) => {
-                    const cellDataChangedInfo = this.api.internalApi.buildDataChangedInfo({
+                    const cellDataChangedInfo = this.api.internalApi.buildCellDataChangedInfo({
                         oldValue: selectedCell.rawValue,
                         newValue: typedBulkUpdateValue,
                         column: selectedCell.column,

package/src/Strategy/CalculatedColumnModule.d.ts

@@ -1,23 +1,27 @@
-/// <reference types="react" />
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
 import { ContextMenuContext } from '../PredefinedConfig/Common/Menu';
-import * as CalculatedColumnRedux from '../Redux/ActionsReducers/CalculatedColumnRedux';
 import { TeamSharingImportInfo } from '../PredefinedConfig/TeamSharingState';
 import { CalculatedColumn } from '../PredefinedConfig/CalculatedColumnState';
-import { AdaptableObjectItemView, IModule } from './Interface/IModule';
+import { AdaptableObjectItemView } from './Interface/IModule';
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
-export declare class CalculatedColumnModule extends AdaptableModuleBase implements IModule {
+import { ICellDataChangeListenerModule } from './Interface/ICellDataChangeListenerModule';
+import { AdaptableModuleView } from './Interface/IModule';
+export declare class CalculatedColumnModule extends AdaptableModuleBase implements ICellDataChangeListenerModule {
+    private isListeningToCellDataChanges;
     constructor(api: AdaptableApi);
     onAdaptableReady(): void;
+    shouldListenToDataChanges(): boolean;
+    checkListenToCellDataChanged(): void;
+    setupCellDataChangeListener(): void;
+    setupRowDataChangeListener(): void;
     onAdaptableStateReloaded(): void;
     getModuleAdaptableObjects(): AdaptableObject[];
     getExplicitlyReferencedColumnIds(calculatedColumn: CalculatedColumn): string[];
     getReferencedNamedQueryNames(calculatedColumn: CalculatedColumn): string[];
-    private isCalculatedColumn;
-    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">[];
+    createColumnMenuItems(column: AdaptableColumn): import("../Utilities/MenuItem").MenuItemShowPopup<"calculated-column-edit" | "cell-summary-show" | "chart-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" | "separator">[];
+    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-all-data" | "export-all-data-excel-download" | "export-all-data-visualexcel-download" | "export-all-data-csv" | "export-all-data-csv-download" | "export-all-data-csv-clipboard" | "export-all-data-json" | "export-all-data-json-download" | "export-all-data-json-clipboard" | "export-current-layout" | "export-current-layout-excel-download" | "export-current-layout-visualexcel-download" | "export-current-layout-csv" | "export-current-layout-csv-download" | "export-current-layout-csv-clipboard" | "export-current-layout-json" | "export-current-layout-json-download" | "export-current-layout-json-clipboard" | "export-selected-data" | "export-selected-data-excel-download" | "export-selected-data-visualexcel-download" | "export-selected-data-csv" | "export-selected-data-csv-download" | "export-selected-data-csv-clipboard" | "export-selected-data-json" | "export-selected-data-json-download" | "export-selected-data-json-clipboard" | "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[];
@@ -27,8 +31,5 @@ export declare class CalculatedColumnModule extends AdaptableModuleBase implemen
         items: AdaptableObjectItemView[];
         abObject: CalculatedColumn;
     }[];
-    getViewProperties(): {
-        getDeleteAction: (calculatedColumn: CalculatedColumn) => CalculatedColumnRedux.CalculatedColumnDeleteAction;
-        getEditWizard: () => (props: import("../View/CalculatedColumn/Wizard/CalculatedColumnWizard").CalculatedColumnWizardProps) => JSX.Element;
-    };
+    getViewProperties(): AdaptableModuleView;
 }

package/src/Strategy/CalculatedColumnModule.js

@@ -1,18 +1,51 @@
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import * as ModuleConstants from '../Utilities/Constants/ModuleConstants';
 import * as CalculatedColumnRedux from '../Redux/ActionsReducers/CalculatedColumnRedux';
-import { getExpressionViewItems } from './Utilities/getExpressionViewItems';
 import { CalculatedColumnWizard } from '../View/CalculatedColumn/Wizard/CalculatedColumnWizard';
 import ArrayExtensions from '../Utilities/Extensions/ArrayExtensions';
-import { getObjectTagsViewItems } from './Utilities/getObjectTagsViewItems';
 import { getCalculatedColumnSettingsTags } from '../View/CalculatedColumn/Utilities/getCalculatedColumnSettingsTags';
-import Helper from '../Utilities/Helpers/Helper';
+import { getExpressionViewItems } from '../Utilities/getExpressionViewItems';
+import { getObjectTagsViewItems } from '../Utilities/getObjectTagsViewItems';
 export class CalculatedColumnModule extends AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.CalculatedColumnModuleId, ModuleConstants.CalculatedColumnFriendlyName, 'calculated-column', 'CalculatedColumnPopup', 'Create bespoke columns whose cell value is derived dynamically from an Expression', api);
+        this.isListeningToCellDataChanges = false;
     }
     onAdaptableReady() {
-        this.api.calculatedColumnApi.refreshAggregatedCalculatedColumns();
+        this.checkListenToCellDataChanged();
+    }
+    shouldListenToDataChanges() {
+        return ArrayExtensions.IsNotNullOrEmpty(this.api.calculatedColumnApi.getCalculatedColumns());
+    }
+    checkListenToCellDataChanged() {
+        if (!this.isListeningToCellDataChanges) {
+            if (this.shouldListenToDataChanges()) {
+                this.setupCellDataChangeListener();
+                this.setupRowDataChangeListener();
+                this.api.calculatedColumnApi.refreshAggregatedCalculatedColumns();
+                this.isListeningToCellDataChanges = true;
+            }
+        }
+    }
+    setupCellDataChangeListener() {
+        this.api.internalApi
+            .getDataService()
+            .on('CellDataChanged', (cellDataChangedInfo) => {
+            if (cellDataChangedInfo.trigger !== 'aggChange') {
+                this.api.internalApi
+                    .getCalculatedColumnExpressionService()
+                    .listentoCellDataChange(cellDataChangedInfo);
+            }
+        });
+    }
+    setupRowDataChangeListener() {
+        this.api.internalApi
+            .getDataService()
+            .on('RowDataChanged', (rowDataChangedInfo) => {
+            this.api.internalApi
+                .getCalculatedColumnExpressionService()
+                .listentoRowDataChange(rowDataChangedInfo);
+        });
     }
     onAdaptableStateReloaded() {
         this.api.calculatedColumnApi.refreshAggregatedCalculatedColumns();
@@ -21,21 +54,13 @@ export class CalculatedColumnModule extends AdaptableModuleBase {
         return this.api.calculatedColumnApi.getCalculatedColumns();
     }
     getExplicitlyReferencedColumnIds(calculatedColumn) {
-        var _a;
-        return ((_a = this.api.expressionApi.getColumnsFromExpression(this.api.expressionApi.getAdaptableQueryExpression(calculatedColumn.Query))) !== null && _a !== void 0 ? _a : []);
+        return (this.api.expressionApi.getColumnsFromExpression(this.api.expressionApi.getAdaptableQueryExpression(calculatedColumn.Query)) ?? []);
     }
     getReferencedNamedQueryNames(calculatedColumn) {
-        var _a;
-        return ((_a = this.api.namedQueryApi.internalApi.getReferencedNamedQueryNames(this.api.expressionApi.getAdaptableQueryExpression(calculatedColumn.Query))) !== null && _a !== void 0 ? _a : []);
-    }
-    isCalculatedColumn(column) {
-        return (column &&
-            Helper.objectExists(this.api.calculatedColumnApi
-                .getCalculatedColumns()
-                .find((cc) => cc.ColumnId == column.columnId)));
+        return (this.api.namedQueryApi.internalApi.getReferencedNamedQueryNames(this.api.expressionApi.getAdaptableQueryExpression(calculatedColumn.Query)) ?? []);
     }
     createColumnMenuItems(column) {
-        if (this.isModuleEditable() && this.isCalculatedColumn(column)) {
+        if (this.isModuleEditable() && column.isCalculatedColumn) {
             const popupParam = {
                 column: column,
                 action: 'Edit',
@@ -51,7 +76,7 @@ export class CalculatedColumnModule extends AdaptableModuleBase {
             return;
         }
         if (this.isModuleEditable() &&
-            this.isCalculatedColumn(menuContext.adaptableColumn) &&
+            menuContext.adaptableColumn.isCalculatedColumn &&
             !menuContext.isRowGroupColumn &&
             menuContext.isSingleSelectedCell) {
             const popupParam = {

package/src/Strategy/CellSummaryModule.d.ts

@@ -1,23 +1,30 @@
-/// <reference types="react" />
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
-import { CellSummmary } from '../PredefinedConfig/Common/CellSummary';
+import { CellSummmaryInfo } 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';
+import { AggregationColumnValue } from '../PredefinedConfig/Common/AggregationColumns';
+import { AdaptableModuleView } from './Interface/IModule';
+export type WeightedAverageConfig = {
+    ColumnId: string;
+    AggFunc: AggregationColumnValue;
+};
+/**
+ * Module that provides Cell Summaries on numeric columns
+ */
 export declare class CellSummaryModule extends AdaptableModuleBase implements ICellSummaryModule {
-    cachedCellSummary: WeakMap<SelectedCellInfo<any>, CellSummmary>;
+    cachedCellSummary: WeakMap<SelectedCellInfo<any>, CellSummmaryInfo>;
     constructor(api: AdaptableApi);
     getViewAccessLevel(): AccessLevel;
-    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;
+    createColumnMenuItems(column: AdaptableColumn): import("../Utilities/MenuItem").MenuItemShowPopup<"calculated-column-edit" | "cell-summary-show" | "chart-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" | "separator">[];
+    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-all-data" | "export-all-data-excel-download" | "export-all-data-visualexcel-download" | "export-all-data-csv" | "export-all-data-csv-download" | "export-all-data-csv-clipboard" | "export-all-data-json" | "export-all-data-json-download" | "export-all-data-json-clipboard" | "export-current-layout" | "export-current-layout-excel-download" | "export-current-layout-visualexcel-download" | "export-current-layout-csv" | "export-current-layout-csv-download" | "export-current-layout-csv-clipboard" | "export-current-layout-json" | "export-current-layout-json-download" | "export-current-layout-json-clipboard" | "export-selected-data" | "export-selected-data-excel-download" | "export-selected-data-visualexcel-download" | "export-selected-data-csv" | "export-selected-data-csv-download" | "export-selected-data-csv-clipboard" | "export-selected-data-json" | "export-selected-data-json-download" | "export-selected-data-json-clipboard" | "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">[];
+    createCellSummaryInfo(selectedCellInfo: SelectedCellInfo): CellSummmaryInfo;
+    private getNumberFormatOptions;
+    private formatValue;
+    private getWeightedAverageConfig;
     private getWeightedAverageCellSummary;
-    getViewProperties(): {
-        getStatusBarPanelProps(): {
-            view: () => JSX.Element;
-        };
-    };
+    getViewProperties(): AdaptableModuleView;
 }