@adaptabletools/adaptable 20.2.0 → 20.2.2

package/src/agGrid/AgGridExportAdapter.js

@@ -180,19 +180,19 @@ export class AgGridExportAdapter {
             // recreating the standard AG Grid styling for row groups: 'Parent -> Child'
             // additionally the values are formatted
             let rowGroupNode = params.node;
-            const isFooterRow = rowGroupNode.footer;
+            const agColumn = params.column;
             const rowGroupSummary = [
-                this.processRowGroupForExcelExport(rowGroupNode, exportContext) ?? '',
+                this.processRowGroupForExcelExport(rowGroupNode, exportContext, agColumn) ?? '',
             ];
             while (rowGroupNode.parent) {
                 rowGroupNode = rowGroupNode.parent;
-                const formattedParentNode = this.processRowGroupForExcelExport(rowGroupNode, exportContext);
+                const formattedParentNode = this.processRowGroupForExcelExport(rowGroupNode, exportContext, agColumn);
                 if (formattedParentNode) {
                     rowGroupSummary.push(formattedParentNode);
                 }
             }
             let summary = rowGroupSummary.reverse().join(' -> ');
-            if (isFooterRow) {
+            if (agColumn?.getColId() === AG_GRID_GROUPED_COLUMN && rowGroupNode.footer) {
                 summary = `Total: ${summary}`;
             }
             return summary;
@@ -407,17 +407,29 @@ export class AgGridExportAdapter {
         }
         return this.getCellExportValueFromRawValue(rowNode, this.adaptableApi.gridApi.getRawValueFromRowNode(rowNode, columnId), columnId, exportContext);
     }
-    processRowGroupForExcelExport(rowNode, exportContext) {
+    processRowGroupForExcelExport(rowNode, exportContext, agColumn) {
         if (this.isTreeDataGrid()) {
             return rowNode.key;
         }
-        const columnId = rowNode.field ??
-            rowNode.rowGroupColumn?.getColId() ??
-            rowNode.rowGroupColumn?.getColDef()?.field;
-        if (!columnId || !rowNode.key) {
+        const getColIdAndRawValue = () => {
+            if (this.adaptableApi.columnApi.isAutoRowGroupColumn(agColumn?.getColId())) {
+                const columnId = rowNode.field ??
+                    rowNode.rowGroupColumn?.getColId() ??
+                    rowNode.rowGroupColumn?.getColDef()?.field;
+                let rawValue = rowNode.key;
+                return { columnId, rawValue };
+            }
+            if (this.adaptableApi.columnApi.isPivotResultColumn(agColumn.getColId())) {
+                const columnId = agColumn.getColId();
+                const rawValue = rowNode.aggData?.[columnId];
+                return { columnId, rawValue };
+            }
+            return {};
+        };
+        let { columnId, rawValue } = getColIdAndRawValue();
+        if (!columnId || rawValue == null) {
             return;
         }
-        let rawValue = rowNode.key;
         const columnDataType = this.adaptableApi.columnApi.getColumnDataTypeForColumnId(columnId);
         if ((columnDataType === 'date' || columnDataType === 'dateString') &&
             typeof rawValue === 'string' &&

package/src/env.js

@@ -1,5 +1,5 @@
 export 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: 1749810312509 || Date.now(),
-    VERSION: "20.2.0" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1750862989331 || Date.now(),
+    VERSION: "20.2.2" || '--current-version--',
 };

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

@@ -1,3 +1,4 @@
+import { XOR } from '../../Utilities/Extensions/TypeExtensions';
 /**
  * Defines how a Column is sorted
  */
@@ -64,15 +65,27 @@ export interface BaseLayoutModel {
      */
     RowGroupValues?: {
         RowGroupDisplay: 'always-expanded';
-    } | {
+    } | ({
         RowGroupDisplay: 'expanded';
+    } & XOR<{
         Values: any[][];
-    } | {
+    }, {
+        GroupKeys: {
+            RowGroupedColumns: string[];
+            Values?: any[][];
+        }[];
+    }>) | {
         RowGroupDisplay: 'always-collapsed';
-    } | {
+    } | ({
         RowGroupDisplay: 'collapsed';
+    } & XOR<{
         Values: any[][];
-    };
+    }, {
+        GroupKeys: {
+            RowGroupedColumns: string[];
+            Values?: any[][];
+        }[];
+    }>);
     /**
      * Behaviour for Expanding / Collapsing Column Groups
      */

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

@@ -62,7 +62,7 @@ export declare class LayoutManager<DATA_TYPE = any> extends LMEmitter {
     private applyLayout;
     private applyTableLayout;
     private getRowGroupNodePathsAs;
-    applyRowGroupValues(RowGroupValues: TableLayoutModel['RowGroupValues']): void;
+    applyRowGroupValues(RowGroupValues: TableLayoutModel['RowGroupValues'], rowGroupedColumns: string[]): void;
     private computeColumnStateForPivotLayout;
     private computePivotAggregations;
     private computeColumnStateForTableLayout;

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

@@ -232,7 +232,7 @@ export class LayoutManager extends LMEmitter {
             // but we want to suspend the listener
             // as it would re-trigger another change
             const unsupress = this.suspendAgGridListener();
-            this.applyRowGroupValues(layout.RowGroupValues);
+            this.applyRowGroupValues(layout.RowGroupValues, layout.RowGroupedColumns);
             unsupress();
         }
         if ((!prevLayout?.RowGroupedColumns || !prevLayout?.RowGroupedColumns.length) &&
@@ -244,7 +244,7 @@ export class LayoutManager extends LMEmitter {
             // but we want to suspend the listener
             // as it would re-trigger another change
             const unsupress = this.suspendAgGridListener();
-            this.applyRowGroupValues(layout.RowGroupValues);
+            this.applyRowGroupValues(layout.RowGroupValues, layout.RowGroupedColumns);
             unsupress();
         }
         if (!shouldSkipTriggerChange) {
@@ -331,9 +331,8 @@ export class LayoutManager extends LMEmitter {
         return this.gridApi.getGridOption('treeData');
     }
     getUndecidedLayoutModelFromGrid(columnState) {
-        let TableColumns = columnState
-            .map((c) => c.colId)
-            .filter((colId) => colId !== 'ag-Grid-SelectionColumn');
+        let TableColumns = columnState.map((c) => c.colId);
+        // .filter((colId) => colId !== 'ag-Grid-SelectionColumn');
         let ColumnWidths = {};
         let ColumnSorts = [];
         let RowGroupedColumns = [];
@@ -496,10 +495,26 @@ export class LayoutManager extends LMEmitter {
                         : this.getRowGroupNodePathsAs({
                             expanded: true,
                         });
-                    RowGroupValues = {
-                        RowGroupDisplay: 'collapsed',
-                        Values: ExpandedValues,
-                    };
+                    if (Array.isArray(currentRowGroupValues.GroupKeys)) {
+                        RowGroupValues = {
+                            RowGroupDisplay: 'collapsed',
+                            GroupKeys: currentRowGroupValues.GroupKeys.map((item) => {
+                                if ((item.RowGroupedColumns || []).join(',') === (RowGroupedColumns || []).join(',')) {
+                                    return {
+                                        RowGroupedColumns: item.RowGroupedColumns,
+                                        Values: ExpandedValues,
+                                    };
+                                }
+                                return item;
+                            }),
+                        };
+                    }
+                    else {
+                        RowGroupValues = {
+                            RowGroupDisplay: 'collapsed',
+                            Values: ExpandedValues,
+                        };
+                    }
                 }
                 else if (currentRowGroupValues.RowGroupDisplay === 'expanded') {
                     const CollapsedValues = isGroupingNew
@@ -507,10 +522,26 @@ export class LayoutManager extends LMEmitter {
                         : this.getRowGroupNodePathsAs({
                             expanded: false,
                         });
-                    RowGroupValues = {
-                        RowGroupDisplay: 'expanded',
-                        Values: CollapsedValues,
-                    };
+                    if (Array.isArray(currentRowGroupValues.GroupKeys)) {
+                        RowGroupValues = {
+                            RowGroupDisplay: 'expanded',
+                            GroupKeys: currentRowGroupValues.GroupKeys.map((item) => {
+                                if ((item.RowGroupedColumns || []).join(',') === (RowGroupedColumns || []).join(',')) {
+                                    return {
+                                        RowGroupedColumns: item.RowGroupedColumns,
+                                        Values: CollapsedValues,
+                                    };
+                                }
+                                return item;
+                            }),
+                        };
+                    }
+                    else {
+                        RowGroupValues = {
+                            RowGroupDisplay: 'expanded',
+                            Values: CollapsedValues,
+                        };
+                    }
                 }
             }
         }
@@ -897,7 +928,7 @@ export class LayoutManager extends LMEmitter {
             this.gridApi.applyColumnState(this.computeColumnStateForTableLayout(layout));
             // but also let's not forget to apply the row group values
             if (hasGroupedColumns && layout.RowGroupValues && !options?.skipApplyRowGroupsExpandedState) {
-                this.applyRowGroupValues(layout.RowGroupValues);
+                this.applyRowGroupValues(layout.RowGroupValues, layout.RowGroupedColumns);
             }
             this.applyColumnGroupCollapseExpandState(layout);
         });
@@ -921,7 +952,7 @@ export class LayoutManager extends LMEmitter {
         });
         return result;
     }
-    applyRowGroupValues(RowGroupValues) {
+    applyRowGroupValues(RowGroupValues, rowGroupedColumns) {
         if (!RowGroupValues) {
             return;
         }
@@ -934,9 +965,21 @@ export class LayoutManager extends LMEmitter {
             return;
         }
         const defaultExpanded = RowGroupValues.RowGroupDisplay === 'expanded';
-        if (RowGroupValues.Values) {
+        let currentRowGroupedValues = RowGroupValues.Values;
+        if (RowGroupValues.GroupKeys) {
+            const matchingRowGroupColumnValues = RowGroupValues.GroupKeys.find((item) => {
+                return (item.RowGroupedColumns || []).join(',') === (rowGroupedColumns || []).join(',');
+            });
+            if (matchingRowGroupColumnValues) {
+                currentRowGroupedValues = matchingRowGroupColumnValues.Values;
+            }
+            else {
+                currentRowGroupedValues = [];
+            }
+        }
+        if (currentRowGroupedValues) {
             const deepMap = new DeepMap();
-            RowGroupValues.Values.forEach((rowGroupValue) => {
+            currentRowGroupedValues.forEach((rowGroupValue) => {
                 deepMap.set(rowGroupValue, true);
             });
             this.gridApi.forEachNode((node) => {
@@ -1228,7 +1271,7 @@ export class LayoutManager extends LMEmitter {
         const hasGroupedColumns = layout.PivotGroupedColumns && layout.PivotGroupedColumns.length;
         // but also let's not forget to apply the row group values
         if (hasGroupedColumns && layout.RowGroupValues && !options?.skipApplyRowGroupsExpandedState) {
-            this.applyRowGroupValues(layout.RowGroupValues);
+            this.applyRowGroupValues(layout.RowGroupValues, layout.PivotGroupedColumns);
         }
     }
     applyPivotTotals(layout) {

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

@@ -934,11 +934,31 @@ export declare const ADAPTABLE_METAMODEL: {
         name: string;
         kind: string;
         desc: string;
-        props: {
+        props: ({
             name: string;
             kind: string;
             desc: string;
-        }[];
+            isOpt: boolean;
+            ref?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            desc: string;
+            ref: string;
+            isOpt?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt?: undefined;
+            ref?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt: boolean;
+            ref: string;
+        })[];
     };
     AdaptableStatusBar: {
         name: string;
@@ -1667,6 +1687,11 @@ export declare const ADAPTABLE_METAMODEL: {
         kind: string;
         desc: string;
     };
+    CellAlignment: {
+        name: string;
+        kind: string;
+        desc: string;
+    };
     CellColorRange: {
         name: string;
         kind: string;
@@ -1975,6 +2000,21 @@ export declare const ADAPTABLE_METAMODEL: {
             ref?: undefined;
         })[];
     };
+    ColumnGroupScope: {
+        name: string;
+        kind: string;
+        desc: string;
+    };
+    ColumnGroupValues: {
+        name: string;
+        kind: string;
+        desc: string;
+    };
+    ColumnGroupValuesWithExceptionKeys: {
+        name: string;
+        kind: string;
+        desc: string;
+    };
     ColumnMenuContext: {
         name: string;
         kind: string;
@@ -3563,12 +3603,6 @@ export declare const ADAPTABLE_METAMODEL: {
         kind: string;
         desc: string;
         props: ({
-            name: string;
-            kind: string;
-            desc: string;
-            isOpt: boolean;
-            ref?: undefined;
-        } | {
             name: string;
             kind: string;
             desc: string;
@@ -5321,8 +5355,8 @@ export declare const ADAPTABLE_METAMODEL: {
             kind: string;
             desc: string;
             isOpt: boolean;
+            ref: string;
             defVal?: undefined;
-            ref?: undefined;
         } | {
             name: string;
             kind: string;
@@ -5337,13 +5371,6 @@ export declare const ADAPTABLE_METAMODEL: {
             isOpt: boolean;
             defVal: string;
             ref: string;
-        } | {
-            name: string;
-            kind: string;
-            desc: string;
-            isOpt: boolean;
-            ref: string;
-            defVal?: undefined;
         })[];
     };
     StatusBarState: {