@adaptabletools/adaptable 20.0.4-canary.0 → 20.0.4-canary.2

package/package.json

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

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: 1744377437477 || Date.now(),
-    VERSION: "20.0.4-canary.0" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1744635576553 || Date.now(),
+    VERSION: "20.0.4-canary.2" || '--current-version--',
 };

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

@@ -73,8 +73,12 @@ export declare class LayoutManager<DATA_TYPE = any> extends LMEmitter {
     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

@@ -1102,6 +1102,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) => {
@@ -1112,14 +1113,35 @@ export class LayoutManager extends LMEmitter {
             this.patchPivotTotalColumn(colGroupDef);
         });
     }
+    isPivotRowTotalColDef(colDef) {
+        return colDef.colId?.startsWith('PivotRowTotal_');
+    }
     patchGrandTotalColumn(resultColDef) {
         if (!isPivotLayoutModel(this.currentLayout) || !this.currentLayout.GrandTotalColumn) {
             return;
         }
-        if (resultColDef.colId?.startsWith('PivotRowTotal_')) {
+        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);
@@ -1130,10 +1152,20 @@ export class LayoutManager extends LMEmitter {
         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);
+                }
+            }
             if (isPivotTotalColDef(colDef)) {
                 if (!colDef.colId.startsWith('pivot_')) {
                     this.warn(`Pivot total column ${colDef.colId} is not prefixed with 'pivot_', skipping...`);
@@ -1160,21 +1192,19 @@ export class LayoutManager extends LMEmitter {
             }
         });
         colGroupDef.children = [
+            ...pivotRowTotalColDefsBefore,
             ...pivotTotalColDefsBefore,
             ...normalColDefs,
             ...pivotTotalColDefsAfter,
+            ...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
@@ -1184,6 +1214,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}`);
@@ -1193,7 +1240,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 {