@adaptabletools/adaptable-cjs 20.0.5 → 20.0.7-canary.0

package/src/Api/Implementation/LayoutHelpers.js

@@ -209,12 +209,16 @@ const pivotLayoutToPivotLayoutModel = (pivotLayout) => {
         ColumnPinning: pivotLayout.ColumnPinning,
         PivotColumns: pivotLayout.PivotColumns,
         PivotExpandLevel: pivotLayout.PivotExpandLevel,
-        PivotAggregationColumns: (pivotLayout.PivotAggregationColumns || []).map(({ ColumnId, AggFunc }) => {
+        PivotAggregationColumns: (pivotLayout.PivotAggregationColumns || []).map(({ ColumnId, AggFunc, TotalColumn }) => {
             return {
                 ColumnId,
                 AggFunc: toAggFunc(AggFunc),
+                TotalColumn,
             };
         }),
+        GrandTotalRow: pivotLayout.GrandTotalRow,
+        GrandTotalColumn: pivotLayout.GrandTotalColumn,
+        PivotGroupTotalColumn: pivotLayout.PivotGroupTotalColumn,
         RowGroupValues: pivotLayout.RowGroupValues
             ? pivotLayout.RowGroupValues.RowGroupDefaultBehavior === 'always-collapsed' ||
                 pivotLayout.RowGroupValues.RowGroupDefaultBehavior === 'always-expanded'
@@ -340,10 +344,29 @@ const pivotLayoutModelToPivotLayout = (layoutModel, defaults) => {
     else {
         delete pivotLayout.RowGroupValues;
     }
+    if (layoutModel.GrandTotalRow) {
+        pivotLayout.GrandTotalRow = layoutModel.GrandTotalRow;
+    }
+    else {
+        delete pivotLayout.GrandTotalRow;
+    }
+    if (layoutModel.GrandTotalColumn) {
+        pivotLayout.GrandTotalColumn = layoutModel.GrandTotalColumn;
+    }
+    else {
+        delete pivotLayout.GrandTotalColumn;
+    }
+    if (layoutModel.PivotGroupTotalColumn) {
+        pivotLayout.PivotGroupTotalColumn = layoutModel.PivotGroupTotalColumn;
+    }
+    else {
+        delete pivotLayout.PivotGroupTotalColumn;
+    }
     if (layoutModel.PivotAggregationColumns) {
-        pivotLayout.PivotAggregationColumns = (layoutModel.PivotAggregationColumns || []).map(({ ColumnId, AggFunc }) => ({
+        pivotLayout.PivotAggregationColumns = (layoutModel.PivotAggregationColumns || []).map(({ ColumnId, AggFunc, TotalColumn }) => ({
             ColumnId,
             AggFunc: toAggregationColumnValue(AggFunc),
+            TotalColumn,
         }));
     }
     else {

package/src/Api/Internal/ColumnInternalApi.d.ts

@@ -1,5 +1,5 @@
 import { ApiBase } from '../Implementation/ApiBase';
-import { Column, IRowNode } from 'ag-grid-enterprise';
+import { Column, HeaderValueGetterParams, IRowNode } from 'ag-grid-enterprise';
 import { CustomSort } from '../../AdaptableState/CustomSortState';
 import { ColumnValuesComparer } from '../../AdaptableOptions/CustomSortOptions';
 import { AdaptableColumn } from '../../types';
@@ -31,4 +31,6 @@ export declare class ColumnInternalApi extends ApiBase {
     getAgGridColumnForAdaptableColumn(columnId: string): Column;
     getActiveColumnComparator(columnId: string, customSort?: CustomSort, customSortComparer?: ColumnValuesComparer): (valueA: any, valueB: any, nodeA?: IRowNode, nodeB?: IRowNode, isInverted?: boolean) => number | undefined;
     isSpecialColumn(columnId: string, column?: AdaptableColumn): boolean;
+    getColumnHeaderName(params: HeaderValueGetterParams): string;
+    private buildColumnHeaderContext;
 }

package/src/Api/Internal/ColumnInternalApi.js

@@ -6,6 +6,10 @@ const ApiBase_1 = require("../Implementation/ApiBase");
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 const uniq_1 = tslib_1.__importDefault(require("lodash/uniq"));
 const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
+const ColumnApiImpl_1 = require("../Implementation/ColumnApiImpl");
+const destructurePivotColumnId_1 = require("../../layout-manager/src/destructurePivotColumnId");
+const isPivotGroupTotalColumn_1 = require("../../layout-manager/src/isPivotGroupTotalColumn");
+const isPivotTotalColumn_1 = require("../../layout-manager/src/isPivotTotalColumn");
 function getAutoRowGroupColumnIdFor(columnId) {
     return `${GeneralConstants_1.AG_GRID_GROUPED_COLUMN}-${columnId}`;
 }
@@ -86,5 +90,202 @@ class ColumnInternalApi extends ApiBase_1.ApiBase {
                 this.getColumnApi().isActionColumn(columnId) ||
                 this.getColumnApi().isFdc3Column(columnId));
     }
+    getColumnHeaderName(params) {
+        // this is the same object, but casting it makes it easier to work with
+        const isColumn = !params.columnGroup;
+        const columnParams = params;
+        const isColumnGroup = !!params.columnGroup;
+        const columnGroupParams = params;
+        const defaultHeaderName = params.colDef?.headerName ??
+            (isColumn ? StringExtensions_1.default.CamelCaseToHumanText(columnParams.colDef?.field) : '') ??
+            '';
+        // for now we override ONLY the header names
+        if (params.location !== 'header') {
+            return defaultHeaderName;
+        }
+        // 1. Layout specific header has the highest priority
+        const layoutSpecificCustomHeader = this.getLayoutApi().getCurrentLayout().ColumnHeaders?.[isColumn ? columnParams.column.getColId() : columnGroupParams.columnGroup.getGroupId()];
+        if (layoutSpecificCustomHeader) {
+            return layoutSpecificCustomHeader;
+        }
+        // 2. check for custom ColumnOptions.columnHeader
+        if (typeof this.getColumnOptions().columnHeader === 'function') {
+            const columnHeaderContext = this.buildColumnHeaderContext(params, defaultHeaderName);
+            if (columnHeaderContext === 'skip') {
+                return defaultHeaderName;
+            }
+            const customHeader = this.getColumnOptions().columnHeader(columnHeaderContext);
+            return customHeader;
+        }
+        // 3. fallback to default header name
+        return defaultHeaderName;
+    }
+    buildColumnHeaderContext(params, defaultHeaderName) {
+        const currentLayoutType = this.getLayoutApi().isCurrentLayoutPivot() ? 'pivot' : 'table';
+        const currentLayout = this.getLayoutApi().getCurrentLayout();
+        const baseContext = {
+            ...this.getAdaptableApi().internalApi.buildBaseContext(),
+            defaultHeaderName,
+            currentLayout,
+            currentLayoutName: currentLayout.Name,
+            currentLayoutType: currentLayoutType,
+        };
+        // makes it easier to work with
+        const currentTableLayout = currentLayout;
+        const currentPivotLayout = currentLayout;
+        if (params.column?.getColId() === GeneralConstants_1.AG_GRID_GROUPED_COLUMN) {
+            const columnType = 'autoGroupColumn';
+            return {
+                ...baseContext,
+                columnType,
+                columnId: params.column.getColId(),
+                groupedColumnIds: currentLayoutType === 'table'
+                    ? currentTableLayout.RowGroupedColumns ?? []
+                    : currentPivotLayout.PivotGroupedColumns ?? [],
+            };
+        }
+        if (params.column?.getColId().startsWith(`${GeneralConstants_1.AG_GRID_GROUPED_COLUMN}-`)) {
+            const columnType = 'groupColumn';
+            const columnId = params.column.getColId();
+            // remove `${AG_GRID_GROUPED_COLUMN}-` from beginning of columnId
+            const groupColumnId = columnId.substring(`${GeneralConstants_1.AG_GRID_GROUPED_COLUMN}-`.length);
+            return {
+                ...baseContext,
+                columnType,
+                columnId,
+                groupColumnId,
+            };
+        }
+        if (baseContext.currentLayoutType === 'table') {
+            if (params.columnGroup) {
+                const columnType = 'tableColumnGroup';
+                if (!params.colDef?.children) {
+                    // AG Grid created virtual column groups for all columns
+                    // we want to skip those
+                    return 'skip';
+                }
+                return {
+                    ...baseContext,
+                    columnType,
+                    groupId: params.columnGroup?.getGroupId(),
+                    childrenColumnIds: params.columnGroup
+                        ?.getChildren()
+                        .map((col) => {
+                        if (col.isColumn) {
+                            return col.getColId();
+                        }
+                    })
+                        .filter(Boolean),
+                    state: params.columnGroup?.isExpandable() && !params.columnGroup?.isExpanded()
+                        ? 'collapsed'
+                        : 'expanded',
+                };
+            }
+            if (params.column) {
+                const columnType = 'tableColumn';
+                return {
+                    ...baseContext,
+                    columnType,
+                    columnId: params.column?.getColId(),
+                    aggregation: params.column.getAggFunc(),
+                };
+            }
+        }
+        if (baseContext.currentLayoutType === 'pivot') {
+            if (params.columnGroup) {
+                if (!params.colDef?.pivotKeys) {
+                    // we might have user defined colGroups, but we are not interested in them in pivot mode
+                    return 'skip';
+                }
+                const columnType = 'pivotColumnGroup';
+                return {
+                    ...baseContext,
+                    columnType,
+                    groupId: params.columnGroup?.getGroupId(),
+                    pivotKeys: params.colDef.pivotKeys,
+                    state: params.columnGroup?.isExpandable() && !params.columnGroup?.isExpanded()
+                        ? 'collapsed'
+                        : 'expanded',
+                };
+            }
+            if (params.column) {
+                let columnId = params.column.getColId();
+                if ((0, ColumnApiImpl_1.isPivotGrandTotalColumn)(columnId)) {
+                    const columnType = 'pivotGrandTotal';
+                    const pivotValueCol = params.colDef.pivotValueColumn;
+                    const aggregatedColumnId = pivotValueCol?.getColId();
+                    const currentLayoutAggCols = currentPivotLayout.PivotAggregationColumns?.map((col) => col.ColumnId);
+                    if (!currentLayoutAggCols?.includes(aggregatedColumnId)) {
+                        // this column is not an aggregation column
+                        return 'skip';
+                    }
+                    return {
+                        ...baseContext,
+                        columnType,
+                        aggregatedColumnId,
+                        aggregation: pivotValueCol.getAggFunc(),
+                    };
+                }
+                if ((0, isPivotGroupTotalColumn_1.isPivotGroupTotalColumn)(params.colDef)) {
+                    const columnType = 'pivotGroupTotal';
+                    const pivotColInfo = (0, destructurePivotColumnId_1.destructurePivotColumnId)(params.colDef, {
+                        pivotColIds: currentPivotLayout.PivotColumns,
+                        aggColIds: currentPivotLayout.PivotAggregationColumns.map((col) => col.ColumnId),
+                    }, (message) => this.logWarn(message));
+                    if (pivotColInfo === '!unknown!') {
+                        return 'skip';
+                    }
+                    const pivotKey = pivotColInfo.pivotKeys[pivotColInfo.pivotKeys.length - 1];
+                    return {
+                        ...baseContext,
+                        columnType,
+                        pivotKey,
+                        pivotColumnId: pivotColInfo.pivotColumnId,
+                        aggregation: params.colDef?.pivotValueColumn?.getAggFunc(),
+                    };
+                }
+                if ((0, isPivotTotalColumn_1.isPivotTotalColumn)(params.colDef)) {
+                    const columnType = 'pivotAggregationTotal';
+                    const pivotValueCol = params.colDef.pivotValueColumn;
+                    const pivotColInfo = (0, destructurePivotColumnId_1.destructurePivotColumnId)(params.colDef, {
+                        pivotColIds: currentPivotLayout.PivotColumns,
+                        aggColIds: currentPivotLayout.PivotAggregationColumns.map((col) => col.ColumnId),
+                    }, (message) => this.logWarn(message));
+                    if (pivotColInfo === '!unknown!') {
+                        return 'skip';
+                    }
+                    const pivotKey = pivotColInfo.pivotKeys[pivotColInfo.pivotKeys.length - 1];
+                    return {
+                        ...baseContext,
+                        columnType,
+                        aggregatedColumnId: pivotValueCol?.getColId(),
+                        aggregation: pivotValueCol.getAggFunc(),
+                        pivotColumnId: pivotColInfo.pivotColumnId,
+                        pivotKey,
+                    };
+                }
+                if ((0, ColumnApiImpl_1.isPivotResultColumn)(columnId)) {
+                    const columnType = 'pivotAggregationColumn';
+                    const pivotValueCol = params.colDef.pivotValueColumn;
+                    const aggregatedColumnId = pivotValueCol?.getColId();
+                    const currentLayoutAggCols = currentPivotLayout.PivotAggregationColumns?.map((col) => col.ColumnId);
+                    if (!currentLayoutAggCols?.includes(aggregatedColumnId)) {
+                        // this column is not an aggregation column
+                        return 'skip';
+                    }
+                    return {
+                        ...baseContext,
+                        columnType,
+                        columnId,
+                        pivotKeys: params.colDef.pivotKeys,
+                        aggregatedColumnId,
+                        aggregation: pivotValueCol.getAggFunc(),
+                    };
+                }
+            }
+        }
+        // if nothing matched, we skip this column[group]
+        return 'skip';
+    }
 }
 exports.ColumnInternalApi = ColumnInternalApi;

package/src/Utilities/Constants/GeneralConstants.d.ts

@@ -24,6 +24,7 @@ export declare const GROUP_PATH_SEPARATOR: string;
 export declare const AG_GRID_GROUPED_COLUMN: string;
 export declare const AG_GRID_SELECTION_COLUMN: string;
 export declare const AG_GRID_PIVOT_COLUMN: string;
+export declare const AG_GRID_PIVOT_GRAND_TOTAL_COLUMN: string;
 export declare const AG_GRID_CHART_WINDOW = "AG Grid Window";
 export declare const ADAPTABLE_FDC3_ACTION_COLUMN_FRIENDLY_NAME = "(FDC3ActionColumn)";
 export declare const DEFAULT_DATE_FORMAT_PATTERN = "dd-MM-yyyy";

package/src/Utilities/Constants/GeneralConstants.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LAYOUT_NEW_PIVOT_TOOLTIP = exports.LAYOUT_NEW_TABLE_TOOLTIP = exports.THEME_STYLE = exports.SYSTEM_EXPORT_DESTINATIONS = exports.CLIPBOARD_EXPORT_DESTINATION = exports.DOWNLOAD_EXPORT_DESTINATION = exports.SELECT_REPORT_FORMAT_STRING = exports.SELECT_REPORT_STRING = exports.SYSTEM_REPORT_FORMATS = exports.JSON_FORMAT_REPORT = exports.CSV_FORMAT_REPORT = exports.VISUAL_EXCEL_FORMAT_REPORT = exports.EXCEL_FORMAT_REPORT = exports.SYSTEM_REPORT_NAMES = exports.SELECTED_DATA_REPORT = exports.CURRENT_LAYOUT_REPORT = exports.ALL_DATA_REPORT = exports.SERVER_VALIDATION_MESSAGE_TYPE = exports.SERVER_VALIDATION_HEADER = exports.DEFAULT_LIVE_REPORT_THROTTLE_TIME = exports.MENU_SEPARATOR = exports.QUICK_SEARCH_DEBOUNCE_TIME = exports.DEFAULT_DOUBLE_DISPLAY_VALUE = exports.DEFAULT_INTEGER_DISPLAY_VALUE = exports.DEFAULT_STRING_DISPLAY_VALUE = exports.DEFAULT_DATE_FORMAT_PATTERN_WITH_TIME = exports.DEFAULT_DATE_FORMAT_PATTERN = exports.ADAPTABLE_FDC3_ACTION_COLUMN_FRIENDLY_NAME = exports.AG_GRID_CHART_WINDOW = exports.AG_GRID_PIVOT_COLUMN = exports.AG_GRID_SELECTION_COLUMN = exports.AG_GRID_GROUPED_COLUMN = exports.GROUP_PATH_SEPARATOR = exports.QUARTER_SECOND = exports.HALF_SECOND = exports.EMPTY_ARRAY = exports.EMPTY_STRING = exports.READ_ONLY_STYLE = exports.AGGRID_TOOLPANEL_COLUMNS = exports.AGGRID_TOOLPANEL_FILTERS = exports.ADAPTABLE_TOOLPANEL_COMPONENT = exports.ADAPTABLE_TOOLPANEL_ID = exports.ADAPTABLE_ID = exports.ADAPTABLE = exports.ERROR_LAYOUT = exports.OS_THEME = exports.DARK_THEME = exports.LIGHT_THEME = exports.MISSING_COLUMN = exports.AUTOGENERATED_PK_COLUMN = void 0;
-exports.OBSERVABLE_EXPRESSION_ROW_REMOVED = exports.OBSERVABLE_EXPRESSION_ROW_ADDED = exports.STANDALONE_MODULE_POPUPS = exports.LAYOUT_DELETE_TOOLTIP = exports.LAYOUT_CLONE_TOOLTIP = exports.LAYOUT_EDIT_TOOLTIP = exports.LAYOUT_SAVE_TOOLTIP = exports.LAYOUT_NEW_TABLE_OR_PIVOT_TOOLTIP = void 0;
+exports.LAYOUT_NEW_TABLE_TOOLTIP = exports.THEME_STYLE = exports.SYSTEM_EXPORT_DESTINATIONS = exports.CLIPBOARD_EXPORT_DESTINATION = exports.DOWNLOAD_EXPORT_DESTINATION = exports.SELECT_REPORT_FORMAT_STRING = exports.SELECT_REPORT_STRING = exports.SYSTEM_REPORT_FORMATS = exports.JSON_FORMAT_REPORT = exports.CSV_FORMAT_REPORT = exports.VISUAL_EXCEL_FORMAT_REPORT = exports.EXCEL_FORMAT_REPORT = exports.SYSTEM_REPORT_NAMES = exports.SELECTED_DATA_REPORT = exports.CURRENT_LAYOUT_REPORT = exports.ALL_DATA_REPORT = exports.SERVER_VALIDATION_MESSAGE_TYPE = exports.SERVER_VALIDATION_HEADER = exports.DEFAULT_LIVE_REPORT_THROTTLE_TIME = exports.MENU_SEPARATOR = exports.QUICK_SEARCH_DEBOUNCE_TIME = exports.DEFAULT_DOUBLE_DISPLAY_VALUE = exports.DEFAULT_INTEGER_DISPLAY_VALUE = exports.DEFAULT_STRING_DISPLAY_VALUE = exports.DEFAULT_DATE_FORMAT_PATTERN_WITH_TIME = exports.DEFAULT_DATE_FORMAT_PATTERN = exports.ADAPTABLE_FDC3_ACTION_COLUMN_FRIENDLY_NAME = exports.AG_GRID_CHART_WINDOW = exports.AG_GRID_PIVOT_GRAND_TOTAL_COLUMN = exports.AG_GRID_PIVOT_COLUMN = exports.AG_GRID_SELECTION_COLUMN = exports.AG_GRID_GROUPED_COLUMN = exports.GROUP_PATH_SEPARATOR = exports.QUARTER_SECOND = exports.HALF_SECOND = exports.EMPTY_ARRAY = exports.EMPTY_STRING = exports.READ_ONLY_STYLE = exports.AGGRID_TOOLPANEL_COLUMNS = exports.AGGRID_TOOLPANEL_FILTERS = exports.ADAPTABLE_TOOLPANEL_COMPONENT = exports.ADAPTABLE_TOOLPANEL_ID = exports.ADAPTABLE_ID = exports.ADAPTABLE = exports.ERROR_LAYOUT = exports.OS_THEME = exports.DARK_THEME = exports.LIGHT_THEME = exports.MISSING_COLUMN = exports.AUTOGENERATED_PK_COLUMN = void 0;
+exports.OBSERVABLE_EXPRESSION_ROW_REMOVED = exports.OBSERVABLE_EXPRESSION_ROW_ADDED = exports.STANDALONE_MODULE_POPUPS = exports.LAYOUT_DELETE_TOOLTIP = exports.LAYOUT_CLONE_TOOLTIP = exports.LAYOUT_EDIT_TOOLTIP = exports.LAYOUT_SAVE_TOOLTIP = exports.LAYOUT_NEW_TABLE_OR_PIVOT_TOOLTIP = exports.LAYOUT_NEW_PIVOT_TOOLTIP = void 0;
 exports.AUTOGENERATED_PK_COLUMN = '__ADAPTABLE_PK__';
 exports.MISSING_COLUMN = ' [MISSING]';
 exports.LIGHT_THEME = 'light';
@@ -27,6 +27,7 @@ exports.GROUP_PATH_SEPARATOR = '/';
 exports.AG_GRID_GROUPED_COLUMN = 'ag-Grid-AutoColumn';
 exports.AG_GRID_SELECTION_COLUMN = 'ag-Grid-SelectionColumn';
 exports.AG_GRID_PIVOT_COLUMN = 'pivot_';
+exports.AG_GRID_PIVOT_GRAND_TOTAL_COLUMN = 'PivotRowTotal_pivot_';
 exports.AG_GRID_CHART_WINDOW = 'AG Grid Window';
 exports.ADAPTABLE_FDC3_ACTION_COLUMN_FRIENDLY_NAME = '(FDC3ActionColumn)';
 // FIXME AFL - load this from DateInputOptions

package/src/Utilities/Extensions/StringExtensions.js

@@ -35,13 +35,21 @@ function IsNotNullOrEmptyOrWhiteSpace(stringToCheck) {
     return !IsNullOrEmptyOrWhiteSpace(stringToCheck);
 }
 exports.IsNotNullOrEmptyOrWhiteSpace = IsNotNullOrEmptyOrWhiteSpace;
-// from https://stackoverflow.com/questions/15369566/putting-space-in-camel-case-string-using-regular-expression
+// clone of A Grid's implementation
+// https://github.com/ag-grid/ag-grid/blob/a5c3d9f56350271ab7e8d42d72aaf5314672719a/packages/ag-grid-community/src/columns/columnNameService.ts#L14
 function CamelCaseToHumanText(camelCase) {
     if (!camelCase || camelCase == null) {
         return null;
     }
-    const rex = /([A-Z])([A-Z])([a-z])|([a-z])([A-Z])/g;
-    const words = camelCase.replace(rex, '$1$4 $2$3$5').replace('.', ' ').split(' ');
+    // either split on a lowercase followed by uppercase ie  asHereTo -> as Here To
+    const rex = /([a-z])([A-Z])/g;
+    // or starts with uppercase and we take all expect the last which is assumed to be part of next word if followed by lowercase HEREToThere -> HERE To There
+    const rexCaps = /([A-Z]+)([A-Z])([a-z])/g;
+    const words = camelCase
+        .replace(rex, '$1 $2')
+        .replace(rexCaps, '$1 $2$3')
+        .replace(/\./g, ' ')
+        .split(' ');
     return words
         .map((word) => word.substring(0, 1).toUpperCase() + (word.length > 1 ? word.substring(1, word.length) : ''))
         .join(' ');

package/src/Utilities/adaptableOverrideCheck.d.ts

@@ -0,0 +1,2 @@
+export declare function tagProvidedByAdaptable(fn: any): any;
+export declare function isProvidedByAdaptable(fn: any): boolean;

package/src/Utilities/adaptableOverrideCheck.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isProvidedByAdaptable = exports.tagProvidedByAdaptable = void 0;
+const PROVIDED_BY_ADAPTABLE = Symbol('isProvidedByAdaptable');
+function tagProvidedByAdaptable(fn) {
+    fn[PROVIDED_BY_ADAPTABLE] = true;
+    return fn;
+}
+exports.tagProvidedByAdaptable = tagProvidedByAdaptable;
+function isProvidedByAdaptable(fn) {
+    return fn && !!fn[PROVIDED_BY_ADAPTABLE];
+}
+exports.isProvidedByAdaptable = isProvidedByAdaptable;

package/src/agGrid/AdaptableAgGrid.js

@@ -101,6 +101,7 @@ const AdaptableColumn_1 = require("../AdaptableState/Common/AdaptableColumn");
 const agGridDataTypeDefinitions_1 = require("./agGridDataTypeDefinitions");
 const AgGridThemeAdapter_1 = require("./AgGridThemeAdapter");
 const VersionUpgrade20_1 = require("../migration/VersionUpgrade20");
+const adaptableOverrideCheck_1 = require("../Utilities/adaptableOverrideCheck");
 const LocalEventService_Prototype = ag_grid_enterprise_1.LocalEventService.prototype;
 const LocalEventService_dispatchEvent = LocalEventService_Prototype.dispatchEvent;
 LocalEventService_Prototype.dispatchEvent = function (event) {
@@ -614,6 +615,34 @@ You need to define at least one Layout!`);
             this.agGridAdapter.setAgGridId(agGridId);
             return agGridId;
         });
+        /**
+         * `defaultColDef`
+         */
+        this.agGridOptionsService.setGridOptionsProperty(gridOptions, 'defaultColDef', (original_defaultColDef) => {
+            if (original_defaultColDef?.headerValueGetter) {
+                this.logger.warn(`defaultColDef.headerValueGetter and overrides the Adaptable custom header mechanism! We recommend using a ColumnOptions.tableColumnHeader instead!`);
+                return original_defaultColDef;
+            }
+            const defaultColDef = original_defaultColDef ?? {};
+            defaultColDef.headerValueGetter = (0, adaptableOverrideCheck_1.tagProvidedByAdaptable)((params) => {
+                return this.api.columnApi.internalApi.getColumnHeaderName(params);
+            });
+            return defaultColDef;
+        });
+        /**
+         * `defaultColGroupDef`
+         */
+        this.agGridOptionsService.setGridOptionsProperty(gridOptions, 'defaultColGroupDef', (original_defaultColGroupDef) => {
+            if (original_defaultColGroupDef?.headerValueGetter) {
+                this.logger.warn(`defaultColGroupDef.headerValueGetter and overrides the Adaptable custom header mechanism! We recommend using a ColumnOptions.tableColumnHeader instead!`);
+                return original_defaultColGroupDef;
+            }
+            const defaultColGroupDef = original_defaultColGroupDef ?? {};
+            defaultColGroupDef.headerValueGetter = (0, adaptableOverrideCheck_1.tagProvidedByAdaptable)((params) => {
+                return this.api.columnApi.internalApi.getColumnHeaderName(params);
+            });
+            return defaultColGroupDef;
+        });
         /**
          * `theme`
          */

package/src/agGrid/AgGridAdapter.js

@@ -378,6 +378,7 @@ class AgGridAdapter {
                     agColumn: agGridColumn,
                     columnGroup: isRealColumnGroup ? ColumnGroup : undefined,
                     displayName: displayName,
+                    ...this.adaptableApi.internalApi.buildBaseContext(),
                 })
                 : null;
             friendlyName =

package/src/agGrid/AgGridColumnAdapter.d.ts

@@ -27,7 +27,7 @@ export declare class AgGridColumnAdapter {
     private setupColumnAllowedAggFuncs;
     private setupColumnType;
     private setupColumnCellDataType;
-    setupColumnHeader({ col, abColumn }: ColumnSetupInfo): boolean;
+    setupColumnHeader({ col, abColumn }: ColumnSetupInfo): void;
     private setupColumnFilter;
     setupColumnFloatingFilterTemporarily(initialGridOptions: GridOptions): void;
     private setupColumnFloatingFilter;

package/src/agGrid/AgGridColumnAdapter.js

@@ -17,6 +17,7 @@ const AdaptableNumberEditor_1 = require("./editors/AdaptableNumberEditor");
 const AdaptableDateEditor_1 = require("./editors/AdaptableDateEditor");
 const AgGridExportAdapter_1 = require("./AgGridExportAdapter");
 const AdaptableHelper_1 = require("../Utilities/Helpers/AdaptableHelper");
+const adaptableOverrideCheck_1 = require("../Utilities/adaptableOverrideCheck");
 function getEditorForColumnDataType(columnDataType, variant) {
     if (columnDataType === 'number') {
         return variant === 'react' ? AdaptableNumberEditor_1.AdaptableReactNumberEditor : AdaptableNumberEditor_1.AdaptableNumberEditor;
@@ -376,19 +377,12 @@ class AgGridColumnAdapter {
         });
     }
     setupColumnHeader({ col, abColumn }) {
-        const previousColumnHeader = col?.getColDef()?.headerName;
-        this.setColDefProperty(col, 'headerName', (userHeaderName) => {
-            // set the default to the AG Grid provided values
-            // from https://github.com/ag-grid/ag-grid/blob/v26.1.0/community-modules/core/src/ts/columns/columnModel.ts#L2515
-            let resultHeaderName = userHeaderName ?? StringExtensions_1.default.CamelCaseToHumanText(col.getColDef().field);
-            const layoutCustomHeader = this.adaptableApi.layoutApi.getCurrentLayout().ColumnHeaders?.[col.getColId()];
-            if (layoutCustomHeader) {
-                resultHeaderName = layoutCustomHeader;
-            }
-            return resultHeaderName;
+        this.setColDefProperty(col, 'headerValueGetter', (original_headerValueGetter) => {
+            if (!(0, adaptableOverrideCheck_1.isProvidedByAdaptable)(original_headerValueGetter)) {
+                this.adaptableApi.logWarn(`colDef.headerValueGetter is defined for column '${col.getColId()}', and overrides the Adaptable custom header mechanism! We recommend using a ColumnOptions.tableColumnHeader instead!`);
+            }
+            return original_headerValueGetter;
         });
-        const newColumnHeader = col?.getColDef()?.headerName;
-        return previousColumnHeader !== newColumnHeader;
     }
     setupColumnFilter({ col, colDef }) {
         this.setColDefProperty(col, 'filter', () => {

package/src/components/Select/Select.js

@@ -33,7 +33,7 @@ const INFINITE_COLUMNS_WITH_CHECKBOX = {
         resizable: false,
         defaultSortable: false,
         renderSelectionCheckBox: ({ renderBag }) => {
-            return (React.createElement(rebass_1.Box, { display: 'inline-block', style: checkboxStyle }, renderBag.selectionCheckBox));
+            return renderBag.selectionCheckBox;
         },
         renderHeader: (headerParams) => {
             return (React.createElement(React.Fragment, null,
@@ -153,7 +153,7 @@ const Select = function (props) {
                 placeholder: props.placeholder,
             });
             const title = typeof customRenderValue === 'string' ? customRenderValue : '';
-            children = customRenderValue ? (React.createElement(rebass_1.Box, { display: 'flex', flexDirection: 'row', flex: 1, flexWrap: 'nowrap', alignItems: 'center', overflow: 'hidden' },
+            children = customRenderValue ? (React.createElement(rebass_1.Box, { display: 'flex', flexDirection: 'row', flex: 1, flexWrap: 'nowrap', alignItems: 'center', overflow: 'hidden', height: '100%' },
                 React.createElement("span", { title: title, "data-name": "multi-value-text", style: {
                         flex: '0 1 auto',
                         appearance: 'none',
@@ -470,7 +470,7 @@ const Select = function (props) {
                 return {
                     ...baseStyle,
                     ...commonStyles(state), // height: 30,
-                    minHeight: props.size === 'small' ? 0 : 32,
+                    minHeight: props.size === 'small' ? 0 : '100%',
                     boxShadow: state.isFocused ? 'var(--ab-cmp-select-focused__box-shadow)' : 'none',
                     outline: state.isFocused ? 'var(--ab-cmp-select-focused__outline)' : 'none',
                     border: 'var(--ab-cmp-select__border)',

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: 1744964832292 || Date.now(),
-    VERSION: "20.0.5" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1745347683994 || Date.now(),
+    VERSION: "20.0.7-canary.0" || '--current-version--',
 };

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

@@ -62,26 +62,17 @@ export type ColumnAggregationModel = {
     aggFunc: string | true;
     weightedColumnId?: string;
 };
-export type AggregationColumnsModel = {
+export type AggregationColumnsModelItem = {
     ColumnId: string;
     AggFunc: ColumnAggregationModel;
-}[];
-type RowSummaryPosition = 'Top' | 'Bottom';
-export interface RowSummaryModel {
-    /**
-     * Where Row Summary appears - 'Top' or 'Bottom'
-     */
-    Position?: RowSummaryPosition;
-    /**
-     * Map of Columns with Summary Expressions
-     */
-    ColumnsMap: Record<string, string>;
-    /**
-     * Evaluates only currently filtered rows in the summary
-     * @defaultValue true
-     */
-    IncludeOnlyFilteredRows?: boolean;
-}
+};
+export type AggregationColumnsModel = AggregationColumnsModelItem[];
+export type PivotAggregationColumnsModel = (AggregationColumnsModelItem & {
+    TotalColumn?: boolean | 'before' | 'after' | {
+        PivotColumnId: string;
+        ShowTotal?: boolean | 'before' | 'after';
+    }[];
+})[];
 export interface TableLayoutModel extends BaseLayoutModel {
     TableColumns: string[];
     /**
@@ -96,6 +87,7 @@ export interface TableLayoutModel extends BaseLayoutModel {
      * @defaultValue 'single'
      */
     RowGroupDisplayType?: 'single' | 'multi';
+    PivotAggregationColumns?: never;
     PivotColumns?: never;
     PivotGroupedColumns?: never;
     PivotExpandLevel?: never;
@@ -110,13 +102,24 @@ export interface PivotLayoutModel extends BaseLayoutModel {
     /**
      * Columns showing aggregated values in Group Rows; 1st value in record is Column name, 2nd is either aggfunc (e.g. sum, avg etc.) or 'true' (to use default aggfunc)
      */
-    PivotAggregationColumns?: AggregationColumnsModel;
+    PivotAggregationColumns?: PivotAggregationColumnsModel;
     TableAggregationColumns?: never;
     /**
      * Columns which are row-grouped when the Layout is applied
      */
     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
+     */
+    GrandTotalColumn?: 'before' | 'after' | boolean;
+    /**
+     * Display automatically calculated Totals within EACH Pivot Column Group, in the position specified
+     */
+    PivotGroupTotalColumn?: 'before' | 'after' | boolean;
 }
 export type LayoutModel = TableLayoutModel | PivotLayoutModel;
-export {};

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

@@ -0,0 +1,10 @@
+import { ColDef } from 'ag-grid-enterprise';
+export declare function destructurePivotColumnId(colDef: ColDef, currentModel: {
+    pivotColIds: string[];
+    aggColIds: string[];
+}, logWarning: (message: string) => void): '!unknown!' | {
+    pivotColumnIds: string[];
+    pivotKeys: string[];
+    pivotColumnId: string;
+    aggregationColumnId?: string;
+};