@adaptabletools/adaptable 20.0.0-canary.22 → 20.0.0-canary.23

package/src/agGrid/AdaptableAgGrid.d.ts

@@ -8,7 +8,7 @@ import { EmitterCallback } from '../Utilities/Emitter';
 import { AdaptablePlugin } from '../AdaptableOptions/AdaptablePlugin';
 import { AgGridAdapter } from './AgGridAdapter';
 import { IDataService } from '../Utilities/Services/Interface/IDataService';
-import { AdaptableState } from '../PredefinedConfig/AdaptableState';
+import { AdaptableState } from '../AdaptableState/AdaptableState';
 import { IAdaptableStore } from '../Redux/Store/Interface/IAdaptableStore';
 import { ICalculatedColumnExpressionService } from '../Utilities/Services/Interface/ICalculatedColumnExpressionService';
 import { IModuleService } from '../Utilities/Services/Interface/IModuleService';
@@ -26,7 +26,7 @@ import { RenderReactRootFn } from '../renderReactRoot';
 import { AgGridOptionsService } from './AgGridOptionsService';
 import { AgGridColumnAdapter } from './AgGridColumnAdapter';
 import { RowFormService } from '../Utilities/Services/RowFormService';
-import { GridCellWithCount } from '../PredefinedConfig/Selection/GridCell';
+import { GridCellWithCount } from '../AdaptableState/Selection/GridCell';
 import { FlashingCellService } from '../Utilities/Services/FlashingCellService';
 import { AgGridExportAdapter } from './AgGridExportAdapter';
 import { AgGridThemeAdapter } from './AgGridThemeAdapter';

package/src/agGrid/AdaptableAgGrid.js

@@ -24,7 +24,7 @@ import { AlertService } from '../Utilities/Services/AlertService';
 import { TeamSharingService } from '../Utilities/Services/TeamSharingService';
 import { MetamodelService } from '../Utilities/Services/MetamodelService';
 import { LicenseService } from '../Utilities/Services/LicenseService';
-import { ALL_TOOL_PANELS } from '../PredefinedConfig/Common/Types';
+import { ALL_TOOL_PANELS } from '../AdaptableState/Common/Types';
 import * as ModuleConstants from '../Utilities/Constants/ModuleConstants';
 import { GridFilterModuleId } from '../Utilities/Constants/ModuleConstants';
 import { DashboardModule } from '../Strategy/DashboardModule';
@@ -67,7 +67,7 @@ import { Helper } from '../Utilities/Helpers/Helper';
 import { createUuid } from '../components/utils/uuid';
 import UIHelper from '../View/UIHelper';
 import { getAdaptableToolPanelAgGridComponent } from '../View/Components/ToolPanel/AdaptableToolPanel';
-import { ADAPTABLE_STATUS_PANEL } from '../PredefinedConfig/StatusBarState';
+import { ADAPTABLE_STATUS_PANEL } from '../AdaptableState/StatusBarState';
 import { AdaptableStatusBar } from '../View/StatusBar/AdaptableStatusBar';
 import ArrayExtensions from '../Utilities/Extensions/ArrayExtensions';
 import { AgGridMenuAdapter } from './AgGridMenuAdapter';
@@ -77,9 +77,9 @@ import { AgGridOptionsService } from './AgGridOptionsService';
 import { parseDateValue } from '../Utilities/Helpers/DateHelper';
 import { AgGridColumnAdapter } from './AgGridColumnAdapter';
 import getScrollbarSize from '../Utilities/getScrollbarSize';
-import { WEIGHTED_AVERAGE_AGG_FN_NAME, } from '../PredefinedConfig/Common/AggregationColumns';
+import { WEIGHTED_AVERAGE_AGG_FN_NAME, } from '../AdaptableState/Common/AggregationColumns';
 import { RowFormService } from '../Utilities/Services/RowFormService';
-import { FilterOnDataChangeOptions } from '../PredefinedConfig/Common/Enums';
+import { FilterOnDataChangeOptions } from '../AdaptableState/Common/Enums';
 import { ADAPTABLE_PUBLISH_TIMESTAMP } from '../EnvVars';
 import { AdaptableUpgradeHelper } from '../migration/AdaptableUpgradeHelper';
 import { ensureLoadingScreenPortalElement } from '../components/Modal';
@@ -87,13 +87,13 @@ import { AdaptableLoadingScreen } from '../View/Components/Popups/AdaptableLoadi
 import { createElement } from 'react';
 import { createAgStatusPanelComponent } from '../Utilities/createAgStatusPanelComponent';
 import { weightedAverage } from '../Utilities/weightedAverage';
-import { ROW_SUMMARY_ROW_ID } from '../PredefinedConfig/Common/RowSummary';
+import { ROW_SUMMARY_ROW_ID } from '../AdaptableState/Common/RowSummary';
 import { FlashingCellService } from '../Utilities/Services/FlashingCellService';
 import { AgGridExportAdapter } from './AgGridExportAdapter';
 import { checkForDuplicateColumns, isPivotLayout, layoutModelToLayoutState, layoutStateToLayoutModel, normalizeLayout, tableLayoutToTableLayoutModel, } from '../Api/Implementation/LayoutHelpers';
 import { LayoutManager } from '../layout-manager/src';
 import { isPivotLayoutModel } from '../layout-manager/src/isPivotLayoutModel';
-import { ACTION_COLUMN_TYPE, CALCULATED_COLUMN_TYPE, FDC3_COLUMN_TYPE, FREE_TEXT_COLUMN_TYPE, } from '../PredefinedConfig/Common/AdaptableColumn';
+import { ACTION_COLUMN_TYPE, CALCULATED_COLUMN_TYPE, FDC3_COLUMN_TYPE, FREE_TEXT_COLUMN_TYPE, } from '../AdaptableState/Common/AdaptableColumn';
 import { agGridDataTypeDefinitions } from './agGridDataTypeDefinitions';
 import { AgGridThemeAdapter } from './AgGridThemeAdapter';
 import { mapOldTypeToDataType } from '../migration/VersionUpgrade20';
@@ -493,7 +493,7 @@ export class AdaptableAgGrid {
         // ensure that at least one Layout has been provided
         if (!layoutState || !layoutState.Layouts?.length) {
             this.logger
-                .consoleError(`You have not defined any Layout in your predefinedConfig.Layout.Layouts[] state!
+                .consoleError(`You have not defined any Layout in your InitialState.Layout.Layouts[] state!
 
 You need to define at least one Layout!`);
         }
@@ -527,7 +527,7 @@ You need to define at least one Layout!`);
                 isTree: !!gridOptions.treeData,
             };
             // it's very important that we do this here
-            // as the layout may not be fully specified in the predefinedConfig
+            // as the layout may not be fully specified in the initialState
             // eg: might not include the generated row group columns in the column order
             // but the normalization does this for us
             state.Layout.Layouts = state.Layout.Layouts.map((layout) => normalizeLayout(layout, normalizeOptions));
@@ -538,7 +538,7 @@ You need to define at least one Layout!`);
         if (state?.ToolPanel?.ToolPanels) {
             return state;
         }
-        // no predefined config provided, we will display all the panels collapsed (custom & module)
+        // no Initial Adaptable State provided, we will display all the panels collapsed (custom & module)
         const defaultToolPanels = [];
         this.adaptableOptions.toolPanelOptions?.customToolPanels?.forEach((customToolPanel) => defaultToolPanels.push({ Name: customToolPanel.name }));
         ALL_TOOL_PANELS.forEach((moduleToolPanel) => defaultToolPanels.push({ Name: moduleToolPanel }));
@@ -548,11 +548,12 @@ You need to define at least one Layout!`);
         return state;
     }
     applyFiltering() {
-        this.agGridAdapter.getAgGridApi().onFilterChanged();
+        const agGridApi = this.agGridAdapter.getAgGridApi();
         this._emit('AdapTableFiltersApplied');
         this.refreshSelectedCellsState();
         this.refreshSelectedRowsState();
         this.agGridAdapter.updateColumnFilterActiveState();
+        agGridApi.onFilterChanged();
     }
     // refreshAgGridWithAdaptableState() {
     //   this.refreshColDefs();

package/src/agGrid/AdaptableLogger.d.ts

@@ -1,4 +1,4 @@
-import { AdaptableMessageType } from '../PredefinedConfig/Common/AdaptableMessageType';
+import { AdaptableMessageType } from '../AdaptableState/Common/AdaptableMessageType';
 export declare const errorOnce: (message: string) => void;
 export declare class AdaptableLogger {
     private adaptableId;

package/src/agGrid/AgGridAdapter.d.ts

@@ -1,8 +1,8 @@
 import { ColDef, ColGroupDef, Column, GridApi, GridOptions, IRowNode, ManagedGridOptionKey, ManagedGridOptions, Module, ModuleName } from 'ag-grid-enterprise';
 import { AdaptableAgGrid } from './AdaptableAgGrid';
-import { AdaptableColumn, AdaptableColumnGroup } from '../PredefinedConfig/Common/AdaptableColumn';
-import { SelectedCellInfo } from '../PredefinedConfig/Selection/SelectedCellInfo';
-import { SelectedRowInfo } from '../PredefinedConfig/Selection/SelectedRowInfo';
+import { AdaptableColumn, AdaptableColumnGroup } from '../AdaptableState/Common/AdaptableColumn';
+import { SelectedCellInfo } from '../AdaptableState/Selection/SelectedCellInfo';
+import { SelectedRowInfo } from '../AdaptableState/Selection/SelectedRowInfo';
 export type AgGridThemeMode = 'legacy' | 'themingApi';
 export declare class AgGridAdapter {
     private _adaptableInstance;

package/src/agGrid/AgGridAdapter.js

@@ -1,7 +1,7 @@
 import { ColumnApiModule, } from 'ag-grid-enterprise';
-import { ACTION_COLUMN_TYPE, CALCULATED_COLUMN_TYPE, FDC3_COLUMN_TYPE, FREE_TEXT_COLUMN_TYPE, } from '../PredefinedConfig/Common/AdaptableColumn';
+import { ACTION_COLUMN_TYPE, CALCULATED_COLUMN_TYPE, FDC3_COLUMN_TYPE, FREE_TEXT_COLUMN_TYPE, } from '../AdaptableState/Common/AdaptableColumn';
 import { ADAPTABLE_FDC3_ACTION_COLUMN_FRIENDLY_NAME, } from '../Utilities/Constants/GeneralConstants';
-import { createUuid } from '../PredefinedConfig/Uuid';
+import { createUuid } from '../AdaptableState/Uuid';
 import ArrayExtensions from '../Utilities/Extensions/ArrayExtensions';
 import * as ModuleConstants from '../Utilities/Constants/ModuleConstants';
 import { ALL_AG_GRID_MODULES } from './agGridModules';
@@ -168,39 +168,17 @@ export class AgGridAdapter {
         return this.agGridOptionsService.getUserGridOptionsProperty(propertyName);
     }
     updateColumnFilterActiveState() {
+        const filteredCols = new Set();
         const columnFilters = this.adaptableApi.filterApi.columnFilterApi.getActiveColumnFilters();
-        const activeFilters = columnFilters?.filter?.((columnFilter) => this.adaptableApi.filterApi.columnFilterApi.isColumnFilterActive(columnFilter));
-        const isFilterActive = ArrayExtensions.IsNotNullOrEmpty(activeFilters);
-        const columnsWithActiveFilters = {};
-        if (isFilterActive) {
-            // used in particular at init time to show the filter icon correctly
-            for (const colFilter of activeFilters) {
-                // AG Grid exposes the Column interface, but we need the AG Column class
-                const agGridCol = this.getAgGridApi().getColumn(colFilter.ColumnId);
-                if (agGridCol) {
-                    columnsWithActiveFilters[agGridCol.getColId()] = true;
-                    if (!agGridCol.isFilterActive()) {
-                        // FIXME AFL: changed from fn call; is this enough?
-                        agGridCol.filterActive = true;
-                    }
-                }
-            }
-        }
-        const agFilterModel = this.getAgGridApi().getFilterModel();
-        // AG Grid exposes the Column interface, but we need the AG Column class
-        (this.getAgGridApi().getColumns() || []).forEach((col) => {
-            /**
-             * When AG Grid filters are used active state should not be removed for all columns.
-             * Need to check if the column has a filter model.
-             */
-            const isColumnInFilterModel = agFilterModel && agFilterModel[col.getColId()];
-            if (!isColumnInFilterModel &&
-                !columnsWithActiveFilters[col.getColId()] &&
-                col.isFilterActive()) {
-                // FIXME AFL: changed from fn call; is this enough?
-                col.filterActive = false;
+        columnFilters?.forEach?.((columnFilter) => {
+            if (this.adaptableApi.filterApi.columnFilterApi.isColumnFilterActive(columnFilter)) {
+                filteredCols.add(columnFilter.ColumnId);
             }
         });
+        const agGridApi = this.getAgGridApi();
+        (agGridApi.getColumns() || []).forEach((col) => {
+            col.filterActive = filteredCols.has(col.getColId());
+        });
     }
     getColumnDefinitionsInclSpecialColumns(agGridColDefs) {
         const allColDefs = this.enhanceColDefsWithSpecialColumns(agGridColDefs ?? this.getAgGridApi().getColumnDefs());

package/src/agGrid/AgGridColumnAdapter.d.ts

@@ -1,7 +1,7 @@
 import { AdaptableAgGrid } from './AdaptableAgGrid';
-import { ColumnSetupInfo } from '../PredefinedConfig/Common/ColumnSetupInfo';
+import { ColumnSetupInfo } from '../AdaptableState/Common/ColumnSetupInfo';
 import { ColDef, ColGroupDef, Column, GridOptions } from 'ag-grid-enterprise';
-import { AdaptableColumnDataType } from '../PredefinedConfig/Common/AdaptableColumn';
+import { AdaptableColumnDataType } from '../AdaptableState/Common/AdaptableColumn';
 import { AdaptableVariant } from '../AdaptableInterfaces/IAdaptable';
 export declare function getEditorForColumnDataType(columnDataType: AdaptableColumnDataType, variant: AdaptableVariant): ColDef['cellEditor'];
 export declare class AgGridColumnAdapter {
@@ -23,7 +23,7 @@ export declare class AgGridColumnAdapter {
     private setupColumnCellEditor;
     private setupColumnCellRenderer;
     private setupColumnTooltipValueGetter;
-    private setupColumnQuickFilerText;
+    private setupColumnQuickFilterText;
     private setupColumnAllowedAggFuncs;
     private setupColumnType;
     private setupColumnCellDataType;

package/src/agGrid/AgGridColumnAdapter.js

@@ -3,7 +3,7 @@ import { FilterWrapperFactory } from './FilterWrapper';
 import { FloatingFilterWrapperFactory } from './FloatingFilterWrapper';
 import { convertAdaptableStyleToCSS, getVariableColor, normalizeStyleForAgGrid, } from '../Utilities/Helpers/StyleHelper';
 import StringExtensions from '../Utilities/Extensions/StringExtensions';
-import { ACTION_COLUMN_TYPE, CALCULATED_COLUMN_TYPE, FDC3_COLUMN_TYPE, FREE_TEXT_COLUMN_TYPE, } from '../PredefinedConfig/Common/AdaptableColumn';
+import { ACTION_COLUMN_TYPE, CALCULATED_COLUMN_TYPE, FDC3_COLUMN_TYPE, FREE_TEXT_COLUMN_TYPE, } from '../AdaptableState/Common/AdaptableColumn';
 import tinycolor from 'tinycolor2';
 import UIHelper from '../View/UIHelper';
 import { getPercentBarRendererForColumn } from './cellRenderers/PercentBarRenderer';
@@ -135,7 +135,7 @@ export class AgGridColumnAdapter {
             this.setupColumnComparator(colSetupInfo);
             this.setupColumnCellEditor(colSetupInfo);
             this.setupColumnHeader(colSetupInfo);
-            this.setupColumnQuickFilerText(colSetupInfo);
+            this.setupColumnQuickFilterText(colSetupInfo);
             this.setupColumnAllowedAggFuncs(colSetupInfo);
             this.setupColumnType(colSetupInfo);
             this.setupColumnCellDataType(colSetupInfo);
@@ -157,7 +157,7 @@ export class AgGridColumnAdapter {
                 if (!gridCell.column) {
                     return null;
                 }
-                // if a Visual Data export is in progress, we are interested only in the Excel Style Class
+                // if a VisualExcel report format export is in progress, we are interested only in the Excel Style Class
                 if (this.adaptableApi.exportApi.internalApi.isVisualDataExportInProgress()) {
                     const userDefinedCellClass = typeof userCellClass === 'function' ? userCellClass(params) : userCellClass;
                     const cellClassKey = AgGridExportAdapter.getExcelClassNameForCell(colId, gridCell.primaryKeyValue, userDefinedCellClass);
@@ -325,7 +325,7 @@ export class AgGridColumnAdapter {
             }
         });
     }
-    setupColumnQuickFilerText({ col, abColumn }) {
+    setupColumnQuickFilterText({ col, abColumn }) {
         this.setColDefProperty(col, 'getQuickFilterText', (userGetQuickFilterText) => {
             if (userGetQuickFilterText) {
                 return userGetQuickFilterText;

package/src/agGrid/AgGridExportAdapter.d.ts

@@ -1,8 +1,8 @@
 import { AdaptableAgGrid } from './AdaptableAgGrid';
-import { Report, ReportFormatType } from '../PredefinedConfig/ExportState';
+import { Report, ReportFormatType } from '../AdaptableState/ExportState';
 import { CsvExportParams, ExcelExportParams, ExcelStyle } from 'ag-grid-enterprise';
 import { ExportDestinationType, ExportResultData } from '../AdaptableOptions/ExportOptions';
-import { Layout } from '../PredefinedConfig/LayoutState';
+import { Layout } from '../AdaptableState/LayoutState';
 export interface ExportConfig {
     report: Report;
     format: ReportFormatType;

package/src/agGrid/AgGridExportAdapter.js

@@ -4,7 +4,7 @@ import { convertCSSAbsoluteFontSizeToPt, getVariableColor, sanitizeStyle, } from
 import { DateFormatter } from '../Utilities/Helpers/FormatHelper';
 import tinycolor from 'tinycolor2';
 import StringExtensions from '../Utilities/Extensions/StringExtensions';
-import { createUuid } from '../PredefinedConfig/Uuid';
+import { createUuid } from '../AdaptableState/Uuid';
 import { inferSchema, initParser } from 'udsv';
 import { AG_GRID_GROUPED_COLUMN, AG_GRID_SELECTION_COLUMN, } from '../Utilities/Constants/GeneralConstants';
 export class AgGridExportAdapter {

package/src/agGrid/AgGridMenuAdapter.d.ts

@@ -1,7 +1,7 @@
 import { AdaptableAgGrid } from './AdaptableAgGrid';
 import { DefaultMenuItem, GetContextMenuItems, GetContextMenuItemsParams, GetMainMenuItems, GetMainMenuItemsParams, MenuItemDef } from 'ag-grid-enterprise';
-import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
-import { AdaptableMenuItem } from '../PredefinedConfig/Common/Menu';
+import { AdaptableColumn } from '../AdaptableState/Common/AdaptableColumn';
+import { AdaptableMenuItem } from '../AdaptableState/Common/Menu';
 export declare class AgGridMenuAdapter {
     private _adaptableInstance;
     constructor(_adaptableInstance: AdaptableAgGrid);

package/src/agGrid/AgGridThemeAdapter.d.ts

@@ -1,6 +1,6 @@
 import { AdaptableAgGrid } from './AdaptableAgGrid';
 import { AgGridThemeMode } from './AgGridAdapter';
-import { AdaptableTheme } from '../PredefinedConfig/ThemeState';
+import { AdaptableTheme } from '../AdaptableState/ThemeState';
 export declare class AgGridThemeAdapter {
     private _adaptableInstance;
     private agGridThemeMode;

package/src/agGrid/FilterWrapper.js

@@ -1,5 +1,4 @@
 import * as React from 'react';
-import { forwardRef, useImperativeHandle, useState } from 'react';
 import { AdaptableColumnFilter } from '../View/Components/ColumnFilter/AdaptableColumnFilter';
 import { renderWithAdaptableContext } from '../View/renderWithAdaptableContext';
 export const FilterWrapperFactory = (adaptable) => {
@@ -9,9 +8,7 @@ export const FilterWrapperFactory = (adaptable) => {
             return false;
         }
         //make the small filter icon to appear when there is a filter
-        return (adaptable.api.filterApi.columnFilterApi
-            .getColumnFilters()
-            .findIndex((x) => x.ColumnId == colId) > -1);
+        return adaptable.api.filterApi.columnFilterApi.isColumnFilterActiveForColumn(colId);
     }
     function getFilterProps(colId, hidePopup) {
         let column = adaptable.api.columnApi.getColumnWithColumnId(colId);
@@ -26,35 +23,62 @@ export const FilterWrapperFactory = (adaptable) => {
         return 'filter_' + colId + '_' + adaptable.adaptableOptions.adaptableId;
     }
     if (adaptable.variant === 'react') {
-        return forwardRef(function ReactFilterWrapper(props, ref) {
-            const [filterProps, setFilterProps] = useState(null);
-            const colId = props.column.getId();
-            const column = adaptable.api.columnApi.getColumnWithColumnId(colId);
-            const afterGuidAttached = React.useCallback((params) => {
-                const hidePopup = params?.hidePopup ?? null;
-                const filterProps = getFilterProps(colId, !!hidePopup);
-                setFilterProps(filterProps);
-            }, [colId]);
-            React.useEffect(() => {
-                afterGuidAttached();
-            }, []);
-            useImperativeHandle(ref, () => {
-                return {
-                    isFilterActive: () => isFilterActive(colId),
-                    // left here for backward compatibility
-                    afterGuidAttached,
-                    getModel: () => { },
-                    setModel: () => { },
-                    //we do not filter here.... we filter using the doesExternalFilterPass. Not sure there is a difference....
-                    doesFilterPass: () => true,
-                };
-            });
-            if (!column || !filterProps) {
-                return null;
-            }
-            return renderWithAdaptableContext(React.createElement("div", { id: getContainerId(colId) },
-                React.createElement(AdaptableColumnFilter, { wrapperProps: { p: 2 }, columnId: filterProps.Column.columnId })), adaptable);
-        });
+        // We used to have the implementation below. However, for updating the filtered/not filtered state of the column
+        // we have to call the onModelChange function, and also provide the doesFilterPass function.
+        // starting with version 33 of AG Grid, the doesFilterPass has to be passed to the `useGridFilter` hook
+        // which needs to be imported from 'ag-grid-react' - see https://www.ag-grid.com/react-data-grid/component-filter/#implementing-a-filter-component
+        // but since Adaptable cannot depend on 'ag-grid-react' directly, we can't use a React component anymore
+        // so we simply return the same implementation as the vanilla version
+        // and comment out the implementation below
+        //
+        // return forwardRef(function ReactFilterWrapper(
+        //   props: {
+        //     column: Column;
+        //     onModelChange: (model: any) => void;
+        //   },
+        //   ref
+        // ) {
+        //   const [filterProps, setFilterProps] = useState<ColumnFilterProps | null>(null);
+        //   const colId = props.column.getId();
+        //   const column: AdaptableColumn | undefined =
+        //     adaptable.api.columnApi.getColumnWithColumnId(colId);
+        //   const afterGuidAttached = React.useCallback(
+        //     (params?: { hidePopup?: Function }) => {
+        //       const hidePopup = params?.hidePopup ?? null;
+        //       const filterProps = getFilterProps(colId, !!hidePopup);
+        //       setFilterProps(filterProps);
+        //     },
+        //     [colId]
+        //   );
+        //   const notifyModel = getNotifyModel(colId, props.onModelChange);
+        //   React.useEffect(() => {
+        //     afterGuidAttached();
+        //   }, []);
+        //   useImperativeHandle(ref, () => {
+        //     return {
+        //       isFilterActive: () => isFilterActive(colId),
+        //       // left here for backward compatibility
+        //       afterGuidAttached,
+        //       // getModel: () => {},
+        //       // setModel: () => {},
+        //       //we do not filter here.... we filter using the doesExternalFilterPass. Not sure there is a difference....
+        //       doesFilterPass: () => true,
+        //     };
+        //   });
+        //   if (!column || !filterProps) {
+        //     return null;
+        //   }
+        //   return renderWithAdaptableContext(
+        //     <div id={getContainerId(colId)}>
+        //       <AdaptableColumnFilter
+        //         wrapperProps={{ p: 2 }}
+        //         columnId={filterProps.Column.columnId}
+        //         onChange={notifyModel}
+        //       />
+        //     </div>,
+        //     adaptable
+        //   );
+        // });
     }
     return class FilterWrapper {
         init(params) {
@@ -82,11 +106,16 @@ export const FilterWrapperFactory = (adaptable) => {
         afterGuiAttached(params) {
             //we always unmount first so the autofocus from the form works... in other grids we unmount when hidden
             this.unmountReactRoot?.();
-            let column = adaptable.api.columnApi.getColumnWithColumnId(this.column.getColId());
+            const columnId = this.column.getColId();
+            let column = adaptable.api.columnApi.getColumnWithColumnId(columnId);
+            // for whatever reason, it works without this
+            // const notifyModel = getNotifyModel(colId, this.params.filterChangedCallback);
             if (column) {
                 this.unmountReactRoot = adaptable.renderReactRoot(renderWithAdaptableContext(React.createElement(AdaptableColumnFilter, {
-                    columnId: this.column.getColId(),
+                    columnId,
                     wrapperProps: { p: 2 },
+                    // for whatever reason, it works without this
+                    // onChange: notifyModel,
                 }), adaptable), 
                 // AdaptableColumnFilter(filterProps),
                 this.filterContainer);

package/src/agGrid/FloatingFilterWrapper.js

@@ -2,6 +2,7 @@ import * as React from 'react';
 import { forwardRef, useImperativeHandle } from 'react';
 import { renderWithAdaptableContext } from '../View/renderWithAdaptableContext';
 import { AdaptableFloatingFilter } from '../View/Components/ColumnFilter/AdaptableFloatingFilter';
+import { getAgGridFilterNotifyModelFn } from './getAgGridFilterNotifyModelFn';
 const filterContainerStyle = {
     overflow: 'hidden',
     minWidth: '0',
@@ -24,6 +25,9 @@ export const FloatingFilterWrapperFactory = (adaptable) => {
         };
         return columnFilterProps;
     }
+    function getNotifyModel(colId, onModelChange) {
+        return getAgGridFilterNotifyModelFn(adaptableApi, colId, onModelChange);
+    }
     function patchParentElement(filterContainer) {
         if (filterContainer) {
             // todo: consider theme
@@ -54,17 +58,19 @@ export const FloatingFilterWrapperFactory = (adaptable) => {
     if (adaptable.variant === 'react') {
         return forwardRef(function ReactFloatingFilterWrapper(props, ref) {
             const colId = props.column.getId();
+            const { onModelChange } = props;
             const column = adaptableApi.columnApi.getColumnWithColumnId(colId);
             useImperativeHandle(ref, () => {
                 return {
                     onParentModelChanged() { },
                 };
             });
+            const notifyModel = getNotifyModel(colId, onModelChange);
             if (!column) {
                 return null;
             }
             return renderWithAdaptableContext(React.createElement("div", { ref: patchParentElement, id: getContainerId(colId), style: filterContainerStyle },
-                React.createElement(AdaptableFloatingFilter, { ...getFilterProps(colId) })), adaptable);
+                React.createElement(AdaptableFloatingFilter, { ...getFilterProps(colId), onChange: notifyModel, onClear: notifyModel })), adaptable);
         });
     }
     return class FloatingFilterWrapper {
@@ -82,10 +88,15 @@ export const FloatingFilterWrapperFactory = (adaptable) => {
                 //@ts-ignore
                 this.filterContainer.style[key] = filterContainerStyle[key];
             });
+            const notifyModel = getNotifyModel(colId, params.filterParams.filterChangedCallback);
             const column = adaptableApi.columnApi.getColumnWithColumnId(colId);
             if (column) {
                 const filterProps = getFilterProps(colId);
-                this.unmountReactRoot = adaptable.renderReactRoot(renderWithAdaptableContext(React.createElement(AdaptableFloatingFilter, filterProps), adaptable), this.filterContainer);
+                this.unmountReactRoot = adaptable.renderReactRoot(renderWithAdaptableContext(React.createElement(AdaptableFloatingFilter, {
+                    ...filterProps,
+                    onChange: notifyModel,
+                    onClear: notifyModel,
+                }), adaptable), this.filterContainer);
             }
         }
         getGui() {

package/src/agGrid/agGridDataTypeDefinitions.d.ts

@@ -1,5 +1,5 @@
 import { GridOptions } from 'ag-grid-enterprise';
-import { AdaptableColumnDataType } from '../PredefinedConfig/Common/AdaptableColumn';
+import { AdaptableColumnDataType } from '../AdaptableState/Common/AdaptableColumn';
 export declare const TEXT_ARRAY_DATA_TYPE: AdaptableColumnDataType;
 export declare const NUMBER_ARRAY_DATA_TYPE: AdaptableColumnDataType;
 export declare const TUPLE_ARRAY_DATA_TYPE: AdaptableColumnDataType;

package/src/agGrid/cellRenderers/BadgeRenderer.d.ts

@@ -1,4 +1,4 @@
-import { BadgeStyle } from '../../PredefinedConfig/StyledColumnState';
+import { BadgeStyle } from '../../AdaptableState/StyledColumnState';
 import { AdaptableApi } from '../../Api/AdaptableApi';
-import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
+import { AdaptableColumn } from '../../AdaptableState/Common/AdaptableColumn';
 export declare const getBadgeRendererForColumn: (badgeStyle: BadgeStyle, abColumn: AdaptableColumn, api: AdaptableApi) => any;

package/src/agGrid/cellRenderers/PercentBarRenderer.d.ts

@@ -1,4 +1,4 @@
-import { StyledColumn } from '../../PredefinedConfig/StyledColumnState';
+import { StyledColumn } from '../../AdaptableState/StyledColumnState';
 import { AdaptableApi } from '../../Api/AdaptableApi';
-import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
+import { AdaptableColumn } from '../../AdaptableState/Common/AdaptableColumn';
 export declare const getPercentBarRendererForColumn: (styledColumn: StyledColumn, abColumn: AdaptableColumn, api: AdaptableApi) => any;

package/src/agGrid/getAgGridFilterNotifyModelFn.d.ts

@@ -0,0 +1,2 @@
+import { AdaptableApi } from '../types';
+export declare function getAgGridFilterNotifyModelFn(adaptableApi: AdaptableApi, colId: string, onModelChange: (model: any) => void): () => void;

package/src/agGrid/getAgGridFilterNotifyModelFn.js

@@ -0,0 +1,10 @@
+export function getAgGridFilterNotifyModelFn(adaptableApi, colId, onModelChange) {
+    const notifyModel = () => {
+        const isActive = adaptableApi.filterApi.columnFilterApi.isColumnFilterActiveForColumn(colId);
+        // call it with non null to indicate that the filter is active
+        // call it with null to indicate that the filter is not active
+        // as per the AG Grid documentation
+        onModelChange(isActive ? true : null);
+    };
+    return notifyModel;
+}

package/src/components/AdaptableFormComponent/AdaptableFormComponent.d.ts

@@ -1,9 +1,9 @@
 import * as React from 'react';
-import { AdaptableFormData, AdaptableForm } from '../../PredefinedConfig/Common/AdaptableForm';
+import { AdaptableFormData, AdaptableForm } from '../../AdaptableState/Common/AdaptableForm';
 import { SimpleButtonProps } from '../SimpleButton';
 import { BaseContext } from '../../types';
 import { AdaptableApi } from '../../Api/AdaptableApi';
-import { AdaptableButton } from '../../PredefinedConfig/Common/AdaptableButton';
+import { AdaptableButton } from '../../AdaptableState/Common/AdaptableButton';
 interface AdaptableFormComponentProps {
     formDef: AdaptableForm<BaseContext>;
     data: AdaptableFormData;

package/src/components/Dashboard/DashboardManager.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
-import { DashboardTab } from '../../PredefinedConfig/DashboardState';
-import { AdaptableDashboardToolbar } from '../../PredefinedConfig/Common/Types';
+import { DashboardTab } from '../../AdaptableState/DashboardState';
+import { AdaptableDashboardToolbar } from '../../AdaptableState/Common/Types';
 import { AdaptableApi } from '../../Api/AdaptableApi';
 export interface DashboardToolbar {
     Id: AdaptableDashboardToolbar | string;

package/src/components/Dashboard/DashboardToolbar.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { ReactNode } from 'react';
-import { AccessLevel } from '../../PredefinedConfig/Common/Entitlement';
+import { AccessLevel } from '../../AdaptableState/Common/Entitlement';
 export type DashboardToolbarProps = {
     className?: string;
     title: string;

package/src/components/ExpressionEditor/EditorInput.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { AdaptableApi } from '../../Api/AdaptableApi';
-import { AdaptableModule } from '../../PredefinedConfig/Common/Types';
+import { AdaptableModule } from '../../AdaptableState/Common/Types';
 interface EditorInputProps {
     type: 'boolean' | 'scalar' | 'aggregatedScalar' | 'cumulativeAggregatedScalar' | 'quantileAggregatedScalar';
     module: AdaptableModule;

package/src/components/ExpressionEditor/EditorInputWithWhereClause.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { AdaptableApi } from '../../Api/AdaptableApi';
-import { AdaptableModule } from '../../PredefinedConfig/Common/Types';
+import { AdaptableModule } from '../../AdaptableState/Common/Types';
 interface EditorInputWithWhereClauseProps {
     type: 'observable' | 'aggregatedBoolean';
     module: AdaptableModule;

package/src/components/Icon/index.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { AdaptableElementIcon, AdaptableCustomIcon, AdaptableIcon, AdaptableSystemIcon } from '../../PredefinedConfig/Common/AdaptableIcon';
+import { AdaptableElementIcon, AdaptableCustomIcon, AdaptableIcon, AdaptableSystemIcon } from '../../AdaptableState/Common/AdaptableIcon';
 export interface IconComponentProps {
     icon: AdaptableIcon;
     iconClassName?: string;