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

package/src/Strategy/FormatColumnModule.js

@@ -10,8 +10,6 @@ import { getFormatColumnStyleViewItems } from './Utilities/FormatColumn/getForma
 import { getObjectTagsViewItems } from './Utilities/getObjectTagsViewItems';
 import { getRuleViewItems } from './Utilities/getRuleViewItems';
 import { MoveFormatColumn } from '../View/FormatColumn/MoveFormatColumn';
-import { cloneObject } from '../Utilities/Helpers/Helper';
-import { updateSingleToMultiplePredicates } from './Utilities/updateSingleToMultiplePredicates';
 import ArrayExtensions from '../Utilities/Extensions/ArrayExtensions';
 export class FormatColumnModule extends AdaptableModuleBase {
     constructor(api) {
@@ -39,51 +37,6 @@ export class FormatColumnModule extends AdaptableModuleBase {
         }
         return this.api.namedQueryApi.internalApi.getReferencedNamedQueryNames(queryExpression);
     }
-    updateOldConfig() {
-        this.updateFormatColumnSingleToMultiplePredicates();
-        // update ConditionalStyle StatusBarPanel
-        const oldStatusBars = this.api.internalApi.getState().StatusBar.StatusBars;
-        let replaceConditionalStyleStatusBar = false;
-        const newStatusBars = oldStatusBars.map((statusBar) => (Object.assign(Object.assign({}, statusBar), { StatusBarPanels: [
-                ...new Set(statusBar.StatusBarPanels.map((statusBarPanel) => {
-                    if (statusBarPanel === 'ConditionalStyle') {
-                        replaceConditionalStyleStatusBar = true;
-                        return 'FormatColumn';
-                    }
-                    return statusBarPanel;
-                })),
-            ] })));
-        if (replaceConditionalStyleStatusBar) {
-            this.api.statusBarApi.setStatusBarPanels(newStatusBars);
-        }
-        // update ConditionalStyle dashboard buttons
-        const dashboardModuleButtons = this.api.internalApi.getState().Dashboard.ModuleButtons;
-        if (dashboardModuleButtons.includes('ConditionalStyle')) {
-            dashboardModuleButtons[dashboardModuleButtons.indexOf('ConditionalStyle')] = 'FormatColumn';
-            const test2 = dashboardModuleButtons;
-            this.api.dashboardApi.setModuleButtons([
-                ...new Set(dashboardModuleButtons),
-            ]);
-        }
-        // update ConditionalStyle toolPanel buttons
-        const toolPanelModuleButtons = this.api.internalApi.getState().ToolPanel.ModuleButtons;
-        if (toolPanelModuleButtons.includes('ConditionalStyle')) {
-            toolPanelModuleButtons[toolPanelModuleButtons.indexOf('ConditionalStyle')] = 'FormatColumn';
-            this.api.toolPanelApi.setModuleButtons([
-                ...new Set(dashboardModuleButtons),
-            ]);
-        }
-    }
-    updateFormatColumnSingleToMultiplePredicates() {
-        const formatColumns = this.api.formatColumnApi.getFormatColumns();
-        formatColumns.forEach((formatColumn) => {
-            if (formatColumn.Rule && 'Predicate' in formatColumn.Rule) {
-                const preparedFormatColumn = cloneObject(formatColumn);
-                updateSingleToMultiplePredicates(preparedFormatColumn.Rule);
-                this.api.formatColumnApi.editFormatColumn(preparedFormatColumn);
-            }
-        });
-    }
     addColumnMenuItems(column) {
         let returnColumnMenuItems = [];
         if (column && this.isModuleEditable() && !column.isSparkline) {
@@ -92,12 +45,12 @@ export class FormatColumnModule extends AdaptableModuleBase {
                 action: 'New',
                 source: 'ColumnMenu',
             };
-            const createFormatColumnMenuItem = this.createColumnMenuItemShowPopup('Create', this.moduleInfo.Popup, 'plus', createPopupParam);
+            const createFormatColumnMenuItem = this.createMenuItemShowPopup('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.IsNullOrEmpty(formatColumnsForColumn)) {
-                returnColumnMenuItems.push(this.createColumnMenuItemShowPopup('Create Format Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, createPopupParam));
+                returnColumnMenuItems.push(this.createMenuItemShowPopup('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) {
@@ -107,8 +60,9 @@ export class FormatColumnModule extends AdaptableModuleBase {
                     value: formatColumnsForColumn[0],
                     source: 'ColumnMenu',
                 };
-                const editFormatColumnMenuItem = this.createColumnMenuItemShowPopup('Edit', this.moduleInfo.Popup, 'edit', editPopupParam);
+                const editFormatColumnMenuItem = this.createMenuItemShowPopup('format-column-edit', 'Edit', this.moduleInfo.Popup, 'edit', editPopupParam);
                 returnColumnMenuItems.push({
+                    name: 'parent',
                     label: 'Format Column',
                     module: this.moduleInfo.ModuleName,
                     isVisible: true,
@@ -123,8 +77,9 @@ export class FormatColumnModule extends 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.createMenuItemReduxAction('format-column-edit', 'Show Current', this.moduleInfo.Glyph, PopupRedux.PopupShowScreen('FormatColumn', moduleInfo.Popup));
                 returnColumnMenuItems.push({
+                    name: 'parent',
                     label: 'Format Column',
                     module: this.moduleInfo.ModuleName,
                     isVisible: true,

package/src/Strategy/FreeTextColumnModule.d.ts

@@ -12,7 +12,6 @@ export declare class FreeTextColumnModule extends AdaptableModuleBase implements
     isModuleAvailable(): boolean;
     getModuleAdaptableObjects(): FreeTextColumn[];
     hasNamedQueryReferences(): boolean;
-    updateOldConfig(): void;
     addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
     getTeamSharingAction(): TeamSharingImportInfo<FreeTextColumn>;
     toView(freeTextColumn: FreeTextColumn): AdaptableObjectView;

package/src/Strategy/FreeTextColumnModule.js

@@ -17,36 +17,6 @@ export class FreeTextColumnModule extends AdaptableModuleBase {
     hasNamedQueryReferences() {
         return false;
     }
-    updateOldConfig() {
-        // make sure all default to type string
-        const allFreeTextColumns = this.getModuleAdaptableObjects();
-        for (const freeTextColumn of allFreeTextColumns) {
-            const unTypedCol = freeTextColumn;
-            if (unTypedCol.DataType) {
-                const dataType = unTypedCol.DataType;
-                delete unTypedCol['DataType'];
-                if (!freeTextColumn.FreeTextColumnSettings) {
-                    freeTextColumn.FreeTextColumnSettings = {
-                        DataType: dataType,
-                    };
-                }
-                else {
-                    freeTextColumn.FreeTextColumnSettings.DataType = dataType;
-                }
-                this.api.freeTextColumnApi.editFreeTextColumn(freeTextColumn);
-            }
-            if (!freeTextColumn.FreeTextColumnSettings) {
-                freeTextColumn.FreeTextColumnSettings = {
-                    DataType: 'String',
-                };
-                this.api.freeTextColumnApi.editFreeTextColumn(freeTextColumn);
-            }
-            if (!freeTextColumn.FreeTextColumnSettings.DataType) {
-                freeTextColumn.FreeTextColumnSettings.DataType = 'String';
-                this.api.freeTextColumnApi.editFreeTextColumn(freeTextColumn);
-            }
-        }
-    }
     addColumnMenuItems(column) {
         if (column && this.isModuleEditable()) {
             if (this.api.freeTextColumnApi
@@ -58,7 +28,7 @@ export class FreeTextColumnModule extends AdaptableModuleBase {
                     source: 'ColumnMenu',
                 };
                 return [
-                    this.createColumnMenuItemShowPopup('Edit Free Text Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam),
+                    this.createMenuItemShowPopup('free-text-column-edit', 'Edit Free Text Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam),
                 ];
             }
         }

package/src/Strategy/GridFilterModule.d.ts

@@ -3,6 +3,5 @@ import { AdaptableModuleView, IModule } from './Interface/IModule';
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 export declare class GridFilterModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
-    updateOldConfig(): void;
     getViewProperties(): AdaptableModuleView;
 }

package/src/Strategy/GridFilterModule.js

@@ -2,47 +2,10 @@ import { AdaptableModuleBase } from './AdaptableModuleBase';
 import * as ModuleConstants from '../Utilities/Constants/ModuleConstants';
 import { EditGridFilterButton } from '../View/NamedQuery/EditCurrentQueryButton';
 import { GridFilterStatusbar } from '../View/GridFilter/GridFilterStatusbar';
-import StringExtensions from '../Utilities/Extensions/StringExtensions';
 export class GridFilterModule extends AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.GridFilterModuleId, ModuleConstants.GridFilterFriendlyName, 'filter-list', 'GridFilterPopup', 'Controls the Grid Filter funtionality', api);
     }
-    updateOldConfig() {
-        var _a, _b;
-        const oldQueryState = this.api.internalApi.getAdaptableState().Query;
-        // - move query to current layout
-        const expression = oldQueryState.CurrentQuery;
-        if (expression &&
-            StringExtensions.IsNullOrEmpty(this.api.gridFilterApi.getCurrentGridFilterExpression())) {
-            this.api.gridFilterApi.setGridFilterExpression(expression);
-        }
-        // - move dashboard/toolbar
-        let updateTabs = false;
-        const tabs = this.api.dashboardApi.getTabs().map((tab) => {
-            if (tab.Toolbars.includes('Query')) {
-                updateTabs = true;
-                return Object.assign(Object.assign({}, tab), { 
-                    // replace with 'GridFilter'
-                    Toolbars: tab.Toolbars.map((t) => (t == 'Query' ? 'GridFilter' : t)) });
-            }
-            return tab;
-        });
-        if (updateTabs) {
-            this.api.dashboardApi.setTabs(tabs);
-        }
-        // - move pinned toolbars
-        let updatePinnedToolbars = false;
-        const pinnedToolbars = (_b = (_a = this.api.dashboardApi.getPinnedToolbars()) === null || _a === void 0 ? void 0 : _a.map) === null || _b === void 0 ? void 0 : _b.call(_a, (pinnedToolbar) => {
-            if (pinnedToolbar == 'Query') {
-                updatePinnedToolbars = true;
-                return 'GridFilter';
-            }
-            return pinnedToolbar;
-        });
-        if (updatePinnedToolbars) {
-            this.api.dashboardApi.setPinnedToolbars(pinnedToolbars);
-        }
-    }
     getViewProperties() {
         return {
             getStatusBarPanelProps: () => {

package/src/Strategy/GridInfoModule.js

@@ -11,6 +11,7 @@ export class GridInfoModule extends AdaptableModuleBase {
         if (this.isModuleAvailable()) {
             return [
                 this.createMainMenuItemShowPopup({
+                    Name: 'grid-info-show',
                     Label: 'Grid Info',
                     ComponentName: this.moduleInfo.Popup,
                     Icon: this.moduleInfo.Glyph,
@@ -22,6 +23,7 @@ export class GridInfoModule extends AdaptableModuleBase {
         if (this.isModuleAvailable()) {
             return [
                 this.createMainMenuItemShowPopup({
+                    Name: 'grid-info-show',
                     Label: 'Grid Info',
                     ComponentName: this.moduleInfo.Popup,
                     Icon: this.moduleInfo.Glyph,

package/src/Strategy/Interface/IModule.d.ts

@@ -156,7 +156,6 @@ export interface IModule {
     getModuleFreeTextColumnReferences(): FreeTextColumn[];
     getPopupMaxWidth(): number | undefined;
     canBeAssociatedWithLayouts(): boolean;
-    updateOldConfig(): void;
     /**
      * The following view options are used to render adaptable objects and
      * module general views.

package/src/Strategy/LayoutModule.d.ts

@@ -7,16 +7,17 @@ import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { AdaptableModuleView, IModule, TeamSharingReferences } from './Interface/IModule';
 import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
+import { AggregatedScalarLiveValue } from '../Utilities/Services/AggregatedScalarLiveValue';
 export declare class LayoutModule extends AdaptableModuleBase implements IModule {
+    cachedCellSummary: Map<string, AggregatedScalarLiveValue>;
     protected LayoutState: LayoutState;
     constructor(api: AdaptableApi);
-    updateOldConfig(): void;
-    private clearUnsuportedFeaturesFromLayout;
+    onAdaptableReady(): void;
+    rowSummariesSubscribtions(): void;
     getModuleAdaptableObjects(): AdaptableObject[];
     getExplicitlyReferencedColumnIds(layout: Layout): string[];
     getTeamSharingReferences(adaptableObject: AdaptableObject): TeamSharingReferences;
     hasNamedQueryReferences(): boolean;
-    handleAdaptableReady(): void;
     addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
     addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     private createViewPivotItemsMenuItem;
@@ -44,4 +45,9 @@ export declare class LayoutModule extends AdaptableModuleBase implements IModule
     getViewProperties(): AdaptableModuleView;
     handleLayoutChange(): void;
     getReferencedNamedQueryNames(layout: Layout): string[];
+    /**
+     *
+     * @param colId optional to evaluate only one column
+     */
+    private evaluateRowSummary;
 }

package/src/Strategy/LayoutModule.js

@@ -15,42 +15,16 @@ import { SHOW_PIVOT_COLUMN_DETAILS } from '../View/Components/Popups/WindowPopup
 import flattenDeep from 'lodash/flattenDeep';
 import StringExtensions from '../Utilities/Extensions/StringExtensions';
 import { getGridFilterViewItems } from '../View/Layout/Wizard/getGridFilterPreview';
+import { AggregatedScalarLiveValue } from '../Utilities/Services/AggregatedScalarLiveValue';
+import { SystemRowSummarySet } from '../Redux/ActionsReducers/SystemRedux';
+import { ROW_SUMMARY_ROW_ID, WEIGHTED_AVERAGE_AGGREATED_FUNCTION, } from '../PredefinedConfig/Common/RowSummary';
+import Helper from '../Utilities/Helpers/Helper';
 export class LayoutModule extends AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.LayoutModuleId, ModuleConstants.LayoutFriendlyName, 'grid', 'LayoutPopup', 'Named sets of column visibility, order, groupings, aggregation, pivots etc.', api);
-        this.clearUnsuportedFeaturesFromLayout = (layout) => {
-            const layoutSupportedFeatures = this.api.layoutApi.internalApi.getLayoutSupportedFeatures();
-            let needsUpdate = false;
-            const layoutToSave = Object.assign({}, layout);
-            if (!layoutSupportedFeatures.RowGroupedColumns && layout.RowGroupedColumns) {
-                delete layoutToSave.RowGroupedColumns;
-                needsUpdate = true;
-            }
-            if (!layoutSupportedFeatures.AggregationColumns && layout.AggregationColumns) {
-                delete layoutToSave.AggregationColumns;
-                needsUpdate = true;
-            }
-            if (!layoutSupportedFeatures.PivotColumns && layout.PivotColumns) {
-                delete layoutToSave.PivotColumns;
-                delete layoutToSave.EnablePivot;
-                needsUpdate = true;
-            }
-            if (!layoutSupportedFeatures.ColumnFilters && layout.ColumnFilters) {
-                delete layoutToSave.ColumnFilters;
-                needsUpdate = true;
-            }
-            if (!layoutSupportedFeatures.GridFilter && layout.GridFilter) {
-                delete layoutToSave.GridFilter;
-                needsUpdate = true;
-            }
-            if (!layoutSupportedFeatures.ColumnSorts && layout.ColumnSorts) {
-                delete layoutToSave.ColumnSorts;
-                needsUpdate = true;
-            }
-            if (needsUpdate) {
-                this.api.layoutApi.createOrUpdateLayout(layoutToSave);
-            }
-        };
+        this.cachedCellSummary = new Map();
+    }
+    onAdaptableReady() {
         this.api.eventApi.on('LayoutChanged', (layoutChangedInfo) => {
             var _a;
             if (layoutChangedInfo.newLayoutState.CurrentLayout !==
@@ -59,17 +33,45 @@ export class LayoutModule extends AdaptableModuleBase {
                 this.handleLayoutChange();
             }
         });
+        requestAnimationFrame(() => {
+            this.api.layoutApi.internalApi.fireLayoutChangedEvent('ADAPTABLE_READY', null, this.api.layoutApi.getLayoutState());
+        });
+        this.rowSummariesSubscribtions();
     }
-    updateOldConfig() {
-        /**
-         * Viewport mode does not support a few
-         * features instead of complicating the
-         * logic where layout is applied, it is easier and
-         * less error prone to just remove it.
-         */
-        if (this.api.gridApi.getAgGridRowModelType() === 'viewport') {
-            this.api.layoutApi.getLayouts().forEach(this.clearUnsuportedFeaturesFromLayout);
-        }
+    rowSummariesSubscribtions() {
+        // ROW SUMMARY
+        this.evaluateRowSummary();
+        this.api.eventApi.on('AdaptableStateReloaded', () => {
+            this.evaluateRowSummary();
+        });
+        this.api.eventApi.on('GridDataChanged', (event) => {
+            this.evaluateRowSummary();
+        });
+        this.api.eventApi.on('CellChanged', (event) => {
+            const columnId = event.cellChange.column.columnId;
+            this.evaluateRowSummary({
+                columnId,
+            });
+        });
+        this.api.eventApi.on('LayoutChanged', (event) => {
+            // exclude filter events, those are handled in another event
+            if (event.actionName.includes('FILTER')) {
+                return;
+            }
+            setTimeout(() => {
+                // the timeout is added so the grid has time to repond to the layout changed
+                this.evaluateRowSummary();
+            }, 16);
+        });
+        const adaptable = this.api.internalApi.getAdaptableInstance();
+        adaptable._on('AdapTableFiltersApplied', () => {
+            // we need to use this instead of layout changed
+            // so the rows have time to update
+            this.evaluateRowSummary();
+        });
+        adaptable._on('FirstDataRendered', () => {
+            this.evaluateRowSummary();
+        });
     }
     getModuleAdaptableObjects() {
         return this.api.layoutApi.getLayouts();
@@ -137,18 +139,13 @@ export class LayoutModule extends AdaptableModuleBase {
     hasNamedQueryReferences() {
         return true;
     }
-    handleAdaptableReady() {
-        requestAnimationFrame(() => {
-            this.api.layoutApi.internalApi.fireLayoutChangedEvent('ADAPTABLE_READY', null, this.api.layoutApi.getLayoutState());
-        });
-    }
     addColumnMenuItems(column) {
         var _a, _b;
         let returnColumnMenuItems = [];
         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.createMenuItemShowPopup('layout-edit', 'Edit Layout', this.moduleInfo.Popup, this.moduleInfo.Glyph, {
                     action: 'Edit',
                     source: 'ColumnMenu',
                     value: this.api.layoutApi.getCurrentLayout(),
@@ -156,10 +153,10 @@ export class LayoutModule extends AdaptableModuleBase {
             }
             if (column) {
                 if (!isReadOnlyLayout) {
-                    returnColumnMenuItems.push(this.createColumnMenuItemClickFunction('Change Caption', 'edit', () => this.api.layoutApi.showChangeColumnCaption(column)));
+                    returnColumnMenuItems.push(this.createMenuItemClickFunction('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.createMenuItemClickFunction('layout-column-hide', 'Hide Column', 'visibility-off-bold', () => {
                         this.api.columnApi.hideColumn(column.columnId);
                     }));
                 }
@@ -168,23 +165,24 @@ export class LayoutModule extends 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.createMenuItemClickFunction('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.createMenuItemClickFunction('layout-column-select-reset', 'Column (Reset Selection)', 'columns', () => {
                         this.api.columnApi.selectColumn(column.columnId);
                     }));
                 }
                 else {
-                    selectMenuItems.push(this.createColumnMenuItemClickFunction('Column', 'columns', () => {
+                    selectMenuItems.push(this.createMenuItemClickFunction('layout-column-select', 'Column', 'columns', () => {
                         this.api.columnApi.selectColumn(column.columnId);
                     }));
                 }
             }
-            selectMenuItems.push(this.createColumnMenuItemClickFunction('Whole Grid', this.moduleInfo.Glyph, () => {
+            selectMenuItems.push(this.createMenuItemClickFunction('layout-select-all', 'Whole Grid', this.moduleInfo.Glyph, () => {
                 this.api.gridApi.selectAll();
             }));
             returnColumnMenuItems.push({
+                name: 'layout-select-parent',
                 label: 'Select',
                 isVisible: true,
                 module: this.moduleInfo.ModuleName,
@@ -199,7 +197,7 @@ export class LayoutModule extends 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.createMenuItemShowPopup('layout-edit', 'Edit Layout', this.moduleInfo.Popup, this.moduleInfo.Glyph, {
                 action: 'Edit',
                 source: 'ColumnMenu',
             }));
@@ -211,18 +209,19 @@ export class LayoutModule extends AdaptableModuleBase {
             let clickFunction = () => {
                 this.api.gridApi.deselectAll();
             };
-            returnColumnMenuItems.push(this.createColumnMenuItemClickFunction('Clear Selected Cells', 'undo', clickFunction));
+            returnColumnMenuItems.push(this.createMenuItemClickFunction('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.createMenuItemClickFunction('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.createMenuItemClickFunction('layout-select-all', 'Select', 'tab-unselected', clickFunction));
                 returnColumnMenuItems.push({
+                    name: 'layout-grid-parent',
                     label: 'Grid',
                     module: this.moduleInfo.ModuleName,
                     isVisible: true,
@@ -239,7 +238,7 @@ export class LayoutModule extends AdaptableModuleBase {
     }
     createViewPivotItemsMenuItem(menuContext) {
         // current group => menuContext.rowNode.field;
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
         const selectedCellInfo = (_a = menuContext.selectedCellInfo) !== null && _a !== void 0 ? _a : this.api.gridApi.getSelectedCellInfo();
         if (((_b = selectedCellInfo === null || selectedCellInfo === void 0 ? void 0 : selectedCellInfo.gridCells) === null || _b === void 0 ? void 0 : _b.length) !== 1) {
             return;
@@ -280,7 +279,9 @@ export class LayoutModule extends AdaptableModuleBase {
         }
         const data = flattenDeep(getData(menuContext.rowNode.childrenAfterFilter));
         const rowGroups = currentLayout.RowGroupedColumns;
-        const cellValue = isPivotColumn ? menuContext.rowNode.aggData[columnId] : gridCell.displayValue;
+        const cellValue = isPivotColumn
+            ? (_o = (_m = menuContext.rowNode) === null || _m === void 0 ? void 0 : _m.aggData) === null || _o === void 0 ? void 0 : _o[columnId]
+            : gridCell.displayValue;
         const popupProps = {
             hasPivotValue: isPivotColumn,
             columnId,
@@ -292,6 +293,7 @@ export class LayoutModule extends AdaptableModuleBase {
             pivotColumnId,
         };
         return {
+            name: 'layout-aggregated-view',
             module: this.moduleInfo.ModuleName,
             isVisible: true,
             label: 'Expand Aggregated Value',
@@ -321,7 +323,7 @@ export class LayoutModule extends AdaptableModuleBase {
         return this.getModuleAdaptableObjects().map((layout) => this.toView(layout));
     }
     toView(layout) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g;
         const maxColumnsToDisplay = (_b = (_a = this.api.optionsApi.getLayoutOptions().layoutViewOptions) === null || _a === void 0 ? void 0 : _a.maxColumnsToDisplay) !== null && _b !== void 0 ? _b : 10;
         const columnIdToFriendlyName = (columnId) => {
             return this.api.columnApi.getFriendlyNameForColumnId(columnId);
@@ -390,6 +392,22 @@ export class LayoutModule extends AdaptableModuleBase {
                 (layout === null || layout === void 0 ? void 0 : layout.GridFilter) &&
                     StringExtensions.IsNotNullOrEmpty(layout.GridFilter.Expression) &&
                     getGridFilterViewItems(layout),
+                ((_g = layout === null || layout === void 0 ? void 0 : layout.RowSummaries) === null || _g === void 0 ? void 0 : _g.length) && {
+                    name: 'Row Summaries',
+                    values: layout === null || layout === void 0 ? void 0 : layout.RowSummaries.map((rowSummary) => {
+                        var _a;
+                        const columns = Object.entries((_a = rowSummary.ColumnsMap) !== null && _a !== void 0 ? _a : {})
+                            .map(([columnId, expression]) => {
+                            if (columnId === 'Source' || columnId === 'Uuid') {
+                                return '';
+                            }
+                            return `${expression}(${columnIdToFriendlyName(columnId)})`;
+                        })
+                            .filter(Boolean)
+                            .join(', ');
+                        return `${rowSummary.Position}: ${columns}`;
+                    }),
+                },
             ].filter(Boolean),
             abObject: layout,
         };
@@ -435,7 +453,7 @@ export class LayoutModule extends AdaptableModuleBase {
             .setUpScheduleJobs();
         // CustomSort, FlashingCell, FormatColumn
         // we need to refresh the column defs, as some configs may have changed
-        this.api.internalApi.getAdaptableInstance().setupColumns();
+        this.api.internalApi.getAdaptableInstance().updateColumnModelAndRefreshGrid();
     }
     getReferencedNamedQueryNames(layout) {
         var _a;
@@ -444,4 +462,66 @@ export class LayoutModule extends AdaptableModuleBase {
         }
         return this.api.namedQueryApi.internalApi.getReferencedNamedQueryNames(layout.GridFilter.Expression);
     }
+    /**
+     *
+     * @param colId optional to evaluate only one column
+     */
+    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 {
+                Position,
+                RowData: Object.entries(ColumnsMap !== null && ColumnsMap !== void 0 ? ColumnsMap : {}).reduce((acc, [columnId, expression]) => {
+                    const key = `${columnId}-${expression}`;
+                    let expressionLiveValue = this.cachedCellSummary.get(key);
+                    if (expressionLiveValue) {
+                        if (!reason) {
+                            // refresh all of them
+                            expressionLiveValue.refresh();
+                        }
+                        else if ('columnId' in reason && reason.columnId === columnId) {
+                            expressionLiveValue.refresh();
+                        }
+                    }
+                    if (!expressionLiveValue) {
+                        try {
+                            let aggregatedScalarExpression = `${expression}([${columnId}])`;
+                            if (aggregatedScalarExpression.includes(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({
+                                aggregatedScalarExpression,
+                            }, ModuleConstants.LayoutModuleId, this.api, () => {
+                                return this.api.gridApi.getVisibleRowNodes();
+                            });
+                        }
+                        catch (e) {
+                            this.api.logError('Error evaluating row summary', e);
+                        }
+                        this.cachedCellSummary.set(key, expressionLiveValue);
+                    }
+                    let value = null;
+                    if (expressionLiveValue) {
+                        value = expressionLiveValue.getGlobalAggregatedValue();
+                        if (typeof value === 'number' && !isNaN(value)) {
+                            value = Helper.roundNumber(value, 2);
+                        }
+                    }
+                    acc[columnId] = value;
+                    return acc;
+                }, {
+                    [ROW_SUMMARY_ROW_ID]: true,
+                }),
+            };
+        });
+        this.api.internalApi.dispatchReduxAction(SystemRowSummarySet(rowSummariesResults));
+    }
 }

package/src/Strategy/NamedQueryModule.d.ts

@@ -8,7 +8,6 @@ import { IModule } from './Interface/IModule';
 export declare class NamedQueryModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
     getModuleAdaptableObjects(): AdaptableObject[];
-    updateOldConfig(): void;
     getTeamSharingAction(): TeamSharingImportInfo<NamedQuery>;
     getExplicitlyReferencedColumnIds(namedQuery: NamedQuery): string[];
     getReferencedNamedQueryNames(namedQuery: NamedQuery): string[];

package/src/Strategy/NamedQueryModule.js

@@ -1,6 +1,5 @@
 import * as NamedQueryRedux from '../Redux/ActionsReducers/NamedQueryRedux';
 import * as ModuleConstants from '../Utilities/Constants/ModuleConstants';
-import ArrayExtensions from '../Utilities/Extensions/ArrayExtensions';
 import { EditGridFilterButton } from '../View/NamedQuery/EditCurrentQueryButton';
 import { NamedQueryWizard } from '../View/NamedQuery/Wizard/NamedQueryWizard';
 import { AdaptableModuleBase } from './AdaptableModuleBase';
@@ -12,24 +11,6 @@ export class NamedQueryModule extends AdaptableModuleBase {
     getModuleAdaptableObjects() {
         return this.api.namedQueryApi.getNamedQueries();
     }
-    updateOldConfig() {
-        // - move named queries from old Query State to this Module
-        // Note: GridFilter Module moves the "old" CurrentQuery into Layout
-        const oldQueryState = this.api.internalApi.getAdaptableState().Query;
-        const oldNamedQueries = oldQueryState.NamedQueries;
-        if (ArrayExtensions.IsNotNullOrEmpty(oldNamedQueries)) {
-            const currentNamedQueries = this.api.namedQueryApi.getNamedQueries();
-            oldNamedQueries.forEach((oldNamedQuery) => {
-                const currentQuery = currentNamedQueries.find((q) => q.Name === oldNamedQuery.Name);
-                if (!currentQuery) {
-                    this.api.namedQueryApi.addNamedQuery(oldNamedQuery);
-                }
-            });
-        }
-        if (oldQueryState) {
-            this.api.namedQueryApi.internalApi.cleanupQueryRedux();
-        }
-    }
     getTeamSharingAction() {
         return {
             ModuleEntities: this.api.namedQueryApi.getNamedQueries(),

package/src/Strategy/{NotesModule.d.ts → NoteModule.d.ts}

@@ -2,9 +2,10 @@ import { AdaptableApi } from '../Api/AdaptableApi';
 import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { IModule } from './Interface/IModule';
-export declare class NotesModule extends AdaptableModuleBase implements IModule {
+export declare class NoteModule extends AdaptableModuleBase implements IModule {
     private adaptable;
     constructor(api: AdaptableApi);
+    isModuleAvailable(): boolean;
     addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     private getAddRemoveNoteMenuItems;
 }