@adaptabletools/adaptable 18.0.0-canary.27 → 18.0.0-canary.29

package/src/PredefinedConfig/Common/Menu.js

@@ -4,10 +4,11 @@
 export const ADAPTABLE_COLUMN_MENU_ITEMS = [
     'calculated-column-edit',
     'cell-summary-show',
+    'column-group',
+    'column-filter-group',
     'column-filter-bar-hide',
     'column-filter-bar-show',
     'column-filter-clear',
-    'column-filter-on-cell-value',
     'column-filter-suspend',
     'column-filter-unsuspend',
     'column-info-show',
@@ -26,17 +27,18 @@ export const ADAPTABLE_COLUMN_MENU_ITEMS = [
     '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-select-actions',
     'layout-column-select',
     'layout-column-select-preserve',
     'layout-column-select-reset',
-    'layout-select-all',
+    'layout-grid-select',
     'plus-minus-add',
     'settings-panel-open',
+    'styling-group',
     'styled-column-badge-add',
     'styled-column-badge-edit',
     'styled-column-gradient-add',
@@ -52,11 +54,12 @@ export const ADAPTABLE_COLUMN_MENU_ITEMS = [
  * List of Shipped Adaptable Context Menu Items
  */
 export const ADAPTABLE_CONTEXT_MENU_ITEMS = [
-    'menu-group-parent',
+    'menu-group',
     'alert-clear',
     'bulk-update-apply',
     'calculated-column-edit',
     'cell-summary-show',
+    'column-group',
     'column-filter-on-cell-value',
     'column-filter-clear',
     'column-filter-suspend',
@@ -72,29 +75,39 @@ export const ADAPTABLE_CONTEXT_MENU_ITEMS = [
     'dashboard-hide',
     'dashboard-show',
     'data-import',
-    'export-cells-clipboard',
-    'export-cells-csv',
-    'export-cells-excel',
-    'export-cells-json',
-    'export-cells-table',
-    'export-cells-custom-destination',
-    'export-rows-clipboard',
-    'export-rows-csv',
-    'export-rows-excel',
-    'export-rows-json',
-    'export-rows-table',
-    'export-rows-custom-destination',
+    'edit-group',
+    'export-visual-data-excel',
+    'export-all-data-excel',
+    'export-all-data-csv',
+    'export-all-data-clipboard',
+    'export-all-data-json',
+    'export-all-data-table',
+    'export-current-data-excel',
+    'export-current-data-csv',
+    'export-current-data-clipboard',
+    'export-current-data-json',
+    'export-current-data-table',
+    'export-selected-cells-excel',
+    'export-selected-cells-csv',
+    'export-selected-cells-clipboard',
+    'export-selected-cells-json',
+    'export-selected-cells-table',
+    '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',
+    'grid-group',
     'grid-info-show',
     'layout-aggregated-view',
     'layout-auto-size',
     'layout-clear-selection',
     'layout-edit',
     'layout-select-all',
-    'layout-grid-actions',
     'note-add',
     'note-remove',
     'settings-panel-open',

package/src/PredefinedConfig/Common/TransposeConfig.d.ts

@@ -18,9 +18,9 @@ export interface TransposeConfig {
      */
     visibleColumns?: boolean;
     /**
-      * Only show curerntly visible Rows
-      * @defaultValue false
-      */
+     * Only show curerntly visible Rows
+     * @defaultValue false
+     */
     visibleRows?: boolean;
     /**
      * Autosize columns in transposed view

package/src/PredefinedConfig/FormatColumnState.d.ts

@@ -45,6 +45,10 @@ export interface FormatColumn extends SuspendableObject {
      * @defaultValue false
      */
     IncludeGroupedRows?: boolean;
+    /**
+     * Wehther to include Row Summary Rows
+     */
+    IncludeRowSummaries?: boolean;
 }
 /**
  * The Format Column Rule - can be either a Predicate or a BooleanExpression

package/src/PredefinedConfig/PopupState.d.ts

@@ -1,4 +1,4 @@
-import { ScreenPopup, ConfirmationPopup, PromptPopup, LoadingPopup, WindowPopup, FormPopup } from '../Utilities/Interface/MessagePopups';
+import { ScreenPopup, ConfirmationPopup, PromptPopup, WindowPopup, FormPopup } from '../Utilities/Interface/MessagePopups';
 import { InternalState } from './InternalState';
 /**
  * Internal state to manage open popups - NOT persisted by Redux
@@ -9,5 +9,4 @@ export interface PopupState extends InternalState {
     FormPopup: FormPopup;
     ConfirmationPopup: ConfirmationPopup;
     PromptPopup: PromptPopup;
-    LoadingPopup: LoadingPopup;
 }

package/src/PredefinedConfig/StyledColumnState.d.ts

@@ -41,6 +41,11 @@ export interface StyledColumn extends SuspendableObject {
      * @defaultValue false
      */
     IncludeGroupedRows?: boolean;
+    /**
+     * Includes Row Summaries in Styled Column
+     * @defaultValue false
+     */
+    IncludeRowSummaries?: boolean;
 }
 /**
  * Style used to display Percent Bars in Special Column Style

package/src/PredefinedConfig/SystemState.d.ts

@@ -1,7 +1,7 @@
 import { PreviewInfo } from '../Utilities/Interface/Preview';
 import { InternalState } from './InternalState';
 import { BulkUpdateValidationResult } from '../Strategy/Interface/IBulkUpdateModule';
-import { CellAddress, CellDataChangedInfo, GridCell, SmartEditOperation } from '../types';
+import { AdaptableFrameworkComponent, CellAddress, CellDataChangedInfo, CustomRenderFunction, GridCell, SmartEditOperation } from '../types';
 import type { IPushPullState, IPushPullReport, IPushPullDomain } from './IPushPullState';
 import { OpenFinState, OpenFinReport } from './OpenFinState';
 import { AdaptableAlert } from './Common/AdaptableAlert';
@@ -112,5 +112,7 @@ export interface SystemState extends InternalState, IPushPullState, OpenFinState
 }
 export interface ProgressIndicator {
     active: boolean;
-    label: string;
+    text?: string;
+    render?: CustomRenderFunction;
+    frameworkComponent?: AdaptableFrameworkComponent;
 }

package/src/Redux/ActionsReducers/PopupRedux.d.ts

@@ -1,15 +1,13 @@
 import * as Redux from 'redux';
-import { PopupState } from '../../PredefinedConfig/PopupState';
-import { InputAction, UIPrompt, UIConfirmation } from '../../Utilities/Interface/MessagePopups';
-import { ModuleParams } from '../../View/Components/SharedProps/ModuleViewPopupProps';
-import { AdaptableModule } from '../../PredefinedConfig/Common/Types';
 import { AdaptableAlert } from '../../PredefinedConfig/Common/AdaptableAlert';
-import { AdaptableForm, BaseContext } from '../../types';
 import { FormContext } from '../../PredefinedConfig/Common/FormContext';
+import { AdaptableModule } from '../../PredefinedConfig/Common/Types';
+import { PopupState } from '../../PredefinedConfig/PopupState';
+import { AdaptableForm, BaseContext } from '../../types';
+import { InputAction, UIConfirmation, UIPrompt } from '../../Utilities/Interface/MessagePopups';
+import { ModuleParams } from '../../View/Components/SharedProps/ModuleViewPopupProps';
 export declare const POPUP_SHOW_SCREEN = "POPUP_SHOW_SCREEN";
 export declare const POPUP_HIDE_SCREEN = "POPUP_HIDE_SCREEN";
-export declare const POPUP_SHOW_LOADING = "POPUP_SHOW_LOADING";
-export declare const POPUP_HIDE_LOADING = "POPUP_HIDE_LOADING";
 export declare const POPUP_SHOW_ALERT = "POPUP_SHOW_ALERT";
 export declare const POPUP_SHOW_PROMPT = "POPUP_SHOW_PROMPT";
 export declare const POPUP_HIDE_PROMPT = "POPUP_HIDE_PROMPT";
@@ -51,10 +49,6 @@ export interface PopupShowFormAction extends Redux.Action {
 export interface PopupHideFormAction extends Redux.Action {
     Id: string;
 }
-export interface PopupShowLoadingAction extends Redux.Action {
-}
-export interface PopupHideLoadingAction extends Redux.Action {
-}
 export interface PopupShowAlertAction extends Redux.Action {
     alert: AdaptableAlert;
 }
@@ -97,8 +91,6 @@ export declare const PopupShowForm: (config: {
 }) => PopupShowFormAction;
 export declare const PopupHideForm: (id: string) => PopupHideFormAction;
 export declare const PopupShowAlert: (alert: AdaptableAlert) => PopupShowAlertAction;
-export declare const PopupShowLoading: () => PopupShowLoadingAction;
-export declare const PopupHideLoading: () => PopupHideLoadingAction;
 export declare const PopupShowPrompt: (prompt: UIPrompt) => PopupShowPromptAction;
 export declare const PopupHidePrompt: () => PopupHidePromptAction;
 export declare const PopupConfirmPrompt: (inputText: string) => PopupConfirmPromptAction;

package/src/Redux/ActionsReducers/PopupRedux.js

@@ -1,7 +1,5 @@
 export const POPUP_SHOW_SCREEN = 'POPUP_SHOW_SCREEN';
 export const POPUP_HIDE_SCREEN = 'POPUP_HIDE_SCREEN';
-export const POPUP_SHOW_LOADING = 'POPUP_SHOW_LOADING';
-export const POPUP_HIDE_LOADING = 'POPUP_HIDE_LOADING';
 export const POPUP_SHOW_ALERT = 'POPUP_SHOW_ALERT';
 export const POPUP_SHOW_PROMPT = 'POPUP_SHOW_PROMPT';
 export const POPUP_HIDE_PROMPT = 'POPUP_HIDE_PROMPT';
@@ -53,12 +51,6 @@ export const PopupShowAlert = (alert) => {
         alert: alert,
     };
 };
-export const PopupShowLoading = () => ({
-    type: POPUP_SHOW_LOADING,
-});
-export const PopupHideLoading = () => ({
-    type: POPUP_HIDE_LOADING,
-});
 export const PopupShowPrompt = (prompt) => ({
     type: POPUP_SHOW_PROMPT,
     prompt: prompt,
@@ -91,9 +83,6 @@ const initialState = {
         ComponentName: '',
         Params: null,
     },
-    LoadingPopup: {
-        ShowLoadingPopup: true,
-    },
     ConfirmationPopup: {
         ShowConfirmationPopup: false,
         Msg: '',
@@ -229,14 +218,6 @@ export const PopupReducer = (state = initialState, action) => {
                 ConfirmationPopup: newConfirmationPopup,
             });
         }
-        case POPUP_SHOW_LOADING: {
-            let newLoadingPopup = { ShowLoadingPopup: true };
-            return Object.assign({}, state, { LoadingPopup: newLoadingPopup });
-        }
-        case POPUP_HIDE_LOADING: {
-            let newLoadingPopup = { ShowLoadingPopup: false };
-            return Object.assign({}, state, { LoadingPopup: newLoadingPopup });
-        }
         case POPUP_CLEAR_PARAM: {
             let newScreenPopup = {
                 ShowScreenPopup: state.ScreenPopup.ShowScreenPopup,

package/src/Redux/ActionsReducers/SystemRedux.d.ts

@@ -13,7 +13,7 @@ import { SummaryOperation } from '../../PredefinedConfig/Common/Enums';
 import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
 import { RowsHighlightInfo } from '../../PredefinedConfig/Common/RowsHighlightInfo';
 import { SmartEditOperation } from '../../AdaptableOptions/EditOptions';
-import { DataImportedInfo, DataSet, CellAddress } from '../../types';
+import { DataImportedInfo, DataSet, CellAddress, CustomRenderFunction, AdaptableFrameworkComponent } from '../../types';
 import { ChartModel } from '@ag-grid-community/core';
 import { CachedQuery } from '../../PredefinedConfig/NamedQueryState';
 export declare const FLASHING_CELL_ROW_KEY = "__ROW";
@@ -200,7 +200,9 @@ export interface SystemCellSummaryChangeOperationAction extends Redux.Action {
     cellSummaryOperation: SummaryOperation | string;
 }
 export interface SystemProgressIndicatorShowAction extends Redux.Action {
-    label: string;
+    text?: string;
+    render?: CustomRenderFunction;
+    frameworkComponent?: AdaptableFrameworkComponent;
 }
 export interface SystemProgressIndicatorHideAction extends Redux.Action {
 }
@@ -302,7 +304,11 @@ export declare const SetNewColumnListOrder: (VisibleColumnList: string[]) => Set
 export declare const SetLastAppliedShortcut: (gridCell: GridCell | undefined) => SetLastAppliedShortcutAction;
 export declare const SystemCachedQueryAdd: (cachedQuery: CachedQuery) => SystemCachedQueryAddAction;
 export declare const SystemCellSummaryChangeOperation: (cellSummaryOperation: SummaryOperation | string) => SystemCellSummaryChangeOperationAction;
-export declare const SystemProgressIndicatorShow: (label: string) => SystemProgressIndicatorShowAction;
+export declare const SystemProgressIndicatorShow: (config: {
+    text?: string;
+    render?: CustomRenderFunction;
+    frameworkComponent?: AdaptableFrameworkComponent;
+}) => SystemProgressIndicatorShowAction;
 export declare const SystemProgressIndicatorHide: () => SystemProgressIndicatorHideAction;
 export declare const SystemLicenseShowWatermark: (text: string) => SystemLicenseShowWatermarkAction;
 export declare const SystemLicenseDisablePersistence: () => SystemLicenseDisablePersistenceAction;

package/src/Redux/ActionsReducers/SystemRedux.js

@@ -220,9 +220,11 @@ export const SystemCellSummaryChangeOperation = (cellSummaryOperation) => ({
     type: SYSTEM_CELL_SUMMARY_CHANGE_OPERATION,
     cellSummaryOperation: cellSummaryOperation,
 });
-export const SystemProgressIndicatorShow = (label) => ({
+export const SystemProgressIndicatorShow = (config) => ({
     type: SYSTEM_PROGRESS_INDICATOR_SHOW,
-    label,
+    text: config.text,
+    render: config.render,
+    frameworkComponent: config.frameworkComponent,
 });
 export const SystemProgressIndicatorHide = () => ({
     type: SYSTEM_PROGRESS_INDICATOR_HIDE,
@@ -370,7 +372,7 @@ const initialState = {
     SmartEditValue: 1,
     SmartEditOperation: MathOperation.Multiply,
     CellSummaryOperation: CELL_SUMMARY_DEFAULT_OPERATION,
-    ProgressIndicator: { active: false, label: '' },
+    ProgressIndicator: { active: false, text: '' },
     License: {
         watermark: { show: false, text: null },
         disablePersistence: false,
@@ -627,7 +629,9 @@ export const SystemReducer = (state = initialState, action) => {
             const updatedState = {
                 ProgressIndicator: {
                     active: true,
-                    label: actionTypedAdd.label,
+                    text: actionTypedAdd.text,
+                    render: actionTypedAdd.render,
+                    frameworkComponent: actionTypedAdd.frameworkComponent,
                 },
             };
             return Object.assign({}, state, updatedState);
@@ -636,7 +640,6 @@ export const SystemReducer = (state = initialState, action) => {
             const updatedState = {
                 ProgressIndicator: {
                     active: false,
-                    label: '',
                 },
             };
             return Object.assign({}, state, updatedState);

package/src/Strategy/ColumnFilterModule.js

@@ -47,7 +47,7 @@ export class ColumnFilterModule extends AdaptableModuleBase {
                 const isFilterVisible = this.api.columnFilterApi.isQuickFilterVisible();
                 if (this.isModuleEditable() &&
                     this.api.optionsApi.getColumnFilterOptions().useAdaptableColumnFiltering) {
-                    columnFilterMenuItems.push(this.createMenuItemReduxAction(isFilterVisible ? 'column-filter-bar-hide' : 'column-filter-bar-show', isFilterVisible ? 'Hide Filter Bar' : 'Show Filter Bar', isFilterVisible ? 'unchecked' : 'check', isFilterVisible
+                    columnFilterMenuItems.push(this.createMenuItemReduxAction(isFilterVisible ? 'column-filter-bar-hide' : 'column-filter-bar-show', isFilterVisible ? 'Hide Filter Bar' : 'Show Filter Bar', isFilterVisible ? 'filter-off' : 'filter', isFilterVisible
                         ? SystemRedux.SystemQuickFilterBarHide()
                         : SystemRedux.SystemQuickFilterBarShow()));
                 }

package/src/Strategy/ColumnInfoModule.js

@@ -18,7 +18,7 @@ export class ColumnInfoModule extends AdaptableModuleBase {
                     Name: 'column-info-show',
                     Label: 'Column Info',
                     ComponentName: this.moduleInfo.Popup,
-                    Icon: this.moduleInfo.Glyph,
+                    Icon: 'info',
                     PopupParams: columnPopUpParams,
                 }),
             ];
@@ -35,7 +35,7 @@ export class ColumnInfoModule extends AdaptableModuleBase {
                     Name: 'column-info-show',
                     Label: 'Column Info',
                     ComponentName: this.moduleInfo.Popup,
-                    Icon: this.moduleInfo.Glyph,
+                    Icon: 'info',
                     PopupParams: columnPopUpParams,
                 }),
             ];

package/src/Strategy/ExportModule.d.ts

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

package/src/Strategy/ExportModule.js

@@ -3,7 +3,7 @@ import * as ModuleConstants from '../Utilities/Constants/ModuleConstants';
 import { ExportDestination } from '../PredefinedConfig/Common/Enums';
 import { Helper } from '../Utilities/Helpers/Helper';
 import * as ExportRedux from '../Redux/ActionsReducers/ExportRedux';
-import { SELECTED_CELLS_REPORT, SELECTED_ROWS_REPORT, VISUAL_DATA_REPORT, } from '../Utilities/Constants/GeneralConstants';
+import { ALL_DATA_REPORT, CURRENT_DATA_REPORT, SELECTED_CELLS_REPORT, SELECTED_ROWS_REPORT, VISUAL_DATA_REPORT, } from '../Utilities/Constants/GeneralConstants';
 import ArrayExtensions from '../Utilities/Extensions/ArrayExtensions';
 import StringExtensions from '../Utilities/Extensions/StringExtensions';
 import * as PopupRedux from '../Redux/ActionsReducers/PopupRedux';
@@ -14,7 +14,7 @@ import { getExportRowsViewItems } from './Utilities/Export/getExportRowsViewItem
 import { ReportExportDropdown } from '../View/Export/ReportExportDropdown';
 import { getObjectTagsViewItems } from './Utilities/getObjectTagsViewItems';
 import { ExportSelector } from '../View/Export/ExportSelector';
-import { SystemProgressIndicatorShow, SystemVisualExportBegin, SystemVisualExportEnd, } from '../Redux/ActionsReducers/SystemRedux';
+import { SystemVisualExportBegin, SystemVisualExportEnd, } from '../Redux/ActionsReducers/SystemRedux';
 import { SHOW_EXPORT_TABLE } from '../View/Components/Popups/WindowPopups/windowFactory';
 import { createUuid } from '../PredefinedConfig/Uuid';
 import { waitForTimeout } from '../Utilities/waitForTimeout';
@@ -46,58 +46,69 @@ export class ExportModule extends AdaptableModuleBase {
             return;
         }
         let returnMenuItems = [];
-        const canExportCells = menuContext.selectedCellInfo &&
+        const availableSystemReports = this.api.exportApi.getAvailableSystemReports();
+        if (availableSystemReports.includes(VISUAL_DATA_REPORT)) {
+            returnMenuItems.push(this.createMenuItemClickFunction('export-visual-data-excel', 'Excel', this.moduleInfo.Glyph, () => this.export(this.api.exportApi.getReportByName(VISUAL_DATA_REPORT), ExportDestination.Excel)));
+        }
+        if (availableSystemReports.includes(ALL_DATA_REPORT)) {
+            const allDataReport = this.api.exportApi.getReportByName(ALL_DATA_REPORT);
+            returnMenuItems.push(...this.buildReportMenuItems(allDataReport));
+        }
+        if (availableSystemReports.includes(CURRENT_DATA_REPORT)) {
+            const currentDataReport = this.api.exportApi.getReportByName(CURRENT_DATA_REPORT);
+            returnMenuItems.push(...this.buildReportMenuItems(currentDataReport));
+        }
+        const canExportCells = availableSystemReports.includes(SELECTED_CELLS_REPORT) &&
+            menuContext.selectedCellInfo &&
             ArrayExtensions.IsNotNullOrEmpty(menuContext.selectedCellInfo.columns) &&
             ArrayExtensions.IsNotNullOrEmpty(menuContext.selectedCellInfo.gridCells);
-        const canExportRows = menuContext.selectedRowInfo &&
+        if (canExportCells) {
+            const selectedCellReport = this.api.exportApi.getReportByName(SELECTED_CELLS_REPORT);
+            returnMenuItems.push(...this.buildReportMenuItems(selectedCellReport));
+        }
+        const canExportRows = availableSystemReports.includes(SELECTED_ROWS_REPORT) &&
+            menuContext.selectedRowInfo &&
             ArrayExtensions.IsNotNullOrEmpty(menuContext.selectedRowInfo.gridRows) &&
             menuContext.gridCell &&
             menuContext.gridCell.primaryKeyValue &&
             menuContext.isSelectedRow;
-        if (canExportCells) {
-            const selectedCellReport = this.api.exportApi.getReportByName(SELECTED_CELLS_REPORT);
-            returnMenuItems.push(...this.buildReportMenuItems(selectedCellReport, 'cells'));
-        }
         if (canExportRows) {
             const selectedRowReport = this.api.exportApi.getReportByName(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 ExportDestination.CSV:
-                return `export-${selectionType}-csv`;
-            case ExportDestination.Clipboard:
-                return `export-${selectionType}-clipboard`;
-            case ExportDestination.Excel:
-                return `export-${selectionType}-excel`;
-            case ExportDestination.JSON:
-                return `export-${selectionType}-json`;
-            case ExportDestination.Table:
-                return `export-${selectionType}-table`;
-        }
-    }
     async export(report, exportDestination) {
         var _a;
         const cleanupExportProcess = () => {
             this.api.internalApi.dispatchReduxAction(SystemVisualExportEnd());
-            this.api.internalApi.hideProgressIndicator();
+            this.api.userInterfaceApi.hideProgressIndicator();
         };
         if (report.Name === VISUAL_DATA_REPORT) {
             this.api.internalApi.dispatchReduxAction(SystemVisualExportBegin());
         }
-        this.api.internalApi.dispatchReduxAction(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 waitForTimeout(16);

package/src/Strategy/GridInfoModule.js

@@ -2,7 +2,7 @@ import { AdaptableModuleBase } from './AdaptableModuleBase';
 import * as ModuleConstants from '../Utilities/Constants/ModuleConstants';
 export class GridInfoModule extends AdaptableModuleBase {
     constructor(api) {
-        super(ModuleConstants.GridInfoModuleId, ModuleConstants.GridInfoFriendlyName, 'align-justify', 'GridInfoPopup', 'Display information about the Grid, the Options selected and all columns', api);
+        super(ModuleConstants.GridInfoModuleId, ModuleConstants.GridInfoFriendlyName, 'grid-info', 'GridInfoPopup', 'Display information about the Grid, the Options selected and all columns', api);
     }
     getViewAccessLevel() {
         return 'Full';

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;
 }