@adaptabletools/adaptable 18.0.0-canary.3 → 18.0.0-canary.5

package/src/Strategy/ColumnFilterModule.js

@@ -28,70 +28,7 @@ export class ColumnFilterModule extends AdaptableModuleBase {
     hasNamedQueryReferences() {
         return false;
     }
-    updateOldConfig() {
-        // Note: have updated Dashboard and Status bar but NOT Tool Panels
-        // Update Module Buttons
-        let updateModuleButtons = false;
-        let moduleButtons = this.api.dashboardApi.getModuleButtons();
-        if (!moduleButtons.includes('ColumnFilter')) {
-            moduleButtons = moduleButtons.map((moduleButton) => {
-                if (moduleButton == 'Filter') {
-                    updateModuleButtons = true;
-                    return 'ColumnFilter';
-                }
-                return moduleButton;
-            });
-        }
-        if (updateModuleButtons) {
-            this.api.dashboardApi.setModuleButtons(moduleButtons);
-        }
-        // Update Toolbars
-        let updateTabs = false;
-        const tabs = this.api.dashboardApi.getTabs().map((tab) => {
-            if (tab.Toolbars.includes('Filter') && !tab.Toolbars.includes('ColumnFilter')) {
-                updateTabs = true;
-                return Object.assign(Object.assign({}, tab), { 
-                    // replace with 'GridFilter'
-                    Toolbars: tab.Toolbars.map((t) => (t == 'Filter' ? 'ColumnFilter' : t)) });
-            }
-            return tab;
-        });
-        if (updateTabs) {
-            this.api.dashboardApi.setTabs(tabs);
-        }
-        // - move pinned toolbars
-        let updatePinnedToolbars = false;
-        let pinnedToolbars = this.api.dashboardApi.getPinnedToolbars();
-        if (pinnedToolbars && !(pinnedToolbars === null || pinnedToolbars === void 0 ? void 0 : pinnedToolbars.includes('ColumnFilter'))) {
-            pinnedToolbars = pinnedToolbars.map((pinnedToolbar) => {
-                if (pinnedToolbar == 'Filter') {
-                    updatePinnedToolbars = true;
-                    return 'ColumnFilter';
-                }
-                return pinnedToolbar;
-            });
-        }
-        if (updatePinnedToolbars) {
-            this.api.dashboardApi.setPinnedToolbars(pinnedToolbars);
-        }
-        // Update Status Bar
-        let updateStatusBars = false;
-        const statusBars = this.api.statusBarApi
-            .getAdaptableStatusBars()
-            .map((panel) => {
-            return Object.assign(Object.assign({}, panel), { StatusBarPanels: panel.StatusBarPanels.map((panel) => {
-                    if (panel === 'Filter') {
-                        updateStatusBars = true;
-                        return 'ColumnFilter';
-                    }
-                    return panel;
-                }) });
-        });
-        if (updateStatusBars) {
-            this.api.statusBarApi.setStatusBarPanels(statusBars);
-        }
-    }
-    handleAdaptableReady() {
+    onAdaptableReady() {
         if (this.api.optionsApi.getColumnFilterOptions().quickFilterOptions.showQuickFilter == false) {
             this.api.columnFilterApi.hideQuickFilterBar();
         }

package/src/Strategy/CommentsModule.d.ts

@@ -9,6 +9,7 @@ import { IModule } from './Interface/IModule';
 export declare class CommentsModule extends AdaptableModuleBase implements IModule {
     private adaptable;
     constructor(api: AdaptableApi);
+    onAdaptableReady(): void;
     isModuleAvailable(): boolean;
     private loadComments;
     addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;

package/src/Strategy/CommentsModule.js

@@ -9,7 +9,8 @@ export class CommentsModule extends AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.CommentsModuleId, ModuleConstants.CommentsFriendlyName, 'comments', 'CommentsPopup', 'comments', api);
         this.adaptable = api.internalApi.getAdaptableInstance();
-        this.adaptable.api.eventApi.on('AdaptableReady', () => this.handleAdaptableReady());
+    }
+    onAdaptableReady() {
         this.loadComments();
     }
     isModuleAvailable() {

package/src/Strategy/CustomSortModule.js

@@ -25,7 +25,7 @@ export class CustomSortModule extends AdaptableModuleBase {
                 .find((x) => x.ColumnId == column.columnId);
             let label = customSort ? 'Edit ' : 'Create ';
             // dont show a menu item if there is a custom sort that uses a comparer function
-            const columnSortComparer = this.api.customSortApi.internalApi.getCustomSortComparer(column);
+            const columnSortComparer = this.api.customSortApi.internalApi.getCustomSortComparer(column.columnId);
             if (columnSortComparer) {
                 return undefined;
             }

package/src/Strategy/DashboardModule.d.ts

@@ -4,8 +4,7 @@ import { IModule } from './Interface/IModule';
 import { AdaptableApi } from '../Api/AdaptableApi';
 export declare class DashboardModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
-    updateOldConfig(): void;
-    handleAdaptableReady(): void;
+    onAdaptableReady(): void;
     addColumnMenuItems(): AdaptableMenuItem[] | undefined;
     addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     private buildMenuItems;

package/src/Strategy/DashboardModule.js

@@ -5,14 +5,7 @@ export class DashboardModule extends AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.DashboardModuleId, ModuleConstants.DashboardFriendlyName, 'dashboard', 'DashboardPopup', 'The Dashboard - usually placed above the Grid - is designed to provide quick access to commonly required AdapTable functionalty', api);
     }
-    updateOldConfig() {
-        let dashboardState = this.api.dashboardApi.getDashboardState();
-        if (dashboardState.VisibleButtons) {
-            this.api.logWarn(`Updating Obsolete VisibleButtons Config for DashboardState: [${dashboardState.VisibleButtons}]`);
-            this.api.dashboardApi.setModuleButtons(dashboardState.VisibleButtons);
-        }
-    }
-    handleAdaptableReady() {
+    onAdaptableReady() {
         // we used to create a default tab here but we no longer do // this.api.internalApi.setDefaultDashboardTab();
         // this handler reacts to the 'AdaptableReady' event,
         // but so do all the other possible handlers of the 'DashboardChanged' event

package/src/Strategy/DataChangeHistoryModule.d.ts

@@ -3,6 +3,7 @@ import { AdaptableModuleView, IModule } from './Interface/IModule';
 import { AdaptableApi } from '../Api/AdaptableApi';
 export declare class DataChangeHistoryModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
+    onAdaptableReady(): void;
     isModuleAvailable(): boolean;
     getPopupMaxWidth(): number;
     hasNamedQueryReferences(): boolean;

package/src/Strategy/DataChangeHistoryModule.js

@@ -6,6 +6,8 @@ import { ModuleNames } from '@ag-grid-community/core';
 export class DataChangeHistoryModule extends AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.DataChangeHistoryModuleId, ModuleConstants.DataChangeHistoryFriendlyName, 'target', 'DataChangeHistoryPopup', 'Provides an overview of all previous changes, giving the possibility to undo specific changes', api);
+    }
+    onAdaptableReady() {
         this.api.internalApi
             .getDataService()
             .on('CellDataChanged', (cellDataChangedInfo) => {
@@ -20,7 +22,7 @@ export class DataChangeHistoryModule extends AdaptableModuleBase {
         const isAdaptableModuleAvailable = super.isModuleAvailable();
         const isAgGridModuleAvailable = this.api.internalApi
             .getAdaptableInstance()
-            .isAgGridModulePresent(ModuleNames.ClientSideRowModelModule);
+            .agGridAdapter.isModulePresent(ModuleNames.ClientSideRowModelModule);
         if (isAdaptableModuleAvailable && !isAgGridModuleAvailable) {
             this.api.logWarn(`Data Change History is NOT available due to missing required AG Grid module: ${ModuleNames.ClientSideRowModelModule}`);
         }

package/src/Strategy/DataSetModule.d.ts

@@ -5,7 +5,7 @@ import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
 import { DataSet } from '../AdaptableOptions/DataSetOptions';
 export declare class DataSetModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
-    handleAdaptableReady(): void;
+    onAdaptableReady(): void;
     getModuleAdaptableObjects(): AdaptableObject[];
     hasNamedQueryReferences(): boolean;
     toView(dataSet: DataSet): AdaptableObjectView;

package/src/Strategy/DataSetModule.js

@@ -8,7 +8,7 @@ export class DataSetModule extends AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.DataSetModuleId, ModuleConstants.DataSetFriendlyName, 'data-set', 'DataSetPopup', 'Update the entire data source in AdapTable using pre-populated data sets', api);
     }
-    handleAdaptableReady() {
+    onAdaptableReady() {
         this.api.dataSetApi.getDataSets().forEach((ds) => {
             if (!ds.Uuid) {
                 ds.Uuid = createUuid();

package/src/Strategy/FlashingCellModule.d.ts

@@ -9,8 +9,7 @@ import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
 import { FlashingCellDefinition } from '../PredefinedConfig/FlashingCellState';
 export declare class FlashingCellModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
-    updateOldConfig(): void;
-    private updateFlashingCellSingleToMultiplePredicates;
+    onAdaptableReady(): void;
     getModuleAdaptableObjects(config?: {
         includeLayoutNotAssociatedObjects?: boolean;
     }): AdaptableObject[];

package/src/Strategy/FlashingCellModule.js

@@ -11,11 +11,11 @@ import { FlashingCellWizard } from '../View/FlashingCell/Wizard/FlashingCellWiza
 import { getObjectTagsViewItems } from './Utilities/getObjectTagsViewItems';
 import { getFlashingTargetViewItems } from './Utilities/FlashingCell/getFlashingTargetViewItems';
 import { getFlashingCellStyleViewItems } from './Utilities/FlashingCell/getFlashingCellStyleViewItems';
-import { cloneObject } from '../Utilities/Helpers/Helper';
-import { updateSingleToMultiplePredicates } from './Utilities/updateSingleToMultiplePredicates';
 export class FlashingCellModule extends AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.FlashingCellModuleId, ModuleConstants.FlashingCellFriendlyName, 'lightning', 'FlashingAlert', 'Flash cells when they change', api);
+    }
+    onAdaptableReady() {
         this.api.internalApi
             .getDataService()
             .on('CellDataChanged', (cellDataChangedInfo) => {
@@ -38,19 +38,6 @@ export class FlashingCellModule extends AdaptableModuleBase {
             this.handleCellDataChanged(cellDataChangedInfo);
         });
     }
-    updateOldConfig() {
-        this.updateFlashingCellSingleToMultiplePredicates();
-    }
-    updateFlashingCellSingleToMultiplePredicates() {
-        const flashingCells = this.api.flashingCellApi.getFlashingCellDefinitions();
-        flashingCells.forEach((flashingCell) => {
-            if (flashingCell.Rule && 'Predicate' in flashingCell.Rule) {
-                const preparedFlashingCell = cloneObject(flashingCell);
-                updateSingleToMultiplePredicates(preparedFlashingCell.Rule);
-                this.api.flashingCellApi.editFlashingCellDefinition(preparedFlashingCell);
-            }
-        });
-    }
     getModuleAdaptableObjects(config) {
         return this.api.flashingCellApi.getFlashingCellDefinitions(config);
     }

package/src/Strategy/FormatColumnModule.d.ts

@@ -13,8 +13,6 @@ export declare class FormatColumnModule extends AdaptableModuleBase implements I
     }): AdaptableObject[];
     getExplicitlyReferencedColumnIds(formatColumn: FormatColumn): string[];
     getReferencedNamedQueryNames(formatColumn: FormatColumn): string[];
-    updateOldConfig(): void;
-    private updateFormatColumnSingleToMultiplePredicates;
     addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
     getTeamSharingAction(): TeamSharingImportInfo<FormatColumn>;
     toView(formatColumn: FormatColumn): AdaptableObjectView;

package/src/Strategy/FormatColumnModule.js

@@ -10,8 +10,6 @@ import { getFormatColumnStyleViewItems } from './Utilities/FormatColumn/getForma
 import { getObjectTagsViewItems } from './Utilities/getObjectTagsViewItems';
 import { getRuleViewItems } from './Utilities/getRuleViewItems';
 import { MoveFormatColumn } from '../View/FormatColumn/MoveFormatColumn';
-import { cloneObject } from '../Utilities/Helpers/Helper';
-import { updateSingleToMultiplePredicates } from './Utilities/updateSingleToMultiplePredicates';
 import ArrayExtensions from '../Utilities/Extensions/ArrayExtensions';
 export class FormatColumnModule extends AdaptableModuleBase {
     constructor(api) {
@@ -39,51 +37,6 @@ export class FormatColumnModule extends AdaptableModuleBase {
         }
         return this.api.namedQueryApi.internalApi.getReferencedNamedQueryNames(queryExpression);
     }
-    updateOldConfig() {
-        this.updateFormatColumnSingleToMultiplePredicates();
-        // update ConditionalStyle StatusBarPanel
-        const oldStatusBars = this.api.internalApi.getState().StatusBar.StatusBars;
-        let replaceConditionalStyleStatusBar = false;
-        const newStatusBars = oldStatusBars.map((statusBar) => (Object.assign(Object.assign({}, statusBar), { StatusBarPanels: [
-                ...new Set(statusBar.StatusBarPanels.map((statusBarPanel) => {
-                    if (statusBarPanel === 'ConditionalStyle') {
-                        replaceConditionalStyleStatusBar = true;
-                        return 'FormatColumn';
-                    }
-                    return statusBarPanel;
-                })),
-            ] })));
-        if (replaceConditionalStyleStatusBar) {
-            this.api.statusBarApi.setStatusBarPanels(newStatusBars);
-        }
-        // update ConditionalStyle dashboard buttons
-        const dashboardModuleButtons = this.api.internalApi.getState().Dashboard.ModuleButtons;
-        if (dashboardModuleButtons.includes('ConditionalStyle')) {
-            dashboardModuleButtons[dashboardModuleButtons.indexOf('ConditionalStyle')] = 'FormatColumn';
-            const test2 = dashboardModuleButtons;
-            this.api.dashboardApi.setModuleButtons([
-                ...new Set(dashboardModuleButtons),
-            ]);
-        }
-        // update ConditionalStyle toolPanel buttons
-        const toolPanelModuleButtons = this.api.internalApi.getState().ToolPanel.ModuleButtons;
-        if (toolPanelModuleButtons.includes('ConditionalStyle')) {
-            toolPanelModuleButtons[toolPanelModuleButtons.indexOf('ConditionalStyle')] = 'FormatColumn';
-            this.api.toolPanelApi.setModuleButtons([
-                ...new Set(dashboardModuleButtons),
-            ]);
-        }
-    }
-    updateFormatColumnSingleToMultiplePredicates() {
-        const formatColumns = this.api.formatColumnApi.getFormatColumns();
-        formatColumns.forEach((formatColumn) => {
-            if (formatColumn.Rule && 'Predicate' in formatColumn.Rule) {
-                const preparedFormatColumn = cloneObject(formatColumn);
-                updateSingleToMultiplePredicates(preparedFormatColumn.Rule);
-                this.api.formatColumnApi.editFormatColumn(preparedFormatColumn);
-            }
-        });
-    }
     addColumnMenuItems(column) {
         let returnColumnMenuItems = [];
         if (column && this.isModuleEditable() && !column.isSparkline) {

package/src/Strategy/FreeTextColumnModule.d.ts

@@ -12,7 +12,6 @@ export declare class FreeTextColumnModule extends AdaptableModuleBase implements
     isModuleAvailable(): boolean;
     getModuleAdaptableObjects(): FreeTextColumn[];
     hasNamedQueryReferences(): boolean;
-    updateOldConfig(): void;
     addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
     getTeamSharingAction(): TeamSharingImportInfo<FreeTextColumn>;
     toView(freeTextColumn: FreeTextColumn): AdaptableObjectView;

package/src/Strategy/FreeTextColumnModule.js

@@ -17,36 +17,6 @@ export class FreeTextColumnModule extends AdaptableModuleBase {
     hasNamedQueryReferences() {
         return false;
     }
-    updateOldConfig() {
-        // make sure all default to type string
-        const allFreeTextColumns = this.getModuleAdaptableObjects();
-        for (const freeTextColumn of allFreeTextColumns) {
-            const unTypedCol = freeTextColumn;
-            if (unTypedCol.DataType) {
-                const dataType = unTypedCol.DataType;
-                delete unTypedCol['DataType'];
-                if (!freeTextColumn.FreeTextColumnSettings) {
-                    freeTextColumn.FreeTextColumnSettings = {
-                        DataType: dataType,
-                    };
-                }
-                else {
-                    freeTextColumn.FreeTextColumnSettings.DataType = dataType;
-                }
-                this.api.freeTextColumnApi.editFreeTextColumn(freeTextColumn);
-            }
-            if (!freeTextColumn.FreeTextColumnSettings) {
-                freeTextColumn.FreeTextColumnSettings = {
-                    DataType: 'String',
-                };
-                this.api.freeTextColumnApi.editFreeTextColumn(freeTextColumn);
-            }
-            if (!freeTextColumn.FreeTextColumnSettings.DataType) {
-                freeTextColumn.FreeTextColumnSettings.DataType = 'String';
-                this.api.freeTextColumnApi.editFreeTextColumn(freeTextColumn);
-            }
-        }
-    }
     addColumnMenuItems(column) {
         if (column && this.isModuleEditable()) {
             if (this.api.freeTextColumnApi

package/src/Strategy/GridFilterModule.d.ts

@@ -3,6 +3,5 @@ import { AdaptableModuleView, IModule } from './Interface/IModule';
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 export declare class GridFilterModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
-    updateOldConfig(): void;
     getViewProperties(): AdaptableModuleView;
 }

package/src/Strategy/GridFilterModule.js

@@ -2,47 +2,10 @@ import { AdaptableModuleBase } from './AdaptableModuleBase';
 import * as ModuleConstants from '../Utilities/Constants/ModuleConstants';
 import { EditGridFilterButton } from '../View/NamedQuery/EditCurrentQueryButton';
 import { GridFilterStatusbar } from '../View/GridFilter/GridFilterStatusbar';
-import StringExtensions from '../Utilities/Extensions/StringExtensions';
 export class GridFilterModule extends AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.GridFilterModuleId, ModuleConstants.GridFilterFriendlyName, 'filter-list', 'GridFilterPopup', 'Controls the Grid Filter funtionality', api);
     }
-    updateOldConfig() {
-        var _a, _b;
-        const oldQueryState = this.api.internalApi.getAdaptableState().Query;
-        // - move query to current layout
-        const expression = oldQueryState.CurrentQuery;
-        if (expression &&
-            StringExtensions.IsNullOrEmpty(this.api.gridFilterApi.getCurrentGridFilterExpression())) {
-            this.api.gridFilterApi.setGridFilterExpression(expression);
-        }
-        // - move dashboard/toolbar
-        let updateTabs = false;
-        const tabs = this.api.dashboardApi.getTabs().map((tab) => {
-            if (tab.Toolbars.includes('Query')) {
-                updateTabs = true;
-                return Object.assign(Object.assign({}, tab), { 
-                    // replace with 'GridFilter'
-                    Toolbars: tab.Toolbars.map((t) => (t == 'Query' ? 'GridFilter' : t)) });
-            }
-            return tab;
-        });
-        if (updateTabs) {
-            this.api.dashboardApi.setTabs(tabs);
-        }
-        // - move pinned toolbars
-        let updatePinnedToolbars = false;
-        const pinnedToolbars = (_b = (_a = this.api.dashboardApi.getPinnedToolbars()) === null || _a === void 0 ? void 0 : _a.map) === null || _b === void 0 ? void 0 : _b.call(_a, (pinnedToolbar) => {
-            if (pinnedToolbar == 'Query') {
-                updatePinnedToolbars = true;
-                return 'GridFilter';
-            }
-            return pinnedToolbar;
-        });
-        if (updatePinnedToolbars) {
-            this.api.dashboardApi.setPinnedToolbars(pinnedToolbars);
-        }
-    }
     getViewProperties() {
         return {
             getStatusBarPanelProps: () => {

package/src/Strategy/Interface/IModule.d.ts

@@ -156,7 +156,6 @@ export interface IModule {
     getModuleFreeTextColumnReferences(): FreeTextColumn[];
     getPopupMaxWidth(): number | undefined;
     canBeAssociatedWithLayouts(): boolean;
-    updateOldConfig(): void;
     /**
      * The following view options are used to render adaptable objects and
      * module general views.

package/src/Strategy/LayoutModule.d.ts

@@ -10,13 +10,11 @@ import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
 export declare class LayoutModule extends AdaptableModuleBase implements IModule {
     protected LayoutState: LayoutState;
     constructor(api: AdaptableApi);
-    updateOldConfig(): void;
-    private clearUnsuportedFeaturesFromLayout;
+    onAdaptableReady(): void;
     getModuleAdaptableObjects(): AdaptableObject[];
     getExplicitlyReferencedColumnIds(layout: Layout): string[];
     getTeamSharingReferences(adaptableObject: AdaptableObject): TeamSharingReferences;
     hasNamedQueryReferences(): boolean;
-    handleAdaptableReady(): void;
     addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
     addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     private createViewPivotItemsMenuItem;

package/src/Strategy/LayoutModule.js

@@ -18,39 +18,8 @@ import { getGridFilterViewItems } from '../View/Layout/Wizard/getGridFilterPrevi
 export class LayoutModule extends AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.LayoutModuleId, ModuleConstants.LayoutFriendlyName, 'grid', 'LayoutPopup', 'Named sets of column visibility, order, groupings, aggregation, pivots etc.', api);
-        this.clearUnsuportedFeaturesFromLayout = (layout) => {
-            const layoutSupportedFeatures = this.api.layoutApi.internalApi.getLayoutSupportedFeatures();
-            let needsUpdate = false;
-            const layoutToSave = Object.assign({}, layout);
-            if (!layoutSupportedFeatures.RowGroupedColumns && layout.RowGroupedColumns) {
-                delete layoutToSave.RowGroupedColumns;
-                needsUpdate = true;
-            }
-            if (!layoutSupportedFeatures.AggregationColumns && layout.AggregationColumns) {
-                delete layoutToSave.AggregationColumns;
-                needsUpdate = true;
-            }
-            if (!layoutSupportedFeatures.PivotColumns && layout.PivotColumns) {
-                delete layoutToSave.PivotColumns;
-                delete layoutToSave.EnablePivot;
-                needsUpdate = true;
-            }
-            if (!layoutSupportedFeatures.ColumnFilters && layout.ColumnFilters) {
-                delete layoutToSave.ColumnFilters;
-                needsUpdate = true;
-            }
-            if (!layoutSupportedFeatures.GridFilter && layout.GridFilter) {
-                delete layoutToSave.GridFilter;
-                needsUpdate = true;
-            }
-            if (!layoutSupportedFeatures.ColumnSorts && layout.ColumnSorts) {
-                delete layoutToSave.ColumnSorts;
-                needsUpdate = true;
-            }
-            if (needsUpdate) {
-                this.api.layoutApi.createOrUpdateLayout(layoutToSave);
-            }
-        };
+    }
+    onAdaptableReady() {
         this.api.eventApi.on('LayoutChanged', (layoutChangedInfo) => {
             var _a;
             if (layoutChangedInfo.newLayoutState.CurrentLayout !==
@@ -59,17 +28,9 @@ export class LayoutModule extends AdaptableModuleBase {
                 this.handleLayoutChange();
             }
         });
-    }
-    updateOldConfig() {
-        /**
-         * Viewport mode does not support a few
-         * features instead of complicating the
-         * logic where layout is applied, it is easier and
-         * less error prone to just remove it.
-         */
-        if (this.api.gridApi.getAgGridRowModelType() === 'viewport') {
-            this.api.layoutApi.getLayouts().forEach(this.clearUnsuportedFeaturesFromLayout);
-        }
+        requestAnimationFrame(() => {
+            this.api.layoutApi.internalApi.fireLayoutChangedEvent('ADAPTABLE_READY', null, this.api.layoutApi.getLayoutState());
+        });
     }
     getModuleAdaptableObjects() {
         return this.api.layoutApi.getLayouts();
@@ -137,11 +98,6 @@ export class LayoutModule extends AdaptableModuleBase {
     hasNamedQueryReferences() {
         return true;
     }
-    handleAdaptableReady() {
-        requestAnimationFrame(() => {
-            this.api.layoutApi.internalApi.fireLayoutChangedEvent('ADAPTABLE_READY', null, this.api.layoutApi.getLayoutState());
-        });
-    }
     addColumnMenuItems(column) {
         var _a, _b;
         let returnColumnMenuItems = [];
@@ -435,7 +391,7 @@ export class LayoutModule extends AdaptableModuleBase {
             .setUpScheduleJobs();
         // CustomSort, FlashingCell, FormatColumn
         // we need to refresh the column defs, as some configs may have changed
-        this.api.internalApi.getAdaptableInstance().setupColumns();
+        this.api.internalApi.getAdaptableInstance().updateColumnModelAndRefreshGrid();
     }
     getReferencedNamedQueryNames(layout) {
         var _a;

package/src/Strategy/NamedQueryModule.d.ts

@@ -8,7 +8,6 @@ import { IModule } from './Interface/IModule';
 export declare class NamedQueryModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
     getModuleAdaptableObjects(): AdaptableObject[];
-    updateOldConfig(): void;
     getTeamSharingAction(): TeamSharingImportInfo<NamedQuery>;
     getExplicitlyReferencedColumnIds(namedQuery: NamedQuery): string[];
     getReferencedNamedQueryNames(namedQuery: NamedQuery): string[];

package/src/Strategy/NamedQueryModule.js

@@ -1,6 +1,5 @@
 import * as NamedQueryRedux from '../Redux/ActionsReducers/NamedQueryRedux';
 import * as ModuleConstants from '../Utilities/Constants/ModuleConstants';
-import ArrayExtensions from '../Utilities/Extensions/ArrayExtensions';
 import { EditGridFilterButton } from '../View/NamedQuery/EditCurrentQueryButton';
 import { NamedQueryWizard } from '../View/NamedQuery/Wizard/NamedQueryWizard';
 import { AdaptableModuleBase } from './AdaptableModuleBase';
@@ -12,24 +11,6 @@ export class NamedQueryModule extends AdaptableModuleBase {
     getModuleAdaptableObjects() {
         return this.api.namedQueryApi.getNamedQueries();
     }
-    updateOldConfig() {
-        // - move named queries from old Query State to this Module
-        // Note: GridFilter Module moves the "old" CurrentQuery into Layout
-        const oldQueryState = this.api.internalApi.getAdaptableState().Query;
-        const oldNamedQueries = oldQueryState.NamedQueries;
-        if (ArrayExtensions.IsNotNullOrEmpty(oldNamedQueries)) {
-            const currentNamedQueries = this.api.namedQueryApi.getNamedQueries();
-            oldNamedQueries.forEach((oldNamedQuery) => {
-                const currentQuery = currentNamedQueries.find((q) => q.Name === oldNamedQuery.Name);
-                if (!currentQuery) {
-                    this.api.namedQueryApi.addNamedQuery(oldNamedQuery);
-                }
-            });
-        }
-        if (oldQueryState) {
-            this.api.namedQueryApi.internalApi.cleanupQueryRedux();
-        }
-    }
     getTeamSharingAction() {
         return {
             ModuleEntities: this.api.namedQueryApi.getNamedQueries(),

package/src/Strategy/PlusMinusModule.d.ts

@@ -17,7 +17,7 @@ export declare class PlusMinusModule extends AdaptableModuleBase implements IPlu
     }): AdaptableObject[];
     getExplicitlyReferencedColumnIds(plusMinusNudge: PlusMinusNudge): string[];
     getReferencedNamedQueryNames(plusMinusNudge: PlusMinusNudge): string[];
-    handleAdaptableReady(): void;
+    onAdaptableReady(): void;
     checkListenToKeyDown(): void;
     addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
     private handleKeyDown;

package/src/Strategy/PlusMinusModule.js

@@ -33,7 +33,7 @@ export class PlusMinusModule extends AdaptableModuleBase {
         }
         return this.api.namedQueryApi.internalApi.getReferencedNamedQueryNames((_b = plusMinusNudge.Rule) === null || _b === void 0 ? void 0 : _b.BooleanExpression);
     }
-    handleAdaptableReady() {
+    onAdaptableReady() {
         let plusMinusNudges = this.api.plusMinusApi.getAllPlusMinus();
         this.shouldHandleKeyDown = ArrayExtensions.IsNotNullOrEmpty(plusMinusNudges);
         if (this.shouldHandleKeyDown) {

package/src/Strategy/ScheduleModule.d.ts

@@ -6,7 +6,7 @@ import { IScheduleModule } from './Interface/IScheduleModule';
 export declare class ScheduleModule extends AdaptableModuleBase implements IScheduleModule {
     private scheduleJobs;
     constructor(api: AdaptableApi);
-    handleAdaptableReady(): void;
+    onAdaptableReady(): void;
     setUpScheduleJobs(): void;
     private addSchedule;
     private addMidnightRefreshSchedule;

package/src/Strategy/ScheduleModule.js

@@ -36,7 +36,7 @@ export class ScheduleModule extends AdaptableModuleBase {
         this.scheduleJobs = [];
         this.addMidnightRefreshSchedule();
     }
-    handleAdaptableReady() {
+    onAdaptableReady() {
         this.setUpScheduleJobs();
     }
     setUpScheduleJobs() {

package/src/Strategy/ShortcutModule.d.ts

@@ -14,7 +14,7 @@ export declare class ShortcutModule extends AdaptableModuleBase implements IShor
     }): AdaptableObject[];
     hasNamedQueryReferences(): boolean;
     getTeamSharingAction(): TeamSharingImportInfo<Shortcut>;
-    handleAdaptableReady(): void;
+    onAdaptableReady(): void;
     checkListenToKeyDown(): void;
     private handleKeyDown;
     private calculateShortcut;

package/src/Strategy/ShortcutModule.js

@@ -27,7 +27,7 @@ export class ShortcutModule extends AdaptableModuleBase {
             EditAction: ShortcutRedux.ShortcutEdit,
         };
     }
-    handleAdaptableReady() {
+    onAdaptableReady() {
         this.checkListenToKeyDown();
         this.adaptable._on('CellEditorKeyDown', (cellEditorKeyDownEvent) => {
             this.handleKeyDown(cellEditorKeyDownEvent);

package/src/Strategy/StyledColumnModule.d.ts

@@ -9,7 +9,6 @@ import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
 import { StyledColumn } from '../PredefinedConfig/StyledColumnState';
 export declare class StyledColumnModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
-    updateOldConfig(): void;
     getModuleAdaptableObjects(config?: {
         includeLayoutNotAssociatedObjects?: boolean;
     }): AdaptableObject[];