@adaptabletools/adaptable 21.0.10 → 21.0.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "21.0.10",
+  "version": "21.0.12",
   "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/AdaptablePredicate.js

@@ -32,11 +32,13 @@ export const SystemPredicateDefs = [
                 if (!predicateInput) {
                     return;
                 }
-                if (adaptableApi.columnScopeApi.isScopeInScope(predicateInput.columnScope, 
-                // 'In' ColumnScope
-                {
-                    DataTypes: ['text', 'number', 'date', 'textArray', 'numberArray'],
-                })) {
+                // make sure that the input Predicate  is included in the 'In' Predicate
+                if (adaptableApi.columnScopeApi.scopeIsAll(predicateInput.columnScope) ||
+                    adaptableApi.columnScopeApi.isScopeInScope(predicateInput.columnScope, 
+                    // 'In' ColumnScope
+                    {
+                        DataTypes: ['text', 'number', 'date', 'textArray', 'numberArray'],
+                    })) {
                     return predicateInput;
                 }
             })
@@ -113,11 +115,13 @@ export const SystemPredicateDefs = [
                 if (!predicateInput) {
                     return;
                 }
-                if (adaptableApi.columnScopeApi.isScopeInScope(predicateInput.columnScope, 
-                // 'NotIn' ColumnScope
-                {
-                    DataTypes: ['text', 'number', 'date', 'textArray', 'numberArray'],
-                })) {
+                // make sure that the input Predicate  is included in the 'NotIn' Predicate
+                if (adaptableApi.columnScopeApi.scopeIsAll(predicateInput.columnScope) ||
+                    adaptableApi.columnScopeApi.isScopeInScope(predicateInput.columnScope, 
+                    // 'NotIn' ColumnScope
+                    {
+                        DataTypes: ['text', 'number', 'date', 'textArray', 'numberArray'],
+                    })) {
                     return predicateInput;
                 }
             })

package/src/Utilities/Extensions/StringExtensions.js

@@ -6,7 +6,7 @@ export function IsNotNull(stringToCheck) {
     return !IsNull(stringToCheck);
 }
 export function IsEmpty(stringToCheck) {
-    return stringToCheck == '';
+    return stringToCheck === '';
 }
 export function IsNotEmpty(stringToCheck) {
     return !IsEmpty(stringToCheck);
@@ -18,7 +18,7 @@ export function IsNotNullOrEmpty(stringToCheck) {
     return !IsNullOrEmpty(stringToCheck);
 }
 export function IsNullOrEmptyOrWhiteSpace(stringToCheck) {
-    return IsNullOrEmpty(stringToCheck) || IsEmpty(stringToCheck.trim());
+    return IsNullOrEmpty(stringToCheck) || IsEmpty(stringToCheck?.trim());
 }
 export function IsNotNullOrEmptyOrWhiteSpace(stringToCheck) {
     return !IsNullOrEmptyOrWhiteSpace(stringToCheck);

package/src/View/Components/FilterForm/ListBoxFilterForm.js

@@ -15,8 +15,7 @@ export const ColumnValuesSelect = (props) => {
         if (!isActive && distinctValue.value && distinctValue.value instanceof Date) {
             isActive = selectedColumnValues.some((dateStr) => isEqual(parseDateValue(dateStr), parseDateValue(distinctValue.value)));
         }
-        const columnLabel = distinctValue.label;
-        if (StringExtensions.IsNullOrEmpty(columnLabel)) {
+        if (StringExtensions.IsNullOrEmpty(distinctValue.value)) {
             return false;
         }
         if (isActive) {

package/src/agGrid/AdaptableAgGrid.js

@@ -2463,7 +2463,10 @@ You need to define at least one Layout!`);
                 const value = gridCell.rawValue;
                 // we want to filter out empty values
                 if (value === '' || value === null || value === undefined) {
-                    return;
+                    // 2025-10-31: we want to allow empty values to be included
+                    // after all - they are not displayed by default
+                    // but will be accessible in the customInFilterValues callback
+                    // return;
                 }
                 gridCells.push(gridCell);
             }

package/src/agGrid/AgGridAdapter.js

@@ -8,6 +8,7 @@ import { agGridDataTypeDefinitions, ALL_ADAPTABLE_DATA_TYPES } from './agGridDat
 import { isPivotGrandTotal } from '../Api/Implementation/ColumnApiImpl';
 import { isPivotColumnTotal } from '../layout-manager/src/isPivotColumnTotal';
 import { isPivotAggTotalColumn } from '../layout-manager/src/isPivotAggTotalColumn';
+import { isWeightedAverageAggFuncName } from '../AdaptableState/Common/AggregationColumns';
 // 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;
@@ -608,9 +609,10 @@ export class AgGridAdapter {
         return false;
     }
     getColumnAggregationFunctions(colDef) {
-        const result = colDef.allowedAggFuncs || ['sum', 'min', 'max', 'count', 'avg', 'first', 'last']; // those are the default fns aggrid supports out-of-the-box
+        let result = [].concat(colDef.allowedAggFuncs || ['sum', 'min', 'max', 'count', 'avg', 'first', 'last']); // those are the default fns aggrid supports out-of-the-box
         const gridOptionsAggFuncs = this.adaptableApi.agGridApi.getGridOption('aggFuncs') || {};
         result.push(...Object.keys(gridOptionsAggFuncs));
+        result = result.filter((func) => !isWeightedAverageAggFuncName(func));
         return [...new Set(result)];
     }
     isTreeColumn(isGeneratedRowGroupColumn) {

package/src/agGrid/AgGridColumnAdapter.js

@@ -17,6 +17,7 @@ import { AdaptableFilterHandler } from './AdaptableFilterHandler';
 import { AgGridFilterAdapterFactory } from './AgGridFilterAdapter';
 import { AgGridFloatingFilterAdapterFactory } from './AgGridFloatingFilterAdapter';
 import { errorOnce } from './AdaptableLogger';
+import { isWeightedAverageAggFuncName } from '../AdaptableState/Common/AggregationColumns';
 export function getEditorForColumnDataType(columnDataType, variant) {
     if (columnDataType === 'number') {
         return variant === 'react' ? AdaptableReactNumberEditor : AdaptableNumberEditor;
@@ -516,7 +517,10 @@ export class AgGridColumnAdapter {
     }
     setupColumnAllowedAggFuncs({ col, abColumn }) {
         this.setColDefProperty(col, 'allowedAggFuncs', () => {
-            return abColumn.availableAggregationFunctions;
+            if (!abColumn.availableAggregationFunctions) {
+                return undefined;
+            }
+            return abColumn.availableAggregationFunctions.filter((func) => !isWeightedAverageAggFuncName(func));
         });
     }
     setupColumnType(columnSetupInfo) {

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: 1761827363149 || Date.now(),
-    VERSION: "21.0.10" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1762861055223 || Date.now(),
+    VERSION: "21.0.12" || '--current-version--',
 };