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

package/src/Utilities/Services/CalculatedColumnExpressionService.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CalculatedColumnExpressionService = void 0;
-const Enums_1 = require("../../PredefinedConfig/Common/Enums");
 const LoggingHelper_1 = require("../Helpers/LoggingHelper");
 const ModuleConstants_1 = require("../Constants/ModuleConstants");
 const scalarAggregationHelper_1 = require("../ExpressionFunctions/scalarAggregationHelper");
@@ -42,28 +41,28 @@ class CalculatedColumnExpressionService {
                 // currently AggregatedScalarExpression support only numerical values
                 // TODO AFL try to derive the type from the aggregatedColumn?
                 // we definitely don't want to aggregate everything only to get the data type
-                return Enums_1.DataType.Number;
+                return 'Number';
             }
             let firstRowNode = this.adaptableApi.gridApi.getFirstRowNode();
             let firstRowValue = this.adaptableApi.internalApi
                 .getQueryLanguageService()
                 .evaluateScalarExpression(calculatedColumnQuery.ScalarExpression, ModuleConstants_1.CalculatedColumnModuleId, firstRowNode);
             if (firstRowValue instanceof Date) {
-                return Enums_1.DataType.Date;
+                return 'Date';
             }
             if (typeof firstRowValue === 'boolean') {
-                return Enums_1.DataType.Boolean;
+                return 'Boolean';
             }
             if (typeof firstRowValue === 'string') {
-                return Enums_1.DataType.String;
+                return 'String';
             }
             if (typeof firstRowValue === 'number') {
-                return Enums_1.DataType.Number;
+                return 'Number';
             }
         }
         catch (e) {
             LoggingHelper_1.LogAdaptableWarning(`Invalid CalculatedColumn expression ${this.adaptableApi.queryLanguageApi.getAdaptableQueryExpression(calculatedColumnQuery)} :: ${e}`);
-            return Enums_1.DataType.Number;
+            return 'Number';
         }
     }
     isCalculatedColumnQueryValid(calculatedColumnQuery) {

package/src/Utilities/Services/RowEditService.d.ts

@@ -22,4 +22,5 @@ export declare class RowEditService implements IRowEditService {
     private buildFormFieldLabelContext;
     private getFieldTypeFromColumnType;
     private getFieldValueOptions;
+    private autoHandleActionRowButtons;
 }

package/src/Utilities/Services/RowEditService.js

@@ -7,6 +7,10 @@ class RowEditService {
         this.adaptableInstance = this.adaptableApi.internalApi.getAdaptableInstance();
         this.rowEditFormOptions =
             this.adaptableApi.internalApi.getAdaptableInstance().adaptableOptions.editOptions.rowFormOptions;
+        if (this.adaptableInstance.adaptableOptions.userInterfaceOptions.actionOptions
+            .autoHandleActionRowButtons) {
+            this.adaptableInstance.api.eventApi.on('RowFormSubmitted', (eventInfo) => this.autoHandleActionRowButtons(eventInfo));
+        }
     }
     buildRowEditForm(rowNode) {
         return this.buildRowForm('rowEdited', rowNode);
@@ -48,10 +52,13 @@ class RowEditService {
         };
     }
     buildRowFormFields(type, rowNode) {
-        const relevantColumns = this.adaptableApi.columnApi.getColumns().filter((column) => {
+        const relevantColumns = this.adaptableApi.columnApi
+            .getColumns()
+            .filter((column) => {
             // if there is NO rowNode, do NOT display the non-editable fields as they will be empty
             return !!rowNode || this.isColumnEditable(column, rowNode);
-        });
+        })
+            .filter((column) => !this.adaptableApi.columnApi.isActionRowButtonColumn(column.columnId));
         return relevantColumns.map((column) => this.buildFormField(type, column, rowNode));
     }
     buildRowFormButtons(type, rowNode) {
@@ -161,5 +168,30 @@ class RowEditService {
             label: value,
         }));
     }
+    autoHandleActionRowButtons(rowEditedFormInfo) {
+        const { adaptableApi } = rowEditedFormInfo;
+        if (rowEditedFormInfo.type === 'rowEdited') {
+            const { rowNode, formData } = rowEditedFormInfo;
+            const newRowData = Object.assign(Object.assign({}, rowNode.data), formData);
+            adaptableApi.gridApi.updateGridData([newRowData]);
+        }
+        if (rowEditedFormInfo.type === 'rowDeleted') {
+            const { rowNode } = rowEditedFormInfo;
+            const deletedRowData = rowNode.data;
+            adaptableApi.gridApi.deleteGridData([deletedRowData]);
+        }
+        if (rowEditedFormInfo.type === 'rowCreated') {
+            const { formData } = rowEditedFormInfo;
+            const setPrimaryKeyValueFunction = adaptableApi.internalApi.getAdaptableInstance().adaptableOptions.userInterfaceOptions
+                .actionOptions.setPrimaryKeyValue;
+            const newRowData = typeof setPrimaryKeyValueFunction === 'function'
+                ? setPrimaryKeyValueFunction({
+                    rowData: formData,
+                    adaptableApi,
+                })
+                : Object.assign({}, formData);
+            adaptableApi.gridApi.addGridData([newRowData], { addIndex: 0 });
+        }
+    }
 }
 exports.RowEditService = RowEditService;

package/src/View/BulkUpdate/BulkUpdatePopup.js

@@ -6,7 +6,6 @@ const React = tslib_1.__importStar(require("react"));
 const react_redux_1 = require("react-redux");
 const BulkUpdateRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/BulkUpdateRedux"));
 const SystemRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/SystemRedux"));
-const Enums_1 = require("../../PredefinedConfig/Common/Enums");
 const PanelWithImage_1 = require("../Components/Panels/PanelWithImage");
 const AdaptablePopover_1 = require("../AdaptablePopover");
 const StringExtensions_1 = require("../../Utilities/Extensions/StringExtensions");
@@ -34,7 +33,7 @@ class BulkUpdatePopupComponent extends React.Component {
         let dataTypeErrorMessage = '';
         if (col && StringExtensions_1.StringExtensions.IsNotNullOrEmpty(this.props.BulkUpdateValue)) {
             // check that the update value is a number for a numeric column.  not issue for dates as we dont allow free text
-            if (col.dataType == Enums_1.DataType.Number) {
+            if (col.dataType == 'Number') {
                 if (isNaN(Number(this.props.BulkUpdateValue))) {
                     hasDataTypeError = true;
                     dataTypeErrorMessage = 'This column only accepts numbers';
@@ -50,7 +49,7 @@ class BulkUpdatePopupComponent extends React.Component {
             return null;
         }
         return (React.createElement(PanelWithImage_1.PanelWithImage, { bodyProps: { padding: 2 }, flex: 1, glyphicon: this.props.moduleInfo.Glyph, header: this.props.moduleInfo.FriendlyName, infoLink: this.props.moduleInfo.HelpPage, infoLinkDisabled: !this.props.api.internalApi.isDocumentationLinksDisplayed(), variant: "primary" },
-            col.dataType == Enums_1.DataType.Date ? (React.createElement(React.Fragment, null,
+            col.dataType == 'Date' ? (React.createElement(React.Fragment, null,
                 React.createElement(HelpBlock_1.default, { marginTop: 2, marginBottom: 2 }, "Enter a date value. Alternatively, tick the checkbox and select from an existing column value."),
                 React.createElement(rebass_1.Box, null,
                     React.createElement(CheckBox_1.CheckBox, { marginLeft: 2, onChange: (checked) => this.onUseColumnValuesSelectorChanged(checked), checked: this.state.useSelector },

package/src/View/CalculatedColumn/Wizard/CalculatedColumnExpressionWizardSection.js

@@ -6,7 +6,6 @@ const React = tslib_1.__importStar(require("react"));
 const react_1 = require("react");
 const rebass_1 = require("rebass");
 const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
-const Enums_1 = require("../../../PredefinedConfig/Common/Enums");
 const ExpressionEditor_1 = require("../../../components/ExpressionEditor");
 const Tabs_1 = require("../../../components/Tabs");
 const CodeBlock_1 = require("../../../components/CodeBlock");
@@ -65,8 +64,8 @@ exports.CalculatedColumnExpressionWizardSection = (props) => {
     const setCalculatedColumnExpression = (calculatedColumnQuery) => {
         const calculatedColumnExpressionService = api.internalApi.getCalculatedColumnExpressionService();
         const dataType = calculatedColumnExpressionService.getCalculatedColumnDataType(calculatedColumnQuery);
-        const Pivotable = dataType == Enums_1.DataType.String;
-        const Aggregatable = dataType == Enums_1.DataType.Number;
+        const Pivotable = dataType == 'String';
+        const Aggregatable = dataType == 'Number';
         props.onChange(Object.assign(Object.assign({}, data), { Query: calculatedColumnQuery, CalculatedColumnSettings: Object.assign(Object.assign({}, data.CalculatedColumnSettings), { DataType: dataType, Pivotable,
                 Aggregatable }) }));
     };

package/src/View/CalculatedColumn/Wizard/CalculatedColumnSettingsWizardSection.js

@@ -4,7 +4,6 @@ exports.CalculatedColumnSettingsWizardSection = exports.isValidCalculatedColumnS
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const rebass_1 = require("rebass");
-const Enums_1 = require("../../../PredefinedConfig/Common/Enums");
 const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
 const FormLayout_1 = tslib_1.__importStar(require("../../../components/FormLayout"));
 const Input_1 = tslib_1.__importDefault(require("../../../components/Input"));
@@ -64,10 +63,10 @@ exports.CalculatedColumnSettingsWizardSection = (props) => {
     const validCheck = exports.isValidCalculatedColumnSettings(data, api);
     const ErrorMessage = validCheck === true ? null : validCheck;
     let options = [
-        { value: Enums_1.DataType.Number, label: Enums_1.DataType.Number },
-        { value: Enums_1.DataType.String, label: Enums_1.DataType.String },
-        { value: Enums_1.DataType.Date, label: Enums_1.DataType.Date },
-        { value: Enums_1.DataType.Boolean, label: Enums_1.DataType.Boolean },
+        { value: 'Number', label: 'Number' },
+        { value: 'String', label: 'String' },
+        { value: 'Date', label: 'Date' },
+        { value: 'Boolean', label: 'Boolean' },
     ];
     const [ColumnNameFocused, setColumnNameFocused] = react_1.useState(false);
     const ColumnName = data.FriendlyName;

package/src/View/CellSummary/CellSummaryDetails.js

@@ -6,8 +6,8 @@ const React = tslib_1.__importStar(require("react"));
 const EmptyContent_1 = tslib_1.__importDefault(require("../../components/EmptyContent"));
 const InfiniteTable_1 = require("../../components/InfiniteTable");
 const columnsMap = new Map([
-    ['Operation', { field: 'Operation', flex: 1 }],
-    ['Value', { field: 'Value', flex: 1 }],
+    ['Operation', { field: 'Operation', defaultFlex: 1 }],
+    ['Value', { field: 'Value', defaultFlex: 1 }],
 ]);
 const tableDOMProps = {
     style: {

package/src/View/Components/FilterForm/FilterForm.js

@@ -105,7 +105,7 @@ class FilterFormComponent extends React.Component {
         this._isMounted = false;
     }
     componentDidMount() {
-        if (this.props.currentColumn.dataType != Enums_1.DataType.Boolean) {
+        if (this.props.currentColumn.dataType != 'Boolean') {
             this.loadPermittedValues();
         }
     }

package/src/View/Components/FilterForm/QuickFilterForm.js

@@ -321,7 +321,7 @@ class QuickFilterFormComponent extends React.Component {
     }
     clearFilter() {
         const { filter } = this.state;
-        this.props.api.layoutApi.clearColumnFilterByColumn(filter.ColumnId);
+        this.props.api.filterApi.clearColumnFilterByColumn(filter.ColumnId);
     }
     hasValuesPredicate(predicate) {
         return (predicate === null || predicate === void 0 ? void 0 : predicate.PredicateId) === 'Values' || (predicate === null || predicate === void 0 ? void 0 : predicate.PredicateId) === 'ExcludeValues';

package/src/View/Components/PreviewResultsPanel.js

@@ -9,9 +9,9 @@ const check_1 = tslib_1.__importDefault(require("../../components/icons/check"))
 const UIHelper_1 = tslib_1.__importDefault(require("../UIHelper"));
 const Panel_1 = tslib_1.__importDefault(require("../../components/Panel"));
 const columnsMap = new Map([
-    ['InitialValue', { field: 'InitialValue', flex: 1, header: 'Current', align: 'center' }],
-    ['ComputedValue', { field: 'ComputedValue', flex: 1, header: 'New', align: 'center' }],
-    ['ValidInfo', { field: 'ValidInfo', width: 80, header: 'Valid', align: 'center' }],
+    ['InitialValue', { field: 'InitialValue', defaultFlex: 1, header: 'Current', align: 'center' }],
+    ['ComputedValue', { field: 'ComputedValue', defaultFlex: 1, header: 'New', align: 'center' }],
+    ['ValidInfo', { field: 'ValidInfo', defaultWidth: 80, header: 'Valid', align: 'center' }],
 ]);
 const tableDOMProps = {
     style: { flex: 1 },

package/src/View/Components/WizardSummaryPage.js

@@ -6,8 +6,8 @@ const React = tslib_1.__importStar(require("react"));
 const WizardPanel_1 = tslib_1.__importDefault(require("../../components/WizardPanel"));
 const InfiniteTable_1 = require("../../components/InfiniteTable");
 const columnsMap = new Map([
-    ['Key', { field: 'Key', header: 'Property', flex: 1 }],
-    ['Value', { field: 'Value', header: 'Value', flex: 3 }],
+    ['Key', { field: 'Key', header: 'Property', defaultFlex: 1 }],
+    ['Value', { field: 'Value', header: 'Value', defaultFlex: 3 }],
 ]);
 const tableDOMProps = {
     className: 'ab-WizardSummary__list',

package/src/View/Filter/ActiveFiltersPanel.js

@@ -9,6 +9,6 @@ const AdaptableObjectCompactList_1 = require("../Components/AdaptableObjectList/
 exports.ActiveFiltersPanel = () => {
     const adaptable = AdaptableContext_1.useAdaptable();
     const filterModule = adaptable.ModuleService.getModuleById(ModuleConstants.FilterModuleId);
-    const columnFilters = adaptable.api.layoutApi.getAllColumnFilter();
+    const columnFilters = adaptable.api.filterApi.getColumnFilters();
     return React.createElement(AdaptableObjectCompactList_1.AdaptableObjectCompactList, { abObjects: columnFilters, module: filterModule });
 };

package/src/View/Filter/FilterSummary.js

@@ -34,7 +34,7 @@ class FilterSummaryComponent extends React.Component {
         if (columnFilter == null) {
             return 'No Column Filter Active';
         }
-        return this.props.api.layoutApi.columnFilterToString(columnFilter);
+        return this.props.api.filterApi.columnFilterToString(columnFilter);
     }
 }
 exports.FilterSummaryComponent = FilterSummaryComponent;

package/src/View/Filter/FilterViewPanel.js

@@ -27,10 +27,10 @@ class FilterViewPanelComponent extends React.Component {
                 } }, "Show Quick Filter")))));
     }
     onClearFilters() {
-        this.props.api.layoutApi.clearAllColumnFilter();
+        this.props.api.filterApi.clearColumnFilters();
     }
     onClearColumnFilter(columnFilter) {
-        this.props.api.layoutApi.clearColumnFilterByColumn(columnFilter.ColumnId);
+        this.props.api.filterApi.clearColumnFilterByColumn(columnFilter.ColumnId);
     }
 }
 function mapStateToProps(state) {

package/src/View/FreeTextColumn/Wizard/FreeTextColumnSettingsWizardSection.js

@@ -8,7 +8,6 @@ const Input_1 = tslib_1.__importDefault(require("../../../components/Input"));
 const ErrorBox_1 = tslib_1.__importDefault(require("../../../components/ErrorBox"));
 const Radio_1 = tslib_1.__importDefault(require("../../../components/Radio"));
 const FormLayout_1 = tslib_1.__importStar(require("../../../components/FormLayout"));
-const Enums_1 = require("../../../PredefinedConfig/Common/Enums");
 const DropdownButton_1 = tslib_1.__importDefault(require("../../../components/DropdownButton"));
 const react_1 = require("react");
 const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
@@ -19,10 +18,10 @@ const DateHelper_1 = require("../../../Utilities/Helpers/DateHelper");
 const Tag_1 = require("../../../components/Tag");
 const SpecialColumnSettingsWizardStep_1 = require("../../SpecialColumnSettingsWizardStep");
 const options = [
-    { value: Enums_1.DataType.Number, label: Enums_1.DataType.Number },
-    { value: Enums_1.DataType.String, label: Enums_1.DataType.String },
-    { value: Enums_1.DataType.Date, label: Enums_1.DataType.Date },
-    { value: Enums_1.DataType.Boolean, label: Enums_1.DataType.Boolean },
+    { value: 'Number', label: 'Number' },
+    { value: 'String', label: 'String' },
+    { value: 'Date', label: 'Date' },
+    { value: 'Boolean', label: 'Boolean' },
 ];
 exports.renderFreeTextColumnSummary = (data) => {
     var _a;

package/src/View/GridInfo/ColumnInfoComponent.js

@@ -125,7 +125,7 @@ class ColumnInfoComponent extends React.Component {
                     React.createElement(FreeTextColumnSummary_1.FreeTextColumnSummary, { key: ModuleConstants.FreeTextColumnModuleId, summarisedColumn: this.state.SelectedColumn, teamSharingActivated: this.props.teamSharingActivated, accessLevel: this.getAccessLevel(ModuleConstants.FreeTextColumnModuleId), api: this.props.api, moduleInfo: moduleService.getModuleInfoByModule(ModuleConstants.FreeTextColumnModuleId) })));
             }
             if (this.isModuleAvailable(ModuleConstants.PlusMinusModuleId) &&
-                this.state.SelectedColumn.dataType == Enums_1.DataType.Number) {
+                this.state.SelectedColumn.dataType == 'Number') {
                 summaries.push(React.createElement("div", { key: ModuleConstants.PlusMinusModuleId, className: this.isModuleReadOnly(ModuleConstants.PlusMinusModuleId)
                         ? GeneralConstants.READ_ONLY_STYLE
                         : '' },

package/src/View/GridInfo/GridInfoPopup.js

@@ -57,7 +57,7 @@ exports.GridInfoPopup = (props) => {
         const freeTextColumns = props.api.freeTextColumnApi
             .getAllFreeTextColumn()
             .map((c) => c.ColumnId);
-        const columnFilterDescription = props.api.layoutApi.columnFiltersToString(props.api.layoutApi.getAllColumnFilter());
+        const columnFilterDescription = props.api.filterApi.columnFiltersToString(props.api.filterApi.getColumnFilters());
         const sorts = ArrayExtensions_1.default.IsNotNullOrEmpty(props.api.gridApi.getColumnSorts())
             ? props.api.gridApi.getColumnSorts().map((gs) => {
                 return props.api.columnApi.getFriendlyNameFromColumnId(gs.ColumnId) + ': ' + gs.SortOrder;

package/src/View/UIHelper.js

@@ -109,22 +109,22 @@ function getEmptyConfigState() {
 exports.getEmptyConfigState = getEmptyConfigState;
 function getDescriptionForDataType(dataType) {
     switch (dataType) {
-        case Enums_1.DataType.String:
+        case 'String':
             return 'string';
-        case Enums_1.DataType.Number:
+        case 'Number':
             return 'number';
-        case Enums_1.DataType.Date:
+        case 'Date':
             return 'date';
     }
 }
 exports.getDescriptionForDataType = getDescriptionForDataType;
 function getPlaceholderForDataType(dataType) {
     switch (dataType) {
-        case Enums_1.DataType.String:
+        case 'String':
             return 'Enter Value';
-        case Enums_1.DataType.Number:
+        case 'Number':
             return 'Enter Number';
-        case Enums_1.DataType.Date:
+        case 'Date':
             return 'Enter Date';
     }
 }

package/src/agGrid/Adaptable.js

@@ -1625,7 +1625,7 @@ class Adaptable {
         // see https://www.ag-grid.com/javascript-data-grid/change-detection/#triggering-value-change-detection
         let newValue;
         let dataType = column.dataType;
-        newValue = dataType == Enums_1.DataType.Number ? Number(value) : value;
+        newValue = dataType == 'Number' ? Number(value) : value;
         if (dataType == undefined) {
             return; // no point continuing as probably a wrong  column
         }
@@ -2190,6 +2190,17 @@ class Adaptable {
         }
         const editButtons = actionRowButtons
             .map((buttonName) => {
+            if (buttonName === 'create') {
+                // we need this dirty hack until ActionColumn support for custom icons is improved
+                const label = rowEditIcons_1.rowAddIcon;
+                return {
+                    label,
+                    tooltip: 'Create',
+                    onClick: () => {
+                        this.api.gridApi.openCreateRowForm();
+                    },
+                };
+            }
             if (buttonName === 'edit') {
                 // we need this dirty hack until ActionColumn support for custom icons is improved
                 const label = rowEditIcons_1.rowEditIcon;
@@ -2236,17 +2247,20 @@ class Adaptable {
             return [];
         }
         const rowEditActionColumn = {
-            columnId: 'adaptableRowEditButtons',
+            columnId: GeneralConstants_1.ADAPTABLE_ROW_ACTION_BUTTONS,
             actionColumnButton: editButtons,
         };
         return [
             {
                 headerName: '',
-                colId: 'adaptableRowEditButtons',
+                colId: GeneralConstants_1.ADAPTABLE_ROW_ACTION_BUTTONS,
                 hide: false,
                 editable: false,
                 width: editButtons.length * 42,
                 resizable: false,
+                lockVisible: true,
+                suppressColumnsToolPanel: true,
+                suppressFiltersToolPanel: true,
                 suppressMenu: true,
                 suppressMovable: true,
                 filter: false,
@@ -2260,7 +2274,7 @@ class Adaptable {
                 cellRendererParams: {
                     actionColumn: rowEditActionColumn,
                 },
-                cellClass: 'adaptableRowEditButtons',
+                cellClass: GeneralConstants_1.ADAPTABLE_ROW_ACTION_BUTTONS,
                 type: [GeneralConstants_1.AB_SPECIAL_COLUMN, 'abColDefObject'],
             },
         ];
@@ -2857,7 +2871,7 @@ class Adaptable {
             if (this.isDestroyed) {
                 return true;
             }
-            const columnFilters = this.api.layoutApi.getAllColumnFilter();
+            const columnFilters = this.api.filterApi.getColumnFilters();
             const isFilterActive = ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(columnFilters);
             const isQueryActive = StringExtensions_1.StringExtensions.IsNotNullOrEmpty(this.api.queryApi.getCurrentQuery());
             return (isFilterActive ||
@@ -2888,10 +2902,10 @@ class Adaptable {
             try {
                 // we then assess filters (if running locally)
                 if (evaluateFilterOnClient) {
-                    const columnFilters = this.api.layoutApi.getAllColumnFilter();
+                    const columnFilters = this.api.filterApi.getColumnFilters();
                     if (columnFilters.length > 0) {
                         for (const columnFilter of columnFilters) {
-                            if (!this.api.layoutApi.evaluateColumnFilter(columnFilter, node)) {
+                            if (!this.api.filterApi.evaluateColumnFilter(columnFilter, node)) {
                                 return false;
                             }
                         }
@@ -2918,7 +2932,7 @@ class Adaptable {
         this.prepareGrid();
     }
     updateColumnFilterActiveState() {
-        const columnFilters = this.api.layoutApi.getAllColumnFilter();
+        const columnFilters = this.api.filterApi.getColumnFilters();
         const isFilterActive = ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(columnFilters);
         const columnsWithActiveFilters = {};
         if (isFilterActive) {
@@ -3947,7 +3961,7 @@ class Adaptable {
     checkColumnsDataTypeSet() {
         // check that we have no unknown columns - if we do then ok
         const colDefs = this.api.columnApi.getColumns();
-        if (colDefs.some((colDef) => colDef.dataType === Enums_1.DataType.Unknown)) {
+        if (colDefs.some((colDef) => colDef.dataType === 'Unknown')) {
             this.updateColumnsIntoStore();
         }
     }
@@ -4126,7 +4140,7 @@ class Adaptable {
         themeClassNamesToRemove.forEach((cssClassName) => el.classList.remove(cssClassName));
         // remove infinite table classnames
         themesToRemove.forEach((theme) => {
-            el.classList.remove(`it--theme-${theme.Name}`);
+            el.classList.remove(`infinite-${theme.Name}`);
         });
         if (this.adaptableOptions.userInterfaceOptions &&
             this.adaptableOptions.userInterfaceOptions.useCustomMacLikeScrollbars &&
@@ -4140,7 +4154,7 @@ class Adaptable {
         const newThemeClassName = GeneralConstants.THEME_STYLE + themeName;
         el.classList.add(newThemeClassName);
         // add infinite table classname for theme
-        el.classList.add(`it--theme-${themeName}`);
+        el.classList.add(`infinite-${themeName}`);
         const computedDocumentStyle = getComputedStyle(el);
         const [abLoaded, abThemeLoaded] = ['--ab-loaded', '--ab-theme-loaded'].map((variable) => {
             let val = computedDocumentStyle.getPropertyValue(variable);

package/src/agGrid/FilterWrapper.js

@@ -15,8 +15,8 @@ exports.FilterWrapperFactory = (adaptable) => {
         }
         isFilterActive() {
             //make the small filter icon to appear when there is a filter
-            return (adaptable.api.layoutApi
-                .getAllColumnFilter()
+            return (adaptable.api.filterApi
+                .getColumnFilters()
                 .findIndex((x) => x.ColumnId == this.params.column.getColId()) > -1);
         }
         doesFilterPass(params) {

package/src/agGrid/agGridHelper.d.ts

@@ -1,8 +1,7 @@
 import { ColDef, Column, GridOptions, ICellRendererFunc, SideBarDef, ToolPanelDef } from '@ag-grid-community/all-modules';
 import { IAdaptable } from '../AdaptableInterfaces/IAdaptable';
-import { AdaptableColumn, AdaptableColumnGroup } from '../PredefinedConfig/Common/AdaptableColumn';
+import { AdaptableColumn, AdaptableColumnDataType, AdaptableColumnGroup } from '../PredefinedConfig/Common/AdaptableColumn';
 import { AdaptableNodeComparerFunction } from '../PredefinedConfig/Common/AdaptableComparerFunction';
-import { DataType } from '../PredefinedConfig/Common/Enums';
 import { AdaptableColumnType, AdaptableModule } from '../PredefinedConfig/Common/Types';
 import { IModule } from '../Strategy/Interface/IModule';
 import { IPPStyle } from '../Utilities/Interface/IPPStyle';
@@ -47,7 +46,7 @@ export declare class agGridHelper {
     private isColumnSparkline;
     private getColumnDataType;
     private getAbColDefValue;
-    getAgGridDataType(dataType: DataType): AdaptableColumnType;
+    getAgGridDataType(dataType: AdaptableColumnDataType): AdaptableColumnType;
     checkShouldClearExistingFiltersOrSearches(): void;
     runAdaptableGroupComparerFunction(): AdaptableNodeComparerFunction;
     getCurrentIPPStyle(): IPPStyle;