@adaptabletools/adaptable 20.3.0-canary.1 → 20.3.0-canary.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "20.3.0-canary.1",
+  "version": "20.3.0-canary.2",
   "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/DefaultAdaptableOptions.js

@@ -153,6 +153,7 @@ const DefaultAdaptableOptions = {
             defaultNumericColumnFilter: 'Equals',
             defaultTextColumnFilter: 'Contains',
             defaultDateColumnFilter: 'On',
+            defaultArrayColumnFilter: 'In',
             hideQuickFilterDropdown: undefined,
             hideQuickFilterInput: undefined,
             quickFilterDebounce: 250,

package/src/AdaptableOptions/FilterOptions.d.ts

@@ -106,6 +106,13 @@ export interface ColumnFilterOptions<TData = any> {
      * @gridInfoItem
      */
     defaultDateColumnFilter?: StrictExtract<SystemFilterPredicateId, 'After' | 'Before' | 'On' | 'NotOn' | 'In'> | ((adaptableColumnContext: AdaptableColumnContext<TData>) => StrictExtract<SystemFilterPredicateId, 'After' | 'Before' | 'On' | 'NotOn' | 'In'>);
+    /**
+     * Default filter type for array Columns ('textArray', 'numberArray', etc.)
+     *
+     * @defaultValue In
+     * @gridInfoItem
+     */
+    defaultArrayColumnFilter?: StrictExtract<SystemFilterPredicateId, 'In' | 'NotIn' | 'Blanks' | 'NonBlanks'> | ((adaptableColumnContext: AdaptableColumnContext<TData>) => StrictExtract<SystemFilterPredicateId, 'In' | 'NotIn' | 'Blanks' | 'NonBlanks'>);
     /**
      * Hides Dropdown in Quick Filter Bar for a given Column
      *

package/src/AdaptableState/Common/AdaptablePredicate.js

@@ -172,7 +172,12 @@ export const SystemPredicateDefs = [
         icon: { name: 'unfilled-circle' },
         columnScope: { All: true },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn', 'badgeStyle'],
-        handler: ({ value }) => Helper.isInputNullOrEmpty(value),
+        handler: ({ value, column, adaptableApi }) => {
+            if (adaptableApi.columnApi.internalApi.hasArrayDataType(column)) {
+                return value == undefined || value.length === 0;
+            }
+            return Helper.isInputNullOrEmpty(value);
+        },
     },
     {
         id: 'NonBlanks',
@@ -180,7 +185,12 @@ export const SystemPredicateDefs = [
         icon: { name: 'filled-circle' },
         columnScope: { All: true },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn', 'badgeStyle'],
-        handler: ({ value }) => Helper.isInputNotNullOrEmpty(value),
+        handler: ({ value, column, adaptableApi }) => {
+            if (adaptableApi.columnApi.internalApi.hasArrayDataType(column)) {
+                return value == undefined || value.length === 0;
+            }
+            return Helper.isInputNotNullOrEmpty(value);
+        },
     },
     // Numeric System Filters
     {

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

@@ -152,6 +152,26 @@ export const mapColumnFilterToQlPredicate = (columnFilter, abColumn, qlPredicate
             case 'boolean':
                 defaultQlPredicate = { operator: 'BooleanToggle', args: [] };
                 break;
+            case 'textArray':
+            case 'numberArray':
+                let defaultQlArrayPredicate;
+                const defaultArrayColumnFilter = columnFilterOptions.defaultArrayColumnFilter;
+                if (defaultArrayColumnFilter) {
+                    if (typeof defaultArrayColumnFilter === 'function') {
+                        const context = {
+                            column: abColumn,
+                            ...api.internalApi.buildBaseContext(),
+                        };
+                        defaultQlArrayPredicate = defaultArrayColumnFilter(context);
+                    }
+                    else {
+                        defaultQlArrayPredicate = defaultArrayColumnFilter;
+                    }
+                }
+                defaultQlPredicate = defaultQlArrayPredicate
+                    ? { operator: defaultQlArrayPredicate, args: [] }
+                    : { operator: 'In', args: [] };
+                break;
         }
         if (defaultQlPredicate === null) {
             // take the firstavailable one

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: 1752759816335 || Date.now(),
-    VERSION: "20.3.0-canary.1" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1752841742262 || Date.now(),
+    VERSION: "20.3.0-canary.2" || '--current-version--',
 };