@adaptabletools/adaptable 20.0.4-canary.3 → 20.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "20.0.4-canary.3",
+  "version": "20.0.4",
   "description": "Powerful data-agnostic HTML5 AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
   "keywords": [
     "web-components",

package/src/AdaptableState/Common/AggregationColumns.d.ts

@@ -12,14 +12,7 @@ export type TableAggregationColumns = {
 /**
  * Defines an Aggregated Column in a Pivot Layout
  */
-export type PivotAggregationColumns = {
-    ColumnId: string;
-    AggFunc: AggregationColumnValue;
-    TotalColumn?: boolean | 'before' | 'after' | {
-        PivotColumnId: string;
-        ShowTotal?: boolean | 'before' | 'after';
-    }[];
-}[];
+export type PivotAggregationColumns = TableAggregationColumns;
 export declare const WEIGHTED_AVERAGE_AGG_FN_NAME = "weightedAvg";
 /**
  * Defines a Weighted Average Agg

package/src/AdaptableState/LayoutState.d.ts

@@ -148,18 +148,6 @@ export interface PivotLayout extends LayoutBase {
      * Row Grouped Columns Columns - must NOT be provided
      */
     RowGroupedColumns?: never;
-    /**
-     * Display Grand Total Row at the top or bottom of the Pivot Table
-     */
-    GrandTotalRow?: 'top' | 'bottom' | boolean;
-    /**
-     * Display automatically calculated Totals of all Pivot Columns, in the position specified
-     */
-    GrandTotalColumn?: 'before' | 'after' | boolean;
-    /**
-     * Display automatically calculated Totals within EACH Pivot Column Group, in the position specified
-     */
-    PivotGroupTotalColumn?: 'before' | 'after' | boolean;
 }
 /**
  * Manages how (and which) Row Group values are stored

package/src/Api/Implementation/LayoutHelpers.js

@@ -197,16 +197,12 @@ export const pivotLayoutToPivotLayoutModel = (pivotLayout) => {
         ColumnPinning: pivotLayout.ColumnPinning,
         PivotColumns: pivotLayout.PivotColumns,
         PivotExpandLevel: pivotLayout.PivotExpandLevel,
-        PivotAggregationColumns: (pivotLayout.PivotAggregationColumns || []).map(({ ColumnId, AggFunc, TotalColumn }) => {
+        PivotAggregationColumns: (pivotLayout.PivotAggregationColumns || []).map(({ ColumnId, AggFunc }) => {
             return {
                 ColumnId,
                 AggFunc: toAggFunc(AggFunc),
-                TotalColumn,
             };
         }),
-        GrandTotalRow: pivotLayout.GrandTotalRow,
-        GrandTotalColumn: pivotLayout.GrandTotalColumn,
-        PivotGroupTotalColumn: pivotLayout.PivotGroupTotalColumn,
         RowGroupValues: pivotLayout.RowGroupValues
             ? pivotLayout.RowGroupValues.RowGroupDefaultBehavior === 'always-collapsed' ||
                 pivotLayout.RowGroupValues.RowGroupDefaultBehavior === 'always-expanded'
@@ -330,29 +326,10 @@ export const pivotLayoutModelToPivotLayout = (layoutModel, defaults) => {
     else {
         delete pivotLayout.RowGroupValues;
     }
-    if (layoutModel.GrandTotalRow) {
-        pivotLayout.GrandTotalRow = layoutModel.GrandTotalRow;
-    }
-    else {
-        delete pivotLayout.GrandTotalRow;
-    }
-    if (layoutModel.GrandTotalColumn) {
-        pivotLayout.GrandTotalColumn = layoutModel.GrandTotalColumn;
-    }
-    else {
-        delete pivotLayout.GrandTotalColumn;
-    }
-    if (layoutModel.PivotGroupTotalColumn) {
-        pivotLayout.PivotGroupTotalColumn = layoutModel.PivotGroupTotalColumn;
-    }
-    else {
-        delete pivotLayout.PivotGroupTotalColumn;
-    }
     if (layoutModel.PivotAggregationColumns) {
-        pivotLayout.PivotAggregationColumns = (layoutModel.PivotAggregationColumns || []).map(({ ColumnId, AggFunc, TotalColumn }) => ({
+        pivotLayout.PivotAggregationColumns = (layoutModel.PivotAggregationColumns || []).map(({ ColumnId, AggFunc }) => ({
             ColumnId,
             AggFunc: toAggregationColumnValue(AggFunc),
-            TotalColumn,
         }));
     }
     else {

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

@@ -43,5 +43,5 @@ export declare class ColumnFilterInternalApi extends ApiBase {
     areColumnFiltersDifferent(oldFilters: ColumnFilter[], newFilters: ColumnFilter[]): boolean;
     getPredicateDefShortcuts(predicateDef: AdaptablePredicateDef): string[];
     showQuickFilterDropdown(columnId: string): boolean;
-    openColumnFilterPopup(columnId: string): void;
+    openColumnFilterPopup(columnId: string, popupProps?: any): void;
 }

package/src/Api/Internal/ColumnFilterInternalApi.js

@@ -187,7 +187,7 @@ export class ColumnFilterInternalApi extends ApiBase {
         }
         return true;
     }
-    openColumnFilterPopup(columnId) {
+    openColumnFilterPopup(columnId, popupProps) {
         this.getAdaptableInternalApi().showPopupWindow({
             id: COLUMN_FILTER_WINDOW,
             title: ModuleConstants.ColumnFilterFriendlyName,
@@ -199,6 +199,7 @@ export class ColumnFilterInternalApi extends ApiBase {
                     width: 380,
                     height: 450,
                 },
+                ...popupProps,
             },
         });
     }

package/src/Strategy/CalculatedColumnModule.js

@@ -60,6 +60,12 @@ export class CalculatedColumnModule extends AdaptableModuleBase {
         return (this.api.namedQueryApi.internalApi.getReferencedNamedQueryNames(this.api.expressionApi.getAdaptableQueryExpression(calculatedColumn.Query)) ?? []);
     }
     createColumnMenuItems(column) {
+        if (!column) {
+            return;
+        }
+        if (!this.isModuleAvailable()) {
+            return;
+        }
         if (this.isModuleEditable() && column.isCalculatedColumn) {
             const popupParam = {
                 column: column,
@@ -72,6 +78,9 @@ export class CalculatedColumnModule extends AdaptableModuleBase {
         }
     }
     createContextMenuItems(menuContext) {
+        if (!menuContext.adaptableColumn) {
+            return;
+        }
         if (!this.isModuleAvailable()) {
             return;
         }

package/src/View/Components/ColumnFilter/AdaptableFloatingFilter.js

@@ -34,5 +34,5 @@ export const AdaptableFloatingFilter = (props) => {
                 ]);
                 props.onChange?.();
             }
-        }, onClear: onClear, columnId: props.Column.columnId, predicate: qlPredicate, predicateDefs: qlPredicateDefs, disabled: columnFilter?.IsSuspended, onPredicateChange: onPredicateChange }));
+        }, onClear: onClear, columnId: props.Column.columnId, predicate: qlPredicate, predicateDefs: qlPredicateDefs, disabled: columnFilter?.IsSuspended, onPredicateChange: onPredicateChange, onChange: props.onChange }));
 };

package/src/View/Components/ColumnFilter/ColumnFilterWindow.js

@@ -12,6 +12,7 @@ export const ColumnFilterWindow = (props) => {
     React.useEffect(() => {
         setColumnId(initialColumnId);
     }, [props.popupProps.value]);
+    const onChange = props.popupProps.onChange;
     return (React.createElement(Flex, { flex: 1, minHeight: 0, height: "100%", flexDirection: "column", p: 2, className: "ab-ColumnFilterWindow" },
         React.createElement(Box, { mb: 2 },
             React.createElement(FormLayout, null,
@@ -28,5 +29,5 @@ export const ColumnFilterWindow = (props) => {
                             }
                             return label;
                         }, onChange: (column) => setColumnId(column), filterColumn: (column) => column.queryable, isMulti: false, value: columnId })))),
-        React.createElement(AdaptableColumnFilter, { columnId: columnId })));
+        React.createElement(AdaptableColumnFilter, { columnId: columnId, onChange: onChange })));
 };

package/src/View/Components/ColumnFilter/FloatingFilter.d.ts

@@ -8,5 +8,6 @@ export interface FloatingFilterProps {
     onPredicateChange: (predicate: QlPredicate) => void;
     onKeydown?: (event: React.KeyboardEventHandler<HTMLDivElement>) => void;
     onClear?: () => void;
+    onChange?: () => void;
 }
 export declare const FloatingFilter: React.FunctionComponent<FloatingFilterProps>;

package/src/View/Components/ColumnFilter/FloatingFilter.js

@@ -77,7 +77,9 @@ export const FloatingFilter = (props) => {
                     });
                 } }))),
         isInlineEditable && (React.createElement(SimpleButton, { px: 0, onClick: () => {
-                adaptable.api.filterApi.columnFilterApi.internalApi.openColumnFilterPopup(props.columnId);
+                adaptable.api.filterApi.columnFilterApi.internalApi.openColumnFilterPopup(props.columnId, {
+                    onChange: props.onChange,
+                });
             }, "data-name": "expand-filter", icon: "expand", variant: "text" })),
         (isMultiple ||
             !isPredicateEmpty(props.predicate.args[0], singleFilterPredicateDef)) && (React.createElement(SimpleButton, { "data-name": "clear-filter", p: 0, variant: "text", onClick: handleClear, icon: "close" }))));

package/src/View/Components/FilterForm/ListBoxFilterForm.js

@@ -24,7 +24,7 @@ export const ColumnValuesSelect = (props) => {
         }
         return true;
     });
-    const component = (React.createElement(Select, { isMulti: true, showHeaderSelectionCheckbox: true, searchable: true, closeMenuOnSelect: false, size: "small", menuStyle: {
+    const component = (React.createElement(Select, { isMulti: true, showHeaderSelectionCheckbox: true, searchable: true, closeMenuOnSelect: false, menuStyle: {
             minWidth: `var(--ab-cmp-select-column-menu-${column.columnId}__min-width, var(--ab-cmp-select-column-menu__min-width, 260px))`,
         }, ...props.selectProps, options: options, value: value, isLoading: props.isLoading, onChange: props.onChange }));
     return (React.createElement("div", { className: join(baseClassName, props.isLoading && `${baseClassName}--loading`, !value.length && `${baseClassName}--empty`), onKeyDownCapture: (e) => {

package/src/env.js

@@ -1,5 +1,5 @@
 export default {
     NEXT_PUBLIC_INFINITE_TABLE_LICENSE_KEY: "StartDate=2021-06-29|EndDate=2030-01-01|Owner=Adaptable|Type=distribution|TS=1624971462479|C=137829811,1004007071,2756196225,1839832928,3994409405,636616862" || '',
-    PUBLISH_TIMESTAMP: 1744658441173 || Date.now(),
-    VERSION: "20.0.4-canary.3" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1744726345600 || Date.now(),
+    VERSION: "20.0.4" || '--current-version--',
 };

package/src/layout-manager/src/LayoutManagerModel.d.ts

@@ -62,17 +62,26 @@ export type ColumnAggregationModel = {
     aggFunc: string | true;
     weightedColumnId?: string;
 };
-export type AggregationColumnsModelItem = {
+export type AggregationColumnsModel = {
     ColumnId: string;
     AggFunc: ColumnAggregationModel;
-};
-export type AggregationColumnsModel = AggregationColumnsModelItem[];
-export type PivotAggregationColumnsModel = (AggregationColumnsModelItem & {
-    TotalColumn?: boolean | 'before' | 'after' | {
-        PivotColumnId: string;
-        ShowTotal?: boolean | 'before' | 'after';
-    }[];
-})[];
+}[];
+type RowSummaryPosition = 'Top' | 'Bottom';
+export interface RowSummaryModel {
+    /**
+     * Where Row Summary appears - 'Top' or 'Bottom'
+     */
+    Position?: RowSummaryPosition;
+    /**
+     * Map of Columns with Summary Expressions
+     */
+    ColumnsMap: Record<string, string>;
+    /**
+     * Evaluates only currently filtered rows in the summary
+     * @defaultValue true
+     */
+    IncludeOnlyFilteredRows?: boolean;
+}
 export interface TableLayoutModel extends BaseLayoutModel {
     TableColumns: string[];
     /**
@@ -87,7 +96,6 @@ export interface TableLayoutModel extends BaseLayoutModel {
      * @defaultValue 'single'
      */
     RowGroupDisplayType?: 'single' | 'multi';
-    PivotAggregationColumns?: never;
     PivotColumns?: never;
     PivotGroupedColumns?: never;
     PivotExpandLevel?: never;
@@ -102,24 +110,13 @@ export interface PivotLayoutModel extends BaseLayoutModel {
     /**
      * Columns showing aggregated values in Group Rows; 1st value in record is Column name, 2nd is either aggfunc (e.g. sum, avg etc.) or 'true' (to use default aggfunc)
      */
-    PivotAggregationColumns?: PivotAggregationColumnsModel;
+    PivotAggregationColumns?: AggregationColumnsModel;
     TableAggregationColumns?: never;
     /**
      * Columns which are row-grouped when the Layout is applied
      */
     PivotGroupedColumns?: string[];
     RowGroupedColumns?: never;
-    /**
-     * Display Grand Total Row at the top or bottom of the Pivot Table
-     */
-    GrandTotalRow?: 'top' | 'bottom' | boolean;
-    /**
-     * Display Total of all Pivot Columns before or after the Pivot Columns
-     */
-    GrandTotalColumn?: 'before' | 'after' | boolean;
-    /**
-     * Display automatically calculated Totals within EACH Pivot Column Group, in the position specified
-     */
-    PivotGroupTotalColumn?: 'before' | 'after' | boolean;
 }
 export type LayoutModel = TableLayoutModel | PivotLayoutModel;
+export {};

package/src/layout-manager/src/index.d.ts

@@ -69,16 +69,7 @@ export declare class LayoutManager<DATA_TYPE = any> extends LMEmitter {
     private computeColumnOrderAndVisibility;
     autoSizeColumns(columnIds?: string[]): false | string[];
     private applyPivotLayout;
-    applyPivotTotals(layout: PivotLayoutModel): void;
     applyPivotExpandLevel(layout: PivotLayoutModel): void;
     private withSuppressColumnAnimation;
-    private setupPivotTotals;
-    private isPivotRowTotalColDef;
-    private patchGrandTotalColumn;
-    private isPivotGroupTotalColumn;
-    private patchPivotGroupTotalColumn;
-    private patchPivotTotalColumn;
-    private destructurePivotColumnId;
-    private getPivotTotalColumnConfig;
 }
 export {};

package/src/layout-manager/src/index.js

@@ -3,7 +3,7 @@ import { isPivotLayoutModel } from './isPivotLayoutModel';
 import { LMEmitter } from './LMEmitter';
 import { GROUP_COLUMN_ID__MULTI_PREFIX, GROUP_COLUMN_ID__SINGLE, normalizeLayoutModel, normalizePivotLayoutModel, normalizeTableLayoutModel, } from './normalizeLayoutModel';
 import { isLayoutEqual } from './isLayoutEqual';
-import { simplifyLayoutModel, simplifyPivotLayoutModel, simplifyTableLayoutModel, } from './simplifyLayoutModel';
+import { simplifyTableLayoutModel, simplifyPivotLayoutModel, simplifyLayoutModel, } from './simplifyLayoutModel';
 import { sortColumnIdsByOrder } from './sortColumnIdsByOrder';
 function flattenColDefs(colDefs) {
     const res = [];
@@ -117,12 +117,8 @@ export class LayoutManager extends LMEmitter {
             }).bind(this);
         }
         this.setOptions(options);
-        // this ensures the grand total columns are positioned correctly (before/after) even when changed at runtime
-        // see https://www.ag-grid.com/react-data-grid/pivoting-column-groups/#changing-data-filters-and-configurations
-        this.gridApi.setGridOption('enableStrictPivotColumnOrder', true);
         this.setupEvents();
         this.indexColumns();
-        this.setupPivotTotals();
         globalThis.layoutManager = this;
     }
     destroy() {
@@ -256,18 +252,6 @@ export class LayoutManager extends LMEmitter {
             PivotAggregationColumns: layout.TableAggregationColumns,
             PivotExpandLevel: prevLayout?.PivotExpandLevel ?? -1,
         };
-        const grandTotalRow = this.gridApi.getGridOption('grandTotalRow');
-        if (grandTotalRow) {
-            pivotLayout.GrandTotalRow = grandTotalRow;
-        }
-        const grandTotalColumn = this.gridApi.getGridOption('pivotRowTotals');
-        if (grandTotalColumn) {
-            pivotLayout.GrandTotalColumn = grandTotalColumn;
-        }
-        const pivotGroupTotalColumn = this.gridApi.getGridOption('pivotColumnGroupTotals');
-        if (pivotGroupTotalColumn) {
-            pivotLayout.PivotGroupTotalColumn = pivotGroupTotalColumn;
-        }
         return simplifyPivotLayoutModel(pivotLayout);
     }
     getTableLayoutModelFromGrid() {
@@ -288,7 +272,7 @@ export class LayoutManager extends LMEmitter {
         let ColumnPinning = {};
         const gridState = this.gridApi.getState();
         const prevLayout = this.currentLayout;
-        const prevAggColumns = prevLayout?.TableAggregationColumns ?? prevLayout?.PivotAggregationColumns;
+        const prevAggColumns = prevLayout?.TableAggregationColumns;
         const prevAggColumnsMap = prevAggColumns?.reduce((acc, agg) => {
             acc[agg.ColumnId] = agg;
             return acc;
@@ -999,7 +983,6 @@ export class LayoutManager extends LMEmitter {
         return columnIds;
     }
     applyPivotLayout(layout, options) {
-        this.applyPivotTotals(layout);
         const columnState = this.computeColumnStateForPivotLayout(layout);
         // by simply calling this.gridApi.applyColumnState(columnState)
         // the order of aggregations is not preserved/guaranteed by ag-grid
@@ -1027,50 +1010,6 @@ export class LayoutManager extends LMEmitter {
             this.applyRowGroupValues(layout.RowGroupValues);
         }
     }
-    applyPivotTotals(layout) {
-        /**
-         * GrandTotalRow
-         */
-        if (layout.GrandTotalRow) {
-            const grandTotalRow = layout.GrandTotalRow === true || layout.GrandTotalRow === 'top'
-                ? 'top'
-                : layout.GrandTotalRow === 'bottom'
-                    ? 'bottom'
-                    : null;
-            this.gridApi.setGridOption('grandTotalRow', grandTotalRow);
-        }
-        else {
-            this.gridApi.setGridOption('grandTotalRow', null);
-        }
-        /**
-         * GrandTotalColumn
-         */
-        if (layout.GrandTotalColumn) {
-            const grandTotalColumn = layout.GrandTotalColumn === true || layout.GrandTotalColumn === 'before'
-                ? 'before'
-                : layout.GrandTotalColumn === 'after'
-                    ? 'after'
-                    : null;
-            this.gridApi.setGridOption('pivotRowTotals', grandTotalColumn);
-        }
-        else {
-            this.gridApi.setGridOption('pivotRowTotals', null);
-        }
-        /**
-         * PivotGroupTotalColumn
-         */
-        if (layout.PivotGroupTotalColumn) {
-            const pivotGroupTotalColumn = layout.PivotGroupTotalColumn === true || layout.PivotGroupTotalColumn === 'before'
-                ? 'before'
-                : layout.PivotGroupTotalColumn === 'after'
-                    ? 'after'
-                    : null;
-            this.gridApi.setGridOption('pivotColumnGroupTotals', pivotGroupTotalColumn);
-        }
-        else {
-            this.gridApi.setGridOption('pivotColumnGroupTotals', null);
-        }
-    }
     applyPivotExpandLevel(layout) {
         const PivotExpandLevel = layout.PivotExpandLevel ?? -1;
         const allDisplayedColumnGroups = this.gridApi.getAllDisplayedColumnGroups();
@@ -1106,165 +1045,4 @@ export class LayoutManager extends LMEmitter {
         }
         return res;
     }
-    setupPivotTotals() {
-        const _original_processPivotResultColDef = this.gridApi.getGridOption('processPivotResultColDef');
-        this.gridApi.setGridOption('processPivotResultColDef', (resulColDef) => {
-            _original_processPivotResultColDef?.(resulColDef);
-            if (!isPivotLayoutModel(this.currentLayout)) {
-                return;
-            }
-            this.patchGrandTotalColumn(resulColDef);
-            this.patchPivotGroupTotalColumn(resulColDef);
-        });
-        const _original_processPivotResultColGroupDef = this.gridApi.getGridOption('processPivotResultColGroupDef');
-        this.gridApi.setGridOption('processPivotResultColGroupDef', (colGroupDef) => {
-            _original_processPivotResultColGroupDef?.(colGroupDef);
-            if (!isPivotLayoutModel(this.currentLayout)) {
-                return;
-            }
-            this.patchPivotTotalColumn(colGroupDef);
-        });
-    }
-    isPivotRowTotalColDef(colDef) {
-        return colDef.colId?.startsWith('PivotRowTotal_');
-    }
-    patchGrandTotalColumn(resultColDef) {
-        if (!isPivotLayoutModel(this.currentLayout) || !this.currentLayout.GrandTotalColumn) {
-            return;
-        }
-        if (this.isPivotRowTotalColDef(resultColDef)) {
-            resultColDef.headerName = `Grand Total ${resultColDef.headerName}`;
-        }
-    }
-    isPivotGroupTotalColumn(colDef) {
-        // pivot group total are spanning cross all aggregations
-        // therefore the last part of the colId is empty (hence the "dangling" underscore)
-        return colDef.colId?.startsWith('pivot_') && colDef.colId?.endsWith('_');
-    }
-    patchPivotGroupTotalColumn(resultColDef) {
-        if (!isPivotLayoutModel(this.currentLayout) || !this.currentLayout.PivotGroupTotalColumn) {
-            return;
-        }
-        if (this.isPivotGroupTotalColumn(resultColDef)) {
-            // resultColDef
-            const colInfo = this.destructurePivotColumnId(resultColDef.colId);
-            if (colInfo !== '!unknown!') {
-                const currentPivotKey = colInfo.pivotKeys[colInfo.pivotKeys.length - 1];
-                resultColDef.headerName = `${currentPivotKey} Total`;
-            }
-        }
-    }
-    patchPivotTotalColumn(colGroupDef) {
-        const hasPivotTotalCols = (pivotLayout) => {
-            return pivotLayout.PivotAggregationColumns?.some((aggCol) => !!aggCol.TotalColumn);
-        };
-        const isPivotTotalColDef = (colDef) => {
-            return !!colDef.pivotTotalColumnIds?.length;
-        };
-        if (!isPivotLayoutModel(this.currentLayout) || !hasPivotTotalCols(this.currentLayout)) {
-            return;
-        }
-        const pivotRowTotalColDefsBefore = [];
-        const pivotRowTotalColDefsAfter = [];
-        const pivotTotalColDefsBefore = [];
-        const pivotTotalColDefsAfter = [];
-        const normalColDefs = [];
-        colGroupDef.children.forEach((colDef) => {
-            if (this.isPivotRowTotalColDef(colDef)) {
-                if (this.gridApi.getGridOption('pivotRowTotals') === 'after') {
-                    pivotRowTotalColDefsAfter.push(colDef);
-                }
-                else {
-                    pivotRowTotalColDefsBefore.push(colDef);
-                }
-                return;
-            }
-            if (isPivotTotalColDef(colDef)) {
-                if (!colDef.colId.startsWith('pivot_')) {
-                    this.warn(`Pivot total column ${colDef.colId} is not prefixed with 'pivot_', skipping...`);
-                    return;
-                }
-                // we do this for all total cols, but we will hide the ones that are not visible
-                colDef.columnGroupShow = undefined;
-                colDef.headerName = `Total ${colDef.headerName}`;
-                const totalColConfig = this.getPivotTotalColumnConfig(colDef, this.currentLayout);
-                if (!totalColConfig.visible) {
-                    colDef.hide = true;
-                }
-                else {
-                    if (totalColConfig.position === 'after') {
-                        pivotTotalColDefsAfter.push(colDef);
-                    }
-                    else {
-                        pivotTotalColDefsBefore.push(colDef);
-                    }
-                }
-            }
-            else {
-                normalColDefs.push(colDef);
-            }
-        });
-        colGroupDef.children = [
-            ...pivotRowTotalColDefsBefore,
-            ...pivotTotalColDefsBefore,
-            ...normalColDefs,
-            ...pivotTotalColDefsAfter,
-            ...pivotRowTotalColDefsAfter,
-        ];
-    }
-    destructurePivotColumnId(colId = '') {
-        // Split by underscore to get 4 parts
-        const parts = colId.split('_');
-        if (parts.length !== 4) {
-            this.warn(`Unsupported format of pivot total column id: ${colId}`);
-            return '!unknown!';
-        }
-        // e.g.
-        // pivot_country-sport-year_United States-Basketball_gold
-        // pivotColumnIds: ['country', 'sport', 'year']
-        // pivotKeys: ['United States', 'Basketball']
-        // aggregationColumnId: 'gold'
-        const [_pivotPrefix, pivotColsTxt, pivotKeysTxt, aggregationColumnId] = parts;
-        const pivotColumnIds = pivotColsTxt.split('-');
-        const pivotKeys = pivotKeysTxt.split('-');
-        const pivotColumnId = pivotColumnIds[pivotKeys.length - 1];
-        return {
-            pivotColumnIds,
-            pivotKeys,
-            pivotColumnId,
-            aggregationColumnId,
-        };
-    }
-    getPivotTotalColumnConfig(colDef, currentPivotLayout) {
-        const defaultHiddenConfig = {
-            visible: false,
-        };
-        const colIdInfo = this.destructurePivotColumnId(colDef.colId);
-        if (colIdInfo === '!unknown!') {
-            return defaultHiddenConfig;
-        }
-        const { pivotColumnId, aggregationColumnId } = colIdInfo;
-        const layoutAggCol = currentPivotLayout.PivotAggregationColumns?.find((col) => col.ColumnId === aggregationColumnId);
-        if (!layoutAggCol) {
-            this.warn(`Pivot Totals: could NOT find aggregation(value) column with id ${aggregationColumnId}`);
-            return defaultHiddenConfig;
-        }
-        const layoutPivotTotalColumn = layoutAggCol.TotalColumn;
-        if (!layoutPivotTotalColumn) {
-            return defaultHiddenConfig;
-        }
-        if (Array.isArray(layoutPivotTotalColumn)) {
-            const pivotSpecificConfig = layoutPivotTotalColumn.find((config) => config.PivotColumnId === pivotColumnId);
-            return {
-                visible: pivotSpecificConfig && pivotSpecificConfig.ShowTotal !== false,
-                position: pivotSpecificConfig?.ShowTotal === 'after' ? 'after' : 'before',
-            };
-        }
-        else {
-            return {
-                visible: !!layoutPivotTotalColumn,
-                position: layoutPivotTotalColumn === 'after' ? 'after' : 'before',
-            };
-        }
-    }
 }

package/src/layout-manager/src/normalizeLayoutModel.js

@@ -139,9 +139,6 @@ export function normalizePivotLayoutModel(layout) {
         // make it an own property
         layout.SuppressAggFuncInHeader = undefined;
     }
-    if (!layout.GrandTotalRow) {
-        layout.GrandTotalRow = false;
-    }
     return layout;
 }
 export function normalizeLayoutModel(layout, options) {

package/src/layout-manager/src/simplifyLayoutModel.js

@@ -15,7 +15,7 @@ export function simplifyTableLayoutModel(layout) {
         delete layout.RowGroupedColumns;
     }
     if (!layout.RowGroupedColumns && layout.RowGroupValues) {
-        delete layout.RowGroupValues;
+        // delete layout.RowGroupValues;
     }
     if (layout.SuppressAggFuncInHeader === undefined) {
         delete layout.SuppressAggFuncInHeader;