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

package/src/AdaptableOptions/AdaptableFrameworkComponent.d.ts

@@ -44,6 +44,9 @@ export interface CustomRenderContext extends BaseContext {
      */
     element: HTMLDivElement;
 }
+export interface CustomRenderFunction {
+    (customRenderContext: CustomRenderContext): string | null;
+}
 /**
  * Config used to open a custom window
  */

package/src/AdaptableOptions/MenuOptions.d.ts

@@ -167,7 +167,7 @@ export interface MenuOrderContext extends BaseContext {
 /**
  * Defines AG Grid Context Menu Items
  */
-export type AgGridContextMenuItemType = 'autoSizeAll' | 'expandAll' | 'contractAll' | 'copy' | 'copyWithHeaders' | 'cut' | 'paste' | 'resetColumns' | 'export' | 'csvExport' | 'excelExport' | 'chartRange' | 'pivotChart';
+export type AgGridContextMenuItemType = 'autoSizeAll' | 'expandAll' | 'contractAll' | 'copy' | 'copyWithHeaders' | 'copyWithGroupHeaders' | 'cut' | 'paste' | 'resetColumns' | 'export' | 'csvExport' | 'excelExport' | 'chartRange' | 'pivotChart';
 /**
  * Defines AG Grid Column Menu Items
  */

package/src/Api/GridApi.d.ts

@@ -529,5 +529,8 @@ export interface GridApi {
      * Opens a window with a transposed view of Grid
      */
     showTransposedView(transposeConfig?: TransposeConfig): void;
-    getAllGridColumns(): Column<any>[];
+    /**
+     * Return all AG Grid columns
+     */
+    getAllAgGridColumns(): Column<any>[];
 }

package/src/Api/Implementation/ConfigApiImpl.js

@@ -139,7 +139,6 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
                         .then(() => {
                         this.adaptable.updateColumnModelAndRefreshGrid({ skipColDefsRefresh: true });
                         this.adaptable.setLayout();
-                        this.getAdaptableApi().userInterfaceApi.hideLoadingScreen();
                     })
                         .then(() => {
                         // resolve main(result) promise

package/src/Api/Implementation/GridApiImpl.d.ts

@@ -134,5 +134,5 @@ export declare class GridApiImpl extends ApiBase implements GridApi {
     getAgGridRowModelType(): RowModelType;
     getVisibleRowCount(): number;
     showTransposedView(transposeConfig?: TransposeConfig): void;
-    getAllGridColumns(): Column<any>[];
+    getAllAgGridColumns(): Column<any>[];
 }

package/src/Api/Implementation/GridApiImpl.js

@@ -19,6 +19,11 @@ class GridApiImpl extends ApiBase_1.ApiBase {
         return this.getAdaptableState().Grid;
     }
     loadGridData(dataSource) {
+        // we intentionally set an initial empty array,
+        // to prevent `cellchanged` events from being triggered for rows that have
+        // the same primary key with existing rows
+        // see #testprevent_cellchanged_event_on_load_grid_data
+        this.adaptable.agGridAdapter.setGridOption('rowData', []);
         this.adaptable.setGridData(dataSource);
         const allRowNodes = this.getAllRowNodes();
         this.internalApi.fireGridDataChangedEvent(dataSource, allRowNodes, 'Load');
@@ -553,7 +558,7 @@ class GridApiImpl extends ApiBase_1.ApiBase {
             },
         });
     }
-    getAllGridColumns() {
+    getAllAgGridColumns() {
         return this.adaptable.getAllGridColumns();
     }
 }

package/src/Api/Implementation/UserInterfaceApiImpl.d.ts

@@ -1,13 +1,14 @@
-import { ApiBase } from './ApiBase';
-import { UserInterfaceApi } from '../UserInterfaceApi';
+import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
+import { BulkUpdatePermittedValues, CustomSortPermittedValues, EditLookUpPermittedValues, FilterPermittedValues, PermittedValues } from '../../AdaptableOptions/UserInterfaceOptions';
 import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
 import { AdaptableStyle } from '../../PredefinedConfig/Common/AdaptableStyle';
-import { BulkUpdatePermittedValues, CustomSortPermittedValues, EditLookUpPermittedValues, FilterPermittedValues, PermittedValues } from '../../AdaptableOptions/UserInterfaceOptions';
-import { AdaptableObjectTag, CustomWindowConfig, GridCell } from '../../types';
+import { AdaptableFrameworkComponent, AdaptableObjectTag, CustomRenderFunction, CustomWindowConfig, GridCell } from '../../types';
 import { UserInterfaceInternalApi } from '../Internal/UserInterfaceInternalApi';
-import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
+import { UserInterfaceApi } from '../UserInterfaceApi';
+import { ApiBase } from './ApiBase';
 export declare class UserInterfaceApiImpl extends ApiBase implements UserInterfaceApi {
     internalApi: UserInterfaceInternalApi;
+    private showProgressIndicatorTimeout;
     constructor(adaptable: IAdaptable);
     getColorPalette(): string[];
     getStyleClassNames(): string[] | undefined;
@@ -29,6 +30,14 @@ export declare class UserInterfaceApiImpl extends ApiBase implements UserInterfa
     getCustomIconDefinition(iconName: string): import("../../types").AdaptableIcon | import("../../types").CustomIcon;
     showLoadingScreen(): void;
     hideLoadingScreen(): void;
+    showProgressIndicator(config: {
+        text: string;
+        message?: string;
+        render?: CustomRenderFunction;
+        frameworkComponent?: AdaptableFrameworkComponent;
+        delay?: number;
+    }): void;
+    hideProgressIndicator(): void;
     openCustomWindowPopup(config: CustomWindowConfig): {
         close: () => void;
     };

package/src/Api/Implementation/UserInterfaceApiImpl.js

@@ -2,14 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UserInterfaceApiImpl = void 0;
 const tslib_1 = require("tslib");
-const ApiBase_1 = require("./ApiBase");
 const PopupRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/PopupRedux"));
+const SystemRedux_1 = require("../../Redux/ActionsReducers/SystemRedux");
 const ArrayExtensions_1 = require("../../Utilities/Extensions/ArrayExtensions");
-const UserInterfaceInternalApi_1 = require("../Internal/UserInterfaceInternalApi");
+const logDeprecation_1 = require("../../Utilities/logDeprecation");
 const WindowPopups_1 = require("../../View/Components/Popups/WindowPopups/WindowPopups");
+const UserInterfaceInternalApi_1 = require("../Internal/UserInterfaceInternalApi");
+const ApiBase_1 = require("./ApiBase");
 class UserInterfaceApiImpl extends ApiBase_1.ApiBase {
     constructor(adaptable) {
         super(adaptable);
+        this.showProgressIndicatorTimeout = null;
         this.internalApi = new UserInterfaceInternalApi_1.UserInterfaceInternalApi(adaptable);
     }
     getColorPalette() {
@@ -170,10 +173,29 @@ class UserInterfaceApiImpl extends ApiBase_1.ApiBase {
         return customIcon;
     }
     showLoadingScreen() {
-        this.dispatchAction(PopupRedux.PopupShowLoading());
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'UserInterfaceApi', 'showLoadingScreen', 'showProgressIndicator');
+        this.showProgressIndicator({ text: 'Loading' });
     }
     hideLoadingScreen() {
-        this.dispatchAction(PopupRedux.PopupHideLoading());
+        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'UserInterfaceApi', 'hideLoadingScreen', 'hideProgressIndicator');
+        this.hideProgressIndicator();
+    }
+    showProgressIndicator(config) {
+        if (config.delay) {
+            this.showProgressIndicatorTimeout = setTimeout(() => {
+                this.dispatchAction((0, SystemRedux_1.SystemProgressIndicatorShow)(config));
+            }, config.delay);
+        }
+        else {
+            this.dispatchAction((0, SystemRedux_1.SystemProgressIndicatorShow)(config));
+        }
+    }
+    hideProgressIndicator() {
+        if (this.showProgressIndicatorTimeout) {
+            clearTimeout(this.showProgressIndicatorTimeout);
+            this.showProgressIndicatorTimeout = null;
+        }
+        this.dispatchAction((0, SystemRedux_1.SystemProgressIndicatorHide)());
     }
     openCustomWindowPopup(config) {
         const close = () => {

package/src/Api/Internal/AdaptableInternalApi.d.ts

@@ -89,7 +89,6 @@ export declare class AdaptableInternalApi extends ApiBase {
     destroyFrameworkComponent(containerDomNode: HTMLElement, frameworkComponent: AdaptableFrameworkComponent, componentType: 'toolPanel' | 'toolbar'): void;
     initializeDataChangeHistory(): void;
     executeWithProgressIndicator(label: string, executeFn: () => void, errorHandlingFn?: () => void): void;
-    hideProgressIndicator(): void;
     getCorrectEnglishVariant(wordToSpell: string): string;
     shouldDisplayTagSections(): boolean;
     getAvailableTags(): AdaptableObjectTag[] | undefined;

package/src/Api/Internal/AdaptableInternalApi.js

@@ -4,7 +4,6 @@ exports.AdaptableInternalApi = void 0;
 const tslib_1 = require("tslib");
 const PopupRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/PopupRedux"));
 const SystemRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/SystemRedux"));
-const SystemRedux_1 = require("../../Redux/ActionsReducers/SystemRedux");
 const GridRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/GridRedux"));
 const DeadRedux = tslib_1.__importStar(require("../../Redux/DeadRedux"));
 const ApiBase_1 = require("../Implementation/ApiBase");
@@ -253,7 +252,7 @@ class AdaptableInternalApi extends ApiBase_1.ApiBase {
         }
     }
     executeWithProgressIndicator(label, executeFn, errorHandlingFn) {
-        this.dispatchReduxAction((0, SystemRedux_1.SystemProgressIndicatorShow)(label));
+        this.getAdaptableApi().userInterfaceApi.showProgressIndicator({ text: label, delay: 300 });
         // setTimeout required to give the ProgressIndicator rendering a head-start (see RAF in ProgressIndicator implementation)
         setTimeout(() => {
             try {
@@ -261,14 +260,11 @@ class AdaptableInternalApi extends ApiBase_1.ApiBase {
             }
             catch (error) {
                 errorHandlingFn === null || errorHandlingFn === void 0 ? void 0 : errorHandlingFn();
-                this.hideProgressIndicator();
+                this.getUserInterfaceApi().hideProgressIndicator();
                 this.adaptable.logger.error('Unexpected error while executing a function with a progress indicator', error);
             }
         }, 16);
     }
-    hideProgressIndicator() {
-        this.dispatchReduxAction((0, SystemRedux_1.SystemProgressIndicatorHide)());
-    }
     getCorrectEnglishVariant(wordToSpell) {
         if (wordToSpell.includes('our')) {
             return this.getUserInterfaceOptions().englishVariant == 'GB'

package/src/Api/Internal/FormatColumnInternalApi.js

@@ -7,6 +7,7 @@ const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Exte
 const FormatHelper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/FormatHelper"));
 const ObjectFactory_1 = tslib_1.__importDefault(require("../../Utilities/ObjectFactory"));
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
+const RowSummary_1 = require("../../PredefinedConfig/Common/RowSummary");
 class FormatColumnInternalApi extends ApiBase_1.ApiBase {
     /**
      * Retrieves all Format Columns in Adaptable State with the `Style` property set
@@ -158,7 +159,7 @@ class FormatColumnInternalApi extends ApiBase_1.ApiBase {
      * @param params
      */
     isFormatColumnRelevantForColumn(formatColumn, column, params) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         // suspended is important to be first
         if (formatColumn.IsSuspended) {
             return false;
@@ -167,11 +168,14 @@ class FormatColumnInternalApi extends ApiBase_1.ApiBase {
             this.getAdaptableApi().gridApi.isGroupRowNode(params.node)) {
             return false;
         }
+        if (!formatColumn.IncludeRowSummaries && ((_b = (_a = params.node) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b[RowSummary_1.ROW_SUMMARY_ROW_ID])) {
+            return false;
+        }
         if (!formatColumn.Rule) {
             return true;
         }
         // first run the predicate
-        if (formatColumn.Rule.Predicates && ((_b = (_a = formatColumn.Rule) === null || _a === void 0 ? void 0 : _a.Predicates) === null || _b === void 0 ? void 0 : _b.length)) {
+        if (formatColumn.Rule.Predicates && ((_d = (_c = formatColumn.Rule) === null || _c === void 0 ? void 0 : _c.Predicates) === null || _d === void 0 ? void 0 : _d.length)) {
             const predicateDefHandlerContext = Object.assign({ value: params.value, oldValue: null, displayValue: params.value, node: params.node, column: column }, this.getAdaptableApi().internalApi.buildBaseContext());
             return this.evaluatePredicate(formatColumn, predicateDefHandlerContext);
         }

package/src/Api/Internal/LayoutInternalApi.js

@@ -62,7 +62,7 @@ class LayoutInternalApi extends ApiBase_1.ApiBase {
             if (!layoutState.Layouts || !isLayoutDefined(GeneralConstants_1.DEFAULT_LAYOUT)) {
                 // augogroup columns are not in columns list
                 // the code that adds column ok grid state explicitly ignores autoColumns
-                const allGridColumns = this.getAdaptableApi().gridApi.getAllGridColumns();
+                const allGridColumns = this.getAdaptableApi().gridApi.getAllAgGridColumns();
                 let defaultLayout = ObjectFactory_1.default.CreateEmptyLayout({
                     Name: GeneralConstants_1.DEFAULT_LAYOUT,
                     Columns: defaultLayoutColumns.map((c) => c.columnId),

package/src/Api/UserInterfaceApi.d.ts

@@ -3,8 +3,8 @@ import { AdaptableStyle } from '../PredefinedConfig/Common/AdaptableStyle';
 import { BulkUpdatePermittedValues, CustomSortPermittedValues, EditLookUpPermittedValues, FilterPermittedValues, PermittedValues } from '../AdaptableOptions/UserInterfaceOptions';
 import { GridCell } from '../PredefinedConfig/Selection/GridCell';
 import { AdaptableObjectTag } from '../PredefinedConfig/Common/AdaptableObject';
-import { AdaptableIcon } from '../types';
-import { CustomWindowConfig } from '../AdaptableOptions/AdaptableFrameworkComponent';
+import { AdaptableFrameworkComponent, AdaptableIcon } from '../types';
+import { CustomRenderFunction, CustomWindowConfig } from '../AdaptableOptions/AdaptableFrameworkComponent';
 /**
  * Functions relating to User Interface section of Adaptable State
  */
@@ -72,12 +72,25 @@ export interface UserInterfaceApi {
     getCustomIconDefinition(name: string): AdaptableIcon | undefined;
     /**
      * Displays the popup that says getting data and initialising grid
+     * @deprecated use `showProgressIndicator()` instead
      */
     showLoadingScreen(): void;
     /**
      * Hides the popup that says getting data and initialising grid
+     * @deprecated use `hideProgressIndicator()` instead
      */
     hideLoadingScreen(): void;
+    /**
+     *
+     * @param config
+     */
+    showProgressIndicator(config: {
+        text?: string;
+        render?: CustomRenderFunction;
+        frameworkComponent?: AdaptableFrameworkComponent;
+        delay?: number;
+    }): void;
+    hideProgressIndicator(): void;
     /**
      * Opens window with custom content
      * @param config

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

@@ -54,4 +54,4 @@ export interface AdaptableBaseIcon {
 /**
  * All AdapTable System Icon names
  */
-export type AdaptableSystemIconName = 'add' | 'alert' | 'building' | 'laptop' | 'arrow-down' | 'arrow-left' | 'arrow-right' | 'arrow-up' | 'arrow-up-long' | 'arrow-down-long' | 'arrow-expand' | 'paperclip' | 'unfilled-circle' | 'boolean-list' | 'broadcast' | 'brush' | 'spanner' | 'edit-table' | 'chart-and-grid' | 'calendar' | 'call' | 'cells' | 'fdc3' | 'flag' | 'chart' | 'chat' | 'check' | 'check-circle' | 'checked' | 'clone' | 'close' | 'cloud-upload' | 'collapse' | 'column-add' | 'columns' | 'filter-list' | 'comment' | 'comments' | 'contains' | 'dashboard' | 'data-set' | 'date-range' | 'delete' | 'division' | 'dock' | 'dollar' | 'drag' | 'edit' | 'ends-with' | 'equals' | 'equation' | 'error' | 'expand' | 'exponent' | 'export' | 'export-data' | 'fast-backward' | 'fast-forward' | 'filter' | 'filter-off' | 'lightning' | 'folder' | 'folder-open' | 'folder-shared' | 'color-palette' | 'horizontal-lines' | 'function' | 'greater-than' | 'greater-than-or-equal' | 'history' | 'home' | 'import-export' | 'info' | 'brain' | 'download' | 'grid' | 'interactions' | 'less-than' | 'less-than-or-equal' | 'list' | 'logout' | 'mail' | 'menu' | 'minus' | 'multiplication' | 'money' | 'newpage' | 'news' | 'filled-circle' | 'not-contains' | 'not-equal' | 'open-in-new' | 'order' | 'organisation' | 'pause' | 'percent' | 'percent-tag' | 'person' | 'contact' | 'pie-chart' | 'play' | 'plus' | 'add-circle' | 'search' | 'search-table' | 'select-all' | 'select-off' | 'select-fwd' | 'quote' | 'refresh' | 'regex' | 'reminder' | 'save' | 'schedule' | 'science' | 'settings' | 'link' | 'sort-asc' | 'sort-desc' | 'spark-line' | 'resume' | 'starts-with' | 'assignment' | 'statusbar' | 'stop' | 'traffic-lights' | 'tab-unselected' | 'theme' | 'clipboard' | 'target' | 'triangle-down' | 'triangle-up' | 'unchecked' | 'undo' | 'downloaded' | 'upload' | 'warning' | 'gradient' | 'badge' | 'italic' | 'bold' | 'align-left' | 'align-right' | 'align-center' | 'align-justify' | 'underline' | 'strikethrough' | 'overline' | 'case-upper' | 'case-lower' | 'case-sentence' | 'visibility-on' | 'visibility-off' | 'visibility-off-bold' | 'visibility-on-bold' | 'note' | 'import' | 'grid-filter' | 'grid-info' | 'rows';
+export type AdaptableSystemIconName = 'add' | 'alert' | 'building' | 'laptop' | 'arrow-down' | 'arrow-left' | 'arrow-right' | 'arrow-up' | 'arrow-up-long' | 'arrow-down-long' | 'arrow-expand' | 'paperclip' | 'unfilled-circle' | 'boolean-list' | 'broadcast' | 'brush' | 'spanner' | 'edit-table' | 'chart-and-grid' | 'calendar' | 'call' | 'cells' | 'fdc3' | 'flag' | 'chart' | 'chat' | 'check' | 'check-circle' | 'checked' | 'clone' | 'close' | 'cloud-upload' | 'collapse' | 'column-add' | 'columns' | 'filter-list' | 'copy' | 'comment' | 'comments' | 'contains' | 'dashboard' | 'data-set' | 'date-range' | 'delete' | 'division' | 'dock' | 'dollar' | 'drag' | 'edit' | 'ends-with' | 'equals' | 'equation' | 'error' | 'expand' | 'exponent' | 'export' | 'export-data' | 'fast-backward' | 'fast-forward' | 'filter' | 'filter-off' | 'lightning' | 'folder' | 'folder-open' | 'folder-shared' | 'color-palette' | 'horizontal-lines' | 'function' | 'greater-than' | 'greater-than-or-equal' | 'history' | 'home' | 'import-export' | 'info' | 'brain' | 'download' | 'grid' | 'interactions' | 'less-than' | 'less-than-or-equal' | 'list' | 'logout' | 'mail' | 'menu' | 'minus' | 'multiplication' | 'money' | 'newpage' | 'news' | 'filled-circle' | 'not-contains' | 'not-equal' | 'open-in-new' | 'order' | 'organisation' | 'pause' | 'percent' | 'percent-tag' | 'person' | 'contact' | 'pie-chart' | 'play' | 'plus' | 'add-circle' | 'search' | 'search-table' | 'select-all' | 'select-off' | 'select-fwd' | 'quote' | 'refresh' | 'regex' | 'reminder' | 'save' | 'schedule' | 'science' | 'settings' | 'link' | 'sort-asc' | 'sort-desc' | 'spark-line' | 'resume' | 'starts-with' | 'assignment' | 'statusbar' | 'stop' | 'traffic-lights' | 'tab-unselected' | 'theme' | 'clipboard' | 'target' | 'triangle-down' | 'triangle-up' | 'unchecked' | 'undo' | 'downloaded' | 'upload' | 'warning' | 'gradient' | 'badge' | 'italic' | 'bold' | 'align-left' | 'align-right' | 'align-center' | 'align-justify' | 'underline' | 'strikethrough' | 'overline' | 'case-upper' | 'case-lower' | 'case-sentence' | 'visibility-on' | 'visibility-off' | 'visibility-off-bold' | 'visibility-on-bold' | 'note' | 'import' | 'grid-filter' | 'grid-info' | 'rows';

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

@@ -14,7 +14,7 @@ export declare const ADAPTABLE_COLUMN_MENU_ITEMS: readonly ["calculated-column-e
 /**
  * List of Shipped Adaptable Context Menu Items
  */
-export declare const ADAPTABLE_CONTEXT_MENU_ITEMS: readonly ["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", "column-filter-unsuspend", "column-info-show", "comment-add", "comment-remove", "dashboard-collapse", "dashboard-configure", "dashboard-dock", "dashboard-expand", "dashboard-float", "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", "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", "note-add", "note-remove", "settings-panel-open", "smart-edit-apply", "system-status-show"];
+export declare const ADAPTABLE_CONTEXT_MENU_ITEMS: readonly ["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", "column-filter-unsuspend", "column-info-show", "comment-add", "comment-remove", "dashboard-collapse", "dashboard-configure", "dashboard-dock", "dashboard-expand", "dashboard-float", "dashboard-hide", "dashboard-show", "data-import", "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", "note-add", "note-remove", "settings-panel-open", "smart-edit-apply", "system-status-show"];
 /**
  * Menu item used by Adaptable in both Column and Context Menus
  */

package/src/PredefinedConfig/Common/Menu.js

@@ -78,18 +78,28 @@ exports.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',

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,10 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PopupReducer = exports.PopupClearParam = exports.PopupCancelConfirmation = exports.PopupConfirmConfirmation = exports.PopupShowConfirmation = exports.PopupConfirmPrompt = exports.PopupHidePrompt = exports.PopupShowPrompt = exports.PopupHideLoading = exports.PopupShowLoading = exports.PopupShowAlert = exports.PopupHideForm = exports.PopupShowForm = exports.PopupHideWindow = exports.PopupShowWindow = exports.PopupHideScreen = exports.PopupShowScreen = exports.POPUP_HIDE_FORM = exports.POPUP_SHOW_FORM = exports.POPUP_HIDE_WINDOW = exports.POPUP_SHOW_WINDOW = exports.POPUP_CLEAR_PARAM = exports.POPUP_CANCEL_CONFIRMATION = exports.POPUP_CONFIRM_CONFIRMATION = exports.POPUP_SHOW_CONFIRMATION = exports.POPUP_CONFIRM_PROMPT = exports.POPUP_HIDE_PROMPT = exports.POPUP_SHOW_PROMPT = exports.POPUP_SHOW_ALERT = exports.POPUP_HIDE_LOADING = exports.POPUP_SHOW_LOADING = exports.POPUP_HIDE_SCREEN = exports.POPUP_SHOW_SCREEN = void 0;
+exports.PopupReducer = exports.PopupClearParam = exports.PopupCancelConfirmation = exports.PopupConfirmConfirmation = exports.PopupShowConfirmation = exports.PopupConfirmPrompt = exports.PopupHidePrompt = exports.PopupShowPrompt = exports.PopupShowAlert = exports.PopupHideForm = exports.PopupShowForm = exports.PopupHideWindow = exports.PopupShowWindow = exports.PopupHideScreen = exports.PopupShowScreen = exports.POPUP_HIDE_FORM = exports.POPUP_SHOW_FORM = exports.POPUP_HIDE_WINDOW = exports.POPUP_SHOW_WINDOW = exports.POPUP_CLEAR_PARAM = exports.POPUP_CANCEL_CONFIRMATION = exports.POPUP_CONFIRM_CONFIRMATION = exports.POPUP_SHOW_CONFIRMATION = exports.POPUP_CONFIRM_PROMPT = exports.POPUP_HIDE_PROMPT = exports.POPUP_SHOW_PROMPT = exports.POPUP_SHOW_ALERT = exports.POPUP_HIDE_SCREEN = exports.POPUP_SHOW_SCREEN = void 0;
 exports.POPUP_SHOW_SCREEN = 'POPUP_SHOW_SCREEN';
 exports.POPUP_HIDE_SCREEN = 'POPUP_HIDE_SCREEN';
-exports.POPUP_SHOW_LOADING = 'POPUP_SHOW_LOADING';
-exports.POPUP_HIDE_LOADING = 'POPUP_HIDE_LOADING';
 exports.POPUP_SHOW_ALERT = 'POPUP_SHOW_ALERT';
 exports.POPUP_SHOW_PROMPT = 'POPUP_SHOW_PROMPT';
 exports.POPUP_HIDE_PROMPT = 'POPUP_HIDE_PROMPT';
@@ -63,14 +61,6 @@ const PopupShowAlert = (alert) => {
     };
 };
 exports.PopupShowAlert = PopupShowAlert;
-const PopupShowLoading = () => ({
-    type: exports.POPUP_SHOW_LOADING,
-});
-exports.PopupShowLoading = PopupShowLoading;
-const PopupHideLoading = () => ({
-    type: exports.POPUP_HIDE_LOADING,
-});
-exports.PopupHideLoading = PopupHideLoading;
 const PopupShowPrompt = (prompt) => ({
     type: exports.POPUP_SHOW_PROMPT,
     prompt: prompt,
@@ -110,9 +100,6 @@ const initialState = {
         ComponentName: '',
         Params: null,
     },
-    LoadingPopup: {
-        ShowLoadingPopup: true,
-    },
     ConfirmationPopup: {
         ShowConfirmationPopup: false,
         Msg: '',
@@ -248,14 +235,6 @@ const PopupReducer = (state = initialState, action) => {
                 ConfirmationPopup: newConfirmationPopup,
             });
         }
-        case exports.POPUP_SHOW_LOADING: {
-            let newLoadingPopup = { ShowLoadingPopup: true };
-            return Object.assign({}, state, { LoadingPopup: newLoadingPopup });
-        }
-        case exports.POPUP_HIDE_LOADING: {
-            let newLoadingPopup = { ShowLoadingPopup: false };
-            return Object.assign({}, state, { LoadingPopup: newLoadingPopup });
-        }
         case exports.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

@@ -257,9 +257,11 @@ const SystemCellSummaryChangeOperation = (cellSummaryOperation) => ({
     cellSummaryOperation: cellSummaryOperation,
 });
 exports.SystemCellSummaryChangeOperation = SystemCellSummaryChangeOperation;
-const SystemProgressIndicatorShow = (label) => ({
+const SystemProgressIndicatorShow = (config) => ({
     type: exports.SYSTEM_PROGRESS_INDICATOR_SHOW,
-    label,
+    text: config.text,
+    render: config.render,
+    frameworkComponent: config.frameworkComponent,
 });
 exports.SystemProgressIndicatorShow = SystemProgressIndicatorShow;
 const SystemProgressIndicatorHide = () => ({
@@ -443,7 +445,7 @@ const initialState = {
     SmartEditValue: 1,
     SmartEditOperation: Enums_1.MathOperation.Multiply,
     CellSummaryOperation: GeneralConstants_1.CELL_SUMMARY_DEFAULT_OPERATION,
-    ProgressIndicator: { active: false, label: '' },
+    ProgressIndicator: { active: false, text: '' },
     License: {
         watermark: { show: false, text: null },
         disablePersistence: false,
@@ -700,7 +702,9 @@ 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);
@@ -709,7 +713,6 @@ const SystemReducer = (state = initialState, action) => {
             const updatedState = {
                 ProgressIndicator: {
                     active: false,
-                    label: '',
                 },
             };
             return Object.assign({}, state, updatedState);

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;