@adaptabletools/adaptable-cjs 22.0.0-canary.3 → 22.0.0-canary.4

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

@@ -169,7 +169,7 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
         this.setupEvents();
         this.indexColumns();
         this.setupPivotTotals();
-        globalThis.layoutManager = this;
+        // (globalThis as any).layoutManager = this;
     }
     destroy() {
         if (this.destroyed) {
@@ -347,10 +347,11 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
         const columnState = this.gridApi
             .getColumnState()
             .filter((col) => !pivotResultColumnsSet.has(col.colId));
-        let PivotColumns = this.gridApi.getPivotColumns().map((col) => col.getColId());
+        const PivotColumns = this.gridApi.getPivotColumns().map((col) => col.getColId());
         const layout = this.getUndecidedLayoutModelFromGrid(columnState);
         let ColumnSizing = layout.ColumnSizing || {};
         let ColumnVisibility = { ...layout.ColumnVisibility };
+        const storePivotResultColumns = !!prevLayout?.PivotResultColumns;
         //let's also include the column widths of the pivotResult columns
         pivotResultColumns.forEach((col) => {
             const colId = col.getColId();
@@ -404,6 +405,13 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
             GrandTotalRow: layout.GrandTotalRow,
             PivotExpandLevel: prevLayout?.PivotExpandLevel ?? -1,
         };
+        if (storePivotResultColumns) {
+            // Get pivot result columns in display order (not creation order)
+            const displayedPivotResultColumns = this.gridApi
+                .getAllDisplayedColumns()
+                .filter((col) => pivotResultColumnsSet.has(col.getColId()));
+            pivotLayout.PivotResultColumns = displayedPivotResultColumns.map((col) => col.getColId());
+        }
         if (layout.SuppressAggFuncInHeader) {
             pivotLayout.SuppressAggFuncInHeader = layout.SuppressAggFuncInHeader;
         }
@@ -427,20 +435,20 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
         let TableColumns = columnState.map((c) => c.colId);
         // .filter((colId) => colId !== 'ag-Grid-SelectionColumn');
         let ColumnSorts = [];
-        let RowGroupedColumns = [];
+        const RowGroupedColumns = [];
         let RowGroupValues = undefined;
         let ColumnGroupValues = undefined;
         let TableAggregationColumns = [];
-        let ColumnPinning = {};
+        const ColumnPinning = {};
         const gridState = this.gridApi.getState();
         const prevLayout = this.currentLayout;
         const prevAggColumns = prevLayout?.TableAggregationColumns ?? prevLayout?.PivotAggregationColumns;
-        let ColumnSizing = { ...prevLayout?.ColumnSizing };
+        const ColumnSizing = { ...prevLayout?.ColumnSizing };
         const prevAggColumnsMap = prevAggColumns?.reduce((acc, agg) => {
             acc[agg.ColumnId] = agg;
             return acc;
         }, {});
-        let ColumnVisibility = columnState.reduce((acc, colState) => {
+        const ColumnVisibility = columnState.reduce((acc, colState) => {
             const colId = colState.colId;
             // normally we take the initial width from this object
             let initialWidth = this.initialColumnWidths[colId];
@@ -1242,7 +1250,7 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
         }
     }
     computeColumnStateForPivotLayout(layout) {
-        let columnState = {};
+        const columnState = {};
         const pivotColumnsToIndexes = (layout.PivotColumns || []).reduce((acc, colId, index) => {
             acc[colId] = index;
             return acc;
@@ -1273,6 +1281,12 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
         this.computeColumnSorts(layout, columnState);
         this.computePinnedColumns(layout, columnState);
         this.computePivotAggregations(layout, columnState);
+        // Add pivot result columns to the state for ordering (will be applied with applyOrder: true later)
+        if (Array.isArray(layout.PivotResultColumns)) {
+            layout.PivotResultColumns.forEach((colId) => {
+                columnState.state.push({ colId });
+            });
+        }
         return columnState;
     }
     computePivotAggregations(layout, columnState) {
@@ -1513,6 +1527,10 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
             });
             // now recompute and apply the last one
             this.computePivotAggregations(layout, columnState);
+            // Apply order only on the final call when PivotResultColumns is specified
+            if (Array.isArray(layout.PivotResultColumns)) {
+                columnState.applyOrder = true;
+            }
             this.gridApi.applyColumnState(columnState);
             // let's also include the column widths of the pivotResult columns
             // we can't simply include those in the columnState because the columnState will also apply order

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

@@ -138,6 +138,9 @@ function normalizePivotLayoutModel(layout) {
     if (!layout.ColumnPinning) {
         layout.ColumnPinning = {};
     }
+    if (!layout.PivotResultColumns) {
+        layout.PivotResultColumns = false;
+    }
     if (!layout.ColumnSizing) {
         layout.ColumnSizing = {};
     }

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

@@ -2157,12 +2157,20 @@ export declare const ADAPTABLE_METAMODEL: {
             name: string;
             kind: string;
             desc: string;
+            isOpt?: undefined;
+            ref?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt: boolean;
             ref?: undefined;
         } | {
             name: string;
             kind: string;
             desc: string;
             ref: string;
+            isOpt?: undefined;
         })[];
     };
     CommandHandler: {
@@ -4068,6 +4076,18 @@ export declare const ADAPTABLE_METAMODEL: {
         kind: string;
         desc: string;
     };
+    Identifiable: {
+        name: string;
+        kind: string;
+        desc: string;
+        props: {
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt: boolean;
+            ref: string;
+        }[];
+    };
     InFilterValue: {
         name: string;
         kind: string;
@@ -4457,6 +4477,16 @@ export declare const ADAPTABLE_METAMODEL: {
         kind: string;
         desc: string;
     };
+    NamedObject: {
+        name: string;
+        kind: string;
+        desc: string;
+        props: {
+            name: string;
+            kind: string;
+            desc: string;
+        }[];
+    };
     NamedQuery: {
         name: string;
         kind: string;