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

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/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,8 @@
+import { AdaptableFormData } from '../../types';
+import { BaseContext } from './BaseContext';
+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 });

package/src/Redux/ActionsReducers/LayoutRedux.js

@@ -168,7 +168,6 @@ exports.LayoutReducer = (state = initialState, action) => {
                 layoutToUpdate.Columns = layoutToUpdate.Columns.filter((col) => {
                     return col !== colToRemove;
                 });
-                console.log('updating', layoutToUpdate);
                 return Object.assign(Object.assign({}, state), { Layouts: state.Layouts.map((abObject) => abObject.Uuid === layoutToUpdate.Uuid ? layoutToUpdate : abObject) });
             }
             return state;

package/src/Redux/ActionsReducers/PopupRedux.d.ts

@@ -5,6 +5,7 @@ import { ModuleParams } from '../../View/Components/SharedProps/ModuleViewPopupP
 import { AdaptableModule } from '../../PredefinedConfig/Common/Types';
 import { AdaptableAlert } from '../../PredefinedConfig/Common/AdaptableAlert';
 import { AdaptableForm, BaseContext } from '../../types';
+import { FormContext } from '../../PredefinedConfig/Common/FormContext';
 export declare const POPUP_SHOW_SCREEN = "POPUP_SHOW_SCREEN";
 export declare const POPUP_HIDE_SCREEN = "POPUP_HIDE_SCREEN";
 export declare const POPUP_SHOW_LOADING = "POPUP_SHOW_LOADING";
@@ -89,9 +90,9 @@ export declare const PopupShowWindow: (config: {
 export declare const PopupHideWindow: (id: string) => PopupHideWindowAction;
 export declare const PopupShowForm: (config: {
     Id: string;
-    Form: AdaptableForm<BaseContext>;
+    Form: AdaptableForm<FormContext>;
     FormProps?: any;
-    prepareContext?: (context: BaseContext) => Promise<BaseContext> | BaseContext;
+    prepareContext?: (context: FormContext) => Promise<FormContext> | FormContext;
 }) => PopupShowFormAction;
 export declare const PopupHideForm: (id: string) => PopupHideFormAction;
 export declare const PopupShowAlert: (alert: AdaptableAlert) => PopupShowAlertAction;

package/src/Strategy/AdaptableModuleBase.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AdaptableModuleBase = void 0;
 const tslib_1 = require("tslib");
-const Enums_1 = require("../PredefinedConfig/Common/Enums");
 const StringExtensions_1 = require("../Utilities/Extensions/StringExtensions");
 const MenuItem_1 = require("../Utilities/MenuItem");
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/ArrayExtensions"));
@@ -128,7 +127,7 @@ class AdaptableModuleBase {
                 return !column.isSparkline;
             }
             else if (functionType == 'numeric') {
-                return column.dataType == Enums_1.DataType.Number;
+                return column.dataType == 'Number';
             }
             else if (functionType == 'filter') {
                 return column.filterable;

package/src/Strategy/BulkUpdateModule.js

@@ -4,7 +4,6 @@ exports.BulkUpdateModule = void 0;
 const tslib_1 = require("tslib");
 const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
 const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
-const Enums_1 = require("../PredefinedConfig/Common/Enums");
 const PreviewHelper_1 = require("../Utilities/Helpers/PreviewHelper");
 const StringExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/StringExtensions"));
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/ArrayExtensions"));
@@ -110,13 +109,13 @@ class BulkUpdateModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 column = this.api.columnApi.getColumnFromId(selectedCellInfo.columns[0].columnId);
                 let typedBulkUpdateValue;
                 switch (column.dataType) {
-                    case Enums_1.DataType.Number:
+                    case 'Number':
                         typedBulkUpdateValue = Number(bulkUpdateValue);
                         break;
-                    case Enums_1.DataType.String:
+                    case 'String':
                         typedBulkUpdateValue = bulkUpdateValue;
                         break;
-                    case Enums_1.DataType.Date:
+                    case 'Date':
                         typedBulkUpdateValue = new Date(bulkUpdateValue);
                         break;
                 }

package/src/Strategy/CellSummaryModule.js

@@ -4,7 +4,6 @@ exports.CellSummaryModule = void 0;
 const tslib_1 = require("tslib");
 const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
 const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
-const Enums_1 = require("../PredefinedConfig/Common/Enums");
 const ArrayExtensions_1 = require("../Utilities/Extensions/ArrayExtensions");
 const Helper_1 = require("../Utilities/Helpers/Helper");
 const CellSummaryStatusPanel_1 = require("../View/CellSummary/CellSummaryStatusPanel");
@@ -53,7 +52,7 @@ class CellSummaryModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             let allValues = [];
             let numericColumns = [];
             selectedCellInfo.columns.map((c) => {
-                if (c && c.dataType == Enums_1.DataType.Number) {
+                if (c && c.dataType == 'Number') {
                     numericColumns.push(c.columnId);
                 }
             });

package/src/Strategy/FilterModule.js

@@ -14,7 +14,7 @@ class FilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         super(ModuleConstants.FilterModuleId, 'Filter', 'column-filter', 'FilterPopup', 'Advanced filtering capability allows users to see precisely the data they want', api);
     }
     getModuleAdaptableObjects() {
-        return this.api.layoutApi.getAllColumnFilter();
+        return this.api.filterApi.getColumnFilters();
     }
     getExplicitlyReferencedColumnIds(columnFilter) {
         return [columnFilter.ColumnId];
@@ -26,7 +26,7 @@ class FilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (this.api.internalApi.getAdaptableOptions().filterOptions.showQuickFilter == false) {
             this.api.filterApi.hideQuickFilterBar();
         }
-        const columnFilters = this.api.layoutApi.getAllColumnFilter();
+        const columnFilters = this.api.filterApi.getColumnFilters();
         columnFilters.forEach((cf) => {
             if (!this.api.columnApi.doesColumnExist(cf.ColumnId)) {
                 LoggingHelper_1.LogAdaptableError('Column Filter contains missing column: ' + cf.ColumnId);
@@ -41,14 +41,13 @@ class FilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 menuContext.isSingleSelectedColumn &&
                 menuContext.gridCell != null) {
                 let isMultiple = menuContext.selectedCellInfo.gridCells.length > 1;
-                let pkValues = isMultiple
-                    ? this.api.gridApi.getSelectedCellInfo().gridCells.map((gc) => {
-                        return gc.primaryKeyValue;
-                    })
-                    : [menuContext.gridCell.primaryKeyValue];
-                let clickFunction = () => {
-                    this.api.layoutApi.createColumnFilterForCell(menuContext.adaptableColumn.columnId, pkValues);
-                };
+                let clickFunction = isMultiple
+                    ? () => {
+                        this.api.filterApi.createValuesColumnFilterForCells(menuContext.selectedCellInfo.gridCells);
+                    }
+                    : () => {
+                        this.api.filterApi.createEqualityColumnFilterForCell(menuContext.selectedCellInfo.gridCells[0]);
+                    };
                 menuItemClickFunction = this.createColumnMenuItemClickFunction(isMultiple ? 'Filter on Cell Values' : 'Filter on Cell Value', this.moduleInfo.Glyph, clickFunction);
             }
         }
@@ -65,8 +64,8 @@ class FilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             }
         }
         if (column && this.canCreateColumnMenuItem(column, 'ReadOnly', 'filter')) {
-            let existingColumnFilter = this.api.layoutApi
-                .getAllColumnFilter()
+            let existingColumnFilter = this.api.filterApi
+                .getColumnFilters()
                 .find((x) => x.ColumnId == column.columnId);
             if (existingColumnFilter) {
                 baseMenuItems.push(this.createColumnMenuItemReduxAction('Clear Filter', this.moduleInfo.Glyph, LayoutRedux.LayoutColumnFilterClear(existingColumnFilter)));
@@ -78,7 +77,7 @@ class FilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     getTeamSharingAction() {
         return {
-            ModuleEntities: this.api.layoutApi.getAllColumnFilter(),
+            ModuleEntities: this.api.filterApi.getColumnFilters(),
             AddAction: LayoutRedux.LayoutColumnFilterAdd,
             EditAction: LayoutRedux.LayoutColumnFilterEdit,
         };
@@ -86,9 +85,7 @@ class FilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     toViewCompact(filter) {
         return {
             item: {
-                // we dont really need the name here - is there way to return a single vlaue that takes up the whole line?
-                // name: this.api.columnApi.getFriendlyNameFromColumnId(filter.ColumnId),
-                values: [this.api.layoutApi.columnFilterToString(filter)],
+                values: [this.api.filterApi.columnFilterToString(filter)],
             },
             abObject: filter,
         };
@@ -102,7 +99,7 @@ class FilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 },
                 {
                     name: 'Filter',
-                    values: [this.api.layoutApi.columnFilterToString(filter)],
+                    values: [this.api.filterApi.columnFilterToString(filter)],
                 },
             ],
             abObject: filter,
@@ -124,7 +121,7 @@ class FilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
       `,
             getStatusBarPanelProps() {
                 let text;
-                const filters = api.layoutApi.getAllColumnFilter();
+                const filters = api.filterApi.getColumnFilters();
                 if (filters.length === 0) {
                     text = '0 Filters';
                 }

package/src/Strategy/LayoutModule.js

@@ -42,6 +42,7 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     */
     getModuleAdaptableObjects() {
+        // ignore - triggering build
         return this.api.layoutApi.getAllLayout();
     }
     getExplicitlyReferencedColumnIds(layout) {

package/src/Strategy/PlusMinusModule.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PlusMinusModule = void 0;
 const tslib_1 = require("tslib");
-const Enums_1 = require("../PredefinedConfig/Common/Enums");
 const PlusMinusRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/PlusMinusRedux"));
 const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
 const ArrayExtensions_1 = require("../Utilities/Extensions/ArrayExtensions");
@@ -91,9 +90,7 @@ class PlusMinusModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         let failedPreventEdits = [];
         let side = direction == 'up' ? 1 : -1;
         cellsToUpdate.forEach((gridCell) => {
-            if (gridCell.column &&
-                gridCell.column.dataType == Enums_1.DataType.Number &&
-                !gridCell.column.readOnly) {
+            if (gridCell.column && gridCell.column.dataType == 'Number' && !gridCell.column.readOnly) {
                 let foundRule;
                 let replacementGridCell;
                 plusMinusNudges.forEach((pmr) => {

package/src/Strategy/SmartEditModule.js

@@ -23,7 +23,7 @@ class SmartEditModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         let menuItemShowPopup = undefined;
         if (!menuContext.isRowGroupColumn && this.isModuleEditable()) {
             if (menuContext.adaptableColumn &&
-                menuContext.adaptableColumn.dataType == Enums_1.DataType.Number &&
+                menuContext.adaptableColumn.dataType == 'Number' &&
                 !menuContext.adaptableColumn.readOnly &&
                 menuContext.isSelectedCell &&
                 menuContext.isSingleSelectedColumn &&
@@ -78,7 +78,7 @@ class SmartEditModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         }
         let column = selectedCellInfo.columns[0];
         if (column) {
-            if (column.dataType != Enums_1.DataType.Number) {
+            if (column.dataType != 'Number') {
                 return {
                     Alert: {
                         alertType: 'generic',

package/src/Utilities/Constants/GeneralConstants.d.ts

@@ -26,6 +26,8 @@ export declare const AB_SPECIAL_COLUMN: AdaptableColumnType;
 export declare const HALF_SECOND: number;
 export declare const AG_GRID_GROUPED_COLUMN: string;
 export declare const AG_GRID_PIVOT_COLUMN: string;
+export declare const ADAPTABLE_ROW_ACTION_BUTTONS = "adaptableRowActionButtons";
+export declare const ADAPTABLE_ROW_ACTION_BUTTONS_FRIENDLY_NAME = "(ActionRowButtons)";
 export declare const SYSTEM_STATUS_DEFAULT_MAX_MESSAGES_IN_STORE: number;
 export declare const QUICK_SEARCH_DEFAULT_BACK_COLOR: string;
 export declare const QUICK_SEARCH_DEFAULT_FORE_COLOR: string;

package/src/Utilities/Constants/GeneralConstants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.THEME_STYLE = exports.SELECTED_ROWS_REPORT = exports.SELECTED_CELLS_REPORT = exports.CURRENT_DATA_REPORT = exports.ALL_DATA_REPORT = exports.VISUAL_DATA_REPORT = exports.SYSTEM_THEMES = exports.SMART_EDIT_MATH_OPERATION_STATE_PROPERTY = exports.SMART_EDIT_VALUE_STATE_PROPERTY = exports.QUICK_SEARCH_STYLE_STATE_PROPERTY = exports.QUICK_SEARCH_TEXT_STATE_PROPERTY = exports.CURRENT_THEME_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_DURATION_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_DOWN_COLOR_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_UP_COLOR_STATE_PROPERTY = exports.CURRENT_REPORT_STATE_PROPERTY = exports.CURRENT_LAYOUT_STATE_PROPERTY = exports.SUMMARY_OPERATION_STATE_PROPERTY = exports.ALERT_DEFAULT_SHOW_POPUP = exports.ALERT_DEFAULT_MESSAGE_TYPE = exports.PLUS_MINUS_DEFAULT_NUDGE_VALUE = exports.DEFAULT_LIVE_REPORT_THROTTLE_TIME = exports.THEME_DEFAULT_CURRENT_THEME = exports.SYSTEM_DEFAULT_SYSTEM_STATUS_TYPE = exports.CELL_SUMMARY_DEFAULT_OPERATION = exports.QUICK_SEARCH_DEBOUNCE_TIME = exports.QUICK_SEARCH_DEFAULT_FORE_COLOR = exports.QUICK_SEARCH_DEFAULT_BACK_COLOR = exports.SYSTEM_STATUS_DEFAULT_MAX_MESSAGES_IN_STORE = exports.AG_GRID_PIVOT_COLUMN = exports.AG_GRID_GROUPED_COLUMN = exports.HALF_SECOND = exports.AB_SPECIAL_COLUMN = exports.EMPTY_ARRAY = exports.EMPTY_STRING = exports.FILTER_THROTTLE = exports.FILTER_NEVER = exports.FILTER_ALWAYS = exports.ALL_COLUMN_VALUES = exports.READ_ONLY_STYLE = exports.MENU_PREFIX = exports.AGGRID_TOOLPANEL_COLUMNS = exports.AGGRID_TOOLPANEL_FILTERS = exports.ADAPTABLE_TOOLPANEL_COMPONENT = exports.ADAPTABLE_TOOLPANEL_ID = exports.ADAPTABLE = exports.ADAPTABLE_ID = exports.USER_NAME = exports.DARK_THEME = exports.LIGHT_THEME = exports.DEFAULT_LAYOUT = exports.MISSING_COLUMN = exports.AUTOGENERATED_PK_COLUMN = void 0;
+exports.THEME_STYLE = exports.SELECTED_ROWS_REPORT = exports.SELECTED_CELLS_REPORT = exports.CURRENT_DATA_REPORT = exports.ALL_DATA_REPORT = exports.VISUAL_DATA_REPORT = exports.SYSTEM_THEMES = exports.SMART_EDIT_MATH_OPERATION_STATE_PROPERTY = exports.SMART_EDIT_VALUE_STATE_PROPERTY = exports.QUICK_SEARCH_STYLE_STATE_PROPERTY = exports.QUICK_SEARCH_TEXT_STATE_PROPERTY = exports.CURRENT_THEME_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_DURATION_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_DOWN_COLOR_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_UP_COLOR_STATE_PROPERTY = exports.CURRENT_REPORT_STATE_PROPERTY = exports.CURRENT_LAYOUT_STATE_PROPERTY = exports.SUMMARY_OPERATION_STATE_PROPERTY = exports.ALERT_DEFAULT_SHOW_POPUP = exports.ALERT_DEFAULT_MESSAGE_TYPE = exports.PLUS_MINUS_DEFAULT_NUDGE_VALUE = exports.DEFAULT_LIVE_REPORT_THROTTLE_TIME = exports.THEME_DEFAULT_CURRENT_THEME = exports.SYSTEM_DEFAULT_SYSTEM_STATUS_TYPE = exports.CELL_SUMMARY_DEFAULT_OPERATION = exports.QUICK_SEARCH_DEBOUNCE_TIME = exports.QUICK_SEARCH_DEFAULT_FORE_COLOR = exports.QUICK_SEARCH_DEFAULT_BACK_COLOR = exports.SYSTEM_STATUS_DEFAULT_MAX_MESSAGES_IN_STORE = exports.ADAPTABLE_ROW_ACTION_BUTTONS_FRIENDLY_NAME = exports.ADAPTABLE_ROW_ACTION_BUTTONS = exports.AG_GRID_PIVOT_COLUMN = exports.AG_GRID_GROUPED_COLUMN = exports.HALF_SECOND = exports.AB_SPECIAL_COLUMN = exports.EMPTY_ARRAY = exports.EMPTY_STRING = exports.FILTER_THROTTLE = exports.FILTER_NEVER = exports.FILTER_ALWAYS = exports.ALL_COLUMN_VALUES = exports.READ_ONLY_STYLE = exports.MENU_PREFIX = exports.AGGRID_TOOLPANEL_COLUMNS = exports.AGGRID_TOOLPANEL_FILTERS = exports.ADAPTABLE_TOOLPANEL_COMPONENT = exports.ADAPTABLE_TOOLPANEL_ID = exports.ADAPTABLE = exports.ADAPTABLE_ID = exports.USER_NAME = exports.DARK_THEME = exports.LIGHT_THEME = exports.DEFAULT_LAYOUT = exports.MISSING_COLUMN = exports.AUTOGENERATED_PK_COLUMN = void 0;
 const Enums_1 = require("../../PredefinedConfig/Common/Enums");
 const UIHelper_1 = require("../../View/UIHelper");
 exports.AUTOGENERATED_PK_COLUMN = '__ADAPTABLE_PK__';
@@ -28,6 +28,8 @@ exports.AB_SPECIAL_COLUMN = 'abSpecialColumn';
 exports.HALF_SECOND = 500;
 exports.AG_GRID_GROUPED_COLUMN = 'ag-Grid-AutoColumn';
 exports.AG_GRID_PIVOT_COLUMN = 'pivot_';
+exports.ADAPTABLE_ROW_ACTION_BUTTONS = 'adaptableRowActionButtons';
+exports.ADAPTABLE_ROW_ACTION_BUTTONS_FRIENDLY_NAME = '(ActionRowButtons)';
 /*
 Redux / State Defaults
 Try to put all our Redux / State defaults here and ONLY reference from here - avoid magic numbers / strings.

package/src/Utilities/Defaults/DefaultAdaptableOptions.js

@@ -227,6 +227,8 @@ exports.DefaultAdaptableOptions = {
             actionColumns: undefined,
             actionRowButtons: undefined,
             actionRowButtonsPosition: 'pinnedLeft',
+            autoHandleActionRowButtons: false,
+            setPrimaryKeyValue: undefined,
         },
         colorPalette: UIHelper_1.default.getDefaultColors(),
         editableCellStyle: undefined,