@adaptabletools/adaptable-cjs 20.0.7-canary.1 → 20.0.7-canary.3

package/src/agGrid/AdaptableAgGrid.js

@@ -3317,13 +3317,21 @@ You need to define at least one Layout!`);
         }
         return prevRowGroupedColumns.join(',') !== currentRowGroupedColumns.join(',');
     }
+    hasPivotTotalsInLayout(one, other) {
+        const prevAggregationColumns = one.PivotAggregationColumns || [];
+        const currentAggregationColumns = other.PivotAggregationColumns || [];
+        const prevHasPivotTotals = prevAggregationColumns.some((col) => !!col.TotalColumn);
+        const currentHasPivotTotals = currentAggregationColumns.some((col) => !!col.TotalColumn);
+        return prevHasPivotTotals || currentHasPivotTotals;
+    }
     onLayoutChange(layout) {
         this.logger.info('onLayoutChange()');
         const prevOnChangeLayout = this.__prevLayoutForOnChange || this.api.layoutApi.getCurrentLayout();
         // see #on-regroup-expect-group-column-to-be-recomputed-and-setup-properly
         const rowGroupsChanged = this.isRowGroupDifferentInLayout(prevOnChangeLayout, layout);
+        const hasPivotTotalsInLayout = this.hasPivotTotalsInLayout(prevOnChangeLayout, layout);
         const pivotColsChanged = JSON.stringify(layout.PivotColumns) !== JSON.stringify(prevOnChangeLayout.PivotColumns);
-        if (rowGroupsChanged || pivotColsChanged) {
+        if (rowGroupsChanged || pivotColsChanged || hasPivotTotalsInLayout) {
             this.updateColumnModelAndRefreshGrid();
         }
         else {

package/src/agGrid/AgGridAdapter.d.ts

@@ -63,6 +63,7 @@ export declare class AgGridAdapter {
     private isCalculatedColumn;
     private isFreeTextColumn;
     private isActionColumn;
+    private isPivotTotalColumn;
     private isColumnFilterable;
     private getColumnTypes;
     private getColumnPinnedPosition;

package/src/agGrid/AgGridAdapter.js

@@ -10,6 +10,9 @@ const ArrayExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensio
 const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
 const agGridModules_1 = require("./agGridModules");
 const agGridDataTypeDefinitions_1 = require("./agGridDataTypeDefinitions");
+const ColumnApiImpl_1 = require("../Api/Implementation/ColumnApiImpl");
+const isPivotGroupTotalColumn_1 = require("../layout-manager/src/isPivotGroupTotalColumn");
+const isPivotAggTotalColumn_1 = require("../layout-manager/src/isPivotAggTotalColumn");
 // AG GRID obfuscates its internals, this is (currently) the best way to get hold of its internal services
 const DANGER_AG_GRID_BEANS_MAP = {};
 const getColumnApiModule = () => ag_grid_enterprise_1.ColumnApiModule;
@@ -436,6 +439,7 @@ class AgGridAdapter {
             isCalculatedColumn: this.isCalculatedColumn(colDef),
             isFreeTextColumn: this.isFreeTextColumn(colDef),
             isActionColumn: this.isActionColumn(colDef),
+            isPivotTotalColumn: this.isPivotTotalColumn(colDef),
         };
         abColumn.queryable = this.isColumnQueryable(abColumn);
         abColumn.exportable = this.isColumnExportable(abColumn);
@@ -609,6 +613,11 @@ class AgGridAdapter {
     isActionColumn(colDef) {
         return this.adaptableApi.actionColumnApi.getActionColumnForColumnId(colDef.colId) != null;
     }
+    isPivotTotalColumn(colDef) {
+        return ((0, ColumnApiImpl_1.isPivotGrandTotalColumn)(colDef.colId) ||
+            (0, isPivotGroupTotalColumn_1.isPivotGroupTotalColumn)(colDef.colId) ||
+            (0, isPivotAggTotalColumn_1.isPivotAggTotalColumn)(colDef));
+    }
     isColumnFilterable(colDef) {
         // follow agGrid logic which is that ONLY filterable if explicitly set
         if (this.adaptableApi.entitlementApi.getEntitlementAccessLevelForModule(ModuleConstants.ColumnFilterModuleId) == 'Hidden') {

package/src/components/Select/Select.js

@@ -32,8 +32,10 @@ const INFINITE_COLUMNS_WITH_CHECKBOX = {
         },
         resizable: false,
         defaultSortable: false,
-        renderSelectionCheckBox: ({ renderBag }) => {
-            return renderBag.selectionCheckBox;
+        renderSelectionCheckBox: true,
+        className: 'ab-Select-CheckboxColumn',
+        renderValue: ({ renderBag }) => {
+            return React.createElement("div", { className: "InfiniteCell_content_value" }, renderBag.value);
         },
         renderHeader: (headerParams) => {
             return (React.createElement(React.Fragment, null,
@@ -78,8 +80,15 @@ const doesOptionMatchValue = function (value) {
     };
 };
 const Select = function (props) {
+    let maxLabelLength = 0;
     const ref = React.useRef(null);
-    const valueToOptionMap = new Map((props.options || []).map((opt) => [opt.value, opt]));
+    const valueToOptionMap = new Map((props.options || []).map((opt) => {
+        let label = opt.label;
+        if (typeof label === 'string' || typeof label === 'number' || typeof label === 'boolean') {
+            maxLabelLength = Math.max(maxLabelLength, `${label}`.length);
+        }
+        return [opt.value, opt];
+    }));
     const findOptionByValue = (value) => {
         const option = valueToOptionMap.get(value);
         if (option) {
@@ -420,7 +429,10 @@ const Select = function (props) {
                     zIndex: 999999,
                     boxShadow: 'var(--ab-cmp-select-menu__box-shadow)',
                     minWidth: `var(--ab-cmp-select-menu__min-width)`,
+                    width: `${Math.max(maxLabelLength, 10)}ch`,
                     '--ab-cmp-select-menu__min-height': `min(${(props.options || []).length + (showHeaderSelectionCheckbox ? 1 : 0)} * var(--ab-grid-row-height), 20rem)`,
+                    maxHeight: 'var(--ab-cmp-select-menu__max-height)',
+                    maxWidth: 'var(--ab-cmp-select-menu__max-width)',
                     ...commonStyles(state),
                     ...props.menuStyle,
                 };

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: 1745430388589 || Date.now(),
-    VERSION: "20.0.7-canary.1" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1745852659007 || Date.now(),
+    VERSION: "20.0.7-canary.3" || '--current-version--',
 };

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

@@ -57,6 +57,10 @@ export interface BaseLayoutModel {
     ColumnPinning?: {
         [columnId: string]: 'left' | 'right';
     };
+    /**
+     * Display Grand Total Row at the top or bottom of the Pivot Table
+     */
+    GrandTotalRow?: 'top' | 'bottom' | boolean;
 }
 export type ColumnAggregationModel = {
     aggFunc: string | true;
@@ -109,10 +113,6 @@ export interface PivotLayoutModel extends BaseLayoutModel {
      */
     PivotGroupedColumns?: string[];
     RowGroupedColumns?: never;
-    /**
-     * Display Grand Total Row at the top or bottom of the Pivot Table
-     */
-    GrandTotalRow?: 'top' | 'bottom' | boolean;
     /**
      * Display Total of all Pivot Columns before or after the Pivot Columns
      */

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

@@ -72,8 +72,8 @@ export declare class LayoutManager<DATA_TYPE = any> extends LMEmitter {
     applyPivotTotals(layout: PivotLayoutModel): void;
     applyPivotExpandLevel(layout: PivotLayoutModel): void;
     private withSuppressColumnAnimation;
+    private patchColDefType;
     private setupPivotTotals;
-    private isPivotRowTotalColDef;
     private patchPivotTotalColumn;
     private getPivotTotalColumnConfig;
 }

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

@@ -9,7 +9,9 @@ const isLayoutEqual_1 = require("./isLayoutEqual");
 const simplifyLayoutModel_1 = require("./simplifyLayoutModel");
 const sortColumnIdsByOrder_1 = require("./sortColumnIdsByOrder");
 const destructurePivotColumnId_1 = require("./destructurePivotColumnId");
-const isPivotTotalColumn_1 = require("./isPivotTotalColumn");
+const isPivotAggTotalColumn_1 = require("./isPivotAggTotalColumn");
+const isPivotGrandTotalColumn_1 = require("./isPivotGrandTotalColumn");
+const isPivotGroupTotalColumn_1 = require("./isPivotGroupTotalColumn");
 function flattenColDefs(colDefs) {
     const res = [];
     const iteration = (c) => {
@@ -259,12 +261,9 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
             RowGroupValues: layout.RowGroupValues,
             PivotGroupedColumns: layout.RowGroupedColumns,
             PivotAggregationColumns: layout.TableAggregationColumns,
+            GrandTotalRow: layout.GrandTotalRow,
             PivotExpandLevel: prevLayout?.PivotExpandLevel ?? -1,
         };
-        const grandTotalRow = this.gridApi.getGridOption('grandTotalRow');
-        if (grandTotalRow) {
-            pivotLayout.GrandTotalRow = grandTotalRow;
-        }
         const grandTotalColumn = this.gridApi.getGridOption('pivotRowTotals');
         if (grandTotalColumn) {
             pivotLayout.GrandTotalColumn = grandTotalColumn;
@@ -446,6 +445,7 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
                 }
             }
         }
+        const grandTotalRow = this.gridApi.getGridOption('grandTotalRow');
         const layout = (0, simplifyLayoutModel_1.simplifyTableLayoutModel)({
             TableColumns: TableColumns,
             ColumnVisibility,
@@ -455,6 +455,7 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
             TableAggregationColumns,
             ColumnPinning: ColumnPinning,
             RowGroupValues,
+            GrandTotalRow: grandTotalRow,
         });
         return layout;
     }
@@ -693,6 +694,17 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
             // @ts-ignore
             this.gridApi.setGridOption('suppressAggFuncInHeader', layout.SuppressAggFuncInHeader);
         }
+        if (layout.GrandTotalRow) {
+            const grandTotalRow = layout.GrandTotalRow === true || layout.GrandTotalRow === 'top'
+                ? 'top'
+                : layout.GrandTotalRow === 'bottom'
+                    ? 'bottom'
+                    : null;
+            this.gridApi.setGridOption('grandTotalRow', grandTotalRow);
+        }
+        else {
+            this.gridApi.setGridOption('grandTotalRow', null);
+        }
         if ((0, isPivotLayoutModel_1.isPivotLayoutModel)(layout)) {
             try {
                 const perfApplyPivot = this.beginPerf('applyLayout:pivot');
@@ -1036,17 +1048,7 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
         /**
          * GrandTotalRow
          */
-        if (layout.GrandTotalRow) {
-            const grandTotalRow = layout.GrandTotalRow === true || layout.GrandTotalRow === 'top'
-                ? 'top'
-                : layout.GrandTotalRow === 'bottom'
-                    ? 'bottom'
-                    : null;
-            this.gridApi.setGridOption('grandTotalRow', grandTotalRow);
-        }
-        else {
-            this.gridApi.setGridOption('grandTotalRow', null);
-        }
+        // is common to both Table and Pivot and is applied in applyLayout()
         /**
          * GrandTotalColumn
          */
@@ -1111,8 +1113,28 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
         }
         return res;
     }
+    patchColDefType(colDef, colTypes) {
+        const originalTypes = colDef.type == undefined ? [] : Array.isArray(colDef.type) ? colDef.type : [colDef.type];
+        const columnTypes = new Set(originalTypes);
+        colTypes.forEach((colType) => {
+            columnTypes.add(colType);
+        });
+        colDef.type = Array.from(columnTypes);
+    }
     setupPivotTotals() {
         const _original_processPivotResultColDef = this.gridApi.getGridOption('processPivotResultColDef');
+        this.gridApi.setGridOption('processPivotResultColDef', (colDef) => {
+            _original_processPivotResultColDef?.(colDef);
+            if (!(0, isPivotLayoutModel_1.isPivotLayoutModel)(this.currentLayout)) {
+                return;
+            }
+            if ((0, isPivotGrandTotalColumn_1.isPivotGrandTotalColumn)(colDef)) {
+                this.patchColDefType(colDef, ['pivotTotalColumn', 'pivotGrandTotalColumn']);
+            }
+            if ((0, isPivotGroupTotalColumn_1.isPivotGroupTotalColumn)(colDef.colId)) {
+                this.patchColDefType(colDef, ['pivotTotalColumn', 'pivotGroupTotalColumn']);
+            }
+        });
         const _original_processPivotResultColGroupDef = this.gridApi.getGridOption('processPivotResultColGroupDef');
         this.gridApi.setGridOption('processPivotResultColGroupDef', (colGroupDef) => {
             _original_processPivotResultColGroupDef?.(colGroupDef);
@@ -1122,9 +1144,6 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
             this.patchPivotTotalColumn(colGroupDef);
         });
     }
-    isPivotRowTotalColDef(colDef) {
-        return colDef.colId?.startsWith('PivotRowTotal_');
-    }
     patchPivotTotalColumn(colGroupDef) {
         const hasPivotTotalCols = (pivotLayout) => {
             return pivotLayout.PivotAggregationColumns?.some((aggCol) => !!aggCol.TotalColumn);
@@ -1138,7 +1157,7 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
         const pivotTotalColDefsAfter = [];
         const normalColDefs = [];
         colGroupDef.children.forEach((colDef) => {
-            if (this.isPivotRowTotalColDef(colDef)) {
+            if ((0, isPivotGrandTotalColumn_1.isPivotGrandTotalColumn)(colDef)) {
                 if (this.gridApi.getGridOption('pivotRowTotals') === 'after') {
                     pivotRowTotalColDefsAfter.push(colDef);
                 }
@@ -1147,11 +1166,12 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
                 }
                 return;
             }
-            if ((0, isPivotTotalColumn_1.isPivotTotalColumn)(colDef)) {
+            if ((0, isPivotAggTotalColumn_1.isPivotAggTotalColumn)(colDef)) {
                 if (!colDef.colId.startsWith('pivot_')) {
                     this.warn(`Pivot total column ${colDef.colId} is not prefixed with 'pivot_', skipping...`);
                     return;
                 }
+                this.patchColDefType(colDef, ['pivotTotalColumn', 'pivotAggregationTotalColumn']);
                 // we do this for all total cols, but we will hide the ones that are not visible
                 colDef.columnGroupShow = undefined;
                 const totalColConfig = this.getPivotTotalColumnConfig(colDef, this.currentLayout);

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

@@ -0,0 +1,2 @@
+import { ColDef } from 'ag-grid-enterprise';
+export declare function isPivotAggTotalColumn(colDef: ColDef): colDef is ColDef;

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

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isPivotAggTotalColumn = void 0;
+function isPivotAggTotalColumn(colDef) {
+    return !!colDef.pivotTotalColumnIds?.length;
+}
+exports.isPivotAggTotalColumn = isPivotAggTotalColumn;

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

@@ -0,0 +1,2 @@
+import { ColDef, ColGroupDef } from 'ag-grid-enterprise';
+export declare function isPivotGrandTotalColumn(colDef: ColDef | ColGroupDef): boolean;

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

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

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

@@ -1,2 +1 @@
-import { ColDef } from 'ag-grid-enterprise';
-export declare function isPivotGroupTotalColumn(colDef: ColDef): boolean;
+export declare function isPivotGroupTotalColumn(colId: string): boolean;

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

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isPivotGroupTotalColumn = void 0;
-function isPivotGroupTotalColumn(colDef) {
+function isPivotGroupTotalColumn(colId) {
     // pivot group total are spanning cross all aggregations
     // therefore the last part of the colId is empty (hence the "dangling" underscore)
-    return colDef.colId?.startsWith('pivot_') && colDef.colId?.endsWith('_');
+    return colId?.startsWith('pivot_') && colId?.endsWith('_');
 }
 exports.isPivotGroupTotalColumn = isPivotGroupTotalColumn;

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

@@ -144,9 +144,6 @@ function normalizePivotLayoutModel(layout) {
         // make it an own property
         layout.SuppressAggFuncInHeader = undefined;
     }
-    if (!layout.GrandTotalRow) {
-        layout.GrandTotalRow = false;
-    }
     return layout;
 }
 exports.normalizePivotLayoutModel = normalizePivotLayoutModel;

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

@@ -56,6 +56,9 @@ function simplifyTableLayoutModel(layout) {
         });
         layout.RowGroupDisplayType = displayType;
     }
+    if (!layout.GrandTotalRow) {
+        delete layout.GrandTotalRow;
+    }
     return layout;
 }
 exports.simplifyTableLayoutModel = simplifyTableLayoutModel;

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

@@ -314,6 +314,11 @@ export declare const ADAPTABLE_METAMODEL: {
             isOpt: boolean;
         }[];
     };
+    AdaptableColumnType: {
+        name: string;
+        kind: string;
+        desc: string;
+    };
     AdaptableComment: {
         name: string;
         kind: string;
@@ -920,11 +925,6 @@ export declare const ADAPTABLE_METAMODEL: {
             desc: string;
         }[];
     };
-    AdaptableSpecialColumnType: {
-        name: string;
-        kind: string;
-        desc: string;
-    };
     AdaptableState: {
         name: string;
         kind: string;
@@ -4056,13 +4056,19 @@ export declare const ADAPTABLE_METAMODEL: {
         name: string;
         kind: string;
         desc: string;
-        props: {
+        props: ({
             name: string;
             kind: string;
             desc: string;
             isOpt: boolean;
             defVal: string;
-        }[];
+        } | {
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt: boolean;
+            defVal?: undefined;
+        })[];
     };
     LayoutViewOptions: {
         name: string;