@adaptabletools/adaptable 20.0.0-canary.9 → 20.0.0

package/src/View/Schedule/Wizard/ScheduleWizard.js

@@ -4,7 +4,7 @@ import { OnePageAdaptableWizard, OnePageWizardSummary, } from '../../../View/Wiz
 import { ScheduleSettingsWizard, ScheduleSettingsSummary, isSettingsValid, } from './ScheduleSettingsWizard';
 import { ScheduleScheduleWizard, isScheduleValid } from './ScheduleScheduleWizard';
 import { ScheduleScheduleSummary } from './ScheduleScheduleSummary';
-import { ScheduleType } from '../../../PredefinedConfig/Common/Enums';
+import { ScheduleType } from '../../../AdaptableState/Common/Enums';
 import ObjectFactory from '../../../Utilities/ObjectFactory';
 import { useDispatch } from 'react-redux';
 import * as ScheduleRedux from '../../../Redux/ActionsReducers/ScheduleRedux';

package/src/View/Shortcut/Wizard/ShortcutScopeWizardSection.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { Shortcut } from '../../../PredefinedConfig/ShortcutState';
+import { Shortcut } from '../../../AdaptableState/ShortcutState';
 interface StyleScopeWizardSectionProps {
     onChange: (data: Shortcut) => void;
 }

package/src/View/Shortcut/Wizard/ShortcutSettingsWizard.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { Shortcut } from '../../../PredefinedConfig/ShortcutState';
+import { Shortcut } from '../../../AdaptableState/ShortcutState';
 export declare const isSettingsValid: (data: Shortcut) => string | true;
 export declare const ShortcutSettingsSummary: React.FunctionComponent;
 interface ShortcutSettingsWizardProps {

package/src/View/Shortcut/Wizard/ShortcutWizard.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { AdaptableOnePageWizardProps } from '../../../View/Wizard/Interface/IAdaptableWizard';
-import { Shortcut } from '../../../PredefinedConfig/ShortcutState';
+import { Shortcut } from '../../../AdaptableState/ShortcutState';
 export interface ShortcutWizardProps extends AdaptableOnePageWizardProps<Shortcut> {
     availableKeys: string[];
 }

package/src/View/Shortcut/shortcutOperations.d.ts

@@ -1,2 +1,2 @@
-import { MathOperation } from '../../PredefinedConfig/Common/Enums';
+import { MathOperation } from '../../AdaptableState/Common/Enums';
 export declare const shortcutOperationList: Array<MathOperation>;

package/src/View/Shortcut/shortcutOperations.js

@@ -1,4 +1,4 @@
-import { MathOperation } from '../../PredefinedConfig/Common/Enums';
+import { MathOperation } from '../../AdaptableState/Common/Enums';
 export const shortcutOperationList = [
     MathOperation.Add,
     MathOperation.Subtract,

package/src/View/SmartEdit/SmartEditPopup.js

@@ -2,7 +2,7 @@ import * as React from 'react';
 import { connect } from 'react-redux';
 import * as SmartEditRedux from '../../Redux/ActionsReducers/SmartEditRedux';
 import * as InternalRedux from '../../Redux/ActionsReducers/InternalRedux';
-import { MathOperation } from '../../PredefinedConfig/Common/Enums';
+import { MathOperation } from '../../AdaptableState/Common/Enums';
 import { PanelWithImage } from '../Components/Panels/PanelWithImage';
 import { AdaptablePopover } from '../AdaptablePopover';
 import { EnumExtensions } from '../../Utilities/Extensions/EnumExtensions';

package/src/View/SmartEdit/SmartEditViewPanel.js

@@ -1,6 +1,6 @@
 import * as InternalRedux from '../../Redux/ActionsReducers/InternalRedux';
 import * as SmartEditRedux from '../../Redux/ActionsReducers/SmartEditRedux';
-import { MathOperation, StatusColour } from '../../PredefinedConfig/Common/Enums';
+import { MathOperation, StatusColour } from '../../AdaptableState/Common/Enums';
 import * as React from 'react';
 import { StringExtensions } from '../../Utilities/Extensions/StringExtensions';
 import { PreviewResultsPanel } from '../Components/PreviewResultsPanel';

package/src/View/StateManagement/StateManagementPopup.js

@@ -10,18 +10,18 @@ export const StateManagementPopup = (props) => {
     return (React.createElement(PopupPanel, { className: baseClassName, headerText: props.moduleInfo.FriendlyName, glyphicon: props.moduleInfo.Glyph, infoLink: props.moduleInfo.HelpPage, infoLinkDisabled: !props.api.internalApi.isDocumentationLinksDisplayed() },
         React.createElement(Panel, { className: `${baseClassName}__panel`, "data-name": "user-state", header: 'User State', style: { height: 'auto' }, variant: "default", borderRadius: "none", marginRight: 2, mb: 2 },
             React.createElement(HelpBlock, { marginBottom: 2 }, 'Clear all current user state that has been persisted'),
-            React.createElement(HelpBlock, { style: { color: 'var(--ab-color-warn)' } }, 'This will cause this window to close and any State you have previously created will be lost, and the initial Predefined Config will be reapplied'),
-            React.createElement(ClearButton, { "data-name": "clear-user-state-button", tone: "info", variant: "raised", marginTop: 2, accessLevel: props.accessLevel, onClick: () => props.api.configApi.reloadPredefinedConfig() }, "Clear User State")),
-        React.createElement(Panel, { className: `${baseClassName}__panel`, "data-name": "predefined-config", header: 'Predefined Config', style: { height: 'auto' }, variant: "default", borderRadius: "none", marginTop: 3, marginRight: 2, mb: 2 },
-            React.createElement(HelpBlock, { marginTop: 2 }, 'Load Predefined Config (from a .json file) - this will cause this window to close'),
+            React.createElement(HelpBlock, { style: { color: 'var(--ab-color-warn)' } }, 'This will cause this window to close and any State you have previously created will be lost, and the Initial Adaptable State will be reapplied'),
+            React.createElement(ClearButton, { "data-name": "clear-user-state-button", tone: "info", variant: "raised", marginTop: 2, accessLevel: props.accessLevel, onClick: () => props.api.stateApi.reloadInitialState() }, "Clear User State")),
+        React.createElement(Panel, { className: `${baseClassName}__panel`, "data-name": "initial-state", header: 'Initial Adaptable State', style: { height: 'auto' }, variant: "default", borderRadius: "none", marginTop: 3, marginRight: 2, mb: 2 },
+            React.createElement(HelpBlock, { marginTop: 2 }, 'Load Initial Adaptable State (from a .json file) - this will cause this window to close'),
             ' ',
-            React.createElement(LoadButton, { tone: "info", variant: "raised", marginTop: 2, accessLevel: props.accessLevel, onLoad: (json) => props.api.configApi.reloadPredefinedConfig(json), "data-name": "load-predefined-config-button" }, "Load Predefined Config")),
+            React.createElement(LoadButton, { tone: "info", variant: "raised", marginTop: 2, accessLevel: props.accessLevel, onLoad: (json) => props.api.stateApi.reloadInitialState(json), "data-name": "load-initial-state-button" }, "Load Initial Adaptable State")),
         React.createElement(Panel, { className: `${baseClassName}__panel`, "data-name": "adaptable-state", header: 'Export Adaptable State', style: { height: 'auto' }, variant: "default", borderRadius: "none", marginTop: 3, marginRight: 2, mb: 2 },
             React.createElement(HelpBlock, { marginTop: 2, marginBottom: 2 }, 'Exports the currently persisted Adaptable State'),
             ' ',
             React.createElement(ExportDropdown, { api: props.api, type: "adaptableState", marginRight: 3, style: { flex: 1, maxWidth: 'none' }, columns: ['label'], "data-name": "export-adaptable-state-dropdown" }, "Select Export Destination")),
-        React.createElement(Panel, { className: `${baseClassName}__panel`, "data-name": "initial-predefined-config", header: 'Export Initial Predefined Config', style: { height: 'auto' }, variant: "default", borderRadius: "none", marginTop: 3, marginRight: 2, mb: 2 },
-            React.createElement(HelpBlock, { marginTop: 2, marginBottom: 2 }, 'Exports the Predefined Config which was provided at design time'),
+        React.createElement(Panel, { className: `${baseClassName}__panel`, "data-name": "initial-state", header: 'Export Initial Adaptable State', style: { height: 'auto' }, variant: "default", borderRadius: "none", marginTop: 3, marginRight: 2, mb: 2 },
+            React.createElement(HelpBlock, { marginTop: 2, marginBottom: 2 }, 'Exports the Initial Adaptable State which was provided at design time'),
             ' ',
-            React.createElement(ExportDropdown, { api: props.api, type: "predefinedConfig", marginRight: 3, style: { flex: 1, maxWidth: 'none' }, columns: ['label'], "data-name": "export-initial-predefined-config-dropdown" }, "Select Export Destination"))));
+            React.createElement(ExportDropdown, { api: props.api, type: "initialState", marginRight: 3, style: { flex: 1, maxWidth: 'none' }, columns: ['label'], "data-name": "export-initial-state-dropdown" }, "Select Export Destination"))));
 };

package/src/View/StateManagement/StateManagementViewPanel.js

@@ -10,8 +10,8 @@ export const StateManagementViewPanel = (props) => {
     const elementType = isToolbar ? 'DashboardToolbar' : 'ToolPanel';
     return (React.createElement(Flex, { flexDirection: isToolbar ? 'row' : 'column', className: join(props.accessLevel == 'ReadOnly' ? GeneralConstants.READ_ONLY_STYLE : '', `ab-${elementType}__StateManagement__wrap`) },
         React.createElement(Flex, { flexDirection: "row" },
-            React.createElement(LoadButton, { tooltip: "Load Predefined Config", variant: "text", icon: "upload", onLoad: (json) => props.api.configApi.reloadPredefinedConfig(json), accessLevel: props.accessLevel }, !isToolbar && 'Load'),
-            React.createElement(ClearButton, { icon: "delete", tooltip: "Clear User State", variant: "text", onClick: () => props.api.configApi.reloadPredefinedConfig(), accessLevel: props.accessLevel }, !isToolbar && 'Clear')),
+            React.createElement(LoadButton, { tooltip: "Load Initial Adaptable State", variant: "text", icon: "upload", onLoad: (json) => props.api.stateApi.reloadInitialState(json), accessLevel: props.accessLevel }, !isToolbar && 'Load'),
+            React.createElement(ClearButton, { icon: "delete", tooltip: "Clear User State", variant: "text", onClick: () => props.api.stateApi.reloadInitialState(), accessLevel: props.accessLevel }, !isToolbar && 'Clear')),
         React.createElement(ExportDropdown, { api: props.api, type: "adaptableState" }, "All State"),
-        React.createElement(ExportDropdown, { api: props.api, type: "predefinedConfig" }, "Predefined Config")));
+        React.createElement(ExportDropdown, { api: props.api, type: "initialState" }, "Initial Adaptable State")));
 };

package/src/View/StateManagement/components/ExportDropdown.d.ts

@@ -3,6 +3,6 @@ import { AdaptableApi } from '../../../../types';
 import { DropdownButtonProps } from '../../../components/DropdownButton';
 export interface ExportDropdownProps extends Omit<DropdownButtonProps, 'options' | 'value'> {
     api: AdaptableApi;
-    type: 'adaptableState' | 'predefinedConfig';
+    type: 'adaptableState' | 'initialState';
 }
 export declare const ExportDropdown: React.FunctionComponent<ExportDropdownProps>;

package/src/View/StateManagement/components/ExportDropdown.js

@@ -5,12 +5,12 @@ export const ExportDropdown = (props) => {
     const handleChange = (destination) => {
         switch (props.type) {
             case 'adaptableState':
-                const adaptableState = props.api.configApi.getPersistedState();
+                const adaptableState = props.api.stateApi.getPersistedState();
                 handleExportState(destination, 'adaptableState', adaptableState);
                 break;
-            case 'predefinedConfig':
-                const predefinedConfig = props.api.configApi.getPredefinedConfig();
-                handleExportState(destination, 'predefinedConfig', predefinedConfig);
+            case 'initialState':
+                const initialState = props.api.stateApi.getInitialState();
+                handleExportState(destination, 'initialState', initialState);
                 break;
         }
     };

package/src/View/StateManagement/components/LoadButton.js

@@ -2,7 +2,7 @@ import * as React from 'react';
 import { readJSONFile } from '../../../components/FileDroppable';
 import SimpleButton from '../../../components/SimpleButton';
 export const LoadButton = (props) => {
-    const onLoadPredefinedConfig = (e) => {
+    const onLoadInitialState = (e) => {
         const nativeEvent = e.nativeEvent;
         let files;
         if (nativeEvent && nativeEvent.dataTransfer) {
@@ -17,7 +17,7 @@ export const LoadButton = (props) => {
         });
     };
     return (React.createElement(SimpleButton, { ...props, className: "ab-StateManagement__Load-Button" },
-        React.createElement("input", { type: "file", onChange: (json) => onLoadPredefinedConfig(json), accept: '.json', style: {
+        React.createElement("input", { type: "file", onChange: (json) => onLoadInitialState(json), accept: '.json', style: {
                 opacity: 0,
                 position: 'absolute',
                 cursor: 'pointer',

package/src/View/StateManagement/handleExportState.d.ts

@@ -1 +1 @@
-export declare const handleExportState: (type: 'Clipboard' | 'Console' | 'JSON', name: 'adaptableState' | 'predefinedConfig', state: any) => void;
+export declare const handleExportState: (type: 'Clipboard' | 'Console' | 'JSON', name: 'adaptableState' | 'initialState', state: any) => void;

package/src/View/StatusBar/AdaptableStatusBar.js

@@ -1,16 +1,18 @@
 import * as React from 'react';
+import { useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { Flex } from 'rebass';
 import { getStatusPanelsSelector } from '../../Redux/ActionsReducers/StatusBarRedux';
 import { useAdaptable } from '../AdaptableContext';
 import { StatusBarPanel } from './StatusBarPanel';
+import { useRerender } from '../../components/utils/useRerender';
 export const AdaptableStatusBar = (props) => {
-    /**
-     * All state is selected so the Status Bar is re-rendered for all adaptable state changes
-     */
-    const state = useSelector((state) => state);
-    const statusPanels = getStatusPanelsSelector(state);
     const adaptable = useAdaptable();
+    const rerender = useRerender();
+    useEffect(() => {
+        return adaptable.api.eventApi.on('AdaptableStateChanged', rerender);
+    }, [adaptable]);
+    const statusPanels = useSelector(getStatusPanelsSelector);
     const dispatch = useDispatch();
     const statusSubPanels = statusPanels.find((statusPanel) => statusPanel.Key === props.context.Key);
     const allMenuItems = useSelector((state) => state?.Internal?.SettingsPanelModuleEntries);

package/src/View/StatusBar/StatusBarPopup.js

@@ -2,7 +2,7 @@ import * as React from 'react';
 import { useSelector } from 'react-redux';
 import { ModuleManager } from '../../components/DragAndDropContext/ModuleManager';
 import EmptyContent from '../../components/EmptyContent';
-import { ALL_STATUS_SUB_PANELS, } from '../../PredefinedConfig/Common/Types';
+import { ALL_STATUS_SUB_PANELS } from '../../AdaptableState/Common/Types';
 import { getStatusPanelsSelector } from '../../Redux/ActionsReducers/StatusBarRedux';
 import { useAdaptable } from '../AdaptableContext';
 import { PopupPanel } from '../Components/Popups/AdaptablePopup/PopupPanel';

package/src/View/StyledColumn/Wizard/StyledColumnWizard.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { AdaptableOnePageWizardProps } from '../../Wizard/Interface/IAdaptableWizard';
-import { StyledColumn } from '../../../PredefinedConfig/StyledColumnState';
+import { StyledColumn } from '../../../AdaptableState/StyledColumnState';
 export interface StyledColumnWizardProps extends AdaptableOnePageWizardProps<StyledColumn> {
     isNew: boolean;
 }

package/src/View/StyledColumn/Wizard/StyledColumnWizardColumnSection.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { StyledColumn } from '../../../PredefinedConfig/StyledColumnState';
+import { StyledColumn } from '../../../AdaptableState/StyledColumnState';
 export declare const renderStyledColumnColumnSummary: (data: StyledColumn) => React.JSX.Element;
 export declare const isValidStyledColumnColumn: (data: StyledColumn) => true | string;
 export type StyledColumnWizardColumnSectionProps = {

package/src/View/StyledColumn/Wizard/StyledColumnWizardStyleSection/StyledColumnWizardStyleSection.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { StyledColumn } from '../../../../PredefinedConfig/StyledColumnState';
+import { StyledColumn } from '../../../../AdaptableState/StyledColumnState';
 import { AdaptableApi } from '../../../../types';
 export declare const renderFormatColumnStyleWizardSummary: (data: StyledColumn) => React.JSX.Element;
 export declare const renderStyledColumnStyleSummary: (data: StyledColumn, api: AdaptableApi) => React.JSX.Element;

package/src/View/StyledColumn/Wizard/StyledColumnWizardTypeSection.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { StyledColumn } from '../../../PredefinedConfig/StyledColumnState';
+import { StyledColumn } from '../../../AdaptableState/StyledColumnState';
 export declare const renderStyledColumnTypeSummary: (data: StyledColumn) => React.JSX.Element;
 export interface StyledColumnWizardTypeSectionProps {
     onChange: (styledColumn: StyledColumn) => void;

package/src/View/SystemStatus/SystemStatusPopup.js

@@ -8,7 +8,7 @@ import AdaptableHelper from '../../Utilities/Helpers/AdaptableHelper';
 import { SystemStatusEntityRow } from './SystemStatusEntityRow';
 import ArrayExtensions from '../../Utilities/Extensions/ArrayExtensions';
 import { PopupPanel } from '../Components/Popups/AdaptablePopup/PopupPanel';
-import { SortOrder } from '../../PredefinedConfig/Common/Enums';
+import { SortOrder } from '../../AdaptableState/Common/Enums';
 const colItems = [
     { Content: 'Message', Size: 10 },
     { Content: 'Timestamp', Size: 3 },

package/src/View/SystemStatus/SystemStatusViewPanel.d.ts

@@ -1,5 +1,5 @@
 import { ViewPanelProps } from '../Components/SharedProps/ViewPanelProps';
-import { SystemStatusMessageInfo } from '../../PredefinedConfig/Common/SystemStatusMessageInfo';
+import { SystemStatusMessageInfo } from '../../AdaptableState/Common/SystemStatusMessageInfo';
 import * as React from 'react';
 export interface SystemStatusViewPanelComponentProps extends ViewPanelProps {
     SystemStatusMessageInfos: SystemStatusMessageInfo[];

package/src/View/Theme/ThemePopup.d.ts

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import * as ThemeRedux from '../../Redux/ActionsReducers/ThemeRedux';
 import { ModuleViewPopupProps } from '../Components/SharedProps/ModuleViewPopupProps';
-import { AdaptableTheme } from '../../PredefinedConfig/ThemeState';
+import { AdaptableTheme } from '../../AdaptableState/ThemeState';
 interface ThemePopupProps extends ModuleViewPopupProps<ThemePopupComponent> {
     CurrentTheme: string;
     UserThemes: AdaptableTheme[];

package/src/View/UIHelper.d.ts

@@ -1,11 +1,11 @@
 import { CSSProperties } from 'react';
 import { EditableConfigEntityState } from './Components/SharedProps/EditableConfigEntityState';
-import { StatusColour } from '../PredefinedConfig/Common/Enums';
-import { AdaptableStyle } from '../PredefinedConfig/Common/AdaptableStyle';
-import { Schedule, Weekday } from '../PredefinedConfig/Common/Schedule';
+import { StatusColour } from '../AdaptableState/Common/Enums';
+import { AdaptableStyle } from '../AdaptableState/Common/AdaptableStyle';
+import { Schedule, Weekday } from '../AdaptableState/Common/Schedule';
 import { AdaptableColumnDataType, AdaptableSystemIconName, AdaptableOptions } from '../types';
-import { AdaptableAlert } from '../PredefinedConfig/Common/AdaptableAlert';
-import { AdaptableMessageType } from '../PredefinedConfig/Common/AdaptableMessageType';
+import { AdaptableAlert } from '../AdaptableState/Common/AdaptableAlert';
+import { AdaptableMessageType } from '../AdaptableState/Common/AdaptableMessageType';
 export declare const BLACK: string;
 export declare const WHITE: string;
 export declare const LIGHT_GRAY: string;

package/src/View/UIHelper.js

@@ -1,5 +1,5 @@
 import { WizardStatus, } from './Components/SharedProps/EditableConfigEntityState';
-import { FontWeight, FontStyle, StatusColour } from '../PredefinedConfig/Common/Enums';
+import { FontWeight, FontStyle, StatusColour } from '../AdaptableState/Common/Enums';
 import { StringExtensions } from '../Utilities/Extensions/StringExtensions';
 import ArrayExtensions from '../Utilities/Extensions/ArrayExtensions';
 export const BLACK = 'Black';

package/src/View/Wizard/Interface/IAdaptableWizard.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { AdaptableObject } from '../../../PredefinedConfig/Common/AdaptableObject';
+import { AdaptableObject } from '../../../AdaptableState/Common/AdaptableObject';
 import { AdaptableApi } from '../../../Api/AdaptableApi';
 import { ModuleInfo } from '../../../Strategy/Interface/IModule';
 import { ModuleParams } from '../../Components/SharedProps/ModuleViewPopupProps';

package/src/View/Wizard/ObjectTagsWizardSection.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { AdaptableObject } from '../../PredefinedConfig/Common/AdaptableObject';
+import { AdaptableObject } from '../../AdaptableState/Common/AdaptableObject';
 type ObjectTagsWizardSectionProps<T extends AdaptableObject> = {
     onChange: (data: T) => void;
 };

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';
@@ -333,5 +333,6 @@ export declare class AdaptableAgGrid implements IAdaptable {
     refreshLayout(): void;
     private isRowGroupDifferentInLayout;
     private onLayoutChange;
+    private validateColumnDefTypes;
 }
 export {};

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,18 +87,24 @@ 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';
 const LocalEventService_Prototype = LocalEventService.prototype;
 const LocalEventService_dispatchEvent = LocalEventService_Prototype.dispatchEvent;
 LocalEventService_Prototype.dispatchEvent = function (event) {
+    const agGridApi = event.api;
+    if (agGridApi?.isDestroyed()) {
+        // do nothing if AG Grid was destroyed in the meantime
+        return;
+    }
     LocalEventService_dispatchEvent.apply(this, arguments);
     if (event.type === 'cellChanged' || event.type === 'dataChanged') {
         const eventRowNode = event.node;
@@ -118,6 +124,10 @@ LocalEventService_Prototype.dispatchEvent = function (event) {
                     // so IGNORE IT
                     return;
                 }
+                if (adaptable.isDestroyed) {
+                    // do nothing if adaptable is destroyed (this is a rare case and happens when Adaptable is quickly destroyed and recreated)
+                    return;
+                }
                 // we're on the correct instance, so do this
                 //@ts-ignore
                 const fn = adaptable.rowListeners ? adaptable.rowListeners[event.type] : null;
@@ -353,9 +363,10 @@ export class AdaptableAgGrid {
         this.lifecycleState = 'initAgGrid';
         this.agGridAdapter.initialGridOptions = gridOptions;
         const perfInitAgGrid = this.logger.beginPerf(`initAgGrid()`);
-        // AG Grid evaluates early on the floatingFilter params, so we need to "suppres" the floating filter temporarily
+        // AG Grid evaluates early on the floatingFilter params, so we need to "suppress" the floating filter temporarily
         // we will reset it once Adaptable is ready
         this.agGridColumnAdapter.setupColumnFloatingFilterTemporarily(gridOptions);
+        this.validateColumnDefTypes(gridOptions.columnDefs);
         const agGridApi = await this.initializeAgGrid(gridOptions, config.modules, config.renderAgGridFrameworkComponent);
         if (agGridApi === false) {
             this.midwayDestroy();
@@ -482,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!`);
         }
@@ -516,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));
@@ -527,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 }));
@@ -537,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();
@@ -2621,7 +2633,7 @@ You need to define at least one Layout!`);
         themeClassNamesToRemove.forEach((cssClassName) => el.classList.remove(cssClassName));
         // remove infinite table classnames
         themesToRemove.forEach((theme) => {
-            el.classList.remove(`infinite-${theme.Name}`);
+            el.classList.remove(`infinite-theme-mode--${theme.Name}`);
         });
         // VARIANT
         let variantTheme = '';
@@ -2637,10 +2649,10 @@ You need to define at least one Layout!`);
         }
         if (isSystemTheme) {
             // add infinite table classname for theme
-            el.classList.add(`infinite-${themeName}`);
+            el.classList.add(`infinite-theme-mode--${themeName}`);
         }
         else if (variantTheme) {
-            el.classList.add(`infinite-${variantTheme}`);
+            el.classList.add(`infinite-theme-mode--${variantTheme}`);
         }
         // Update AG THEME
         this.agGridThemeAdapter.applyAgGridThemeOnAdaptableThemeChange(newTheme, variantTheme, container, themesToRemove);
@@ -3288,4 +3300,24 @@ You need to define at least one Layout!`);
         this.__prevLayoutForOnChange = layout;
         this.api.layoutApi.createOrUpdateLayout(layout);
     }
+    validateColumnDefTypes(columnDefs) {
+        // in Adaptable version 20 we switched from colDef.type to colDef.cellDataType
+        // although we documented this change and try to infer the correct cellDataTypes, it's best to also check if the client dev forgot to adjust his colDefs
+        columnDefs.forEach((colDef) => {
+            if (colDef.children?.length) {
+                this.validateColumnDefTypes(colDef.children);
+            }
+            const columnDefinition = colDef;
+            const colDefType = columnDefinition.type;
+            const colDefTypes = typeof colDefType === 'string' ? [colDefType] : colDefType || [];
+            colDefTypes
+                .filter((colType) => colType.startsWith('abColDef'))
+                .forEach((colType) => {
+                const newValidCellDataType = mapOldTypeToDataType(colType);
+                if (newValidCellDataType) {
+                    this.logger.consoleWarn(`Column ${columnDefinition.colId ?? columnDefinition.field} has a type of ${colType} which is no longer in use${newValidCellDataType !== 'unknown' ? `. Please use 'colDef.cellDataType' instead: ${newValidCellDataType}` : ''}`);
+                }
+            });
+        });
+    }
 }

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());
@@ -521,7 +499,7 @@ export class AgGridAdapter {
         else if (Array.isArray(value)) {
             const arrayDataType = ALL_ADAPTABLE_DATA_TYPES.find((arrayType) => {
                 const dataTypeDefinition = agGridDataTypeDefinitions[arrayType];
-                const dataTypeMatching = dataTypeDefinition?.dataTypeMatcher(value);
+                const dataTypeMatching = dataTypeDefinition?.dataTypeMatcher?.(value);
                 return dataTypeMatching;
             });
             if (arrayDataType) {

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;