@adaptabletools/adaptable 20.0.4-canary.1 → 20.0.4-canary.3

package/package.json

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

package/src/Api/Implementation/LayoutHelpers.js

@@ -333,12 +333,21 @@ export const pivotLayoutModelToPivotLayout = (layoutModel, defaults) => {
     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 }) => ({
             ColumnId,

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: 1744398186764 || Date.now(),
-    VERSION: "20.0.4-canary.1" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1744658441173 || Date.now(),
+    VERSION: "20.0.4-canary.3" || '--current-version--',
 };

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

@@ -75,7 +75,10 @@ export declare class LayoutManager<DATA_TYPE = any> extends LMEmitter {
     private setupPivotTotals;
     private isPivotRowTotalColDef;
     private patchGrandTotalColumn;
+    private isPivotGroupTotalColumn;
+    private patchPivotGroupTotalColumn;
     private patchPivotTotalColumn;
+    private destructurePivotColumnId;
     private getPivotTotalColumnConfig;
 }
 export {};

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

@@ -256,6 +256,18 @@ 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() {
@@ -1102,6 +1114,7 @@ export class LayoutManager extends LMEmitter {
                 return;
             }
             this.patchGrandTotalColumn(resulColDef);
+            this.patchPivotGroupTotalColumn(resulColDef);
         });
         const _original_processPivotResultColGroupDef = this.gridApi.getGridOption('processPivotResultColGroupDef');
         this.gridApi.setGridOption('processPivotResultColGroupDef', (colGroupDef) => {
@@ -1123,6 +1136,24 @@ export class LayoutManager extends LMEmitter {
             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);
@@ -1146,6 +1177,7 @@ export class LayoutManager extends LMEmitter {
                 else {
                     pivotRowTotalColDefsBefore.push(colDef);
                 }
+                return;
             }
             if (isPivotTotalColDef(colDef)) {
                 if (!colDef.colId.startsWith('pivot_')) {
@@ -1180,16 +1212,12 @@ export class LayoutManager extends LMEmitter {
             ...pivotRowTotalColDefsAfter,
         ];
     }
-    getPivotTotalColumnConfig(colDef, currentPivotLayout) {
-        const defaultHiddenConfig = {
-            visible: false,
-        };
-        const colId = colDef.colId;
+    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 defaultHiddenConfig;
+            return '!unknown!';
         }
         // e.g.
         // pivot_country-sport-year_United States-Basketball_gold
@@ -1199,6 +1227,23 @@ export class LayoutManager extends LMEmitter {
         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}`);
@@ -1208,7 +1253,6 @@ export class LayoutManager extends LMEmitter {
         if (!layoutPivotTotalColumn) {
             return defaultHiddenConfig;
         }
-        const pivotColumnId = pivotColumnIds[pivotKeys.length - 1];
         if (Array.isArray(layoutPivotTotalColumn)) {
             const pivotSpecificConfig = layoutPivotTotalColumn.find((config) => config.PivotColumnId === pivotColumnId);
             return {