@adaptabletools/adaptable-cjs 18.0.0-canary.28 → 18.0.0-canary.29

package/src/Strategy/ExportModule.js

@@ -50,58 +50,69 @@ class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             return;
         }
         let returnMenuItems = [];
-        const canExportCells = menuContext.selectedCellInfo &&
+        const availableSystemReports = this.api.exportApi.getAvailableSystemReports();
+        if (availableSystemReports.includes(GeneralConstants_1.VISUAL_DATA_REPORT)) {
+            returnMenuItems.push(this.createMenuItemClickFunction('export-visual-data-excel', 'Excel', this.moduleInfo.Glyph, () => this.export(this.api.exportApi.getReportByName(GeneralConstants_1.VISUAL_DATA_REPORT), Enums_1.ExportDestination.Excel)));
+        }
+        if (availableSystemReports.includes(GeneralConstants_1.ALL_DATA_REPORT)) {
+            const allDataReport = this.api.exportApi.getReportByName(GeneralConstants_1.ALL_DATA_REPORT);
+            returnMenuItems.push(...this.buildReportMenuItems(allDataReport));
+        }
+        if (availableSystemReports.includes(GeneralConstants_1.CURRENT_DATA_REPORT)) {
+            const currentDataReport = this.api.exportApi.getReportByName(GeneralConstants_1.CURRENT_DATA_REPORT);
+            returnMenuItems.push(...this.buildReportMenuItems(currentDataReport));
+        }
+        const canExportCells = availableSystemReports.includes(GeneralConstants_1.SELECTED_CELLS_REPORT) &&
+            menuContext.selectedCellInfo &&
             ArrayExtensions_1.default.IsNotNullOrEmpty(menuContext.selectedCellInfo.columns) &&
             ArrayExtensions_1.default.IsNotNullOrEmpty(menuContext.selectedCellInfo.gridCells);
-        const canExportRows = menuContext.selectedRowInfo &&
+        if (canExportCells) {
+            const selectedCellReport = this.api.exportApi.getReportByName(GeneralConstants_1.SELECTED_CELLS_REPORT);
+            returnMenuItems.push(...this.buildReportMenuItems(selectedCellReport));
+        }
+        const canExportRows = availableSystemReports.includes(GeneralConstants_1.SELECTED_ROWS_REPORT) &&
+            menuContext.selectedRowInfo &&
             ArrayExtensions_1.default.IsNotNullOrEmpty(menuContext.selectedRowInfo.gridRows) &&
             menuContext.gridCell &&
             menuContext.gridCell.primaryKeyValue &&
             menuContext.isSelectedRow;
-        if (canExportCells) {
-            const selectedCellReport = this.api.exportApi.getReportByName(GeneralConstants_1.SELECTED_CELLS_REPORT);
-            returnMenuItems.push(...this.buildReportMenuItems(selectedCellReport, 'cells'));
-        }
         if (canExportRows) {
             const selectedRowReport = this.api.exportApi.getReportByName(GeneralConstants_1.SELECTED_ROWS_REPORT);
-            returnMenuItems.push(...this.buildReportMenuItems(selectedRowReport, 'rows'));
+            returnMenuItems.push(...this.buildReportMenuItems(selectedRowReport));
         }
         return returnMenuItems;
     }
-    buildReportMenuItems(report, selectionType) {
+    buildReportMenuItems(report) {
+        // a bit convoluted, but ce la vie, that's what happens when you use enums instead of union types
+        // convert to lowercase and replace empty spaces with hyphens
+        const adjustName = (name = '') => {
+            const result = name.replace(/ /g, '-');
+            return result.toLowerCase();
+        };
+        const getMenuItemName = (reportName, destination) => {
+            return `export-${adjustName(reportName)}-${adjustName(destination)}`;
+        };
         const menuItems = [];
         for (const destination of this.api.exportApi.getAvailableExportDestinations()) {
-            menuItems.push(this.createMenuItemClickFunction(this.getMenuName(destination, selectionType), destination, this.moduleInfo.Glyph, () => this.export(report, destination)));
+            menuItems.push(this.createMenuItemClickFunction(getMenuItemName(report.Name, destination), destination, this.moduleInfo.Glyph, () => this.export(report, destination)));
         }
         for (const customDestination of this.api.exportApi.getCustomDestinations()) {
-            menuItems.push(this.createMenuItemClickFunction(`export-${selectionType}-custom-destination`, customDestination.name, this.moduleInfo.Glyph, () => this.export(report, customDestination.name)));
+            menuItems.push(this.createMenuItemClickFunction(getMenuItemName(report.Name, customDestination.name), customDestination.name, this.moduleInfo.Glyph, () => this.export(report, customDestination.name)));
         }
         return menuItems;
     }
-    getMenuName(exportDestination, selectionType) {
-        switch (exportDestination) {
-            case Enums_1.ExportDestination.CSV:
-                return `export-${selectionType}-csv`;
-            case Enums_1.ExportDestination.Clipboard:
-                return `export-${selectionType}-clipboard`;
-            case Enums_1.ExportDestination.Excel:
-                return `export-${selectionType}-excel`;
-            case Enums_1.ExportDestination.JSON:
-                return `export-${selectionType}-json`;
-            case Enums_1.ExportDestination.Table:
-                return `export-${selectionType}-table`;
-        }
-    }
     async export(report, exportDestination) {
         var _a;
         const cleanupExportProcess = () => {
             this.api.internalApi.dispatchReduxAction((0, SystemRedux_1.SystemVisualExportEnd)());
-            this.api.internalApi.hideProgressIndicator();
+            this.api.userInterfaceApi.hideProgressIndicator();
         };
         if (report.Name === GeneralConstants_1.VISUAL_DATA_REPORT) {
             this.api.internalApi.dispatchReduxAction((0, SystemRedux_1.SystemVisualExportBegin)());
         }
-        this.api.internalApi.dispatchReduxAction((0, SystemRedux_1.SystemProgressIndicatorShow)(`${report.Name} Export in progress...`));
+        this.api.userInterfaceApi.showProgressIndicator({
+            text: `${report.Name} Export in progress...`,
+        });
         try {
             // waitForTimeout required to give the ProgressIndicator rendering a head-start (see rAF in ProgressIndicator implementation)
             await (0, waitForTimeout_1.waitForTimeout)(16);

package/src/Strategy/LayoutModule.d.ts

@@ -7,13 +7,11 @@ 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;
+    private rowSummaryService;
     constructor(api: AdaptableApi);
     onAdaptableReady(): void;
-    rowSummariesSubscriptions(): void;
     getModuleAdaptableObjects(): AdaptableObject[];
     getExplicitlyReferencedColumnIds(layout: Layout): string[];
     getTeamSharingReferences(adaptableObject: AdaptableObject): TeamSharingReferences;
@@ -45,9 +43,4 @@ 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

@@ -19,16 +19,14 @@ const windowFactory_1 = require("../View/Components/Popups/WindowPopups/windowFa
 const flattenDeep_1 = tslib_1.__importDefault(require("lodash/flattenDeep"));
 const StringExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/StringExtensions"));
 const getGridFilterPreview_1 = require("../View/Layout/Wizard/getGridFilterPreview");
-const AggregatedScalarLiveValue_1 = require("../Utilities/Services/AggregatedScalarLiveValue");
-const SystemRedux_1 = require("../Redux/ActionsReducers/SystemRedux");
-const RowSummary_1 = require("../PredefinedConfig/Common/RowSummary");
-const Helper_1 = tslib_1.__importDefault(require("../Utilities/Helpers/Helper"));
+const RowSummaryService_1 = require("../Utilities/Services/RowSummaryService");
 class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.LayoutModuleId, ModuleConstants.LayoutFriendlyName, 'grid', 'LayoutPopup', 'Named sets of column visibility, order, groupings, aggregation, pivots etc.', api);
-        this.cachedCellSummary = new Map();
+        this.rowSummaryService = new RowSummaryService_1.RowSummaryService(this.api);
     }
     onAdaptableReady() {
+        this.rowSummaryService.onAdapterReady();
         this.api.eventApi.on('LayoutChanged', (layoutChangedInfo) => {
             var _a;
             if (layoutChangedInfo.newLayoutState.CurrentLayout !==
@@ -40,49 +38,6 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         requestAnimationFrame(() => {
             this.api.layoutApi.internalApi.fireLayoutChangedEvent('ADAPTABLE_READY', null, this.api.layoutApi.getLayoutState());
         });
-        this.rowSummariesSubscriptions();
-    }
-    rowSummariesSubscriptions() {
-        if (this.api.isDestroyed()) {
-            return;
-        }
-        // Currently not available for serverside model
-        if (!this.api.layoutApi.internalApi.getLayoutSupportedFeatures().RowSummaries) {
-            return;
-        }
-        // 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();
@@ -448,70 +403,5 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         }
         return this.api.namedQueryApi.internalApi.getReferencedNamedQueryNames(layout.GridFilter.Expression);
     }
-    /**
-     *
-     * @param colId optional to evaluate only one column
-     */
-    evaluateRowSummary(reason) {
-        var _a;
-        if (this.api.isDestroyed()) {
-            return;
-        }
-        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(RowSummary_1.WEIGHTED_AVERAGE_AGGREATED_FUNCTION) &&
-                                currentLayout.AggregationColumns[columnId] &&
-                                typeof currentLayout.AggregationColumns[columnId] === 'object') {
-                                const weight = currentLayout.AggregationColumns[columnId]
-                                    .weightedColumnId;
-                                if (weight) {
-                                    aggregatedScalarExpression = `AVG([${columnId}], WEIGHT([${weight}]))`;
-                                }
-                            }
-                            expressionLiveValue = new AggregatedScalarLiveValue_1.AggregatedScalarLiveValue({
-                                aggregatedScalarExpression,
-                            }, ModuleConstants.LayoutModuleId, this.api, () => {
-                                return this.api.gridApi.getVisibleRowNodes();
-                            });
-                        }
-                        catch (e) {
-                            this.api.logError('Error evaluating row summary', e);
-                        }
-                        this.cachedCellSummary.set(key, expressionLiveValue);
-                    }
-                    let value = null;
-                    if (expressionLiveValue) {
-                        value = expressionLiveValue.getGlobalAggregatedValue();
-                        if (typeof value === 'number' && !isNaN(value)) {
-                            value = Helper_1.default.roundNumber(value, 2);
-                        }
-                    }
-                    acc[columnId] = value;
-                    return acc;
-                }, {
-                    [RowSummary_1.ROW_SUMMARY_ROW_ID]: true,
-                }),
-            };
-        });
-        this.api.internalApi.dispatchReduxAction((0, SystemRedux_1.SystemRowSummarySet)(rowSummariesResults));
-    }
 }
 exports.LayoutModule = LayoutModule;

package/src/Strategy/StyledColumnModule.js

@@ -175,10 +175,13 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 },
             });
         }
-        if (!styledColumn.BadgeStyle) {
+        if (styledColumn.BadgeStyle) {
             specificTypeItems.push({
                 name: 'Settings',
-                values: [`Include grouped rows: ${styledColumn.IncludeGroupedRows ? 'Yes' : 'No'}`],
+                values: [
+                    `Include grouped rows: ${styledColumn.IncludeGroupedRows ? 'Yes' : 'No'}`,
+                    `Include row summaries: ${styledColumn.IncludeRowSummaries ? 'Yes' : 'No'}`,
+                ],
             });
         }
         if (styledColumn.BadgeStyle) {

package/src/Strategy/Utilities/FormatColumn/getFormatColumnSettingsViewItems.js

@@ -6,6 +6,7 @@ const getFormatColumnSettingsViewItems = (formatColumn) => {
     const values = [
         `Cell alignment: ${(_a = formatColumn.CellAlignment) !== null && _a !== void 0 ? _a : 'default'}`,
         `Include grouped rows: ${formatColumn.IncludeGroupedRows ? 'Yes' : 'No'}`,
+        `Include row summaries: ${formatColumn.IncludeRowSummaries ? 'Yes' : 'No'}`,
     ].filter(Boolean);
     return {
         name: 'Settings',

package/src/Utilities/Interface/MessagePopups.d.ts

@@ -32,9 +32,6 @@ export interface ScreenPopup {
         [key: string]: any;
     };
 }
-export interface LoadingPopup {
-    ShowLoadingPopup: boolean;
-}
 export interface ConfirmationPopup {
     ShowConfirmationPopup: boolean;
     Header: string;

package/src/Utilities/Services/RowSummaryService.d.ts

@@ -0,0 +1,22 @@
+import { AdaptableApi, Layout } from '../../types';
+import { AggregatedScalarLiveValue } from './AggregatedScalarLiveValue';
+/**
+ * The logic is extracted here to make it easier to follow
+ */
+export declare class RowSummaryService {
+    private api;
+    cachedCellSummary: Map<string, AggregatedScalarLiveValue>;
+    previousRowSummaries: any;
+    previousLayout: Layout | null;
+    debouncedEvaluateRowSummary: import("lodash").DebouncedFunc<(reason?: {
+        columnId: string;
+    }) => void>;
+    constructor(api: AdaptableApi);
+    onAdapterReady(): void;
+    rowSummariesSubscriptions(): void;
+    /**
+     *
+     * @param colId optional to evaluate only one column
+     */
+    private evaluateRowSummary;
+}

package/src/Utilities/Services/RowSummaryService.js

@@ -0,0 +1,146 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RowSummaryService = void 0;
+const tslib_1 = require("tslib");
+const lodash_1 = require("lodash");
+const RowSummary_1 = require("../../PredefinedConfig/Common/RowSummary");
+const SystemRedux_1 = require("../../Redux/ActionsReducers/SystemRedux");
+const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
+const Helper_1 = tslib_1.__importDefault(require("../Helpers/Helper"));
+const AggregatedScalarLiveValue_1 = require("./AggregatedScalarLiveValue");
+const ObjectExtensions_1 = require("../Extensions/ObjectExtensions");
+const debounce_1 = tslib_1.__importDefault(require("lodash/debounce"));
+/**
+ * The logic is extracted here to make it easier to follow
+ */
+class RowSummaryService {
+    constructor(api) {
+        this.api = api;
+        this.cachedCellSummary = new Map();
+        this.debouncedEvaluateRowSummary = (0, debounce_1.default)(this.evaluateRowSummary, 300);
+    }
+    onAdapterReady() {
+        this.rowSummariesSubscriptions();
+    }
+    rowSummariesSubscriptions() {
+        // return;
+        if (this.api.isDestroyed()) {
+            return;
+        }
+        // Currently not available for serverside model
+        if (!this.api.layoutApi.internalApi.getLayoutSupportedFeatures().RowSummaries) {
+            return;
+        }
+        this.debouncedEvaluateRowSummary();
+        this.api.eventApi.on('AdaptableStateReloaded', () => {
+            this.debouncedEvaluateRowSummary();
+        });
+        this.api.eventApi.on('GridDataChanged', (event) => {
+            this.debouncedEvaluateRowSummary();
+        });
+        this.api.eventApi.on('CellChanged', (event) => {
+            const columnId = event.cellChange.column.columnId;
+            this.debouncedEvaluateRowSummary({
+                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.debouncedEvaluateRowSummary();
+            }, 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.debouncedEvaluateRowSummary();
+        });
+        adaptable._on('FirstDataRendered', () => {
+            this.debouncedEvaluateRowSummary();
+        });
+    }
+    /**
+     *
+     * @param colId optional to evaluate only one column
+     */
+    evaluateRowSummary(reason) {
+        var _a;
+        if (this.api.isDestroyed()) {
+            return;
+        }
+        const currentLayout = this.api.layoutApi.getCurrentLayout();
+        let previousLayout = this.previousLayout;
+        // it is added here to be sure it is saved
+        this.previousLayout = currentLayout;
+        /**
+         * If the previous & current layout does not have row summaries, it is safe to exit
+         */
+        if ((0, ObjectExtensions_1.isObjectEmpty)(currentLayout === null || currentLayout === void 0 ? void 0 : currentLayout.RowSummaries) && (0, ObjectExtensions_1.isObjectEmpty)(previousLayout === null || previousLayout === void 0 ? void 0 : previousLayout.RowSummaries)) {
+            return;
+        }
+        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(RowSummary_1.WEIGHTED_AVERAGE_AGGREATED_FUNCTION) &&
+                                currentLayout.AggregationColumns[columnId] &&
+                                typeof currentLayout.AggregationColumns[columnId] === 'object') {
+                                const weight = currentLayout.AggregationColumns[columnId]
+                                    .weightedColumnId;
+                                if (weight) {
+                                    aggregatedScalarExpression = `AVG([${columnId}], WEIGHT([${weight}]))`;
+                                }
+                            }
+                            expressionLiveValue = new AggregatedScalarLiveValue_1.AggregatedScalarLiveValue({
+                                aggregatedScalarExpression,
+                            }, ModuleConstants.LayoutModuleId, this.api, () => {
+                                return this.api.gridApi.getVisibleRowNodes();
+                            });
+                        }
+                        catch (e) {
+                            this.api.logError('Error evaluating row summary', e);
+                        }
+                        this.cachedCellSummary.set(key, expressionLiveValue);
+                    }
+                    let value = null;
+                    if (expressionLiveValue) {
+                        value = expressionLiveValue.getGlobalAggregatedValue();
+                        if (typeof value === 'number' && !isNaN(value)) {
+                            value = Helper_1.default.roundNumber(value, 2);
+                        }
+                    }
+                    acc[columnId] = value;
+                    return acc;
+                }, {
+                    [RowSummary_1.ROW_SUMMARY_ROW_ID]: true,
+                }),
+            };
+        });
+        if (this.previousRowSummaries && (0, lodash_1.isEqual)(rowSummariesResults, this.previousRowSummaries)) {
+            return;
+        }
+        this.api.internalApi.dispatchReduxAction((0, SystemRedux_1.SystemRowSummarySet)(rowSummariesResults));
+        this.previousRowSummaries = rowSummariesResults;
+    }
+}
+exports.RowSummaryService = RowSummaryService;

package/src/View/FormatColumn/Wizard/FormatColumnSettingsWizardSection.js

@@ -19,7 +19,10 @@ const renderFormatColumnSettingsSummary = (data) => {
             React.createElement(Tag_1.Tag, null, (_a = data.CellAlignment) !== null && _a !== void 0 ? _a : 'default')),
         React.createElement(rebass_1.Text, { mt: 3 },
             "Include grouped rows ",
-            React.createElement(Tag_1.Tag, null, data.IncludeGroupedRows ? 'yes' : 'no'))));
+            React.createElement(Tag_1.Tag, null, data.IncludeGroupedRows ? 'yes' : 'no')),
+        React.createElement(rebass_1.Text, { mt: 3 },
+            "Include row summaries ",
+            React.createElement(Tag_1.Tag, null, data.IncludeRowSummaries ? 'yes' : 'no'))));
 };
 exports.renderFormatColumnSettingsSummary = renderFormatColumnSettingsSummary;
 const FormatColumnSettingsWizardSection = (props) => {
@@ -34,6 +37,9 @@ const FormatColumnSettingsWizardSection = (props) => {
     const onIncludeGroupedRowsChanged = (IncludeGroupedRows) => {
         props.onChange(Object.assign(Object.assign({}, data), { IncludeGroupedRows }));
     };
+    const onIncludeRowSummariesChanged = (IncludeRowSummaries) => {
+        props.onChange(Object.assign(Object.assign({}, data), { IncludeRowSummaries }));
+    };
     return (React.createElement(Tabs_1.Tabs, null,
         React.createElement(Tabs_1.Tabs.Tab, null, "Settings"),
         React.createElement(Tabs_1.Tabs.Content, null,
@@ -52,6 +58,9 @@ const FormatColumnSettingsWizardSection = (props) => {
                                     : onCellAlignmentSelectChanged(null) }))),
                     React.createElement(FormLayout_1.FormRow, { label: "Include Grouped Rows:" },
                         React.createElement(rebass_1.Flex, { alignItems: "center", marginLeft: 2 },
-                            React.createElement(CheckBox_1.CheckBox, { "data-name": "include-grouped-rows-checkbox", checked: data.IncludeGroupedRows, onChange: onIncludeGroupedRowsChanged, mr: 2 }))))))));
+                            React.createElement(CheckBox_1.CheckBox, { "data-name": "include-grouped-rows-checkbox", checked: data.IncludeGroupedRows, onChange: onIncludeGroupedRowsChanged, mr: 2 }))),
+                    React.createElement(FormLayout_1.FormRow, { label: "Include Row Summaries:" },
+                        React.createElement(rebass_1.Flex, { alignItems: "center", marginLeft: 2 },
+                            React.createElement(CheckBox_1.CheckBox, { "data-name": "include-grouped-rows-checkbox", checked: data.IncludeRowSummaries, onChange: onIncludeRowSummariesChanged, mr: 2 }))))))));
 };
 exports.FormatColumnSettingsWizardSection = FormatColumnSettingsWizardSection;

package/src/View/StyledColumn/Wizard/StyledColumnWizard.js

@@ -81,7 +81,7 @@ const StyledColumnWizard = (props) => {
                     React.createElement(StyledColumnWizardStyleSection_1.StyledColumnWizardStyleSection, { onChange: setStyledColumn })));
             },
             title: 'Style',
-        }, AdditionalSettingSection);
+        });
     }
     else if (styledColumn.BadgeStyle) {
         specificSteps.push({

package/src/View/StyledColumn/Wizard/StyledColumnWizardSettingsSection.js

@@ -4,28 +4,29 @@ exports.StyledColumnWizardSettingsSection = exports.renderStyledColumnWizardSett
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const rebass_1 = require("rebass");
-const FormLayout_1 = tslib_1.__importStar(require("../../../components/FormLayout"));
 const CheckBox_1 = require("../../../components/CheckBox");
+const FormLayout_1 = tslib_1.__importStar(require("../../../components/FormLayout"));
 const Tabs_1 = require("../../../components/Tabs");
-const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
 const Tag_1 = require("../../../components/Tag");
-let alignmentOptions = [
-    { value: 'Left', label: 'Left' },
-    { value: 'Right', label: 'Right' },
-    { value: 'Center', label: 'Center' },
-];
+const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
 const renderStyledColumnWizardSettingsSummary = (data) => {
     return (React.createElement(rebass_1.Box, { padding: 2 },
         React.createElement(rebass_1.Text, { mt: 3 },
             "Include grouped rows ",
-            React.createElement(Tag_1.Tag, null, data.IncludeGroupedRows ? 'yes' : 'no'))));
+            React.createElement(Tag_1.Tag, null, data.IncludeGroupedRows ? 'yes' : 'no')),
+        React.createElement(rebass_1.Text, { mt: 3 },
+            "Include row summaries ",
+            React.createElement(Tag_1.Tag, null, data.IncludeRowSummaries ? 'yes' : 'no'))));
 };
 exports.renderStyledColumnWizardSettingsSummary = renderStyledColumnWizardSettingsSummary;
 const StyledColumnWizardSettingsSection = (props) => {
-    const { data, api } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
+    const { data } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
     const onIncludeGroupedRowsChanged = (IncludeGroupedRows) => {
         props.onChange(Object.assign(Object.assign({}, data), { IncludeGroupedRows }));
     };
+    const onIncludeRowSummariesChanged = (IncludeRowSummaries) => {
+        props.onChange(Object.assign(Object.assign({}, data), { IncludeRowSummaries }));
+    };
     return (React.createElement(Tabs_1.Tabs, null,
         React.createElement(Tabs_1.Tabs.Tab, null, "Settings"),
         React.createElement(Tabs_1.Tabs.Content, null,
@@ -33,6 +34,9 @@ const StyledColumnWizardSettingsSection = (props) => {
                 React.createElement(FormLayout_1.default, null,
                     React.createElement(FormLayout_1.FormRow, { label: "Include Grouped Rows:" },
                         React.createElement(rebass_1.Flex, { alignItems: "center", marginLeft: 2 },
-                            React.createElement(CheckBox_1.CheckBox, { "data-name": "include-grouped-rows-checkbox", checked: data.IncludeGroupedRows, onChange: onIncludeGroupedRowsChanged, mr: 2 }))))))));
+                            React.createElement(CheckBox_1.CheckBox, { "data-name": "include-grouped-rows-checkbox", checked: data.IncludeGroupedRows, onChange: onIncludeGroupedRowsChanged, mr: 2 }))),
+                    React.createElement(FormLayout_1.FormRow, { label: "Include Row Summaries:" },
+                        React.createElement(rebass_1.Flex, { alignItems: "center", marginLeft: 2 },
+                            React.createElement(CheckBox_1.CheckBox, { "data-name": "include-grouped-rows-checkbox", checked: data.IncludeRowSummaries, onChange: onIncludeRowSummariesChanged, mr: 2 }))))))));
 };
 exports.StyledColumnWizardSettingsSection = StyledColumnWizardSettingsSection;

package/src/agGrid/AgGridColumnAdapter.js

@@ -9,7 +9,6 @@ const FloatingFilterWrapper_1 = require("./FloatingFilterWrapper");
 const StyleHelper_1 = require("../Utilities/Helpers/StyleHelper");
 const StringExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/StringExtensions"));
 const ObjectFactory_1 = require("../Utilities/ObjectFactory");
-const clamp_1 = tslib_1.__importDefault(require("lodash/clamp"));
 const tinycolor2_1 = tslib_1.__importDefault(require("tinycolor2"));
 const UIHelper_1 = tslib_1.__importDefault(require("../View/UIHelper"));
 const PercentBarRenderer_1 = require("./PercentBarRenderer");
@@ -669,6 +668,7 @@ class AgGridColumnAdapter {
         return Object.assign(Object.assign({}, this.getFormatColumnCellStyle(gridCell.column, activeFormatColumnsWithStyle, params)), styledColumnStyle);
     }
     getStyledColumnStyle(styledColumn, abColumn, params) {
+        var _a, _b;
         let style = {};
         const gradientStyle = styledColumn === null || styledColumn === void 0 ? void 0 : styledColumn.GradientStyle;
         if (params.value === undefined) {
@@ -676,18 +676,24 @@ class AgGridColumnAdapter {
         }
         let colValue = params.value;
         if (this.adaptableApi.gridApi.isGroupRowNode(params.node)) {
-            if (styledColumn.IncludeGroupedRows) {
-                const minColumnValue = this.adaptableApi.styledColumnApi.internalApi.getMinValueForNumericColumn(abColumn);
-                const maxColumnValue = this.adaptableApi.styledColumnApi.internalApi.getMaxValueForNumericColumn(abColumn);
-                /**
-                 * Color should always be in bounds, it should not overflow.
-                 * If the value is out of range, it shoul set the maximum/minimum color.
-                 */
-                colValue = (0, clamp_1.default)(params.value, minColumnValue, maxColumnValue);
-            }
-            else {
-                return style;
-            }
+            // We no longer support Grouped Rows
+            return style;
+            // if (styledColumn.IncludeGroupedRows) {
+            //   const minColumnValue =
+            //     this.adaptableApi.styledColumnApi.internalApi.getMinValueForNumericColumn(abColumn);
+            //   const maxColumnValue =
+            //     this.adaptableApi.styledColumnApi.internalApi.getMaxValueForNumericColumn(abColumn);
+            //   /**
+            //    * Color should always be in bounds, it should not overflow.
+            //    * If the value is out of range, it shoul set the maximum/minimum color.
+            //    */
+            //   colValue = clamp(params.value, minColumnValue, maxColumnValue);
+            // } else {
+            //   return style;
+            // }
+        }
+        if (((_b = (_a = params === null || params === void 0 ? void 0 : params.node) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b[RowSummary_1.ROW_SUMMARY_ROW_ID]) && !styledColumn.IncludeRowSummaries) {
+            return style;
         }
         if (gradientStyle) {
             const min = this.adaptableApi.styledColumnApi.internalApi.getNumericStyleMinValue(styledColumn, abColumn, params.node, colValue);

package/src/agGrid/AgGridMenuAdapter.d.ts

@@ -10,6 +10,7 @@ export declare class AgGridMenuAdapter {
     destroy(): void;
     buildColumnMenu(params: GetMainMenuItemsParams, originalGetMainMenuItems: GetMainMenuItems): (string | MenuItemDef)[];
     buildContextMenu(params: GetContextMenuItemsParams, originalGetContextMenuItems: GetContextMenuItems): (string | MenuItemDef)[];
+    private removeConsecutiveSeparators;
     private createColumnMenuContextObject;
     private createAdaptableContextMenuItems;
     private createContextMenuContextObject;
@@ -17,6 +18,10 @@ export declare class AgGridMenuAdapter {
     private mapCustomMenuItemToAgGridMenuDefinition;
     private mapUserMenuItemToAgGridMenuDefinition;
     private buildContextMenuDefaultStructure;
+    /**
+     * Hide menu group with no subitems or elevate single subitem to parent level
+     */
+    private normalizeMenuGroup;
     /**
      * Default strategy for menu items: return as is if there is only one item, otherwise group them under a parent item
      */