@adaptabletools/adaptable 20.0.12 → 20.0.13

package/package.json

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

package/src/AdaptableState/Common/AggregationColumns.d.ts

@@ -1,6 +1,7 @@
 /**
  * Defines which Columns in a Layout display Aggregated values when Row-Grouped
  */
+import { PivotTotalPosition } from '../LayoutState';
 export type AggregationColumnValue = string | true | WeightedAverageAggregation;
 /**
  * Defines an Aggregated Column in a Table Layout
@@ -24,9 +25,9 @@ export type PivotAggregationColumns = {
     /**
      * Whether to show the total for this column; it can be also customized for specific Pivot Columns
      */
-    Total?: boolean | 'before' | 'after' | {
+    Total?: PivotTotalPosition | {
         PivotColumnId: string;
-        ShowTotal?: boolean | 'before' | 'after';
+        ShowTotal?: PivotTotalPosition;
     }[];
 }[];
 export declare const WEIGHTED_AVERAGE_AGG_FN_NAME = "weightedAvg";

package/src/AdaptableState/Common/AggregationColumns.js

@@ -1,6 +1,3 @@
-/**
- * Defines which Columns in a Layout display Aggregated values when Row-Grouped
- */
 export const WEIGHTED_AVERAGE_AGG_FN_NAME = 'weightedAvg';
 export const isWeightedAverageAggFuncName = (aggFunc) => {
     return aggFunc === WEIGHTED_AVERAGE_AGG_FN_NAME;

package/src/AdaptableState/LayoutState.d.ts

@@ -155,12 +155,16 @@ export interface PivotLayout extends LayoutBase {
     /**
      * Display automatically calculated Totals of all Pivot Columns, in the position specified
      */
-    PivotGrandTotal?: 'before' | 'after' | boolean;
+    PivotGrandTotal?: PivotTotalPosition;
     /**
      * Display automatically calculated Totals within EACH Pivot Column Group, in the position specified
      */
-    PivotColumnTotal?: 'before' | 'after' | boolean;
+    PivotColumnTotal?: PivotTotalPosition;
 }
+/**
+ * Defines the position of Pivot Total position - 'before' or 'after' the Value Column(s)
+ */
+export type PivotTotalPosition = 'before' | 'after' | boolean;
 /**
  * Manages how (and which) Row Group values are stored
  */

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

@@ -179,7 +179,7 @@ const PivotColumnRow = (props) => {
                     ' ',
                     React.createElement(DropdownButton, { columns: ['label'], items: numericColumnsOptions, ml: 2 }, weightName))),
                 aggValue && (React.createElement(Flex, { backgroundColor: "primary", ml: 3, alignItems: "center" },
-                    React.createElement(Text, null, "Total Column"),
+                    React.createElement(Text, null, "Total"),
                     ' ',
                     React.createElement(DropdownButton, { columns: ['label'], items: totalOptions, ml: 2 }, currentTotal)))),
             hasPivotSpecificTotals && (React.createElement(Flex, { ml: 2, pl: 2, flexWrap: "wrap", flex: "1 1 auto", alignItems: "center", style: {
@@ -333,7 +333,7 @@ export const PivotAggregationsSection = (props) => {
                                     GrandTotalRow: value,
                                 });
                             }, isClearable: true })),
-                    React.createElement(FormRow, { label: 'Grand Total Column' },
+                    React.createElement(FormRow, { label: 'Pivot Grand Total' },
                         React.createElement(Select, { style: { width: 120 }, options: ['before', 'after'].map((position) => {
                                 return {
                                     label: StringExtensions.CapitaliseFirstLetter(position),
@@ -345,7 +345,7 @@ export const PivotAggregationsSection = (props) => {
                                     PivotGrandTotal: value,
                                 });
                             }, isClearable: true })),
-                    React.createElement(FormRow, { label: 'Pivot Group Total Column' }, isPivotColumnTotalEnabled === true ? (React.createElement(Select, { style: { width: 120 }, options: ['before', 'after'].map((position) => {
+                    React.createElement(FormRow, { label: 'Pivot Column Total' }, isPivotColumnTotalEnabled === true ? (React.createElement(Select, { style: { width: 120 }, options: ['before', 'after'].map((position) => {
                             return {
                                 label: StringExtensions.CapitaliseFirstLetter(position),
                                 value: position,

package/src/agGrid/AdaptableAgGrid.js

@@ -93,7 +93,7 @@ import { AgGridExportAdapter } from './AgGridExportAdapter';
 import { checkForDuplicateColumns, isPivotLayout, layoutModelToLayoutState, layoutStateToLayoutModel, normalizeLayout, } from '../Api/Implementation/LayoutHelpers';
 import { LayoutManager } from '../layout-manager/src';
 import { isPivotLayoutModel } from '../layout-manager/src/isPivotLayoutModel';
-import { ACTION_COLUMN_TYPE, CALCULATED_COLUMN_TYPE, FDC3_COLUMN_TYPE, FREE_TEXT_COLUMN_TYPE, } from '../AdaptableState/Common/AdaptableColumn';
+import { ACTION_COLUMN_TYPE, CALCULATED_COLUMN_TYPE, FDC3_COLUMN_TYPE, FREE_TEXT_COLUMN_TYPE, PIVOT_AGGREGATION_TOTAL_COLUMN_TYPE, PIVOT_ANY_TOTAL_COLUMN_TYPE, PIVOT_COLUMN_TOTAL_COLUMN_TYPE, PIVOT_GRAND_TOTAL_COLUMN_TYPE, } from '../AdaptableState/Common/AdaptableColumn';
 import { agGridDataTypeDefinitions } from './agGridDataTypeDefinitions';
 import { AgGridThemeAdapter } from './AgGridThemeAdapter';
 import { mapOldTypeToDataType } from '../migration/VersionUpgrade20';
@@ -1076,6 +1076,10 @@ You need to define at least one Layout!`);
                 [FREE_TEXT_COLUMN_TYPE]: {},
                 [ACTION_COLUMN_TYPE]: {},
                 [FDC3_COLUMN_TYPE]: {},
+                [PIVOT_ANY_TOTAL_COLUMN_TYPE]: {},
+                [PIVOT_GRAND_TOTAL_COLUMN_TYPE]: {},
+                [PIVOT_COLUMN_TOTAL_COLUMN_TYPE]: {},
+                [PIVOT_AGGREGATION_TOTAL_COLUMN_TYPE]: {},
             };
             const patchedColumnTypes = Object.assign({}, providedColumnTypes, adaptableSpecialColumnTypes);
             const customColumnTypes = this.api.columnApi.getColumnTypes() ?? [];

package/src/agGrid/AgGridColumnAdapter.js

@@ -202,14 +202,32 @@ export class AgGridColumnAdapter {
             const quickSearchStyle = this.getQuickSearchCellStyle();
             const hasQuickSearchStyle = quickSearchStyle != undefined;
             const cellStyle = (params) => {
-                const gridCell = this.adaptableApi.gridApi.getGridCellFromRowNode(params.node, abColumn.columnId);
+                const columnId = params.column.getColId();
+                const gridCell = this.adaptableApi.gridApi.getGridCellFromRowNode(params.node, columnId);
                 if (!gridCell || !gridCell.column) {
                     return {};
                 }
                 const isQuickSearchActive = hasQuickSearchStyle && this.isQuickSearchActive(gridCell, params);
-                const userDefined = typeof userCellStyle === 'function' ? userCellStyle(params) : userCellStyle;
+                let baseStyles = {};
+                // this is required because otherwise, when AG Grid filters, it refershed the pivotResultColDef and the base styles get lost
+                // if pivot result col: inherit styles from base column
+                if (this.adaptableApi.columnApi.isPivotResultColumn(columnId)) {
+                    const baseColumn = params.column.getColDef()?.pivotValueColumn;
+                    if (baseColumn) {
+                        const baseColDefCellStyle = baseColumn?.getColDef()?.cellStyle;
+                        const baseColParams = { ...params, column: baseColumn };
+                        baseStyles =
+                            typeof baseColDefCellStyle === 'function'
+                                ? baseColDefCellStyle(baseColParams)
+                                : baseColDefCellStyle;
+                    }
+                }
+                else {
+                    // inherit styles from user provided colDef property
+                    baseStyles = typeof userCellStyle === 'function' ? userCellStyle(params) : userCellStyle;
+                }
                 const result = {
-                    ...userDefined,
+                    ...baseStyles,
                     ...this.getReadOnlyCellStyle(gridCell, params),
                     ...this.getEditableCellStyle(gridCell, params),
                     ...this.getEditedCellStyle(gridCell, params),

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: 1746136567034 || Date.now(),
-    VERSION: "20.0.12" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1746196666403 || Date.now(),
+    VERSION: "20.0.13" || '--current-version--',
 };

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

@@ -4382,18 +4382,18 @@ export declare const ADAPTABLE_METAMODEL: {
             kind: string;
             desc: string;
             isOpt: boolean;
-            ref?: undefined;
+            ref: string;
         } | {
             name: string;
             kind: string;
             desc: string;
-            isOpt: boolean;
-            ref: string;
+            isOpt?: undefined;
+            ref?: undefined;
         } | {
             name: string;
             kind: string;
             desc: string;
-            isOpt?: undefined;
+            isOpt: boolean;
             ref?: undefined;
         })[];
     };