@adaptabletools/adaptable-cjs 20.0.11 → 20.0.13

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

@@ -1,20 +1,63 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isLayoutEqual = exports.isPivotLayoutEqual = exports.isTableLayoutEqual = void 0;
+exports.isLayoutEqual = exports.isPivotLayoutEqual = exports.isTableLayoutEqual = exports.logChanges = exports.getChanges = void 0;
 const tslib_1 = require("tslib");
 const isEqual_1 = tslib_1.__importDefault(require("lodash/isEqual"));
+const infinite_react_1 = require("@infinite-table/infinite-react");
 const isPivotLayoutModel_1 = require("./isPivotLayoutModel");
 const normalizeLayoutModel_1 = require("./normalizeLayoutModel");
+const logger = (0, infinite_react_1.debug)(`LayoutManager:Diffing`);
+const getChanges = (l1, l2) => {
+    if (!l1 || typeof l1 !== 'object' || !l2 || typeof l2 !== 'object') {
+        return [
+            {
+                key: 'missing',
+                value1: l1,
+                value2: l2,
+            },
+        ];
+    }
+    const k1 = Object.keys(l1);
+    const k2 = Object.keys(l2);
+    const allKeys = new Set([...k1, ...k2]);
+    const changes = [];
+    for (const key of allKeys) {
+        if (!(0, isEqual_1.default)(l1[key], l2[key])) {
+            changes.push({ key, value1: l1[key], value2: l2[key] });
+        }
+    }
+    return changes;
+};
+exports.getChanges = getChanges;
+const logChanges = (l1, l2, log) => {
+    log = log || logger;
+    const changes = (0, exports.getChanges)(l1, l2);
+    log('---');
+    log('Layouts are not equal.');
+    log('Layout 1', l1);
+    log('Layout 2', l2);
+    log('Differences:', changes);
+    log('---');
+};
+exports.logChanges = logChanges;
 function isTableLayoutEqual(l1, l2) {
     l1 = (0, normalizeLayoutModel_1.normalizeTableLayoutModel)(l1);
     l2 = (0, normalizeLayoutModel_1.normalizeTableLayoutModel)(l2);
-    return (0, isEqual_1.default)(l1, l2);
+    const res = (0, isEqual_1.default)(l1, l2);
+    if (!res) {
+        (0, exports.logChanges)(l1, l2);
+    }
+    return res;
 }
 exports.isTableLayoutEqual = isTableLayoutEqual;
 function isPivotLayoutEqual(l1, l2) {
     l1 = (0, normalizeLayoutModel_1.normalizePivotLayoutModel)(l1);
     l2 = (0, normalizeLayoutModel_1.normalizePivotLayoutModel)(l2);
-    return (0, isEqual_1.default)(l1, l2);
+    const res = (0, isEqual_1.default)(l1, l2);
+    if (!res) {
+        (0, exports.logChanges)(l1, l2);
+    }
+    return res;
 }
 exports.isPivotLayoutEqual = isPivotLayoutEqual;
 function isLayoutEqual(l1, l2) {

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

@@ -0,0 +1 @@
+export declare function isPivotColumnTotal(colId: string): boolean;

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

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

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/isPivotGrandTotal.js

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

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

@@ -29,6 +29,14 @@ 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
@@ -136,6 +144,22 @@ 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;
 }
 exports.normalizePivotLayoutModel = normalizePivotLayoutModel;

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

@@ -56,7 +56,7 @@ function simplifyTableLayoutModel(layout) {
         });
         layout.RowGroupDisplayType = displayType;
     }
-    if (!layout.GrandTotalRow) {
+    if (layout.GrandTotalRow === undefined) {
         delete layout.GrandTotalRow;
     }
     return layout;
@@ -79,6 +79,15 @@ 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;
 }
 exports.simplifyPivotLayoutModel = simplifyPivotLayoutModel;

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;
         })[];
     };