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

package/src/agGrid/AgGridAdapter.js

@@ -1,11 +1,14 @@
 import { ColumnApiModule, } from 'ag-grid-enterprise';
 import { ACTION_COLUMN_TYPE, CALCULATED_COLUMN_TYPE, FDC3_COLUMN_TYPE, FREE_TEXT_COLUMN_TYPE, } from '../AdaptableState/Common/AdaptableColumn';
-import { ADAPTABLE_FDC3_ACTION_COLUMN_FRIENDLY_NAME, } from '../Utilities/Constants/GeneralConstants';
+import { ADAPTABLE_FDC3_ACTION_COLUMN_FRIENDLY_NAME } from '../Utilities/Constants/GeneralConstants';
 import { createUuid } from '../AdaptableState/Uuid';
 import ArrayExtensions from '../Utilities/Extensions/ArrayExtensions';
 import * as ModuleConstants from '../Utilities/Constants/ModuleConstants';
 import { ALL_AG_GRID_MODULES } from './agGridModules';
 import { agGridDataTypeDefinitions, ALL_ADAPTABLE_DATA_TYPES } from './agGridDataTypeDefinitions';
+import { isPivotGrandTotalColumn } from '../Api/Implementation/ColumnApiImpl';
+import { isPivotGroupTotalColumn } from '../layout-manager/src/isPivotGroupTotalColumn';
+import { isPivotAggTotalColumn } from '../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 = () => ColumnApiModule;
@@ -432,6 +435,7 @@ export 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);
@@ -605,6 +609,11 @@ export class AgGridAdapter {
     isActionColumn(colDef) {
         return this.adaptableApi.actionColumnApi.getActionColumnForColumnId(colDef.colId) != null;
     }
+    isPivotTotalColumn(colDef) {
+        return (isPivotGrandTotalColumn(colDef.colId) ||
+            isPivotGroupTotalColumn(colDef.colId) ||
+            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

@@ -28,8 +28,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,
@@ -74,8 +76,15 @@ const doesOptionMatchValue = function (value) {
     };
 };
 export 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) {
@@ -416,7 +425,10 @@ export 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

@@ -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: 1745430358199 || Date.now(),
-    VERSION: "20.0.7-canary.1" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1745852629865 || 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

@@ -6,7 +6,9 @@ import { isLayoutEqual } from './isLayoutEqual';
 import { simplifyLayoutModel, simplifyPivotLayoutModel, simplifyTableLayoutModel, } from './simplifyLayoutModel';
 import { sortColumnIdsByOrder } from './sortColumnIdsByOrder';
 import { destructurePivotColumnId } from './destructurePivotColumnId';
-import { isPivotTotalColumn } from './isPivotTotalColumn';
+import { isPivotAggTotalColumn } from './isPivotAggTotalColumn';
+import { isPivotGrandTotalColumn } from './isPivotGrandTotalColumn';
+import { isPivotGroupTotalColumn } from './isPivotGroupTotalColumn';
 function flattenColDefs(colDefs) {
     const res = [];
     const iteration = (c) => {
@@ -256,12 +258,9 @@ export class LayoutManager extends 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;
@@ -443,6 +442,7 @@ export class LayoutManager extends LMEmitter {
                 }
             }
         }
+        const grandTotalRow = this.gridApi.getGridOption('grandTotalRow');
         const layout = simplifyTableLayoutModel({
             TableColumns: TableColumns,
             ColumnVisibility,
@@ -452,6 +452,7 @@ export class LayoutManager extends LMEmitter {
             TableAggregationColumns,
             ColumnPinning: ColumnPinning,
             RowGroupValues,
+            GrandTotalRow: grandTotalRow,
         });
         return layout;
     }
@@ -690,6 +691,17 @@ export class LayoutManager extends 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 (isPivotLayoutModel(layout)) {
             try {
                 const perfApplyPivot = this.beginPerf('applyLayout:pivot');
@@ -1033,17 +1045,7 @@ export class LayoutManager extends 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
          */
@@ -1108,8 +1110,28 @@ export class LayoutManager extends 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 (!isPivotLayoutModel(this.currentLayout)) {
+                return;
+            }
+            if (isPivotGrandTotalColumn(colDef)) {
+                this.patchColDefType(colDef, ['pivotTotalColumn', 'pivotGrandTotalColumn']);
+            }
+            if (isPivotGroupTotalColumn(colDef.colId)) {
+                this.patchColDefType(colDef, ['pivotTotalColumn', 'pivotGroupTotalColumn']);
+            }
+        });
         const _original_processPivotResultColGroupDef = this.gridApi.getGridOption('processPivotResultColGroupDef');
         this.gridApi.setGridOption('processPivotResultColGroupDef', (colGroupDef) => {
             _original_processPivotResultColGroupDef?.(colGroupDef);
@@ -1119,9 +1141,6 @@ export class LayoutManager extends LMEmitter {
             this.patchPivotTotalColumn(colGroupDef);
         });
     }
-    isPivotRowTotalColDef(colDef) {
-        return colDef.colId?.startsWith('PivotRowTotal_');
-    }
     patchPivotTotalColumn(colGroupDef) {
         const hasPivotTotalCols = (pivotLayout) => {
             return pivotLayout.PivotAggregationColumns?.some((aggCol) => !!aggCol.TotalColumn);
@@ -1135,7 +1154,7 @@ export class LayoutManager extends LMEmitter {
         const pivotTotalColDefsAfter = [];
         const normalColDefs = [];
         colGroupDef.children.forEach((colDef) => {
-            if (this.isPivotRowTotalColDef(colDef)) {
+            if (isPivotGrandTotalColumn(colDef)) {
                 if (this.gridApi.getGridOption('pivotRowTotals') === 'after') {
                     pivotRowTotalColDefsAfter.push(colDef);
                 }
@@ -1144,11 +1163,12 @@ export class LayoutManager extends LMEmitter {
                 }
                 return;
             }
-            if (isPivotTotalColumn(colDef)) {
+            if (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/{isPivotTotalColumn.js → isPivotAggTotalColumn.js}

@@ -1,3 +1,3 @@
-export function isPivotTotalColumn(colDef) {
+export function isPivotAggTotalColumn(colDef) {
     return !!colDef.pivotTotalColumnIds?.length;
 }

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,3 @@
+export function isPivotGrandTotalColumn(colDef) {
+    return colDef?.colId?.startsWith('PivotRowTotal_pivot_');
+}

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,5 +1,5 @@
-export function isPivotGroupTotalColumn(colDef) {
+export 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('_');
 }

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

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

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

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

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;