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

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/FormatColumnApiImpl.js

@@ -275,13 +275,13 @@ class FormatColumnApiImpl extends ApiBase_1.ApiBase {
         this.adaptable.api.eventApi.emit('CheckboxColumnClicked', checkboxColumnClickedInfo);
     }
     applyCustomFormatters(value, options) {
-        var _a, _b;
+        var _a, _b, _c;
         const columnCustomFormatters = (_a = options === null || options === void 0 ? void 0 : options.CustomDisplayFormats) !== null && _a !== void 0 ? _a : [];
         if (!(columnCustomFormatters === null || columnCustomFormatters === void 0 ? void 0 : columnCustomFormatters.length)) {
             return value;
         }
         const adaptableOptions = this.adaptable.adaptableOptions;
-        const customFormattersFromOptions = (_b = adaptableOptions === null || adaptableOptions === void 0 ? void 0 : adaptableOptions.userInterfaceOptions) === null || _b === void 0 ? void 0 : _b.customDisplayFormatters;
+        const customFormattersFromOptions = (_c = (_b = adaptableOptions === null || adaptableOptions === void 0 ? void 0 : adaptableOptions.userInterfaceOptions) === null || _b === void 0 ? void 0 : _b.customDisplayFormatters) !== null && _c !== void 0 ? _c : [];
         // formatters are applied in the order they are defined in the options
         const customFormatters = customFormattersFromOptions.filter((customFormatterOption) => columnCustomFormatters.includes(customFormatterOption.id));
         return customFormatters.reduce((acc, formatter) => {

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,

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

@@ -11,7 +11,7 @@ import { SelectedRowInfo } from '../../PredefinedConfig/Selection/SelectedRowInf
 import { AdaptableModule, AdaptableQLModule } from '../../PredefinedConfig/Common/Types';
 import { GridCell } from '../../PredefinedConfig/Selection/GridCell';
 import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
-import { AdaptableCellChangedAlert, AdaptableOptions, AdaptableRowChangedAlert, AdaptableState, AlertButtonContext, BaseContext, Layout, LayoutAssociatedObject, SystemStatusMessageInfo, SharedEntity, AdaptableIcon } from '../../types';
+import { AdaptableCellChangedAlert, AdaptableOptions, AdaptableRowChangedAlert, AdaptableState, AlertFormContext, BaseContext, Layout, LayoutAssociatedObject, SystemStatusMessageInfo, SharedEntity, AdaptableIcon } from '../../types';
 import { IValidationService } from '../../Utilities/Services/Interface/IValidationService';
 import { IModuleService } from '../../Utilities/Services/Interface/IModuleService';
 import { IReportService } from '../../Utilities/Services/Interface/IReportService';
@@ -39,8 +39,8 @@ import { EditLookUpPermittedValues } from '../../../types';
 import { IRowEditService } from '../../Utilities/Services/Interface/IRowEditService';
 export declare class InternalApiImpl extends ApiBase implements InternalApi {
     getSystemState(): SystemState;
-    getAdaptableFormFromAlertForm(alertForm: string | AlertButtonForm, context: any, defaultMessageType?: AdaptableMessageType): (Omit<AdaptableForm<AlertButtonContext>, 'buttons'> & {
-        buttons?: (Omit<AdaptableButton<AlertButtonContext>, 'buttonStyle'> & {
+    getAdaptableFormFromAlertForm(alertForm: string | AlertButtonForm, context: any, defaultMessageType?: AdaptableMessageType): (Omit<AdaptableForm<AlertFormContext>, 'buttons'> & {
+        buttons?: (Omit<AdaptableButton<AlertFormContext>, 'buttonStyle'> & {
             buttonStyle?: ButtonStyle;
         })[];
     }) | undefined;

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

@@ -3,8 +3,7 @@ import { LayoutApi } from '../LayoutApi';
 import { LayoutState, Layout } from '../../PredefinedConfig/LayoutState';
 import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
 import { ColumnSort } from '../../PredefinedConfig/Common/ColumnSort';
-import { ColumnFilter, LayoutAssociatedObject } from '../../types';
-import { RowNode } from '@ag-grid-community/all-modules';
+import { LayoutAssociatedObject } from '../../types';
 export declare class LayoutApiImpl extends ApiBase implements LayoutApi {
     getLayoutState(): LayoutState;
     shouldAutoSaveLayout: (layout?: Layout) => boolean;
@@ -43,19 +42,6 @@ export declare class LayoutApiImpl extends ApiBase implements LayoutApi {
     isCurrentLayoutDefault(): boolean;
     areExpandedRowGroupsSavedInLayouts(): boolean;
     isObjectAvailableInCurrentLayout(adaptableObject: LayoutAssociatedObject): boolean;
-    getAllColumnFilter(): ColumnFilter[];
-    getColumnFilterById(id: ColumnFilter['Uuid']): ColumnFilter;
-    setColumnFilter(columnFilters: ColumnFilter[]): ColumnFilter[] | null;
-    clearColumnFilter(columnFilter: ColumnFilter): void;
-    clearColumnFilterByColumns(columns: string[]): void;
-    clearColumnFilterByColumn(column: string): void;
-    clearAllColumnFilter(): void;
-    clearAndSetColumnFilter(columnFilters: ColumnFilter[]): void;
-    getAllColumnFilterForColumn(column: string): ColumnFilter[];
-    createColumnFilterForCell(columnId: string, primarykeyValues: any[]): ColumnFilter | null;
-    columnFilterToString(columnFilter: ColumnFilter): string;
-    columnFiltersToString(columnFilters: ColumnFilter[]): string;
-    evaluateColumnFilter(columnFilter: ColumnFilter, node: RowNode): boolean;
     removeColumnFromCurrentLayout(columnId: string): void;
     removeColumnFromAllLayouts(columnId: string): void;
     removeColumnFromLayout(columnId: string, layoutName: string): void;

package/src/Api/Implementation/LayoutApiImpl.js

@@ -321,158 +321,6 @@ class LayoutApiImpl extends ApiBase_1.ApiBase {
             ? true
             : (_a = adaptableObject.Tags) === null || _a === void 0 ? void 0 : _a.map((tag) => tag).includes(this.getCurrentLayoutName());
     }
-    getAllColumnFilter() {
-        var _a;
-        const currentLayout = this.getCurrentLayout();
-        return (_a = currentLayout.ColumnFilters) !== null && _a !== void 0 ? _a : [];
-    }
-    getColumnFilterById(id) {
-        var _a;
-        return (_a = this.getAllColumnFilter()) === null || _a === void 0 ? void 0 : _a.find((columnFilter) => columnFilter.Uuid === id);
-    }
-    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.getAllColumnFilter().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]);
-        }
-    }
-    clearAllColumnFilter() {
-        this.dispatchAction(LayoutRedux.LayoutColumnFilterClearAll());
-        this.adaptable.clearGridFiltering();
-    }
-    clearAndSetColumnFilter(columnFilters) {
-        this.clearAllColumnFilter();
-        columnFilters.forEach((columnFilter) => {
-            if (this.getAllColumnFilter().find((cf) => cf.ColumnId == columnFilter.ColumnId)) {
-                this.dispatchAction(LayoutRedux.LayoutColumnFilterSet(columnFilter));
-            }
-            else {
-                this.dispatchAction(LayoutRedux.LayoutColumnFilterAdd(columnFilter));
-            }
-        });
-    }
-    getAllColumnFilterForColumn(column) {
-        let columnFilters = this.getAllColumnFilter();
-        if (columnFilters) {
-            return columnFilters.filter((cf) => cf.ColumnId == column);
-        }
-        else {
-            return [];
-        }
-    }
-    createColumnFilterForCell(columnId, primarykeyValues) {
-        let cellValues = [];
-        let predicateId;
-        if (primarykeyValues.length == 1) {
-            const normalisedValue = this.adaptable.api.gridApi.getCellNormalisedValue(primarykeyValues[0], columnId);
-            if (normalisedValue) {
-                cellValues.push(normalisedValue);
-                const dataType = this.adaptable.api.columnApi.getColumnDataTypeFromColumnId(columnId);
-                if (dataType) {
-                    if (dataType == 'Number') {
-                        predicateId = 'Equals';
-                    }
-                    else if (dataType == 'Date') {
-                        predicateId = 'On';
-                    }
-                    else if (dataType == 'String') {
-                        predicateId = 'Is';
-                    }
-                    else {
-                        predicateId = 'Equals';
-                    }
-                }
-            }
-        }
-        else {
-            primarykeyValues.forEach((pk) => {
-                const displayValue = this.adaptable.api.gridApi.getCellDisplayValue(pk, columnId);
-                if (displayValue && !cellValues.includes(displayValue)) {
-                    cellValues.push(displayValue);
-                }
-            });
-            predicateId = 'Values';
-        }
-        const filter = {
-            ColumnId: columnId,
-            Predicate: {
-                PredicateId: predicateId,
-                Inputs: [...new Set(cellValues)],
-            },
-        };
-        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);
-    }
     removeColumnFromCurrentLayout(columnId) {
         this.removeColumnFromLayout(columnId, this.getCurrentLayoutName());
     }

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

@@ -1,6 +1,7 @@
 import { ApiBase } from './ApiBase';
 import { PredicateApi } from '../PredicateApi';
 import { AdaptablePredicateDef, AdaptablePredicate, PredicateDefHandlerParams, ModuleScope } from '../../PredefinedConfig/Common/AdaptablePredicate';
+import { AdaptableColumnDataType, SystemFilterPredicateId } from '../../types';
 export declare class PredicateApiImpl extends ApiBase implements PredicateApi {
     getPredicateDefs(): AdaptablePredicateDef[];
     getSystemPredicateDefs(): AdaptablePredicateDef[];
@@ -12,4 +13,5 @@ export declare class PredicateApiImpl extends ApiBase implements PredicateApi {
     predicateToString(predicate: AdaptablePredicate): string | undefined;
     isValidPredicate(predicate: AdaptablePredicate | undefined): boolean;
     handlePredicate(predicate: AdaptablePredicate | undefined, params: Omit<PredicateDefHandlerParams, 'api' | 'inputs'>, defaultReturn: boolean): boolean;
+    getEqualityPredicateForDataType(dataType: AdaptableColumnDataType): SystemFilterPredicateId;
 }

package/src/Api/Implementation/PredicateApiImpl.js

@@ -78,5 +78,23 @@ class PredicateApiImpl extends ApiBase_1.ApiBase {
             return false;
         }
     }
+    getEqualityPredicateForDataType(dataType) {
+        let predicateId;
+        switch (dataType) {
+            case 'Number':
+                predicateId = 'Equals';
+                break;
+            case 'Date':
+                predicateId = 'On';
+                break;
+            case 'String':
+                predicateId = 'Is';
+                break;
+            default:
+                predicateId = 'Equals';
+                break;
+        }
+        return predicateId;
+    }
 }
 exports.PredicateApiImpl = PredicateApiImpl;

package/src/Api/LayoutApi.d.ts

@@ -1,5 +1,4 @@
-import { RowNode } from '@ag-grid-community/all-modules';
-import { AdaptableColumn, ColumnFilter, ColumnSort, LayoutAssociatedObject } from '../../types';
+import { AdaptableColumn, ColumnSort, LayoutAssociatedObject } from '../../types';
 import { LayoutState, Layout } from '../PredefinedConfig/LayoutState';
 /**
  * Provides run-time access to the Layout Module and associated state
@@ -188,76 +187,6 @@ export interface LayoutApi {
      * @param adaptableObject object to check
      */
     isObjectAvailableInCurrentLayout(adaptableObject: LayoutAssociatedObject): boolean;
-    /**
-     * Retrieves all the Column Filters in the Column Filter State (of Predefined Config)
-     * @returns column filters
-     */
-    getAllColumnFilter(): ColumnFilter[];
-    /**
-     * Retrieves ColumnFilter by Id
-     * @param id column filter id
-     * @returns column filter
-     */
-    getColumnFilterById(id: ColumnFilter['Uuid']): 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 State
-     */
-    clearAllColumnFilter(): 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 new Column Filter on given Column using Primary Key values
-     * @param columnId ColumnId to use
-     * @param primarykeyValues Primary Key Values to use
-     * @returns column filter
-     */
-    createColumnFilterForCell(columnId: string, primarykeyValues: any[]): 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;
     /**
      * Removes a Column from the Current Layout
      * @param columnId Column to remove

package/src/Api/PredicateApi.d.ts

@@ -1,4 +1,6 @@
+import { AdaptableColumnDataType } from '../../types';
 import { AdaptablePredicateDef, AdaptablePredicate, PredicateDefHandlerParams, ModuleScope } from '../PredefinedConfig/Common/AdaptablePredicate';
+import { SystemFilterPredicateId } from '../types';
 /**
  * Functions which manage the Predicate object in AdapTable
  */
@@ -52,4 +54,9 @@ export interface PredicateApi {
      * @param defaultReturn Whether to return the default
      */
     handlePredicate(predicate: AdaptablePredicate | undefined, params: Omit<PredicateDefHandlerParams, 'api' | 'inputs'>, defaultReturn: boolean): boolean;
+    /**
+     * Gets the correct Equality-type System Predicate for a particular DataType
+     * @param dataType DataType of Column
+     */
+    getEqualityPredicateForDataType(dataType: AdaptableColumnDataType): SystemFilterPredicateId;
 }

package/src/PredefinedConfig/AlertState.d.ts

@@ -10,7 +10,7 @@ import { AdaptableStyle } from './Common/AdaptableStyle';
 import { XOR } from '../Utilities/Extensions/TypeExtensions';
 import { AdaptableAggregatedBooleanQuery, AdaptableBooleanQuery, AdaptableObservableQuery } from './Common/AdaptableQuery';
 import { ButtonStyle } from './Common/ButtonStyle';
-import { AlertButtonContext, BaseContext } from '../types';
+import { AlertFormContext, BaseContext } from '../types';
 /**
  * Predefined Configuration for Alert Module
  */
@@ -49,8 +49,8 @@ export interface AlertDefinition extends SuspendableObject {
      */
     AlertForm?: string | AlertButtonForm;
 }
-export declare type AlertButtonForm = Omit<AdaptableForm<AlertButtonContext>, 'title' | 'buttons' | 'fields' | 'description'> & {
-    Buttons?: AlertButton<AlertButtonContext>[];
+export declare type AlertButtonForm = Omit<AdaptableForm<AlertFormContext>, 'title' | 'buttons' | 'fields' | 'description'> & {
+    Buttons?: AlertButton<AlertFormContext>[];
 };
 export interface AlertDefinitionPredicate extends AdaptablePredicate {
     PredicateId: TypeHint<string, SystemAlertPredicateId>;
@@ -69,7 +69,7 @@ export declare type AdaptableAlertAction = 'highlight-cell' | 'highlight-row' |
 /**
  * Defines a button that appears in an Alert Form
  */
-export interface AlertButton<AlertButtonContext> extends Omit<AdaptableButton<BaseContext>, 'onClick' | 'label' | 'buttonStyle' | 'hidden' | 'disabled' | 'tooltip'> {
+export interface AlertButton<AlertFormContext> extends Omit<AdaptableButton<BaseContext>, 'onClick' | 'label' | 'buttonStyle' | 'hidden' | 'disabled' | 'tooltip'> {
     /**
      * Predefined Action(s) to trigger when button is clicked; but the implementation in `actionHandlers` property of Alert Options
      */

package/src/PredefinedConfig/Common/AdaptableColumn.d.ts

@@ -1,6 +1,6 @@
 import { AdaptableObject } from './AdaptableObject';
 /**
- * The type of the column data
+ * Type of data stored in an Adaptable Column
  */
 export declare type AdaptableColumnDataType = 'String' | 'Number' | 'Boolean' | 'Date' | 'Object' | 'Unknown';
 /**

package/src/PredefinedConfig/Common/FormContext.d.ts

@@ -0,0 +1,11 @@
+import { AdaptableFormData } from '../../types';
+import { BaseContext } from './BaseContext';
+/**
+ * Context supplied to Buttons that appear in an Adaptable Form
+ */
+export interface FormContext extends BaseContext {
+    /**
+     * Adaptable Form Data
+     */
+    formData: AdaptableFormData;
+}

package/src/PredefinedConfig/Common/FormContext.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });