@adaptabletools/adaptable 20.0.8 → 20.0.10

package/agGrid.d.ts

@@ -40,7 +40,7 @@ export declare const AdaptableColumnType: {
      */
     Fdc3Column: import("./src/AdaptableState/Common/AdaptableColumn").AdaptableColumnType;
     /**
-     * Any column that is used to display Pivot Totals: PivotGrandTotal, PivotTotal, PivotGroupTotal or PivotAggregationTotal
+     * Any column that is used to display Pivot Totals: PivotGrandTotal, PivotGroupTotal or PivotAggregationTotal
      */
     PivotTotal: import("./src/AdaptableState/Common/AdaptableColumn").AdaptableColumnType;
     /**

package/agGrid.js

@@ -46,7 +46,7 @@ export const AdaptableColumnType = {
      */
     Fdc3Column: FDC3_COLUMN_TYPE,
     /**
-     * Any column that is used to display Pivot Totals: PivotGrandTotal, PivotTotal, PivotGroupTotal or PivotAggregationTotal
+     * Any column that is used to display Pivot Totals: PivotGrandTotal, PivotGroupTotal or PivotAggregationTotal
      */
     PivotTotal: PIVOT_TOTAL_COLUMN_TYPE,
     /**

package/package.json

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

package/src/AdaptableOptions/FilterOptions.d.ts

@@ -1,6 +1,5 @@
 import { FilterActionOnDataChange } from '../AdaptableState/Common/FilterActionOnDataChange';
 import { BaseContext } from '../../types';
-import { AdaptableColumn } from '../AdaptableState/Common/AdaptableColumn';
 import { SystemAlertPredicateId, SystemFilterPredicateId } from '../../types';
 import { StrictExtract } from '../Utilities/Extensions/TypeExtensions';
 import { AdaptableColumnContext } from '../AdaptableState/Common/AdaptableColumnContext';
@@ -92,21 +91,21 @@ export interface ColumnFilterOptions<TData = any> {
      * @defaultValue Equals
      * @gridInfoItem
      */
-    defaultNumericColumnFilter?: StrictExtract<SystemFilterPredicateId, 'GreaterThan' | 'LessThan' | 'Equals' | 'NotEquals' | 'In'> | ((column: AdaptableColumn) => StrictExtract<SystemFilterPredicateId, 'GreaterThan' | 'LessThan' | 'Equals' | 'NotEquals' | 'In'>);
+    defaultNumericColumnFilter?: StrictExtract<SystemFilterPredicateId, 'GreaterThan' | 'LessThan' | 'Equals' | 'NotEquals' | 'In'> | ((adaptableColumnContext: AdaptableColumnContext<TData>) => StrictExtract<SystemFilterPredicateId, 'GreaterThan' | 'LessThan' | 'Equals' | 'NotEquals' | 'In'>);
     /**
      * Default filter type for text Columns
      *
      * @defaultValue Contains
      * @gridInfoItem
      */
-    defaultTextColumnFilter?: StrictExtract<SystemFilterPredicateId, 'Is' | 'IsNot' | 'Contains' | 'NotContains' | 'StartsWith' | 'EndsWith' | 'Regex' | 'In'> | ((column: AdaptableColumn) => StrictExtract<SystemFilterPredicateId, 'Is' | 'IsNot' | 'Contains' | 'NotContains' | 'StartsWith' | 'EndsWith' | 'Regex' | 'In'>);
+    defaultTextColumnFilter?: StrictExtract<SystemFilterPredicateId, 'Is' | 'IsNot' | 'Contains' | 'NotContains' | 'StartsWith' | 'EndsWith' | 'Regex' | 'In'> | ((adaptableColumnContext: AdaptableColumnContext<TData>) => StrictExtract<SystemFilterPredicateId, 'Is' | 'IsNot' | 'Contains' | 'NotContains' | 'StartsWith' | 'EndsWith' | 'Regex' | 'In'>);
     /**
      * Default filter type for date Columns
      *
      * @defaultValue On
      * @gridInfoItem
      */
-    defaultDateColumnFilter?: StrictExtract<SystemFilterPredicateId, 'After' | 'Before' | 'On' | 'NotOn' | 'In'> | ((column: AdaptableColumn) => StrictExtract<SystemFilterPredicateId, 'After' | 'Before' | 'On' | 'NotOn' | 'In'>);
+    defaultDateColumnFilter?: StrictExtract<SystemFilterPredicateId, 'After' | 'Before' | 'On' | 'NotOn' | 'In'> | ((adaptableColumnContext: AdaptableColumnContext<TData>) => StrictExtract<SystemFilterPredicateId, 'After' | 'Before' | 'On' | 'NotOn' | 'In'>);
     /**
      * Hides Dropdown in Quick Filter Bar for a given Column
      *

package/src/AdaptableState/LayoutState.d.ts

@@ -75,7 +75,7 @@ export interface LayoutBase extends AdaptableObject {
      */
     AutoSizeColumns?: boolean;
     /**
-     * Display Grand Total Row at the top or bottom of the Table/Pivot Layout
+     * Display Grand Total Row at the top or bottom of the Layout
      */
     GrandTotalRow?: 'top' | 'bottom' | boolean;
 }

package/src/Strategy/Utilities/Layout/getLayoutFilterViewItems.js

@@ -7,7 +7,7 @@ export const getFilterPreview = (columnFilter, api) => {
     const columnType = api.columnApi.getColumnDataTypeForColumnId(columnFilter.ColumnId);
     const qlDataType = mapColumnDataTypeToExpressionFunctionType(columnType);
     const qlPredicateDefs = predicateDefs.map((pd) => mapAdaptablePredicateDefToQlPredicateDef(pd, qlDataType));
-    const qlPredicate = mapColumnFilterToQlPredicate(columnFilter, column, qlPredicateDefs, columnFilterOptions);
+    const qlPredicate = mapColumnFilterToQlPredicate(columnFilter, column, qlPredicateDefs, columnFilterOptions, api);
     return `[${qlPredicateToString(qlPredicate, qlPredicateDefs)}]`;
 };
 export const getLayoutFilterViewItems = (layout, api) => {

package/src/View/Components/ColumnFilter/LayoutColumnFilter.js

@@ -10,7 +10,7 @@ export const LayoutColumnFilter = (props) => {
     const predicateDefs = api.filterApi.columnFilterApi.getFilterPredicateDefsForColumn(column);
     const qlDataType = mapColumnDataTypeToExpressionFunctionType(column.dataType);
     const qlPredicateDefs = predicateDefs.map((predDef) => mapAdaptablePredicateDefToQlPredicateDef(predDef, qlDataType));
-    const qlPredicate = mapColumnFilterToQlPredicate(props.columnFilter, column, qlPredicateDefs, columnFilterOptions);
+    const qlPredicate = mapColumnFilterToQlPredicate(props.columnFilter, column, qlPredicateDefs, columnFilterOptions, api);
     const handlePredicateChange = (newPredicate) => {
         const newAdaptablePredicates = newPredicate.args.map(mapQlPredicateToAdaptablePredicate);
         const newFilter = {

package/src/View/Components/ColumnFilter/useAdaptableFilterWrapper.js

@@ -9,11 +9,12 @@ import { mapAdaptablePredicateDefToQlPredicateDef, mapColumnFilterToQlPredicate,
 export const useAdaptableFilterWrapper = (columnId, handleOnChangeOverride) => {
     const adaptable = useAdaptable();
     const dispatch = useDispatch();
-    const columnType = adaptable.api.columnApi.getColumnDataTypeForColumnId(columnId);
-    const column = adaptable.api.columnApi.getColumnWithColumnId(columnId);
-    const columnFilterOptions = adaptable.api.optionsApi.getFilterOptions().columnFilterOptions;
+    const api = adaptable.api;
+    const columnType = api.columnApi.getColumnDataTypeForColumnId(columnId);
+    const column = api.columnApi.getColumnWithColumnId(columnId);
+    const columnFilterOptions = api.optionsApi.getFilterOptions().columnFilterOptions;
     const qlPredicateDefs = React.useMemo(() => {
-        const predicateDefs = adaptable.api.filterApi.columnFilterApi.getFilterPredicateDefsForColumn(column);
+        const predicateDefs = api.filterApi.columnFilterApi.getFilterPredicateDefsForColumn(column);
         const qlDataType = mapColumnDataTypeToExpressionFunctionType(columnType);
         return predicateDefs.map((predDef) => mapAdaptablePredicateDefToQlPredicateDef(predDef, qlDataType));
     }, [columnId]);
@@ -22,7 +23,7 @@ export const useAdaptableFilterWrapper = (columnId, handleOnChangeOverride) => {
         return currentLayout?.ColumnFilters?.find((cf) => cf.ColumnId === columnId);
     }, [currentLayout?.ColumnFilters, columnId]);
     const qlPredicate = column
-        ? mapColumnFilterToQlPredicate(columnFilter, column, qlPredicateDefs, columnFilterOptions)
+        ? mapColumnFilterToQlPredicate(columnFilter, column, qlPredicateDefs, columnFilterOptions, api)
         : null;
     const handleOnChange = (adaptablePredicate, logic = 'AND') => {
         // make sure we always have the latest columnFiler

package/src/View/Components/ColumnFilter/utils.d.ts

@@ -1,8 +1,8 @@
 import { QlPredicate, QlPredicateDef } from '../../../parser/src/predicate';
-import { AdaptableColumn, AdaptablePredicate, AdaptablePredicateDef, ColumnFilter, ColumnFilterOptions, ExpressionFunctionInputType } from '../../../types';
+import { AdaptableApi, AdaptableColumn, AdaptablePredicate, AdaptablePredicateDef, ColumnFilter, ColumnFilterOptions, ExpressionFunctionInputType } from '../../../types';
 export declare const mapAdaptablePredicateDefToQlPredicateDef: (adaptablePredicateDef: AdaptablePredicateDef, dataType: ExpressionFunctionInputType) => QlPredicateDef;
 export declare const mapAdaptablePredicateToQlPredicate: (adaptablePredicate: AdaptablePredicate) => QlPredicate;
 export declare const mapQlPredicateToAdaptablePredicate: (qlPredicate: QlPredicate) => AdaptablePredicate;
 export declare const qlPredicateToString: (qlPredicate: QlPredicate, predicateDefs: QlPredicateDef[]) => string;
 export declare const isPredicateEmpty: (predicate: QlPredicate, predicateDef: QlPredicateDef) => boolean;
-export declare const mapColumnFilterToQlPredicate: (columnFilter: ColumnFilter, abColumn: AdaptableColumn, qlPredicateDefs: QlPredicateDef[], columnFilterOptions: ColumnFilterOptions) => QlPredicate;
+export declare const mapColumnFilterToQlPredicate: (columnFilter: ColumnFilter, abColumn: AdaptableColumn, qlPredicateDefs: QlPredicateDef[], columnFilterOptions: ColumnFilterOptions, api: AdaptableApi) => QlPredicate;

package/src/View/Components/ColumnFilter/utils.js

@@ -77,7 +77,7 @@ export const isPredicateEmpty = (predicate, predicateDef) => {
         predicate.args.length === 0 ||
         predicate.args.every((arg) => arg == undefined));
 };
-export const mapColumnFilterToQlPredicate = (columnFilter, abColumn, qlPredicateDefs, columnFilterOptions) => {
+export const mapColumnFilterToQlPredicate = (columnFilter, abColumn, qlPredicateDefs, columnFilterOptions, api) => {
     const combinator = columnFilter?.PredicatesOperator ?? 'AND';
     const qlPredicate = {
         operator: combinator,
@@ -88,18 +88,60 @@ export const mapColumnFilterToQlPredicate = (columnFilter, abColumn, qlPredicate
         let defaultQlPredicate = null;
         switch (abColumn.dataType) {
             case 'number':
-                defaultQlPredicate = columnFilterOptions.defaultNumericColumnFilter
-                    ? { operator: columnFilterOptions.defaultNumericColumnFilter, args: [] }
+                let defaultQlNumberPredicate;
+                const defaultNumericColumnFilter = columnFilterOptions.defaultNumericColumnFilter;
+                if (defaultNumericColumnFilter) {
+                    if (typeof defaultNumericColumnFilter === 'function') {
+                        const context = {
+                            column: abColumn,
+                            ...api.internalApi.buildBaseContext(),
+                        };
+                        defaultQlNumberPredicate = defaultNumericColumnFilter(context);
+                    }
+                    else {
+                        defaultQlNumberPredicate = defaultNumericColumnFilter;
+                    }
+                }
+                defaultQlPredicate = defaultQlNumberPredicate
+                    ? { operator: defaultQlNumberPredicate, args: [] }
                     : { operator: 'Equals', args: [] };
                 break;
             case 'text':
-                defaultQlPredicate = columnFilterOptions.defaultTextColumnFilter
-                    ? { operator: columnFilterOptions.defaultTextColumnFilter, args: [] }
+                let defaultQlTextPredicate;
+                const defaultTextColumnFilter = columnFilterOptions.defaultTextColumnFilter;
+                if (defaultTextColumnFilter) {
+                    if (typeof defaultTextColumnFilter === 'function') {
+                        const context = {
+                            column: abColumn,
+                            ...api.internalApi.buildBaseContext(),
+                        };
+                        defaultQlTextPredicate = defaultTextColumnFilter(context);
+                    }
+                    else {
+                        defaultQlTextPredicate = defaultTextColumnFilter;
+                    }
+                }
+                defaultQlPredicate = defaultQlTextPredicate
+                    ? { operator: defaultQlTextPredicate, args: [] }
                     : { operator: 'Contains', args: [] };
                 break;
             case 'date':
-                defaultQlPredicate = columnFilterOptions.defaultDateColumnFilter
-                    ? { operator: columnFilterOptions.defaultDateColumnFilter, args: [] }
+                let defaultQlDatePredicate;
+                const defaultDateColumnFilter = columnFilterOptions.defaultDateColumnFilter;
+                if (defaultDateColumnFilter) {
+                    if (typeof defaultDateColumnFilter === 'function') {
+                        const context = {
+                            column: abColumn,
+                            ...api.internalApi.buildBaseContext(),
+                        };
+                        defaultQlDatePredicate = defaultDateColumnFilter(context);
+                    }
+                    else {
+                        defaultQlDatePredicate = defaultDateColumnFilter;
+                    }
+                }
+                defaultQlPredicate = defaultQlDatePredicate
+                    ? { operator: defaultQlDatePredicate, args: [] }
                     : { operator: 'On', args: [] };
                 break;
             case 'boolean':

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: 1745928512432 || Date.now(),
-    VERSION: "20.0.8" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1746018963775 || Date.now(),
+    VERSION: "20.0.10" || '--current-version--',
 };

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

@@ -261,6 +261,9 @@ export class LayoutManager extends LMEmitter {
             GrandTotalRow: layout.GrandTotalRow,
             PivotExpandLevel: prevLayout?.PivotExpandLevel ?? -1,
         };
+        if (layout.SuppressAggFuncInHeader) {
+            pivotLayout.SuppressAggFuncInHeader = layout.SuppressAggFuncInHeader;
+        }
         const grandTotalColumn = this.gridApi.getGridOption('pivotRowTotals');
         if (grandTotalColumn) {
             pivotLayout.GrandTotalColumn = grandTotalColumn;
@@ -442,7 +445,6 @@ export class LayoutManager extends LMEmitter {
                 }
             }
         }
-        const grandTotalRow = this.gridApi.getGridOption('grandTotalRow');
         const layout = simplifyTableLayoutModel({
             TableColumns: TableColumns,
             ColumnVisibility,
@@ -452,7 +454,8 @@ export class LayoutManager extends LMEmitter {
             TableAggregationColumns,
             ColumnPinning: ColumnPinning,
             RowGroupValues,
-            GrandTotalRow: grandTotalRow,
+            GrandTotalRow: this.gridApi.getGridOption('grandTotalRow'),
+            SuppressAggFuncInHeader: this.gridApi.getGridOption('suppressAggFuncInHeader'),
         });
         return layout;
     }
@@ -686,10 +689,8 @@ export class LayoutManager extends LMEmitter {
         };
         this.suppressGlobalAgGridEventListener = true;
         const pivotMode = this.gridApi.isPivotMode();
-        if (layout.SuppressAggFuncInHeader !== undefined &&
-            layout.SuppressAggFuncInHeader !== this.gridApi.getGridOption('suppressAggFuncInHeader')) {
-            // @ts-ignore
-            this.gridApi.setGridOption('suppressAggFuncInHeader', layout.SuppressAggFuncInHeader);
+        if (!!layout.SuppressAggFuncInHeader !== !!this.gridApi.getGridOption('suppressAggFuncInHeader')) {
+            this.gridApi.setGridOption('suppressAggFuncInHeader', !!layout.SuppressAggFuncInHeader);
         }
         if (layout.GrandTotalRow) {
             const grandTotalRow = layout.GrandTotalRow === true || layout.GrandTotalRow === 'top'

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

@@ -25,10 +25,6 @@ export function normalizeTableLayoutModel(layout, options) {
     if (!layout.RowGroupedColumns) {
         layout.RowGroupedColumns = [];
     }
-    if (!Object.prototype.hasOwnProperty.call(layout, 'SuppressAggFuncInHeader')) {
-        // make it an own property
-        layout.SuppressAggFuncInHeader = undefined;
-    }
     const ColumnOrderSet = new Set(layout.TableColumns);
     if (layout.RowGroupedColumns && layout.RowGroupedColumns.length && layout.TableColumns) {
         // the layout.TableColumns might not include the group columns
@@ -135,10 +131,6 @@ export function normalizePivotLayoutModel(layout) {
             RowGroupDisplay: 'always-collapsed',
         };
     }
-    if (!Object.prototype.hasOwnProperty.call(layout, 'SuppressAggFuncInHeader')) {
-        // make it an own property
-        layout.SuppressAggFuncInHeader = undefined;
-    }
     return layout;
 }
 export function normalizeLayoutModel(layout, options) {

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

@@ -17,7 +17,7 @@ export function simplifyTableLayoutModel(layout) {
     if (!layout.RowGroupedColumns && layout.RowGroupValues) {
         // delete layout.RowGroupValues;
     }
-    if (layout.SuppressAggFuncInHeader === undefined) {
+    if (!layout.SuppressAggFuncInHeader) {
         delete layout.SuppressAggFuncInHeader;
     }
     // this is the default value
@@ -63,7 +63,7 @@ export function simplifyPivotLayoutModel(layout) {
     if (layout.ColumnWidths && !Object.keys(layout.ColumnWidths).length) {
         delete layout.ColumnWidths;
     }
-    if (layout.SuppressAggFuncInHeader === undefined) {
+    if (!layout.SuppressAggFuncInHeader) {
         delete layout.SuppressAggFuncInHeader;
     }
     if (layout.PivotAggregationColumns && !layout.PivotAggregationColumns.length) {