@adaptabletools/adaptable 20.0.11 → 20.0.13

package/src/layout-manager/src/{isPivotGroupTotalColumn.js → isPivotColumnTotal.js}

@@ -1,4 +1,4 @@
-export function isPivotGroupTotalColumn(colId) {
+export function isPivotColumnTotal(colId) {
     // pivot group total are spanning cross all aggregations
     // therefore the last part of the colId is empty (hence the "dangling" underscore)
     return colId?.startsWith('pivot_') && colId?.endsWith('_');

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

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

package/src/layout-manager/src/{isPivotGrandTotalColumn.js → isPivotGrandTotal.js}

@@ -1,3 +1,3 @@
-export function isPivotGrandTotalColumn(colDef) {
+export function isPivotGrandTotal(colDef) {
     return colDef?.colId?.startsWith('PivotRowTotal_pivot_');
 }

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

@@ -25,6 +25,14 @@ export function normalizeTableLayoutModel(layout, options) {
     if (!layout.RowGroupedColumns) {
         layout.RowGroupedColumns = [];
     }
+    if (!('SuppressAggFuncInHeader' in layout)) {
+        // make it an own property
+        layout.SuppressAggFuncInHeader = undefined;
+    }
+    if (!('GrandTotalRow' in layout)) {
+        // make it an own property
+        layout.GrandTotalRow = undefined;
+    }
     const ColumnOrderSet = new Set(layout.TableColumns);
     if (layout.RowGroupedColumns && layout.RowGroupedColumns.length && layout.TableColumns) {
         // the layout.TableColumns might not include the group columns
@@ -131,6 +139,22 @@ export function normalizePivotLayoutModel(layout) {
             RowGroupDisplay: 'always-collapsed',
         };
     }
+    if (!('SuppressAggFuncInHeader' in layout)) {
+        // make it an own property
+        layout.SuppressAggFuncInHeader = undefined;
+    }
+    if (!('GrandTotalRow' in layout)) {
+        // make it an own property
+        layout.GrandTotalRow = undefined;
+    }
+    if (!('PivotGrandTotal' in layout)) {
+        // make it an own property
+        layout.PivotGrandTotal = undefined;
+    }
+    if (!('PivotColumnTotal' in layout)) {
+        // make it an own property
+        layout.PivotColumnTotal = undefined;
+    }
     return layout;
 }
 export function normalizeLayoutModel(layout, options) {

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

@@ -53,7 +53,7 @@ export function simplifyTableLayoutModel(layout) {
         });
         layout.RowGroupDisplayType = displayType;
     }
-    if (!layout.GrandTotalRow) {
+    if (layout.GrandTotalRow === undefined) {
         delete layout.GrandTotalRow;
     }
     return layout;
@@ -75,6 +75,15 @@ export function simplifyPivotLayoutModel(layout) {
     if (!layout.PivotGroupedColumns && layout.RowGroupValues) {
         delete layout.RowGroupValues;
     }
+    if (layout.GrandTotalRow === undefined) {
+        delete layout.GrandTotalRow;
+    }
+    if (layout.PivotColumnTotal === undefined) {
+        delete layout.PivotColumnTotal;
+    }
+    if (layout.PivotGrandTotal === undefined) {
+        delete layout.PivotGrandTotal;
+    }
     return layout;
 }
 export function simplifyLayoutModel(layout) {

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

@@ -4382,18 +4382,18 @@ export declare const ADAPTABLE_METAMODEL: {
             kind: string;
             desc: string;
             isOpt: boolean;
-            ref?: undefined;
+            ref: string;
         } | {
             name: string;
             kind: string;
             desc: string;
-            isOpt: boolean;
-            ref: string;
+            isOpt?: undefined;
+            ref?: undefined;
         } | {
             name: string;
             kind: string;
             desc: string;
-            isOpt?: undefined;
+            isOpt: boolean;
             ref?: undefined;
         })[];
     };