@adaptabletools/adaptable 12.0.0-canary.0 → 12.0.0-canary.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "12.0.0-canary.0",
+  "version": "12.0.0-canary.1",
   "description": "Powerful data-agnostic HTML5 datagrid add-on that sits on top of an underlying grid component and provides all the rich functionality that advanced users expect from their DataGrids and Data Tables",
   "keywords": [
     "web-components",
@@ -31,7 +31,7 @@
   "main": "agGrid.js",
   "typings": "types.d.ts",
   "dependencies": {
-    "@infinite-table/infinite-react": "0.0.1-canary.11",
+    "@infinite-table/infinite-react": "0.3.10",
     "date-fns": "2.22.1",
     "debug": "^4.3.1",
     "isomorphic-fetch": "^2.2.1",

package/publishTimestamp.d.ts

@@ -1,2 +1,2 @@
-declare const _default: 1654532122066;
+declare const _default: 1654683345204;
 export default _default;

package/publishTimestamp.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = 1654532122066;
+exports.default = 1654683345204;

package/src/AdaptableOptions/EditOptions.d.ts

@@ -1,5 +1,6 @@
 import { RowNode } from '@ag-grid-community/all-modules';
-import { AdaptableButton, AdaptableColumn, AdaptableFormData, BaseContext, RowFormSubmittedInfo, RowFormType } from '../../types';
+import { AdaptableButton, AdaptableColumn, BaseContext, RowFormSubmittedInfo, RowFormType } from '../../types';
+import { FormContext } from '../PredefinedConfig/Common/FormContext';
 import { CellDataChangedInfo } from '../PredefinedConfig/Common/CellDataChangedInfo';
 import { MathOperation } from '../PredefinedConfig/Common/Enums';
 import { GridCell } from '../PredefinedConfig/Selection/GridCell';
@@ -108,14 +109,12 @@ export interface RowFormOptions {
     onFormSubmit?: (rowFormSubmittedInfo: RowFormSubmittedInfo) => void;
 }
 export declare type RowFormContext = CreateRowFormContext | EditRowFormContext;
-export interface CreateRowFormContext extends BaseContext {
+export interface CreateRowFormContext extends FormContext {
     type: Extract<RowFormType, 'rowCreated'>;
-    formData: AdaptableFormData;
     clonedRowNode?: RowNode;
 }
-export interface EditRowFormContext extends BaseContext {
+export interface EditRowFormContext extends FormContext {
     type: Extract<RowFormType, 'rowEdited'>;
-    formData: AdaptableFormData;
     rowNode: RowNode;
 }
 export interface FormParamContext extends BaseContext {

package/src/AdaptableOptions/ExportOptions.d.ts

@@ -1,4 +1,5 @@
-import { AdaptableForm, AdaptableFormData } from '../PredefinedConfig/Common/AdaptableForm';
+import { AdaptableForm } from '../PredefinedConfig/Common/AdaptableForm';
+import { FormContext } from '../PredefinedConfig/Common/FormContext';
 import { ReportData, Report, SystemReportNames } from '../PredefinedConfig/ExportState';
 import { BaseContext } from '../types';
 /**
@@ -77,7 +78,7 @@ export interface CustomDestination {
     /**
      * Optional Adaptable Form - if provided, it must include Buttons that will execute the export
      */
-    form?: AdaptableForm<ExportButtonContext>;
+    form?: AdaptableForm<ExportFormContext>;
     /**
      * Function invoked when export is applied (used if no form is supplied)
      */
@@ -86,7 +87,7 @@ export interface CustomDestination {
 /**
  * Context required by functions when using an Export Button
  */
-export interface ExportButtonContext extends BaseContext {
+export interface ExportFormContext extends FormContext {
     /**
      * The exported report
      */
@@ -99,10 +100,6 @@ export interface ExportButtonContext extends BaseContext {
      * Custom Export destination
      */
     customDestination: CustomDestination;
-    /**
-     * Adaptable Form Data
-     */
-    formData: AdaptableFormData;
 }
 export declare type SystemExportDestinations = SystemExportDestination[];
 export declare type SystemExportDestination = 'Excel' | 'CSV' | 'Clipboard' | 'JSON';

package/src/AdaptableOptions/GeneralOptions.d.ts

@@ -1,6 +1,7 @@
-import { AdaptableForm, AdaptableObject, AdaptableScope, BaseContext } from '../../types';
+import { AdaptableForm, AdaptableObject, AdaptableScope } from '../../types';
 import { AdaptableComparerFunction } from '../PredefinedConfig/Common/AdaptableComparerFunction';
 import { AlternativeModuleName } from '../PredefinedConfig/Common/AlternativeModuleName';
+import { FormContext } from '../PredefinedConfig/Common/FormContext';
 import { CellSummaryOperation } from '../PredefinedConfig/Common/CellSummary';
 /**
  * General options for configuring AdapTable including managing Primary Keys
@@ -88,5 +89,7 @@ export interface DataSet extends AdaptableObject {
     /**
      * Params for Data Set popup form
      */
-    form?: AdaptableForm<BaseContext>;
+    form?: AdaptableForm<DataSetFormContext>;
+}
+export interface DataSetFormContext extends FormContext {
 }

package/src/AdaptableOptions/UserInterfaceOptions.d.ts

@@ -111,13 +111,31 @@ export interface ActionOptions {
      *
      * @defaultValue undefined
      */
-    actionRowButtons?: ('clone' | 'edit' | 'delete')[];
+    actionRowButtons?: ('clone' | 'create' | 'edit' | 'delete')[];
     /**
      * Position of supplied Action Buttons
      *
      * @defaultValue 'pinnedLeft'
      */
     actionRowButtonsPosition?: 'pinnedLeft' | 'pinnedRight';
+    /**
+     * If set to true, the Action Row Buttons will be handled by AdapTable and the grid data model will be automatically updated with the created/edited/deleted rows
+     *
+     * @defaultValue false
+     */
+    autoHandleActionRowButtons?: boolean;
+    /**
+     * Function which is called when auto-handling the 'create' Action Row Button. The returned row value should have a valid(unique) primary key value.
+     *
+     * @defaultValue undefined
+     */
+    setPrimaryKeyValue?: (context: SetPrimaryKeyValueContext) => any;
+}
+/**
+ * The context for the SetPrimaryKeyValueContext function
+ */
+export interface SetPrimaryKeyValueContext extends BaseContext {
+    rowData: any;
 }
 /**
  * A Special Column that wraps an AdapTable Button

package/src/Api/ColumnApi.d.ts

@@ -1,5 +1,4 @@
 import { AdaptableColumn, AdaptableColumnDataType } from '../PredefinedConfig/Common/AdaptableColumn';
-import { DataType } from '../PredefinedConfig/Common/Enums';
 import { Column, RowNode } from '@ag-grid-community/all-modules';
 import { GridCell } from '../../types';
 /**
@@ -59,7 +58,7 @@ export interface ColumnApi {
      * Returns all Columns that have given DataType
      * @param dataType the DataType of the Columns to retrieve
      */
-    getColumnsOfType(dataType: DataType): AdaptableColumn[];
+    getColumnsOfType(dataType: AdaptableColumnDataType): AdaptableColumn[];
     /**
      * Selects (highlights) a Column
      * @param columnId Column to select
@@ -294,4 +293,10 @@ export interface ColumnApi {
      * @param expression Expression to Lookup
      */
     isColumnReferencedInExpression(columnId: string, expression: string): boolean;
+    /**
+     * Checks if a column is a ActionRowButton column (see UserInterfaceOptions.ActionOptions)
+     *
+     * @param columnId Column to Check
+     */
+    isActionRowButtonColumn(columnId: string): boolean;
 }

package/src/Api/EventApi.d.ts

@@ -195,7 +195,18 @@ export interface EventApi {
      * Unsubscribe from LiveDataChanged
      */
     off(eventName: 'LiveDataChanged', callback: (liveDataChangedInfo: LiveDataChangedInfo) => void): void;
+    /**
+     * Event fired when a Row Form is submitted
+     *
+     * @param eventName RowFormSubmitted
+     * @param callback RowFormSubmittedInfo
+     */
     on(eventName: 'RowFormSubmitted', callback: (rowEditedFormInfo: RowFormSubmittedInfo) => void): () => void;
+    /**
+     * Unsubscribe from RowFormSubmitted
+     * @param eventName RowFormSubmitted
+     * @param callback
+     */
     off(eventName: 'RowFormSubmitted', callback: (rowEditedFormInfo: RowFormSubmittedInfo) => void): void;
     /**
      * Event fired when a DataSet is changed

package/src/Api/Events/SearchChanged.d.ts

@@ -24,7 +24,7 @@ export interface SearchChangedInfo extends BaseEventInfo {
  */
 export interface AdaptableSearchState {
     /**
-     * Current Data Source (if one selected)
+     * Current DataSet (if one selected)
      */
     dataSet: DataSet | undefined;
     /**

package/src/Api/ExportApi.d.ts

@@ -1,7 +1,7 @@
 import { AdaptableForm } from '../PredefinedConfig/Common/AdaptableForm';
 import { ExportState, Report, ReportData, ReportSchedule, SystemReportNames } from '../PredefinedConfig/ExportState';
 import { CellDataChangedInfo } from '../PredefinedConfig/Common/CellDataChangedInfo';
-import { CustomDestination, ExportButtonContext } from '../AdaptableOptions/ExportOptions';
+import { CustomDestination, ExportFormContext } from '../AdaptableOptions/ExportOptions';
 import { ExportDestination } from '../PredefinedConfig/Common/Enums';
 /**
  * Provides run-time access to the Export Module and Report state
@@ -122,7 +122,7 @@ export interface ExportApi {
      * Form Data entered by the User in the UI for a Custom Destination
      * @param destination Custom Destination for which to get Form Def
      */
-    getExportDestinationForm(destinationName: string): AdaptableForm<ExportButtonContext> | undefined;
+    getExportDestinationForm(destinationName: string): AdaptableForm<ExportFormContext> | undefined;
     /**
      * Whether given data change affects given report
      * @param cellDataChangedInfo data change to check

package/src/Api/FilterApi.d.ts

@@ -1,5 +1,6 @@
-import { AdaptableColumn, SystemFilterPredicateIds } from '../types';
+import { AdaptableColumn, ColumnFilter, GridCell, SystemFilterPredicateIds } from '../types';
 import { AdaptablePredicateDef } from '../PredefinedConfig/Common/AdaptablePredicate';
+import { RowNode } from '@ag-grid-community/all-modules';
 /**
  * Provides run-time access to Filter section of Adaptable State.
  */
@@ -40,4 +41,71 @@ export interface FilterApi {
      * Whether Quick Filter Form is currently visible
      */
     isQuickFilterVisible(): boolean;
+    /**
+     * Retrieves all the Column Filters in the Column Filter State (of Predefined Config)
+     * @returns column filters
+     */
+    getColumnFilters(): ColumnFilter[];
+    /**
+     * Sets Column Filters - will replace filters for existing column and leave other column filters in place
+     * @param columnFilters Column Filters to set
+     * @returns column filters
+     */
+    setColumnFilter(columnFilters: ColumnFilter[]): ColumnFilter[] | null;
+    /**
+     * Clears given Column Filter
+     * @param columnFilter Column Filter to clear
+     */
+    clearColumnFilter(columnFilter: ColumnFilter): void;
+    /**
+     * Clears Column Filter for given Column
+     * @param columnId Column for which Column Filter should be cleared
+     */
+    clearColumnFilterByColumn(columnId: string): void;
+    /**
+     * Clears Column Filters for given set of Columns
+     * @param columns Columns for which Column Filte should be cleared
+     */
+    clearColumnFilterByColumns(columns: string[]): void;
+    /**
+     * Clears all Column Filters in the Current Layout
+     */
+    clearColumnFilters(): void;
+    /**
+     * Clears existing Column Filters and then sets the new ones
+     * @param columnFilters Column Filters to set
+     */
+    clearAndSetColumnFilter(columnFilters: ColumnFilter[]): void;
+    /**
+     * Retrieves all Column Filters for given Column
+     * @param columnId column to retrieve Column Filters for
+     * @returns column filters
+     */
+    getAllColumnFilterForColumn(columnId: string): ColumnFilter[];
+    /**
+     * Creates an Equality Filter based on given Grid Cells
+     * @param gridCells cells to create Filter for
+     */
+    createValuesColumnFilterForCells(gridCells: GridCell[]): ColumnFilter | null;
+    /**
+     *  Creates an Equality Filter based on given Grid Cell
+     * @param gridCell cell to create Filter for
+     */
+    createEqualityColumnFilterForCell(gridCell: GridCell): ColumnFilter | null;
+    /**
+     * Retrieves description of given Column Filter
+     * @param columnFilter Column Filter to use
+     */
+    columnFilterToString(columnFilter: ColumnFilter): string;
+    /**
+     * Retrieves descriptions of given Column Filters
+     * @param columnFilters Column Filters to use
+     */
+    columnFiltersToString(columnFilters: ColumnFilter[]): string;
+    /**
+     * Calls AdapTableQL to evaluate Filter for given Row
+     * @param columnFilter Column Filter to use
+     * @param node Row Node to evaluate
+     */
+    evaluateColumnFilter(columnFilter: ColumnFilter, node: RowNode): boolean;
 }

package/src/Api/Implementation/ColumnApiImpl.d.ts

@@ -1,6 +1,5 @@
 import { ApiBase } from './ApiBase';
 import { AdaptableColumn, AdaptableColumnDataType } from '../../PredefinedConfig/Common/AdaptableColumn';
-import { DataType } from '../../PredefinedConfig/Common/Enums';
 import { ColumnApi } from '../ColumnApi';
 import { GridCell } from '../../PredefinedConfig/Selection/GridCell';
 import { Column, RowNode } from '@ag-grid-community/all-modules';
@@ -41,7 +40,7 @@ export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
     getAgGridColumnFieldForAdaptableColumn(colId: string): string;
     getAgGridColumnForAdaptableColumn(columnId: string): Column;
     getColumnFromFriendlyName(columnName: string, logWarning?: boolean): AdaptableColumn;
-    getColumnsOfType(dataType: DataType): AdaptableColumn[];
+    getColumnsOfType(dataType: AdaptableColumnDataType): AdaptableColumn[];
     getNumericColumns(): AdaptableColumn[];
     getStringColumns(): AdaptableColumn[];
     getDateColumns(): AdaptableColumn[];
@@ -68,4 +67,5 @@ export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
     usesAdaptableFilterForm(columnId: string): boolean;
     usesAdaptableQuickFilter(columnId: string): boolean;
     isColumnReferencedInExpression(columnId: string, expression: string): boolean;
+    isActionRowButtonColumn(columnId: string): boolean;
 }

package/src/Api/Implementation/ColumnApiImpl.js

@@ -89,13 +89,13 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         return false;
     }
     isNumericColumn(column) {
-        return column.dataType == Enums_1.DataType.Number;
+        return column.dataType == 'Number';
     }
     isBooleanColumn(column) {
-        return column.dataType == Enums_1.DataType.Boolean;
+        return column.dataType == 'Boolean';
     }
     isDateColumn(column) {
-        return column.dataType == Enums_1.DataType.Date;
+        return column.dataType == 'Date';
     }
     getColumnDataTypeFromColumnId(columnId) {
         const column = this.getColumnFromId(columnId); // this.getColumns().find(c => c.ColumnId == columnId);
@@ -224,31 +224,29 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
     }
     getColumnsOfType(dataType) {
         switch (dataType) {
-            case Enums_1.DataType.All:
-                return this.getColumns();
-            case Enums_1.DataType.Boolean:
+            case 'Boolean':
                 return this.getBooleanColumns();
-            case Enums_1.DataType.Date:
+            case 'Date':
                 return this.getDateColumns();
-            case Enums_1.DataType.Number:
+            case 'Number':
                 return this.getNumericColumns();
-            case Enums_1.DataType.String:
+            case 'String':
                 return this.getStringColumns();
             default:
                 return this.getColumns();
         }
     }
     getNumericColumns() {
-        return this.getColumns().filter((c) => c.dataType == Enums_1.DataType.Number);
+        return this.getColumns().filter((c) => c.dataType == 'Number');
     }
     getStringColumns() {
-        return this.getColumns().filter((c) => c.dataType == Enums_1.DataType.String);
+        return this.getColumns().filter((c) => c.dataType == 'String');
     }
     getDateColumns() {
-        return this.getColumns().filter((c) => c.dataType == Enums_1.DataType.Date);
+        return this.getColumns().filter((c) => c.dataType == 'Date');
     }
     getBooleanColumns() {
-        return this.getColumns().filter((c) => c.dataType == Enums_1.DataType.Boolean);
+        return this.getColumns().filter((c) => c.dataType == 'Boolean');
     }
     getSortableColumns() {
         return this.getColumns().filter((c) => c.sortable);
@@ -262,7 +260,7 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
     getAggregetableColumns() {
         return this.getColumns()
             .filter((c) => c.aggregatable)
-            .filter((c) => c.dataType == Enums_1.DataType.Number);
+            .filter((c) => c.dataType == 'Number');
     }
     getQueryableColumns() {
         return this.getColumns().filter((c) => c.queryable);
@@ -409,5 +407,8 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         const colIds = this.adaptable.api.queryLanguageApi.getColumnsFromExpression(expression);
         return colIds.some((c) => c === columnId);
     }
+    isActionRowButtonColumn(columnId) {
+        return columnId === GeneralConstants_1.ADAPTABLE_ROW_ACTION_BUTTONS;
+    }
 }
 exports.ColumnApiImpl = ColumnApiImpl;

package/src/Api/Implementation/ConfigApiImpl.js

@@ -91,7 +91,7 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
             queryAST: currentQuery
                 ? this.adaptable.api.queryLanguageApi.getASTForExpression(currentQuery)
                 : null,
-            columnFilters: this.adaptable.api.layoutApi.getAllColumnFilter(),
+            columnFilters: this.adaptable.api.filterApi.getColumnFilters(),
         };
         return adaptableSearchState;
     }

package/src/Api/Implementation/ExportApiImpl.d.ts

@@ -3,7 +3,7 @@ import { ExportState, Report, ReportData, ReportSchedule, SystemReportNames } fr
 import { ApiBase } from './ApiBase';
 import { AdaptableForm } from '../../PredefinedConfig/Common/AdaptableForm';
 import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
-import { CustomDestination, ExportButtonContext } from '../../AdaptableOptions/ExportOptions';
+import { CustomDestination, ExportFormContext } from '../../AdaptableOptions/ExportOptions';
 import { ExportDestination } from '../../PredefinedConfig/Common/Enums';
 export declare class ExportApiImpl extends ApiBase implements ExportApi {
     getExportState(): ExportState;
@@ -22,7 +22,7 @@ export declare class ExportApiImpl extends ApiBase implements ExportApi {
     selectDestination(destinationName: string): void;
     getAllCustomDestination(): CustomDestination[];
     isExportDestinationCustom(destinationName: string): boolean;
-    getExportDestinationForm(destinationName: string): AdaptableForm<ExportButtonContext> | undefined;
+    getExportDestinationForm(destinationName: string): AdaptableForm<ExportFormContext> | undefined;
     canExportToExcel(): boolean;
     exportDataToExcel(reportData: ReportData, fileName: string): void;
     showExportPopup(): void;

package/src/Api/Implementation/FilterApiImpl.d.ts

@@ -2,7 +2,8 @@ import { ApiBase } from './ApiBase';
 import { FilterApi } from '../FilterApi';
 import { AdaptablePredicateDef } from '../../PredefinedConfig/Common/AdaptablePredicate';
 import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
-import { SystemFilterPredicateIds } from '../../types';
+import { ColumnFilter, GridCell, SystemFilterPredicateIds } from '../../types';
+import { RowNode } from '@ag-grid-community/all-modules';
 export declare class FilterApiImpl extends ApiBase implements FilterApi {
     getAllSystemFilterIds(): SystemFilterPredicateIds;
     findPredicateDefByShortcut(shortcut: string, column: AdaptableColumn): AdaptablePredicateDef;
@@ -13,4 +14,18 @@ export declare class FilterApiImpl extends ApiBase implements FilterApi {
     hideQuickFilterBar(): void;
     isQuickFilterAvailable(): boolean;
     isQuickFilterVisible(): boolean;
+    getColumnFilters(): ColumnFilter[];
+    setColumnFilter(columnFilters: ColumnFilter[]): ColumnFilter[] | null;
+    clearColumnFilter(columnFilter: ColumnFilter): void;
+    clearColumnFilterByColumns(columns: string[]): void;
+    clearColumnFilterByColumn(column: string): void;
+    clearColumnFilters(): void;
+    clearAndSetColumnFilter(columnFilters: ColumnFilter[]): void;
+    getAllColumnFilterForColumn(column: string): ColumnFilter[];
+    createValuesColumnFilterForCells(gridCells: GridCell[]): ColumnFilter | null;
+    createEqualityColumnFilterForCell(gridCell: GridCell): ColumnFilter | null;
+    columnFilterToString(columnFilter: ColumnFilter): string;
+    columnFiltersToString(columnFilters: ColumnFilter[]): string;
+    evaluateColumnFilter(columnFilter: ColumnFilter, node: RowNode): boolean;
+    private getColumnFilterById;
 }

package/src/Api/Implementation/FilterApiImpl.js

@@ -3,7 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FilterApiImpl = void 0;
 const tslib_1 = require("tslib");
 const SystemRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/SystemRedux"));
+const LayoutRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/LayoutRedux"));
 const ApiBase_1 = require("./ApiBase");
+const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
+const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
 class FilterApiImpl extends ApiBase_1.ApiBase {
     getAllSystemFilterIds() {
         return this.getFilterOptions().systemFilters;
@@ -38,5 +41,143 @@ class FilterApiImpl extends ApiBase_1.ApiBase {
         return (this.isQuickFilterAvailable() &&
             this.adaptable.api.internalApi.getSystemState().IsQuickFilterVisible);
     }
+    getColumnFilters() {
+        var _a;
+        const currentLayout = this.adaptable.api.layoutApi.getCurrentLayout();
+        return (_a = currentLayout.ColumnFilters) !== null && _a !== void 0 ? _a : [];
+    }
+    setColumnFilter(columnFilters) {
+        columnFilters.forEach((columnFilter) => {
+            if (!columnFilter.Predicate) {
+                LoggingHelper_1.LogAdaptableWarning('Column Filter has no Predicate', columnFilter);
+            }
+            else {
+                const isValidPredicate = this.adaptable.api.predicateApi.isValidPredicate(columnFilter.Predicate);
+                if (!isValidPredicate) {
+                    LoggingHelper_1.LogAdaptableWarning('Column Filter Predicate is not valid', columnFilter);
+                }
+                else {
+                    this.addUidToAdaptableObject(columnFilter);
+                    if (this.getColumnFilters().find((cf) => cf.ColumnId == columnFilter.ColumnId)) {
+                        this.dispatchAction(LayoutRedux.LayoutColumnFilterSet(columnFilter));
+                    }
+                    else {
+                        this.dispatchAction(LayoutRedux.LayoutColumnFilterAdd(columnFilter));
+                    }
+                }
+                return columnFilters === null || columnFilters === void 0 ? void 0 : columnFilters.map((columnFilter) => this.getColumnFilterById(columnFilter.Uuid));
+            }
+        });
+        return null;
+    }
+    clearColumnFilter(columnFilter) {
+        this.dispatchAction(LayoutRedux.LayoutColumnFilterClear(columnFilter));
+    }
+    clearColumnFilterByColumns(columns) {
+        columns.forEach((c) => {
+            this.clearColumnFilterByColumn(c);
+        });
+    }
+    clearColumnFilterByColumn(column) {
+        let columnFiltersForColumn = this.getAllColumnFilterForColumn(column);
+        if (columnFiltersForColumn) {
+            columnFiltersForColumn.forEach((cf) => {
+                this.dispatchAction(LayoutRedux.LayoutColumnFilterClear(cf));
+            });
+            this.adaptable.clearColumnFiltering([column]);
+        }
+    }
+    clearColumnFilters() {
+        this.dispatchAction(LayoutRedux.LayoutColumnFilterClearAll());
+        this.adaptable.clearGridFiltering();
+    }
+    clearAndSetColumnFilter(columnFilters) {
+        this.clearColumnFilters();
+        columnFilters.forEach((columnFilter) => {
+            if (this.getColumnFilters().find((cf) => cf.ColumnId == columnFilter.ColumnId)) {
+                this.dispatchAction(LayoutRedux.LayoutColumnFilterSet(columnFilter));
+            }
+            else {
+                this.dispatchAction(LayoutRedux.LayoutColumnFilterAdd(columnFilter));
+            }
+        });
+    }
+    getAllColumnFilterForColumn(column) {
+        let columnFilters = this.getColumnFilters();
+        if (columnFilters) {
+            return columnFilters.filter((cf) => cf.ColumnId == column);
+        }
+        else {
+            return [];
+        }
+    }
+    createValuesColumnFilterForCells(gridCells) {
+        if (!gridCells) {
+            return null;
+        }
+        const filter = {
+            ColumnId: gridCells[0].column.columnId,
+            Predicate: {
+                PredicateId: 'Values',
+                Inputs: [...new Set(gridCells.map((gc) => gc.displayValue))],
+            },
+        };
+        const [savedFilter] = this.setColumnFilter([filter]) || [null];
+        return savedFilter;
+    }
+    createEqualityColumnFilterForCell(gridCell) {
+        if (!gridCell) {
+            return null;
+        }
+        const column = gridCell.column;
+        const filter = {
+            ColumnId: column.columnId,
+            Predicate: {
+                PredicateId: this.adaptable.api.predicateApi.getEqualityPredicateForDataType(column.dataType),
+                Inputs: [...new Set([gridCell.rawValue])],
+            },
+        };
+        const [savedFilter] = this.setColumnFilter([filter]) || [null];
+        return savedFilter;
+    }
+    columnFilterToString(columnFilter) {
+        const friendlyName = this.adaptable.api.columnApi.getFriendlyNameFromColumnId(columnFilter.ColumnId);
+        return ('[' +
+            friendlyName +
+            '] ' +
+            this.adaptable.api.predicateApi.predicateToString(columnFilter.Predicate));
+    }
+    columnFiltersToString(columnFilters) {
+        return columnFilters.map((cf) => this.columnFilterToString(cf)).join(', ');
+    }
+    evaluateColumnFilter(columnFilter, node) {
+        var _a;
+        if (!columnFilter.Predicate) {
+            return true;
+        }
+        if ((_a = columnFilter.Predicate.Inputs) === null || _a === void 0 ? void 0 : _a.some((input) => StringExtensions_1.default.IsNullOrEmpty(input))) {
+            return true;
+        }
+        const column = this.adaptable.api.columnApi.getColumnFromId(columnFilter.ColumnId);
+        if (!column) {
+            return true;
+        }
+        const gridCell = this.adaptable.api.gridApi.getGridCellFromRowNode(node, columnFilter.ColumnId);
+        if (!gridCell) {
+            return true;
+        }
+        let value = gridCell.normalisedValue;
+        return this.adaptable.api.predicateApi.handlePredicate(columnFilter.Predicate, {
+            value: value,
+            oldValue: null,
+            displayValue: gridCell.displayValue,
+            node,
+            column,
+        }, true);
+    }
+    getColumnFilterById(id) {
+        var _a;
+        return (_a = this.getColumnFilters()) === null || _a === void 0 ? void 0 : _a.find((columnFilter) => columnFilter.Uuid === id);
+    }
 }
 exports.FilterApiImpl = FilterApiImpl;

package/src/Api/Implementation/GridApiImpl.js

@@ -90,7 +90,7 @@ class GridApiImpl extends ApiBase_1.ApiBase {
     }
     clearGridFiltering() {
         // slightly round the houses but we have to call FilterAPI as it does it properly
-        this.adaptable.api.layoutApi.clearAllColumnFilter();
+        this.adaptable.api.filterApi.clearColumnFilters();
     }
     getAgGridInstance() {
         return this.adaptable.adaptableOptions.gridOptions;
@@ -378,7 +378,9 @@ class GridApiImpl extends ApiBase_1.ApiBase {
         if (!rowNode) {
             LoggingHelper_1.LogAdaptableWarning(`Can NOT edit row: rowNode not found for primaryKey ${primaryKey}`);
         }
-        const editForm = this.adaptable.api.internalApi.getRowEditService().buildRowEditForm(rowNode);
+        const editForm = this.adaptable.api.internalApi
+            .getRowEditService()
+            .buildRowEditForm(rowNode);
         this.dispatchAction(PopupRedux_1.PopupShowForm({
             Id: 'edit_row_form',
             Form: editForm,
@@ -389,7 +391,9 @@ class GridApiImpl extends ApiBase_1.ApiBase {
         }));
     }
     openCreateRowForm(duplicatedRowNodePrimaryKey) {
-        const createForm = this.adaptable.api.internalApi.getRowEditService().buildRowCreateForm();
+        const createForm = this.adaptable.api.internalApi
+            .getRowEditService()
+            .buildRowCreateForm();
         this.dispatchAction(PopupRedux_1.PopupShowForm({
             Id: 'create_row_form',
             Form: createForm,