@adaptabletools/adaptable 20.3.0-canary.1 → 20.3.0

package/package.json

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

@@ -57,6 +57,9 @@ export interface BaseColumnHeaderContext extends BaseContext {
      */
     currentLayout: Layout;
 }
+/**
+ * Context for Columns created automatically by AG Grid when grouping
+ */
 export interface AutoGroupColumnHeaderContext extends BaseColumnHeaderContext {
     /**
      * Auto-generated Group Column when GroupDisplayType is `single` column
@@ -71,11 +74,14 @@ export interface AutoGroupColumnHeaderContext extends BaseColumnHeaderContext {
      */
     groupedColumnIds: string[];
 }
+/**
+ * Context for Columns created when Row Grouping
+ */
 export interface RowGroupColumnHeaderContext extends BaseColumnHeaderContext {
     /**
-     * Group Columns - see `TableLayout.RowGroupedColumns` or `PivotLayout.PivotGroupedColumns`
+     * A Row Grouped Column - see `TableLayout.RowGroupedColumns` or `PivotLayout.PivotGroupedColumns`
      */
-    columnType: 'groupColumn';
+    columnType: 'rowGroupColumn';
     /**
      * Technical ID of the Column
      */
@@ -85,6 +91,9 @@ export interface RowGroupColumnHeaderContext extends BaseColumnHeaderContext {
      */
     groupColumnId: string;
 }
+/**
+ * Context for standard Table Layout Columns
+ */
 export interface TableColumnHeaderContext extends BaseColumnHeaderContext {
     /**
      *  Table Column - see `TableLayout.TableColumns`
@@ -99,9 +108,12 @@ export interface TableColumnHeaderContext extends BaseColumnHeaderContext {
      */
     aggregation?: string;
 }
+/**
+ * Context for Column Group headers
+ */
 export interface TableColumnGroupHeaderContext extends BaseColumnHeaderContext {
     /**
-     * Column Group - see https://www.ag-grid.com/javascript-data-grid/column-groups/
+     * Column Group (used when Column Grouping)
      */
     columnType: 'tableColumnGroup';
     /**
@@ -117,9 +129,12 @@ export interface TableColumnGroupHeaderContext extends BaseColumnHeaderContext {
      */
     state: 'expanded' | 'collapsed';
 }
+/**
+ * Context for Pivot Column Groups
+ */
 export interface PivotColumnGroupHeaderContext extends BaseColumnHeaderContext {
     /**
-     * Pivot Column - see `PivotLayout.PivotColumns`
+     * Pivot Column Column - created by `PivotLayout.PivotColumns`
      */
     columnType: 'pivotColumnGroup';
     /**
@@ -135,11 +150,14 @@ export interface PivotColumnGroupHeaderContext extends BaseColumnHeaderContext {
      */
     state: 'expanded' | 'collapsed';
 }
-export interface PivotAggregationColumnHeaderContext extends BaseColumnHeaderContext {
+/**
+ * Context for Pivot Result Columns
+ */
+export interface PivotResultColumnHeaderContext extends BaseColumnHeaderContext {
     /**
-     * Pivot Aggregation Column - see `PivotLayout.PivotAggregationColumns`
+     * Pivot Result Column - intersecton of `PivotLayout.PivotAggregationColumns` and `PivotLayout.PivotColumns`
      */
-    columnType: 'pivotAggregationColumn';
+    columnType: 'pivotResultColumn';
     /**
      * Technical ID of the generated Column
      */
@@ -157,6 +175,9 @@ export interface PivotAggregationColumnHeaderContext extends BaseColumnHeaderCon
      */
     aggregation: string;
 }
+/**
+ * Context for Pivot Grand Total Columns
+ */
 export interface PivotGrandTotalHeaderContext extends BaseColumnHeaderContext {
     /**
      * Pivot Grand Total - see `PivotLayout.PivotGrandTotal`
@@ -171,6 +192,9 @@ export interface PivotGrandTotalHeaderContext extends BaseColumnHeaderContext {
      */
     aggregation: string;
 }
+/**
+ * Context for Pivot Total Columns
+ */
 export interface PivotColumnTotalHeaderContext extends BaseColumnHeaderContext {
     /**
      * Pivot Column Total - see `PivotLayout.PivotColumnTotal`
@@ -189,6 +213,9 @@ export interface PivotColumnTotalHeaderContext extends BaseColumnHeaderContext {
      */
     aggregation: string;
 }
+/**
+ * Context for Pivot Aggregation Totals
+ */
 export interface PivotAggregationTotalHeaderContext extends BaseColumnHeaderContext {
     /**
      * Pivot Aggregation Total Column - see `PivotLayout.PivotAggregationColumns.TotalColumn`
@@ -211,153 +238,10 @@ export interface PivotAggregationTotalHeaderContext extends BaseColumnHeaderCont
      */
     pivotKey: string;
 }
-export type ColumnHeaderContext = TableColumnHeaderContext | TableColumnGroupHeaderContext | AutoGroupColumnHeaderContext | RowGroupColumnHeaderContext | PivotColumnGroupHeaderContext | PivotAggregationColumnHeaderContext | PivotGrandTotalHeaderContext | PivotColumnTotalHeaderContext | PivotAggregationTotalHeaderContext;
-export type ColumnHeaderContextOld = BaseColumnHeaderContext & ({
-    /**
-     * Auto-generated Group Column when GroupDisplayType is `single` column
-     */
-    columnType: 'autoGroupColumn';
-    /**
-     * Technical ID of the Column
-     */
-    columnId: string;
-    /**
-     * IDs of the Columns that are grouped
-     */
-    groupedColumnIds: string[];
-} | {
-    /**
-     * Group Columns - see `TableLayout.RowGroupedColumns` or `PivotLayout.PivotGroupedColumns`
-     */
-    columnType: 'groupColumn';
-    /**
-     * Technical ID of the Column
-     */
-    columnId: string;
-    /**
-     * ID of the grouped Column
-     */
-    groupColumnId: string;
-} | {
-    /**
-     *  Table Column - see `TableLayout.TableColumns`
-     */
-    columnType: 'tableColumn';
-    /**
-     * Technical ID of the Column
-     */
-    columnId: string;
-    /**
-     * Optional Aggregation function of the Column - see `TableLayout.TableAggregationColumns`
-     */
-    aggregation?: string;
-} | {
-    /**
-     * Column Group - see https://www.ag-grid.com/javascript-data-grid/column-groups/
-     */
-    columnType: 'tableColumnGroup';
-    /**
-     * Technical ID of the Column Group - see `ColGroupDef.groupId`
-     */
-    groupId: string;
-    /**
-     * IDs of the Column Group children - see `ColGroupDef.children`
-     */
-    childrenColumnIds: string[];
-    /**
-     * State of the Column Group
-     */
-    state: 'expanded' | 'collapsed';
-} | {
-    /**
-     * Pivot Column - see `PivotLayout.PivotColumns`
-     */
-    columnType: 'pivotColumnGroup';
-    /**
-     * Technical ID of the generated Column Group
-     */
-    groupId: string;
-    /**
-     * Pivot Keys for the current Column Group
-     */
-    pivotKeys: string[];
-    /**
-     * State of the Column Group
-     */
-    state: 'expanded' | 'collapsed';
-} | {
-    /**
-     * Pivot Aggregation Column - see `PivotLayout.PivotAggregationColumns`
-     */
-    columnType: 'pivotAggregationColumn';
-    /**
-     * Technical ID of the generated Column
-     */
-    columnId: string;
-    /**
-     * Current Pivot Keys
-     */
-    pivotKeys: string[];
-    /**
-     * ID of the Aggregated Column - see `PivotLayout.PivotAggregationColumns`
-     */
-    aggregatedColumnId: string;
-    /**
-     *  Aggregation function of the Column - see `PivotLayout.PivotAggregationColumns.AggregationColumnValue`
-     */
-    aggregation: string;
-} | {
-    /**
-     * Pivot Grand Total - see `PivotLayout.PivotGrandTotal`
-     */
-    columnType: 'pivotGrandTotal';
-    /**
-     * ID of the Aggregated Column - see `PivotLayout.PivotAggregationColumns`
-     */
-    aggregatedColumnId: string;
-    /**
-     *  Aggregation function of the Column - see `PivotLayout.PivotAggregationColumns.AggregationColumnValue`
-     */
-    aggregation: string;
-} | {
-    /**
-     * Pivot Column Total - see `PivotLayout.PivotColumnTotal`
-     */
-    columnType: 'pivotColumnTotal';
-    /**
-     * Current Pivot Keys
-     */
-    pivotKey: string;
-    /**
-     * ID of the Pivot Column - see `PivotLayout.PivotColumns`
-     */
-    pivotColumnId: string;
-    /**
-     *  Aggregation function of the Column - see `PivotLayout.PivotAggregationColumns.AggregationColumnValue`
-     */
-    aggregation: string;
-} | {
-    /**
-     * Pivot Aggregation Total Column - see `PivotLayout.PivotAggregationColumns.TotalColumn`
-     */
-    columnType: 'pivotAggregationTotal';
-    /**
-     * ID of the Aggregated Column - see `PivotLayout.PivotAggregationColumns`
-     */
-    aggregatedColumnId: string;
-    /**
-     *  Aggregation function of the Column - see `PivotLayout.PivotAggregationColumns.AggregationColumnValue`
-     */
-    aggregation: string;
-    /**
-     * ID of the Pivot Column - see `PivotLayout.PivotColumns`
-     */
-    pivotColumnId: string;
-    /**
-     * Current Pivot Keys
-     */
-    pivotKey: string;
-});
+/**
+ * Context provided to columnHeader function custom Headers to be provided for any type of AG Grid Column
+ */
+export type ColumnHeaderContext = TableColumnHeaderContext | TableColumnGroupHeaderContext | AutoGroupColumnHeaderContext | RowGroupColumnHeaderContext | PivotColumnGroupHeaderContext | PivotResultColumnHeaderContext | PivotGrandTotalHeaderContext | PivotColumnTotalHeaderContext | PivotAggregationTotalHeaderContext;
 /**
  * Context used when setting a Column Friendly Name
  */

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/AdaptableState/Common/CustomWindowConfig.d.ts

@@ -1,51 +1,51 @@
 import { AdaptableSystemIconName } from '../../types';
 import { CustomRenderContext, AdaptableFrameworkComponent } from '../../agGrid/AdaptableFrameworkComponent';
 /**
- * Config used to open a custom window
+ * Config used to open a Custom Window
  */
 export interface CustomWindowConfig {
     /**
-     * Unique identifier for the custom window.
+     * Unique identifier for Custom Window
      */
     id: string;
     /**
-     * Title of the custom window.
+     * Title of Custom Window
      */
     title?: string;
     /**
-     * Icon to display in the custom window heading.
+     * Icon to display in Custom Window header
      */
     icon?: AdaptableSystemIconName;
     /**
-     * Render function to display custom content in the window (if not using a framework component).
+     * Render function to display content in Custom Window(if not using a framework component)
      */
     render?: (customRenderContext: CustomRenderContext) => string | null;
     /**
-     * A React, Angular or Vue Framework component to use for the custom window content.
+     * React, Angular or Vue Framework component to use for Custom Window content
      */
     frameworkComponent?: AdaptableFrameworkComponent;
     /**
-     * Callback function to be called when the framework component is destroyed.
+     * Callback function to be called when the framework component is destroyed
      */
     onFrameworkComponentDestroyed?: () => void;
     /**
-     * Window position in pixels.
+     * Size of window in pixels (provided as width, height)
      */
     size?: WindowSize;
     /**
-     * Position of the window in pixels.
+     * Position of window in pixels (provided as x, y)
      */
     position?: WindowPosition;
 }
 /**
- * Defines size of a custom window
+ * Defines size of a Custom Window
  */
 export interface WindowSize {
     width: number;
     height: number;
 }
 /**
- * Defines position of a custom window
+ * Defines position of a Custom Window
  */
 export interface WindowPosition {
     x: number;

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

@@ -17,10 +17,7 @@ export interface ProgressIndicatorConfig {
      */
     frameworkComponent?: AdaptableFrameworkComponent;
     /**
-     * Determines how the custom component is rendered:
-     * - "content" (default): Inside the default Dialog with spinner
-     * - "dialog": As a complete replacement for the Dialog
-     * Applies to both frameworkComponent and render parameters.
+     * Determines whether custom component is rendered as "content" (inside window) or "dialog" (replacing window)
      */
     renderMode?: 'content' | 'dialog';
     /**

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

@@ -15,7 +15,7 @@ export interface RowScope {
      */
     ExcludeSummaryRows?: boolean;
     /**
-     * Exclude Grand Total Rows
+     * Exclude Grand Total Rows (used in Aggregations)
      */
     ExcludeTotalRows?: boolean;
 }

package/src/AdaptableState/FormatColumnState.d.ts

@@ -26,17 +26,17 @@ export interface FormatColumn extends SuspendableObject {
      */
     Scope: ColumnScope;
     /**
-     * Which part of the Column to apply Format to: `cell`, `column header`
+     * Where in Column to apply Format (`cell` or `columnHeader`)
      *
-     * @defaultValue ['cell']
+     * @defaultValue 'cell'
      */
-    Target?: FormatColumnTarget[];
+    Target?: FormatColumnTarget;
     /**
      * Rule to decide whether to apply Format; if undefined Format is always applied
      */
     Rule?: FormatColumnRule;
     /**
-     * Style to apply
+     * AdapTable Style to apply
      */
     Style?: AdaptableStyle;
     /**
@@ -44,21 +44,21 @@ export interface FormatColumn extends SuspendableObject {
      */
     DisplayFormat?: AdaptableFormat;
     /**
-     * Aligns cells 'Left' or 'Right' or 'Center'
+     * Align cells 'Left' or 'Right' or 'Center'
      */
     CellAlignment?: CellAlignment;
     /**
-     * Which types of Rows should be formatted (data, grouped, summary)
+     * Which types of Rows to apply format (data, grouped, summary, total)
      */
     RowScope?: RowScope;
     /**
-     * When to format Columns in Column Groups ('Expanded', 'Collapsed' or 'Both')
+     * When to format Columns in Column Groups ('Expanded', 'Collapsed', 'Both')
      *
      */
     ColumnGroupScope?: ColumnGroupScope;
 }
 /**
- * Target for Format Column: Specifies which visual elements of the column receive formatting
+ * Specifies whether Column's cells or header is formatted
  */
 export type FormatColumnTarget = 'cell' | 'columnHeader';
 /**

package/src/Api/Internal/ColumnInternalApi.js

@@ -141,7 +141,7 @@ export class ColumnInternalApi extends ApiBase {
             };
         }
         if (params.column?.getColId().startsWith(`${AG_GRID_GROUPED_COLUMN}-`)) {
-            const columnType = 'groupColumn';
+            const columnType = 'rowGroupColumn';
             const columnId = params.column.getColId();
             // remove `${AG_GRID_GROUPED_COLUMN}-` from beginning of columnId
             const groupColumnId = columnId.substring(`${AG_GRID_GROUPED_COLUMN}-`.length);
@@ -261,7 +261,7 @@ export class ColumnInternalApi extends ApiBase {
                     };
                 }
                 if (isPivotResultColumn(columnId)) {
-                    const columnType = 'pivotAggregationColumn';
+                    const columnType = 'pivotResultColumn';
                     const pivotValueCol = params.colDef.pivotValueColumn;
                     const aggregatedColumnId = pivotValueCol?.getColId();
                     const currentLayoutAggCols = currentPivotLayout.PivotAggregationColumns?.map((col) => col.ColumnId);

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

@@ -1,4 +1,4 @@
-import { IRowNode } from 'ag-grid-enterprise';
+import { HeaderValueGetterParams, IRowNode } from 'ag-grid-enterprise';
 import { AdaptableColumn, AdaptableFormat, AdaptablePredicateDef, ColumnScope, FormatColumn, FormatColumnTarget, StringFormatterOptions } from '../../types';
 import { ApiBase } from '../Implementation/ApiBase';
 export declare class FormatColumnInternalApi extends ApiBase {
@@ -49,7 +49,8 @@ export declare class FormatColumnInternalApi extends ApiBase {
      * @param config
      * @returns list of FormatColumn
      */
-    getFormatColumnsWithDisplayFormatForColumn(column: AdaptableColumn, config?: {
+    getFormatColumnsWithDisplayFormatForColumn(column: AdaptableColumn, config: {
+        target: FormatColumnTarget;
         includeSuspended?: boolean;
     }): FormatColumn[];
     /**
@@ -129,4 +130,5 @@ export declare class FormatColumnInternalApi extends ApiBase {
      * Retrieves the columns that need rerendering based on format column predicates.
      */
     getFormatColumnColumnsDependentOnColumnChange(column: AdaptableColumn): string[];
+    formatColumnHeaderName(headerName: string, params: HeaderValueGetterParams): string;
 }

package/src/Api/Internal/FormatColumnInternalApi.js

@@ -78,8 +78,8 @@ export class FormatColumnInternalApi extends ApiBase {
         const formatColumns = this.getAllFormatColumnWithStyleAndCellAlignment()
             .filter((formatColumn) => {
             // FormatColumn default target is 'cell', so if no target is specified, we assume 'cell'
-            const fcTarget = formatColumn.Target ?? ['cell'];
-            return fcTarget.includes(config.target);
+            const fcTarget = formatColumn.Target ?? 'cell';
+            return fcTarget === config.target;
         })
             .filter((formatColumn) => config?.includeSuspended || !formatColumn.IsSuspended);
         return this.getFormatColumnWithColumnInScope(formatColumns, column);
@@ -116,7 +116,13 @@ export class FormatColumnInternalApi extends ApiBase {
      * @returns list of FormatColumn
      */
     getFormatColumnsWithDisplayFormatForColumn(column, config) {
-        const formatColumns = this.getAllFormatColumnWithDisplayFormat().filter((formatColumn) => config?.includeSuspended || !formatColumn.IsSuspended);
+        const formatColumns = this.getAllFormatColumnWithDisplayFormat()
+            .filter((formatColumn) => {
+            // FormatColumn default target is 'cell', so if no target is specified, we assume 'cell'
+            const fcTarget = formatColumn.Target ?? 'cell';
+            return fcTarget === config.target;
+        })
+            .filter((formatColumn) => config?.includeSuspended || !formatColumn.IsSuspended);
         return this.getFormatColumnWithColumnInScope(formatColumns, column);
     }
     /**
@@ -356,4 +362,27 @@ export class FormatColumnInternalApi extends ApiBase {
         });
         return [...columnsThatNeedRefresh];
     }
+    formatColumnHeaderName(headerName, params) {
+        // currently we only format the header name for normal columns (NOT column groups)
+        if (!params.column) {
+            return headerName;
+        }
+        const abColumn = this.getColumnApi().getColumnWithColumnId(params.column.getColId());
+        const activeFormatColumnsWithDisplayFormat = this.getFormatColumnApi().internalApi.getFormatColumnsWithDisplayFormatForColumn(abColumn, {
+            target: 'columnHeader',
+        });
+        if (!activeFormatColumnsWithDisplayFormat.length) {
+            return headerName;
+        }
+        const mostRelevantFormatColumn = activeFormatColumnsWithDisplayFormat.find((formatColumn) => this.formatColumnShouldRenderInHeader(formatColumn, abColumn));
+        if (!mostRelevantFormatColumn) {
+            return headerName;
+        }
+        if (mostRelevantFormatColumn.DisplayFormat?.Formatter !== 'StringFormatter') {
+            // headers are always strings, so we can only use StringFormatter
+            return headerName;
+        }
+        const formattedHeaderName = this.getFormatColumnApi().internalApi.getStringFormattedValue(headerName, null, abColumn, mostRelevantFormatColumn.DisplayFormat.Options);
+        return formattedHeaderName;
+    }
 }

package/src/Strategy/FormatColumnModule.js

@@ -10,6 +10,7 @@ import { MoveFormatColumn } from '../View/FormatColumn/MoveFormatColumn';
 import { getObjectTagsViewItems } from '../Utilities/getObjectTagsViewItems';
 import { getRuleViewItems } from '../Utilities/getRuleViewItems';
 import { getScopeViewItems } from '../Utilities/getScopeViewItems';
+import { getFormatColumnSettingsTargetItems } from './Utilities/FormatColumn/getFormatColumnSettingsTargetItems';
 export class FormatColumnModule extends AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.FormatColumnModuleId, ModuleConstants.FormatColumnFriendlyName, 'color-palette', 'FormatColumnPopup', 'Create a column style, display format or cell alignment', api);
@@ -82,6 +83,7 @@ export class FormatColumnModule extends AdaptableModuleBase {
             abObject: formatColumn,
             items: [
                 getScopeViewItems(formatColumn.Scope, this.api),
+                getFormatColumnSettingsTargetItems(formatColumn),
                 formatColumn.Rule && getRuleViewItems(formatColumn.Rule, this.api),
                 {
                     name: 'Style',

package/src/Strategy/Utilities/FormatColumn/getFormatColumnSettingsTargetItems.d.ts

@@ -0,0 +1,5 @@
+import { FormatColumn } from '../../../AdaptableState/FormatColumnState';
+export declare const getFormatColumnSettingsTargetItems: (formatColumn: FormatColumn) => {
+    name: string;
+    values: string[];
+};

package/src/Strategy/Utilities/FormatColumn/getFormatColumnSettingsTargetItems.js

@@ -0,0 +1,12 @@
+export const getFormatColumnSettingsTargetItems = (formatColumn) => {
+    if (!formatColumn.Target || formatColumn.Target === 'cell') {
+        return {
+            name: 'Target',
+            values: ['Column Cells'],
+        };
+    }
+    return {
+        name: 'Target',
+        values: ['Column Header'],
+    };
+};

package/src/Utilities/ObjectFactory.js

@@ -230,6 +230,7 @@ export function CreateEmptyFormatColumn() {
         DisplayFormat: undefined,
         CellAlignment: undefined,
         RowScope: undefined,
+        Target: 'cell'
     };
 }
 export function CreateEmptyFreeTextColumn(defaultSpecialColumnSettings) {

package/src/Utilities/getScopeViewItems.js

@@ -1,3 +1,4 @@
+import StringExtensions from './Extensions/StringExtensions';
 export const getScopeViewItems = (scope, api) => {
     let values = [];
     if ('ColumnIds' in scope && Array.isArray(scope.ColumnIds)) {
@@ -5,7 +6,9 @@ export const getScopeViewItems = (scope, api) => {
         values = scope.ColumnIds.map((columnId) => api.columnApi.getFriendlyNameForColumnId(columnId)).filter(Boolean);
     }
     if ('DataTypes' in scope) {
-        values = scope.DataTypes;
+        values = scope.DataTypes.map((d) => {
+            return 'Data Type: ' + StringExtensions.CapitaliseFirstLetter(d);
+        });
     }
     if ('All' in scope) {
         values = ['All Columns'];
@@ -14,7 +17,7 @@ export const getScopeViewItems = (scope, api) => {
         values = scope.ColumnTypes;
     }
     return {
-        label: 'Scope & Target',
+        label: 'Scope',
         name: 'Target',
         values,
     };

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