@adaptabletools/adaptable 20.0.0-canary.8 → 20.0.0

package/src/migration/AdaptableUpgradeHelper.d.ts

@@ -1,5 +1,5 @@
 import { VersionUpgrade } from './VersionUpgrade';
-import { AdaptableState } from '../PredefinedConfig/AdaptableState';
+import { AdaptableState } from '../AdaptableState/AdaptableState';
 /**
  * The upgrade config object
  */

package/src/migration/VersionUpgrade.d.ts

@@ -1,4 +1,4 @@
-import { AdaptableState } from '../PredefinedConfig/AdaptableState';
+import { AdaptableState } from '../AdaptableState/AdaptableState';
 import { MigrationLogger } from './AdaptableUpgradeHelper';
 export declare abstract class VersionUpgrade {
     protected logger: MigrationLogger;

package/src/migration/VersionUpgrade17.d.ts

@@ -1,5 +1,5 @@
 import { VersionUpgrade } from './VersionUpgrade';
-import { AdaptableState } from '../PredefinedConfig/AdaptableState';
+import { AdaptableState } from '../AdaptableState/AdaptableState';
 export declare class VersionUpgrade17 extends VersionUpgrade {
     migrateState(state: AdaptableState): AdaptableState;
     private migrateChartingState;

package/src/migration/VersionUpgrade17.js

@@ -337,7 +337,7 @@ export class VersionUpgrade17 extends VersionUpgrade {
                 cc.CalculatedColumnSettings = {
                     DataType: 'Number',
                 };
-                this.logger.warn(`Updating incorrect Predefined Config for Calculated Column: ${cc.ColumnId}`);
+                this.logger.warn(`Updating incorrect Initial State for Calculated Column: ${cc.ColumnId}`);
             }
         });
         return state;

package/src/migration/VersionUpgrade18.d.ts

@@ -1,5 +1,5 @@
 import { VersionUpgrade } from './VersionUpgrade';
-import { AdaptableState } from '../PredefinedConfig/AdaptableState';
+import { AdaptableState } from '../AdaptableState/AdaptableState';
 export declare class VersionUpgrade18 extends VersionUpgrade {
     migrateState(state: AdaptableState): AdaptableState;
 }

package/src/migration/VersionUpgrade20.d.ts

@@ -1,5 +1,7 @@
 import { VersionUpgrade } from './VersionUpgrade';
-import { AdaptableState } from '../PredefinedConfig/AdaptableState';
+import { AdaptableState } from '../AdaptableState/AdaptableState';
+import { AdaptableColumnDataType } from '../AdaptableState/Common/AdaptableColumn';
+export declare function mapOldTypeToDataType(previousType: string): AdaptableColumnDataType;
 export declare class VersionUpgrade20 extends VersionUpgrade {
     migrateState(state: AdaptableState): AdaptableState;
     private migrateLayoutState;

package/src/migration/VersionUpgrade20.js

@@ -2,20 +2,13 @@ import { VersionUpgrade } from './VersionUpgrade';
 import { ALL_ADAPTABLE_DATA_TYPES } from '../agGrid/agGridDataTypeDefinitions';
 function transition_pre_20(layout) {
     const l = layout;
-    if (l.AggregationColumns && !Array.isArray(l.AggregationColumns)) {
-        const oldAggs = l.AggregationColumns || {};
-        const newAggs = Object.entries(oldAggs).map(([colId, aggFunc]) => ({
-            ColumnId: colId,
-            AggFunc: aggFunc,
-        }));
-        layout.TableAggregationColumns = newAggs;
-    }
-    if (l.Columns) {
+    if (l.Columns && !l.EnablePivot) {
         layout.TableColumns = l.Columns;
         delete l.Columns;
+        delete layout.PivotColumns;
     }
     if (l.PinnedColumnsMap) {
-        layout.ColumnPinning = l.PinnedColumnsMap;
+        layout.ColumnPinning = { ...l.PinnedColumnsMap };
         delete l.PinnedColumnsMap;
     }
     if (l.ColumnHeadersMap) {
@@ -28,16 +21,82 @@ function transition_pre_20(layout) {
     }
     if (l.EnablePivot) {
         layout.PivotColumns = l.PivotColumns || [];
+        delete l.Columns;
+        delete layout.TableColumns;
+        delete l.EnablePivot;
         if (l.AggregationColumns) {
-            layout.PivotAggregationColumns = layout.TableAggregationColumns;
+            layout.PivotAggregationColumns = (Object.entries(l.AggregationColumns) || []).map(([ColumnId, AggFunc]) => {
+                return {
+                    ColumnId,
+                    AggFunc,
+                };
+            });
+            delete layout.TableAggregationColumns;
+            delete l.AggregationColumns;
+        }
+        if (l.RowGroupedColumns) {
+            layout.PivotGroupedColumns = l.RowGroupedColumns;
+            delete l.RowGroupedColumns;
         }
     }
+    else {
+        if (l.AggregationColumns && !Array.isArray(l.AggregationColumns)) {
+            const oldAggs = l.AggregationColumns || {};
+            const newAggs = Object.entries(oldAggs).map(([ColumnId, AggFunc]) => ({
+                ColumnId,
+                AggFunc,
+            }));
+            layout.TableAggregationColumns = newAggs;
+            delete l.AggregationColumns;
+        }
+    }
+    if (l.ExpandedRowGroupValues) {
+        layout.RowGroupValues = {
+            RowGroupDefaultBehavior: 'collapsed',
+            ExceptionGroupKeys: l.ExpandedRowGroupValues,
+        };
+        delete l.ExpandedRowGroupValues;
+    }
+    if (Array.isArray(l.ColumnFilters)) {
+        layout.ColumnFilters = l.ColumnFilters.map((columnFilter) => {
+            const filter = {
+                ...columnFilter,
+            };
+            // version 19 had a single predicate
+            // while version 20 has an array of predicates
+            // @ts-ignore
+            if (filter.Predicate) {
+                // @ts-ignore
+                filter.Predicates = [filter.Predicate];
+                // @ts-ignore
+                delete filter.Predicate;
+            }
+            if (!Array.isArray(filter.Predicates)) {
+                filter.Predicates = [];
+            }
+            filter.Predicates = filter.Predicates.map((p) => {
+                // the following predicate ids were renamed:
+                // Values -> In
+                if (p.PredicateId === 'Values') {
+                    p = { ...p };
+                    p.PredicateId = 'In';
+                }
+                // ExcludeValues -> NotIn
+                if (p.PredicateId === 'ExcludeValues') {
+                    p = { ...p };
+                    p.PredicateId = 'NotIn';
+                }
+                return p;
+            });
+            return filter;
+        });
+    }
     return layout;
 }
 function hasUpToDateDataType(dataType) {
     return ALL_ADAPTABLE_DATA_TYPES.includes(dataType);
 }
-function mapOldTypeToDataType(previousType) {
+export function mapOldTypeToDataType(previousType) {
     if (ALL_ADAPTABLE_DATA_TYPES.includes(previousType)) {
         return previousType;
     }

package/src/themes/index.d.ts

@@ -1,2 +1,2 @@
-import { AdaptableTheme } from '../PredefinedConfig/ThemeState';
+import { AdaptableTheme } from '../AdaptableState/ThemeState';
 export declare const StaticThemes: Array<AdaptableTheme>;

package/src/types.d.ts

@@ -20,7 +20,7 @@ export type { SetPrimaryKeyValueContext, RowFormOptions, RowFormContext, CreateR
 export type { AdaptableNumberCellEditorParams } from './agGrid/editors/AdaptableNumberEditor';
 export type { AdaptableDateEditorParams } from './agGrid/editors/AdaptableDateEditor';
 export type { AdaptablePercentageCellEditorParams } from './agGrid/editors/AdaptablePercentageEditor';
-export type { ExportOptions, SystemExportDestination, CustomDestination, ExternalReport, PreProcessExportContext, DataFormatType, ExportFormContext, ReportContext, ReportFileNameContext, DataFormatDataType, ExportDestinationType, GetDetailRowsContext, BaseExportContext, ExportResultData, } from './AdaptableOptions/ExportOptions';
+export type { ExportOptions, SystemExportDestination, CustomDestination, ProcessExportContext, DataFormatType, ExportFormContext, ReportContext, ReportFileNameContext, DataFormatDataType, ExportDestinationType, GetDetailRowsContext, BaseExportContext, ExportResultData, } from './AdaptableOptions/ExportOptions';
 export type { DataImportValidationError, DataImportOptions, DataImportFileHandler, HandleImportedDataContext, DataImportValidateContext, GetPrimaryKeyValueContext, PreprocessRowDataContext, HandleImportedDataResolution, } from './AdaptableOptions/DataImportOptions';
 export type { DataSetOptions, DataSet, DataSetFormContext, } from './AdaptableOptions/DataSetOptions';
 export type { CellSummaryOptions } from './AdaptableOptions/CellSummaryOptions';
@@ -39,12 +39,12 @@ export type { QuickSearchOptions, QuickSearchContext } from './AdaptableOptions/
 export type { FormatColumnOptions, CustomDisplayFormatter, CustomDisplayFormatterContext, } from './AdaptableOptions/FormatColumnOptions';
 export type { ColumnOptions, ColumnFriendlyNameContext, ColumnTypesContext, } from './AdaptableOptions/ColumnOptions';
 export type { AdaptablePersistStateFunction, AdaptableStateFunctionConfig, AdaptableLoadStateFunction, AdaptableSaveStateFunction, AdaptableClearStateFunction, StateOptions, } from './AdaptableOptions/StateOptions';
-export type { TableAggregationColumns, PivotAggregationColumns, WeightedAverageAggregation, } from './PredefinedConfig/Common/AggregationColumns';
-export type { AccessLevel, Entitlement } from './PredefinedConfig/Common/Entitlement';
-export type { ExtendedLayoutInfo, LayoutExtension, } from './PredefinedConfig/Common/ExtendedLayoutInfo';
-export type { FilterActionOnDataChange, ApplyFilterAction, } from './PredefinedConfig/Common/FilterActionOnDataChange';
-export type { ConfigState } from './PredefinedConfig/ConfigState';
-export type { AdaptableNote, NoteState, AdaptableNotes } from './PredefinedConfig/NoteState';
+export type { TableAggregationColumns, PivotAggregationColumns, WeightedAverageAggregation, } from './AdaptableState/Common/AggregationColumns';
+export type { AccessLevel, Entitlement } from './AdaptableState/Common/Entitlement';
+export type { ExtendedLayoutInfo, LayoutExtension, } from './AdaptableState/Common/ExtendedLayoutInfo';
+export type { FilterActionOnDataChange, ApplyFilterAction, } from './AdaptableState/Common/FilterActionOnDataChange';
+export type { BaseState } from './AdaptableState/BaseState';
+export type { AdaptableNote, NoteState, AdaptableNotes } from './AdaptableState/NoteState';
 export type { TeamSharingOptions, SharedEntitiesContext, } from './AdaptableOptions/TeamSharingOptions';
 export type { ToolPanelOptions, CustomToolPanel, ToolPanelButtonContext, CustomToolPanelButtonContext, } from './AdaptableOptions/ToolPanelOptions';
 export type { UserInterfaceOptions, LoadingScreenOptions, ObjectTagsContext, CustomIcon, } from './AdaptableOptions/UserInterfaceOptions';
@@ -69,7 +69,7 @@ export type { ChartingApi } from './Api/ChartingApi';
 export type { ColumnApi } from './Api/ColumnApi';
 export type { ColumnFilterApi } from './Api/ColumnFilterApi';
 export type { CommentApi } from './Api/CommentApi';
-export type { ConfigApi } from './Api/ConfigApi';
+export type { StateApi } from './Api/StateApi';
 export type { CustomSortApi } from './Api/CustomSortApi';
 export type { DashboardApi } from './Api/DashboardApi';
 export type { DataImportApi } from './Api/DataImportApi';
@@ -129,8 +129,8 @@ export type { RowFormSubmittedInfo, CreatedRowInfo, EditedRowInfo, DeletedRowInf
 export type { ColumnFilterAppliedInfo } from './Api/Events/ColumnFilterApplied';
 export type { GridFilterAppliedInfo } from './Api/Events/GridFilterApplied';
 export type { GridSortedInfo } from './Api/Events/GridSorted';
-export type { AdaptableSearchState } from './PredefinedConfig/Common/AdaptableSearchState';
-export type { AdaptableSortState } from './PredefinedConfig/Common/AdaptableSortState';
+export type { AdaptableSearchState } from './AdaptableState/Common/AdaptableSearchState';
+export type { AdaptableSortState } from './AdaptableState/Common/AdaptableSortState';
 export type { DataSetSelectedInfo } from './Api/Events/DataSetSelected';
 export type { CellSelectionChangedInfo } from './Api/Events/CellSelectionChanged';
 export type { RowSelectionChangedInfo } from './Api/Events/RowSelectionChanged';
@@ -141,79 +141,79 @@ export type { ScheduleTriggeredInfo } from './Api/Events/ScheduleTriggered';
 export type { AdaptableStateChangedInfo } from './Api/Events/AdaptableStateChanged';
 export type { CommentChangedInfo } from './Api/Events/CommentChanged';
 export type { Fdc3MessageInfo, Fdc3MessageSentInfo, Fdc3MessageReceivedInfo, } from './Api/Events/Fdc3MessageInfo';
-export type { AdaptableState, AdaptablePersistentState } from './PredefinedConfig/AdaptableState';
-export type { AlertDefinition, AlertProperties, AlertState, AlertButtonForm, AlertButton, AdaptableAlertCommand, AlertDefinitionPredicate, AlertRule, AdaptableAlertQuery, SystemAlertPredicateId, SystemAlertPredicateIds, } from './PredefinedConfig/AlertState';
-export type { ApplicationDataEntry, ApplicationState } from './PredefinedConfig/ApplicationState';
-export type { SpecialColumnSettings } from './PredefinedConfig/Common/SpecialColumnSettings';
-export type { CalculatedColumn, CalculatedColumnSettings, CalculatedColumnState, AdaptableCalculatedColumnQuery, } from './PredefinedConfig/CalculatedColumnState';
-export type { CellSummmaryInfo, CustomCellSummaryOperation, CustomCellSummaryOperationContext, } from './PredefinedConfig/Common/CellSummary';
-export type { FlashingCellDefinition, FlashingCellState, SystemFlashingCellPredicateId, SystemFlashingCellPredicateIds, } from './PredefinedConfig/FlashingCellState';
-export type { AdaptableAlert, AdaptableAlertType, AdaptableGenericAlert, AdaptableCellChangedAlert, AdaptableRowChangedAlert, AdaptableAlertBase, } from './PredefinedConfig/Common/AdaptableAlert';
-export type { AdaptableFlashingCell } from './PredefinedConfig/Common/AdaptableFlashingCell';
-export type { AdaptableColumn, AdaptableColumnBase, AdaptableSpecialColumnType, AdaptableColumnDataType, AdaptableColumnGroup, } from './PredefinedConfig/Common/AdaptableColumn';
-export type { AdaptableField } from './PredefinedConfig/Common/AdaptableField';
-export type { AdaptableComparerFunction } from './PredefinedConfig/Common/AdaptableComparerFunction';
-export type { SystemStatusMessageInfo } from './PredefinedConfig/Common/SystemStatusMessageInfo';
-export type { AlternativeModuleName } from './PredefinedConfig/Common/AlternativeModuleName';
-export type { AdaptableFormat, DateFormatterOptions, NumberFormatterOptions, StringFormatterOptions, } from './PredefinedConfig/Common/AdaptableFormat';
-export type { AdaptableMessageType } from './PredefinedConfig/Common/AdaptableMessageType';
-export type { AdaptableObject, AdaptableObjectTag, AdaptableObjectLookupCriteria, AdaptableVersion, } from './PredefinedConfig/Common/AdaptableObject';
-export type { SuspendableObject } from './PredefinedConfig/Common/SuspendableObject';
-export type { AdaptableQuery, AdaptableAggregatedBooleanQuery, AdaptableAggregatedScalarQuery, AdaptableBooleanQuery, AdaptableObservableQuery, AdaptableScalarQuery, } from './PredefinedConfig/Common/AdaptableQuery';
-export type { AdaptablePredicate, AdaptableColumnPredicate, AdaptablePredicateDef, PredicateModuleScope, PredicateDefHandlerContext, PredicateDefInput, PredicateDefToStringParams, ColumnFilterDef, } from './PredefinedConfig/Common/AdaptablePredicate';
-export type { ColumnScope } from './PredefinedConfig/Common/ColumnScope';
-export type { RowScope } from './PredefinedConfig/Common/RowScope';
-export type { AdaptableStyle } from './PredefinedConfig/Common/AdaptableStyle';
-export type { AdaptableBaseIcon, AdaptableIcon, AdaptableSystemIcon, AdaptableCustomIcon, AdaptableSystemIconName, AdaptableElementIcon, } from './PredefinedConfig/Common/AdaptableIcon';
-export type { CellHighlightInfo } from './PredefinedConfig/Common/CellHighlightInfo';
-export type { RowHighlightInfo } from './PredefinedConfig/Common/RowHighlightInfo';
-export type { RowsHighlightInfo } from './PredefinedConfig/Common/RowsHighlightInfo';
-export type { ColumnSort } from './PredefinedConfig/Common/ColumnSort';
-export type { CellDataChangedInfo } from './PredefinedConfig/Common/CellDataChangedInfo';
-export type { RowDataChangedInfo, RowDataChangeTrigger, } from './PredefinedConfig/Common/RowDataChangedInfo';
-export type { DataChangedScope } from './PredefinedConfig/Common/DataChangedScope';
-export type { DataUpdateConfig } from './PredefinedConfig/Common/DataUpdateConfig';
-export type { AdaptableFormData, AdaptableForm, AdaptableFormField, AdaptableFormFieldType, } from './PredefinedConfig/Common/AdaptableForm';
-export type { AdaptableButton } from './PredefinedConfig/Common/AdaptableButton';
-export type { AdaptableMenuItem, UserMenuItem, ColumnMenuContext, ContextMenuContext, AdaptableContextMenuItem, AdaptableColumnMenuItem, AdaptableColumnMenuItemName, AdaptableContextMenuItemName, AgGridMenuItem, MenuCategory, MenuSeparator, } from './PredefinedConfig/Common/Menu';
-export type { BaseContext } from './PredefinedConfig/Common/BaseContext';
-export type { AdaptableColumnContext } from './PredefinedConfig/Common/AdaptableColumnContext';
-export type { FormContext } from './PredefinedConfig/Common/FormContext';
-export type { Schedule } from './PredefinedConfig/Common/Schedule';
-export type { ButtonStyle } from './PredefinedConfig/Common/ButtonStyle';
-export type { AdaptableModule, AdaptableToolPanel, AdaptableQLModule, AdaptableSettingsPanel, AdaptableDashboardToolbar, AdaptableStatusBarPanel, AdaptableModuleButton, } from './PredefinedConfig/Common/Types';
-export type { ChartDefinition, ChartingState, ChartingAggFunc, } from './PredefinedConfig/ChartingState';
-export type { CustomSort, CustomSortState } from './PredefinedConfig/CustomSortState';
-export type { DashboardState, DashboardTab, AdaptableCoordinate, } from './PredefinedConfig/DashboardState';
-export type { ExportState, Report, ReportData, ReportColumn, ReportSchedule, SystemReportName, SystemReportNames, SystemReportFormat, ReportRowScope, ReportColumnScope, ReportNameType, ReportFormatType, } from './PredefinedConfig/ExportState';
-export type { ColumnFilter, ColumnFilterPredicate, SystemFilterPredicateIds, SystemFilterPredicateId, } from './PredefinedConfig/Common/ColumnFilter';
-export type { GridFilter } from './PredefinedConfig/Common/GridFilter';
-export type { FormatColumn, FormatColumnState, FormatColumnRule, FormatColumnPredicate, SystemFormatColumnPredicateId, SystemFormatColumnPredicateIds, } from './PredefinedConfig/FormatColumnState';
-export type { StyledColumn, StyledColumnState, PercentBarStyle, GradientStyle, CellColorRange, ColumnComparison, CellTextOptions, CellTextOption, NumericStyledColumn, RangeValueType, SparklineStyle, BadgeStyle, BadgeStyleDefinition, BadgeStylePredicate, SystemBadgeStylePredicateId, SystemBadgeStylePredicateIds, } from './PredefinedConfig/StyledColumnState';
-export type { FreeTextColumn, FreeTextColumnState, FreeTextStoredValue, FreeTextColumnSettings, } from './PredefinedConfig/FreeTextColumnState';
-export type { StatusBarState, AdaptableStatusBar } from './PredefinedConfig/StatusBarState';
-export type { IPushPullDomain, IPushPullReport, IPushPullSchedule, IPushPullState, } from './PredefinedConfig/IPushPullState';
-export type { Layout, LayoutState, LayoutArray, LayoutBase, TableLayout, PivotLayout, RowGroupValues, RowGroupValuesWithExceptionKeys, ColumnStringMap, ColumnNumberMap, ColumnBooleanFalseMap, ColumnDirectionMap, } from './PredefinedConfig/LayoutState';
-export type { RowSummary, RowSummaryPosition } from './PredefinedConfig/Common/RowSummary';
-export type { OpenFinReport, OpenFinSchedule, OpenFinState } from './PredefinedConfig/OpenFinState';
-export type { PlusMinusNudge, PlusMinusState } from './PredefinedConfig/PlusMinusState';
-export type { PredefinedConfig } from './PredefinedConfig/PredefinedConfig';
-export type { NamedQuery, NamedQueryState } from './PredefinedConfig/NamedQueryState';
-export type { QuickSearchState } from './PredefinedConfig/QuickSearchState';
-export type { ReminderSchedule, ScheduleState } from './PredefinedConfig/ScheduleState';
-export type { GridCell, CellUpdateRequest, CellAddress, } from './PredefinedConfig/Selection/GridCell';
-export type { GridRow, RowInfo } from './PredefinedConfig/Selection/GridRow';
-export type { SelectedCellInfo } from './PredefinedConfig/Selection/SelectedCellInfo';
-export type { SelectedRowInfo } from './PredefinedConfig/Selection/SelectedRowInfo';
-export type { GridCellRange } from './PredefinedConfig/Selection/GridCellRange';
-export type { Shortcut, ShortcutState, ShortcutScopeDataType, } from './PredefinedConfig/ShortcutState';
-export type { SharedEntity, AdaptableSharedEntity, CustomSharedEntity, TeamSharingState, SharedEntityType, AdaptableSharedEntityConfig, CustomSharedEntityConfig, } from './PredefinedConfig/TeamSharingState';
-export type { AdaptableTheme, ThemeState } from './PredefinedConfig/ThemeState';
-export type { ToolPanelState, AdaptableToolPanelDefinition, ToolPanelVisibilityMode, } from './PredefinedConfig/ToolPanelState';
+export type { AdaptableState, AdaptablePersistentState } from './AdaptableState/AdaptableState';
+export type { AlertDefinition, AlertProperties, AlertState, AlertButtonForm, AlertButton, AdaptableAlertCommand, AlertDefinitionPredicate, AlertRule, AdaptableAlertQuery, SystemAlertPredicateId, SystemAlertPredicateIds, } from './AdaptableState/AlertState';
+export type { ApplicationDataEntry, ApplicationState } from './AdaptableState/ApplicationState';
+export type { SpecialColumnSettings } from './AdaptableState/Common/SpecialColumnSettings';
+export type { CalculatedColumn, CalculatedColumnSettings, CalculatedColumnState, AdaptableCalculatedColumnQuery, } from './AdaptableState/CalculatedColumnState';
+export type { CellSummmaryInfo, CustomCellSummaryOperation, CustomCellSummaryOperationContext, } from './AdaptableState/Common/CellSummary';
+export type { FlashingCellDefinition, FlashingCellState, SystemFlashingCellPredicateId, SystemFlashingCellPredicateIds, } from './AdaptableState/FlashingCellState';
+export type { AdaptableAlert, AdaptableAlertType, AdaptableGenericAlert, AdaptableCellChangedAlert, AdaptableRowChangedAlert, AdaptableAlertBase, } from './AdaptableState/Common/AdaptableAlert';
+export type { AdaptableFlashingCell } from './AdaptableState/Common/AdaptableFlashingCell';
+export type { AdaptableColumn, AdaptableColumnBase, AdaptableSpecialColumnType, AdaptableColumnDataType, AdaptableColumnGroup, } from './AdaptableState/Common/AdaptableColumn';
+export type { AdaptableField } from './AdaptableState/Common/AdaptableField';
+export type { AdaptableComparerFunction } from './AdaptableState/Common/AdaptableComparerFunction';
+export type { SystemStatusMessageInfo } from './AdaptableState/Common/SystemStatusMessageInfo';
+export type { AlternativeModuleName } from './AdaptableState/Common/AlternativeModuleName';
+export type { AdaptableFormat, DateFormatterOptions, NumberFormatterOptions, StringFormatterOptions, } from './AdaptableState/Common/AdaptableFormat';
+export type { AdaptableMessageType } from './AdaptableState/Common/AdaptableMessageType';
+export type { AdaptableObject, AdaptableObjectTag, AdaptableObjectLookupCriteria, AdaptableVersion, } from './AdaptableState/Common/AdaptableObject';
+export type { SuspendableObject } from './AdaptableState/Common/SuspendableObject';
+export type { AdaptableQuery, AdaptableAggregatedBooleanQuery, AdaptableAggregatedScalarQuery, AdaptableBooleanQuery, AdaptableObservableQuery, AdaptableScalarQuery, } from './AdaptableState/Common/AdaptableQuery';
+export type { AdaptablePredicate, AdaptableColumnPredicate, AdaptablePredicateDef, PredicateModuleScope, PredicateDefHandlerContext, PredicateDefInput, PredicateDefToStringParams, ColumnFilterDef, } from './AdaptableState/Common/AdaptablePredicate';
+export type { ColumnScope } from './AdaptableState/Common/ColumnScope';
+export type { RowScope } from './AdaptableState/Common/RowScope';
+export type { AdaptableStyle } from './AdaptableState/Common/AdaptableStyle';
+export type { AdaptableBaseIcon, AdaptableIcon, AdaptableSystemIcon, AdaptableCustomIcon, AdaptableSystemIconName, AdaptableElementIcon, } from './AdaptableState/Common/AdaptableIcon';
+export type { CellHighlightInfo } from './AdaptableState/Common/CellHighlightInfo';
+export type { RowHighlightInfo } from './AdaptableState/Common/RowHighlightInfo';
+export type { RowsHighlightInfo } from './AdaptableState/Common/RowsHighlightInfo';
+export type { ColumnSort } from './AdaptableState/Common/ColumnSort';
+export type { CellDataChangedInfo } from './AdaptableState/Common/CellDataChangedInfo';
+export type { RowDataChangedInfo, RowDataChangeTrigger, } from './AdaptableState/Common/RowDataChangedInfo';
+export type { DataChangedScope } from './AdaptableState/Common/DataChangedScope';
+export type { DataUpdateConfig } from './AdaptableState/Common/DataUpdateConfig';
+export type { AdaptableFormData, AdaptableForm, AdaptableFormField, AdaptableFormFieldType, } from './AdaptableState/Common/AdaptableForm';
+export type { AdaptableButton } from './AdaptableState/Common/AdaptableButton';
+export type { AdaptableMenuItem, UserMenuItem, ColumnMenuContext, ContextMenuContext, AdaptableContextMenuItem, AdaptableColumnMenuItem, AdaptableColumnMenuItemName, AdaptableContextMenuItemName, AgGridMenuItem, MenuCategory, MenuSeparator, } from './AdaptableState/Common/Menu';
+export type { BaseContext } from './AdaptableState/Common/BaseContext';
+export type { AdaptableColumnContext } from './AdaptableState/Common/AdaptableColumnContext';
+export type { FormContext } from './AdaptableState/Common/FormContext';
+export type { Schedule } from './AdaptableState/Common/Schedule';
+export type { ButtonStyle } from './AdaptableState/Common/ButtonStyle';
+export type { AdaptableModule, AdaptableToolPanel, AdaptableQLModule, AdaptableSettingsPanel, AdaptableDashboardToolbar, AdaptableStatusBarPanel, AdaptableModuleButton, } from './AdaptableState/Common/Types';
+export type { ChartDefinition, ChartingState, ChartingAggFunc, } from './AdaptableState/ChartingState';
+export type { CustomSort, CustomSortState } from './AdaptableState/CustomSortState';
+export type { DashboardState, DashboardTab, AdaptableCoordinate, } from './AdaptableState/DashboardState';
+export type { ExportState, Report, ReportData, ReportColumn, ReportSchedule, SystemReportName, SystemReportNames, SystemReportFormat, ReportRowScope, ReportColumnScope, ReportNameType, ReportFormatType, } from './AdaptableState/ExportState';
+export type { ColumnFilter, ColumnFilterPredicate, SystemFilterPredicateIds, SystemFilterPredicateId, PredicatesOperator, } from './AdaptableState/Common/ColumnFilter';
+export type { GridFilter } from './AdaptableState/Common/GridFilter';
+export type { FormatColumn, FormatColumnState, FormatColumnRule, FormatColumnPredicate, SystemFormatColumnPredicateId, SystemFormatColumnPredicateIds, } from './AdaptableState/FormatColumnState';
+export type { StyledColumn, StyledColumnState, PercentBarStyle, GradientStyle, CellColorRange, ColumnComparison, CellTextOptions, CellTextOption, NumericStyledColumn, RangeValueType, SparklineStyle, BadgeStyle, BadgeStyleDefinition, BadgeStylePredicate, SystemBadgeStylePredicateId, SystemBadgeStylePredicateIds, } from './AdaptableState/StyledColumnState';
+export type { FreeTextColumn, FreeTextColumnState, FreeTextStoredValue, FreeTextColumnSettings, } from './AdaptableState/FreeTextColumnState';
+export type { StatusBarState, AdaptableStatusBar } from './AdaptableState/StatusBarState';
+export type { IPushPullDomain, IPushPullReport, IPushPullSchedule, IPushPullState, } from './AdaptableState/IPushPullState';
+export type { Layout, LayoutState, LayoutArray, LayoutBase, TableLayout, PivotLayout, RowGroupValues, RowGroupValuesWithExceptionKeys, ColumnStringMap, ColumnNumberMap, ColumnBooleanFalseMap, ColumnDirectionMap, } from './AdaptableState/LayoutState';
+export type { RowSummary, RowSummaryPosition } from './AdaptableState/Common/RowSummary';
+export type { OpenFinReport, OpenFinSchedule, OpenFinState } from './AdaptableState/OpenFinState';
+export type { PlusMinusNudge, PlusMinusState } from './AdaptableState/PlusMinusState';
+export type { PredefinedConfig, InitialState } from './AdaptableState/InitialState';
+export type { NamedQuery, NamedQueryState } from './AdaptableState/NamedQueryState';
+export type { QuickSearchState } from './AdaptableState/QuickSearchState';
+export type { ReminderSchedule, ScheduleState } from './AdaptableState/ScheduleState';
+export type { GridCell, CellUpdateRequest, CellAddress } from './AdaptableState/Selection/GridCell';
+export type { GridRow, RowInfo } from './AdaptableState/Selection/GridRow';
+export type { SelectedCellInfo } from './AdaptableState/Selection/SelectedCellInfo';
+export type { SelectedRowInfo } from './AdaptableState/Selection/SelectedRowInfo';
+export type { GridCellRange } from './AdaptableState/Selection/GridCellRange';
+export type { Shortcut, ShortcutState, ShortcutScopeDataType, } from './AdaptableState/ShortcutState';
+export type { SharedEntity, AdaptableSharedEntity, CustomSharedEntity, TeamSharingState, SharedEntityType, AdaptableSharedEntityConfig, CustomSharedEntityConfig, } from './AdaptableState/TeamSharingState';
+export type { AdaptableTheme, ThemeState } from './AdaptableState/ThemeState';
+export type { ToolPanelState, AdaptableToolPanelDefinition, ToolPanelVisibilityMode, } from './AdaptableState/ToolPanelState';
 export type { AdaptableFrameworkComponent, AngularFrameworkComponent, ReactFrameworkComponent, VueFrameworkComponent, CustomRenderFunction, CustomRenderContext, } from './agGrid/AdaptableFrameworkComponent';
 export type { Fdc3Options, GridDataContextMapping, ActionColumnDefaultConfiguration, ResolveContextDataContext, RaiseIntentConfig, BroadcastConfig, HandleFdc3IntentContext, HandleFdc3Context, Fdc3ButtonContext, Fdc3AdaptableButton, HandleFdc3IntentResolutionContext, UIControlConfig, Fdc3IntentOptions, Fdc3ContextOptions, RaiseIntentConfiguration, BroadcastConfiguration, FDC3ActionColumn, } from './AdaptableOptions/Fdc3Options';
-export type { CommentState, CommentThread, AdaptableComment, } from './PredefinedConfig/CommentState';
+export type { CommentState, CommentThread, AdaptableComment } from './AdaptableState/CommentState';
 export type { UpgradeConfig } from '../agGrid';
-export type { ProgressIndicatorConfig } from './PredefinedConfig/Common/ProgressIndicatorConfig';
-export type { CustomWindowConfig } from './PredefinedConfig/Common/CustomWindowConfig';
-export type { TransposeConfig } from './PredefinedConfig/Common/TransposeConfig';
+export type { ProgressIndicatorConfig } from './AdaptableState/Common/ProgressIndicatorConfig';
+export type { CustomWindowConfig } from './AdaptableState/Common/CustomWindowConfig';
+export type { TransposeConfig } from './AdaptableState/Common/TransposeConfig';