@adaptabletools/adaptable-cjs 21.0.8 → 21.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable-cjs",
-  "version": "21.0.8",
+  "version": "21.0.9",
   "description": "Powerful data-agnostic HTML5 AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
   "keywords": [
     "web-components",

package/src/View/Layout/Wizard/sections/AggregationsSection.js

@@ -47,10 +47,15 @@ const ColumnRow = (props) => {
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
     const aggValue = props.layout?.TableAggregationColumns?.find((agg) => agg.ColumnId === props.column.columnId)?.AggFunc;
     const adaptableAggFunctions = [];
-    if (props.column.dataType === 'number') {
+    if (props.column.dataType === 'number' && props.column.aggregatable) {
         adaptableAggFunctions.push(WEIGHTED_AVERAGE_AGG_FN_NAME);
     }
-    const aggOptions = [...props.column.availableAggregationFunctions, ...adaptableAggFunctions].map((fnName) => {
+    // props.column.availableAggregationFunctions is null for non-aggregatable columns
+    // but we want to support non-aggregatable columns that are specified to be aggregated by default
+    // so we need to allow this. as soon as they will be unchecked from aggregation, they will no longer be displayed in the aggregation wizard.
+    // but until the user checks them off, we want to allow them.
+    const availableAggregationFunctions = props.column.availableAggregationFunctions || [];
+    const aggOptions = [...new Set([...availableAggregationFunctions, ...adaptableAggFunctions])].map((fnName) => {
         return {
             label: fnName,
             onClick: () => {
@@ -141,9 +146,17 @@ const AggregationsSection = (props) => {
     const allAggregableColumns = adaptable.api.columnApi.getAggregatableColumns();
     const allColumns = adaptable.api.columnApi.getUIAvailableColumns();
     const numberColumns = adaptable.api.columnApi.getNumericColumns();
-    const sortedAggregableColumns = React.useMemo(() => {
-        return ArrayExtensions_1.default.sortArrayWithOrder(allAggregableColumns.map((col) => col.columnId), (layout.TableAggregationColumns ?? []).map((agg) => agg.ColumnId), { sortUnorderedItems: false }).map((colId) => adaptable.api.columnApi.getColumnWithColumnId(colId));
-    }, [layout, allAggregableColumns]);
+    const allAggregatableColumnIds = allAggregableColumns.map((col) => col.columnId);
+    (layout.TableAggregationColumns || []).forEach((agg) => {
+        // we need to also display the columns currently aggregated,
+        // even if they are not aggregatable
+        if (!allAggregatableColumnIds.includes(agg.ColumnId)) {
+            allAggregatableColumnIds.push(agg.ColumnId);
+        }
+    });
+    const sortedAggregableColumns = ArrayExtensions_1.default.sortArrayWithOrder(allAggregatableColumnIds, (layout.TableAggregationColumns ?? []).map((agg) => agg.ColumnId), { sortUnorderedItems: false })
+        .map((colId) => adaptable.api.columnApi.getColumnWithColumnId(colId))
+        .filter(Boolean);
     const handleColumnsSelectionChange = React.useCallback((columnIds) => {
         const currentAggsMap = (layout.TableAggregationColumns || []).reduce((acc, { ColumnId, AggFunc }) => {
             acc[ColumnId] = AggFunc;

package/src/agGrid/AgGridAdapter.js

@@ -612,7 +612,10 @@ class AgGridAdapter {
         return false;
     }
     getColumnAggregationFunctions(colDef) {
-        return colDef.allowedAggFuncs || ['sum', 'min', 'max', 'count', 'avg', 'first', 'last']; // those are the default fns aggrid supports out-of-the-box
+        const result = colDef.allowedAggFuncs || ['sum', 'min', 'max', 'count', 'avg', 'first', 'last']; // those are the default fns aggrid supports out-of-the-box
+        const gridOptionsAggFuncs = this.adaptableApi.agGridApi.getGridOption('aggFuncs') || {};
+        result.push(...Object.keys(gridOptionsAggFuncs));
+        return [...new Set(result)];
     }
     isTreeColumn(isGeneratedRowGroupColumn) {
         return this.adaptableApi.gridApi.isTreeDataGrid() ? isGeneratedRowGroupColumn : false;

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: 1761108119347 || Date.now(),
-    VERSION: "21.0.8" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1761300055892 || Date.now(),
+    VERSION: "21.0.9" || '--current-version--',
 };

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

@@ -97,7 +97,7 @@ function isGridLayoutSame(options) {
     if (!!gridLayout != !!layout) {
         return false;
     }
-    return (0, isLayoutEqual_1.isLayoutEqual)(gridLayout, layout);
+    return (0, isLayoutEqual_1.isLayoutEqual)((0, normalizeLayoutModel_1.normalizeLayoutModel)(gridLayout), (0, normalizeLayoutModel_1.normalizeLayoutModel)(layout));
 }
 function getDefaultColumnSizeStateForColDef(colId, colDef, options) {
     if (!colDef) {
@@ -315,7 +315,7 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
             // emit an event that the layout has changed from the grid
             this.emitSync('gridLayoutChanged', layout);
             const log = this.debugger.extend('gridLayoutChanged');
-            const changes = (0, isLayoutEqual_1.getChanges)(prevLayout, layout);
+            const changes = (0, isLayoutEqual_1.getChanges)((0, normalizeLayoutModel_1.normalizeLayoutModel)(prevLayout), (0, normalizeLayoutModel_1.normalizeLayoutModel)(layout));
             log('current grid layout:', JSON.stringify(layout, null, 2), '\nprev layout:\n', prevLayout ? JSON.stringify(prevLayout, null, 2) : 'no prev layout', '\nchanges from prev to current:\n', changes);
         }
     }
@@ -336,8 +336,6 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
     getPivotLayoutModelFromGrid() {
         const pivotResultColumns = this.gridApi.getPivotResultColumns() || [];
         const pivotResultColumnsSet = new Set(pivotResultColumns.map((col) => col.getColId()));
-        const rowGroupColumns = this.gridApi.getRowGroupColumns() || [];
-        const rowGroupColumnsSet = new Set(rowGroupColumns.map((col) => col.getColId()));
         const prevLayout = this.currentLayout;
         const columnState = this.gridApi
             .getColumnState()
@@ -365,7 +363,7 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
         // since having normal table columns here will break the equality check
         // so we only want to keep the group columns and the pivot result columns
         Object.keys(ColumnVisibility).forEach((colId) => {
-            const isInLayout = pivotResultColumnsSet.has(colId) || rowGroupColumnsSet.has(colId);
+            const isInLayout = pivotResultColumnsSet.has(colId) || colId.startsWith(normalizeLayoutModel_1.AUTO_GROUP_COLUMN_ID__SINGLE);
             if (!isInLayout) {
                 delete ColumnVisibility[colId];
             }

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

@@ -5,6 +5,9 @@ const isPivotLayoutModel_1 = require("./isPivotLayoutModel");
 exports.AUTO_GROUP_COLUMN_ID__SINGLE = 'ag-Grid-AutoColumn';
 exports.AUTO_GROUP_COLUMN_ID__MULTI_PREFIX = 'ag-Grid-AutoColumn-';
 function normalizeTableLayoutModel(layout, options) {
+    if (!layout) {
+        return;
+    }
     layout = structuredClone(layout);
     if (!layout.ColumnVisibility) {
         layout.ColumnVisibility = {};