@adaptabletools/adaptable-cjs 20.0.7-canary.0 → 20.0.7-canary.2

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

@@ -9,7 +9,9 @@ const isLayoutEqual_1 = require("./isLayoutEqual");
 const simplifyLayoutModel_1 = require("./simplifyLayoutModel");
 const sortColumnIdsByOrder_1 = require("./sortColumnIdsByOrder");
 const destructurePivotColumnId_1 = require("./destructurePivotColumnId");
-const isPivotTotalColumn_1 = require("./isPivotTotalColumn");
+const isPivotAggTotalColumn_1 = require("./isPivotAggTotalColumn");
+const isPivotGrandTotalColumn_1 = require("./isPivotGrandTotalColumn");
+const isPivotGroupTotalColumn_1 = require("./isPivotGroupTotalColumn");
 function flattenColDefs(colDefs) {
     const res = [];
     const iteration = (c) => {
@@ -1111,8 +1113,28 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
         }
         return res;
     }
+    patchColDefType(colDef, colTypes) {
+        const originalTypes = colDef.type == undefined ? [] : Array.isArray(colDef.type) ? colDef.type : [colDef.type];
+        const columnTypes = new Set(originalTypes);
+        colTypes.forEach((colType) => {
+            columnTypes.add(colType);
+        });
+        colDef.type = Array.from(columnTypes);
+    }
     setupPivotTotals() {
         const _original_processPivotResultColDef = this.gridApi.getGridOption('processPivotResultColDef');
+        this.gridApi.setGridOption('processPivotResultColDef', (colDef) => {
+            _original_processPivotResultColDef?.(colDef);
+            if (!(0, isPivotLayoutModel_1.isPivotLayoutModel)(this.currentLayout)) {
+                return;
+            }
+            if ((0, isPivotGrandTotalColumn_1.isPivotGrandTotalColumn)(colDef)) {
+                this.patchColDefType(colDef, ['pivotTotalColumn', 'pivotGrandTotalColumn']);
+            }
+            if ((0, isPivotGroupTotalColumn_1.isPivotGroupTotalColumn)(colDef.colId)) {
+                this.patchColDefType(colDef, ['pivotTotalColumn', 'pivotGroupTotalColumn']);
+            }
+        });
         const _original_processPivotResultColGroupDef = this.gridApi.getGridOption('processPivotResultColGroupDef');
         this.gridApi.setGridOption('processPivotResultColGroupDef', (colGroupDef) => {
             _original_processPivotResultColGroupDef?.(colGroupDef);
@@ -1122,9 +1144,6 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
             this.patchPivotTotalColumn(colGroupDef);
         });
     }
-    isPivotRowTotalColDef(colDef) {
-        return colDef.colId?.startsWith('PivotRowTotal_');
-    }
     patchPivotTotalColumn(colGroupDef) {
         const hasPivotTotalCols = (pivotLayout) => {
             return pivotLayout.PivotAggregationColumns?.some((aggCol) => !!aggCol.TotalColumn);
@@ -1138,7 +1157,7 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
         const pivotTotalColDefsAfter = [];
         const normalColDefs = [];
         colGroupDef.children.forEach((colDef) => {
-            if (this.isPivotRowTotalColDef(colDef)) {
+            if ((0, isPivotGrandTotalColumn_1.isPivotGrandTotalColumn)(colDef)) {
                 if (this.gridApi.getGridOption('pivotRowTotals') === 'after') {
                     pivotRowTotalColDefsAfter.push(colDef);
                 }
@@ -1147,11 +1166,12 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
                 }
                 return;
             }
-            if ((0, isPivotTotalColumn_1.isPivotTotalColumn)(colDef)) {
+            if ((0, isPivotAggTotalColumn_1.isPivotAggTotalColumn)(colDef)) {
                 if (!colDef.colId.startsWith('pivot_')) {
                     this.warn(`Pivot total column ${colDef.colId} is not prefixed with 'pivot_', skipping...`);
                     return;
                 }
+                this.patchColDefType(colDef, ['pivotTotalColumn', 'pivotAggregationTotalColumn']);
                 // we do this for all total cols, but we will hide the ones that are not visible
                 colDef.columnGroupShow = undefined;
                 const totalColConfig = this.getPivotTotalColumnConfig(colDef, this.currentLayout);

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

@@ -0,0 +1,2 @@
+import { ColDef } from 'ag-grid-enterprise';
+export declare function isPivotAggTotalColumn(colDef: ColDef): colDef is ColDef;

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

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isPivotAggTotalColumn = void 0;
+function isPivotAggTotalColumn(colDef) {
+    return !!colDef.pivotTotalColumnIds?.length;
+}
+exports.isPivotAggTotalColumn = isPivotAggTotalColumn;

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

@@ -0,0 +1,2 @@
+import { ColDef, ColGroupDef } from 'ag-grid-enterprise';
+export declare function isPivotGrandTotalColumn(colDef: ColDef | ColGroupDef): boolean;

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

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isPivotGrandTotalColumn = void 0;
+function isPivotGrandTotalColumn(colDef) {
+    return colDef?.colId?.startsWith('PivotRowTotal_pivot_');
+}
+exports.isPivotGrandTotalColumn = isPivotGrandTotalColumn;

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

@@ -1,2 +1 @@
-import { ColDef } from 'ag-grid-enterprise';
-export declare function isPivotGroupTotalColumn(colDef: ColDef): boolean;
+export declare function isPivotGroupTotalColumn(colId: string): boolean;

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

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isPivotGroupTotalColumn = void 0;
-function isPivotGroupTotalColumn(colDef) {
+function isPivotGroupTotalColumn(colId) {
     // 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('_');
+    return colId?.startsWith('pivot_') && colId?.endsWith('_');
 }
 exports.isPivotGroupTotalColumn = isPivotGroupTotalColumn;

package/src/metamodel/adaptable.metamodel.d.ts

@@ -4056,13 +4056,19 @@ export declare const ADAPTABLE_METAMODEL: {
         name: string;
         kind: string;
         desc: string;
-        props: {
+        props: ({
             name: string;
             kind: string;
             desc: string;
             isOpt: boolean;
             defVal: string;
-        }[];
+        } | {
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt: boolean;
+            defVal?: undefined;
+        })[];
     };
     LayoutViewOptions: {
         name: string;