@adaptabletools/adaptable-cjs 20.2.4 → 20.2.6

package/src/agGrid/AgGridColumnAdapter.js

@@ -114,9 +114,10 @@ class AgGridColumnAdapter {
                 this.agGridApi.getAllGridColumns();
         if (pivotMode) {
             const pivotResultColumns = this.agGridApi.getPivotResultColumns() || [];
-            if (pivotResultColumns.length) {
-                cols = [...cols, ...pivotResultColumns];
-            }
+            const autoGroupColumns = this.agGridApi
+                .getAllGridColumns()
+                .filter((column) => this.adaptableApi.columnApi.isAutoRowGroupColumn(column.getColId()));
+            cols = [...autoGroupColumns, ...cols, ...pivotResultColumns];
         }
         // this needs to be here, before the other setup below
         // so the setup methods below reference the correct columns in adaptable store

package/src/agGrid/AgGridExportAdapter.js

@@ -423,7 +423,7 @@ class AgGridExportAdapter {
                 let rawValue = rowNode.key;
                 return { columnId, rawValue };
             }
-            if (this.adaptableApi.columnApi.isPivotResultColumn(agColumn.getColId())) {
+            if (!!rowNode.aggData) {
                 const columnId = agColumn.getColId();
                 const rawValue = rowNode.aggData?.[columnId];
                 return { columnId, rawValue };

package/src/env.js

@@ -2,6 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.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: 1751027848227 || Date.now(),
-    VERSION: "20.2.4" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1751633664670 || Date.now(),
+    VERSION: "20.2.6" || '--current-version--',
 };

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

@@ -226,21 +226,9 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
         const shouldSkipTriggerChange = options?.skipTriggerChange === true;
         this._prevFiredLayout = layout;
         this.currentLayout = layout;
-        if ((!prevLayout?.RowGroupedColumns || !prevLayout?.RowGroupedColumns.length) &&
-            layout.RowGroupedColumns &&
-            layout.RowGroupedColumns.length > 0 &&
-            layout.RowGroupValues) {
-            // most likely the user has changed grouping via some AG Grid action
-            // and we need to make sure the expand/collapse state is applied
-            // but we want to suspend the listener
-            // as it would re-trigger another change
-            const unsupress = this.suspendAgGridListener();
-            this.applyRowGroupValues(layout.RowGroupValues, layout.RowGroupedColumns);
-            unsupress();
-        }
-        if ((!prevLayout?.RowGroupedColumns || !prevLayout?.RowGroupedColumns.length) &&
-            layout.RowGroupedColumns &&
+        if (layout.RowGroupedColumns &&
             layout.RowGroupedColumns.length > 0 &&
+            (prevLayout?.RowGroupedColumns || []).join(',') !== layout.RowGroupedColumns.join(',') &&
             layout.RowGroupValues) {
             // most likely the user has changed grouping via some AG Grid action
             // and we need to make sure the expand/collapse state is applied
@@ -476,12 +464,24 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
             });
         }
         if (RowGroupedColumns && RowGroupedColumns.length) {
+            const LayoutRowGroupedColumns = this.currentLayout?.RowGroupedColumns || this.currentLayout?.PivotGroupedColumns || [];
             // if it's a new grouping, try and take it
-            const isGroupingNew = RowGroupedColumns &&
-                !this.currentLayout?.RowGroupedColumns &&
-                !this.currentLayout?.PivotGroupedColumns;
+            const isGroupingNew = RowGroupedColumns && RowGroupedColumns.join(',') !== LayoutRowGroupedColumns.join(',');
             if (this.currentLayout?.RowGroupValues) {
                 const currentRowGroupValues = this.currentLayout.RowGroupValues;
+                let currentRowGroupValuesGroupKeys = [];
+                if (currentRowGroupValues.RowGroupDisplay === 'expanded' ||
+                    currentRowGroupValues.RowGroupDisplay === 'collapsed') {
+                    if (Array.isArray(currentRowGroupValues.GroupKeys)) {
+                        currentRowGroupValuesGroupKeys =
+                            currentRowGroupValues.GroupKeys.find((item) => {
+                                return ((item.RowGroupedColumns || []).join(',') === (RowGroupedColumns || []).join(','));
+                            })?.Values || [];
+                    }
+                    else {
+                        currentRowGroupValuesGroupKeys = currentRowGroupValues.Values || [];
+                    }
+                }
                 if (currentRowGroupValues.RowGroupDisplay === 'always-collapsed') {
                     RowGroupValues = {
                         RowGroupDisplay: 'always-collapsed',
@@ -494,7 +494,7 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
                 }
                 else if (currentRowGroupValues.RowGroupDisplay === 'collapsed') {
                     const ExpandedValues = isGroupingNew
-                        ? currentRowGroupValues.Values || []
+                        ? currentRowGroupValuesGroupKeys || []
                         : this.getRowGroupNodePathsAs({
                             expanded: true,
                         });
@@ -521,7 +521,7 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
                 }
                 else if (currentRowGroupValues.RowGroupDisplay === 'expanded') {
                     const CollapsedValues = isGroupingNew
-                        ? currentRowGroupValues.Values || []
+                        ? currentRowGroupValuesGroupKeys || []
                         : this.getRowGroupNodePathsAs({
                             expanded: false,
                         });
@@ -1019,7 +1019,9 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
             acc[colId] = index;
             return acc;
         }, {});
-        columnState.applyOrder = true;
+        // having this set to true will change pivot column order when there is sorting
+        // and we don't want that to happen #keep-sorted-columns-in-same-order-as-unsorted
+        // columnState.applyOrder = true;
         const columnIds = getColumnOrderIdsForAllColDefs([
             ...layout.PivotColumns,
             ...(layout.PivotAggregationColumns || []).map((col) => col.ColumnId),

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

@@ -2325,6 +2325,24 @@ export declare const ADAPTABLE_METAMODEL: {
             isOpt?: undefined;
         })[];
     };
+    CustomDestinationsContext: {
+        name: string;
+        kind: string;
+        desc: string;
+        props: ({
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt?: undefined;
+            ref?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt: boolean;
+            ref: string;
+        })[];
+    };
     CustomDisplayFormatter: {
         name: string;
         kind: string;
@@ -3855,6 +3873,22 @@ export declare const ADAPTABLE_METAMODEL: {
             ref: string;
         })[];
     };
+    GroupKeys: {
+        name: string;
+        kind: string;
+        desc: string;
+        props: ({
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt: boolean;
+        } | {
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt?: undefined;
+        })[];
+    };
     HandleFdc3Context: {
         name: string;
         kind: string;