@adaptabletools/adaptable-cjs 18.0.0-canary.2 → 18.0.0-canary.21

package/src/Strategy/DashboardModule.js

@@ -9,14 +9,7 @@ class DashboardModule extends AdaptableModuleBase_1.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
@@ -38,28 +31,29 @@ class DashboardModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (this.isModuleAvailable()) {
             let menuItems = [];
             if (this.isModuleEditable()) {
-                menuItems.push(this.createColumnMenuItemClickFunction('Configure', 'settings', () => this.api.dashboardApi.openDashboardSettingsPanel()));
+                menuItems.push(this.createMenuItemClickFunction('dashboard-configure', 'Configure', 'settings', () => this.api.dashboardApi.openDashboardSettingsPanel()));
             }
             if (this.api.dashboardApi.getDashboardState().IsCollapsed) {
-                menuItems.push(this.createColumnMenuItemReduxAction('Expand', 'expand', DashboardRedux.DashboardSetIsCollapsed(false)));
+                menuItems.push(this.createMenuItemReduxAction('dashboard-expand', 'Expand', 'expand', DashboardRedux.DashboardSetIsCollapsed(false)));
             }
             else {
-                menuItems.push(this.createColumnMenuItemReduxAction('Collapse', 'collapse', DashboardRedux.DashboardSetIsCollapsed(true)));
+                menuItems.push(this.createMenuItemReduxAction('dashboard-collapse', 'Collapse', 'collapse', DashboardRedux.DashboardSetIsCollapsed(true)));
             }
             if (this.api.dashboardApi.getDashboardState().IsFloating) {
-                menuItems.push(this.createColumnMenuItemReduxAction('Dock', 'dock', DashboardRedux.DashboardSetIsFloating(false)));
+                menuItems.push(this.createMenuItemReduxAction('dashboard-dock', 'Dock', 'dock', DashboardRedux.DashboardSetIsFloating(false)));
             }
             else if (this.api.optionsApi.getDashboardOptions().canFloat) {
-                menuItems.push(this.createColumnMenuItemReduxAction('Float', 'dock', DashboardRedux.DashboardSetIsFloating(true)));
+                menuItems.push(this.createMenuItemReduxAction('dashboard-float', 'Float', 'dock', DashboardRedux.DashboardSetIsFloating(true)));
             }
             if (this.api.dashboardApi.getDashboardState().IsHidden) {
-                menuItems.push(this.createColumnMenuItemReduxAction('Show', 'visibility-on-bold', DashboardRedux.DashboardSetIsHidden(false)));
+                menuItems.push(this.createMenuItemReduxAction('dashboard-show', 'Show', 'visibility-on-bold', DashboardRedux.DashboardSetIsHidden(false)));
             }
             else {
-                menuItems.push(this.createColumnMenuItemReduxAction('Hide', 'visibility-off-bold', DashboardRedux.DashboardSetIsHidden(true)));
+                menuItems.push(this.createMenuItemReduxAction('dashboard-hide', 'Hide', 'visibility-off-bold', DashboardRedux.DashboardSetIsHidden(true)));
             }
             return [
                 {
+                    name: 'parent',
                     label: this.moduleInfo.FriendlyName,
                     isVisible: true,
                     module: this.moduleInfo.ModuleName,

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

@@ -10,6 +10,8 @@ const core_1 = require("ag-grid-community");
 class DataChangeHistoryModule extends AdaptableModuleBase_1.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) => {
@@ -24,7 +26,7 @@ class DataChangeHistoryModule extends AdaptableModuleBase_1.AdaptableModuleBase
         const isAdaptableModuleAvailable = super.isModuleAvailable();
         const isAgGridModuleAvailable = this.api.internalApi
             .getAdaptableInstance()
-            .isAgGridModulePresent(core_1.ModuleNames.ClientSideRowModelModule);
+            .agGridAdapter.isModulePresent(core_1.ModuleNames.ClientSideRowModelModule);
         if (isAdaptableModuleAvailable && !isAgGridModuleAvailable) {
             this.api.logWarn(`Data Change History is NOT available due to missing required AG Grid module: ${core_1.ModuleNames.ClientSideRowModelModule}`);
         }

package/src/Strategy/DataImportModule.d.ts

@@ -7,5 +7,5 @@ export declare class DataImportModule extends AdaptableModuleBase implements IMo
     addModuleMenuItem(source: 'ModuleMenu' | 'ModuleButton'): AdaptableMenuItem | undefined;
     addContextMenuItems(): AdaptableMenuItem[] | undefined;
     addColumnMenuItems(): AdaptableMenuItem[] | undefined;
-    private getOpenPopupMenuItem;
+    private createDataImportMenuItem;
 }

package/src/Strategy/DataImportModule.js

@@ -10,27 +10,27 @@ class DataImportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     addModuleMenuItem(source) {
         if (this.isModuleAvailable()) {
-            return this.getOpenPopupMenuItem(source);
+            return this.createDataImportMenuItem(source);
         }
     }
     addContextMenuItems() {
         if (this.isModuleAvailable()) {
-            return [this.getOpenPopupMenuItem('ContextMenu')];
+            return [this.createDataImportMenuItem('ContextMenu')];
         }
         return undefined;
     }
     addColumnMenuItems() {
         if (this.isModuleAvailable()) {
-            return [this.getOpenPopupMenuItem('ColumnMenu')];
+            return [this.createDataImportMenuItem('ColumnMenu')];
         }
     }
-    getOpenPopupMenuItem(source) {
+    createDataImportMenuItem(source) {
         const moduleParams = {
             action: 'New',
             source: source,
             maxWidth: this.getPopupMaxWidth(),
         };
-        return this.createColumnMenuItemShowPopup('Import Data', this.moduleInfo.Popup, this.moduleInfo.Glyph, moduleParams);
+        return this.createMenuItemShowPopup('data-import', 'Import Data', this.moduleInfo.Popup, this.moduleInfo.Glyph, moduleParams);
     }
 }
 exports.DataImportModule = DataImportModule;

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

@@ -12,7 +12,7 @@ class DataSetModule extends AdaptableModuleBase_1.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 = (0, Uuid_1.createUuid)();

package/src/Strategy/ExportModule.d.ts

@@ -15,6 +15,7 @@ export declare class ExportModule extends AdaptableModuleBase implements IExport
     addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     private buildReportMenuItems;
     private buildExportMenuItem;
+    private getMenuName;
     export(report: Report, exportDestination: ExportDestination | string): Promise<void>;
     private preProcessExport;
     private isCustomDestination;

package/src/Strategy/ExportModule.js

@@ -90,15 +90,16 @@ class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     buildReportMenuItems(report) {
         const menuItems = [];
         for (const destination of this.api.exportApi.getAvailableExportDestinations()) {
-            menuItems.push(this.createColumnMenuItemClickFunction(destination, this.moduleInfo.Glyph, () => this.export(report, destination)));
+            menuItems.push(this.createMenuItemClickFunction(this.getMenuName(destination), destination, this.moduleInfo.Glyph, () => this.export(report, destination)));
         }
         for (const customDestination of this.api.exportApi.getCustomDestinations()) {
-            menuItems.push(this.createColumnMenuItemClickFunction(customDestination.name, this.moduleInfo.Glyph, () => this.export(report, customDestination.name)));
+            menuItems.push(this.createMenuItemClickFunction('export-custom-destination', customDestination.name, this.moduleInfo.Glyph, () => this.export(report, customDestination.name)));
         }
         return menuItems;
     }
     buildExportMenuItem(label, subItems) {
         return {
+            name: 'parent',
             label: label,
             module: this.moduleInfo.ModuleName,
             isVisible: true,
@@ -106,6 +107,20 @@ class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             subItems: subItems,
         };
     }
+    getMenuName(exportDestination) {
+        switch (exportDestination) {
+            case Enums_1.ExportDestination.CSV:
+                return 'export-csv';
+            case Enums_1.ExportDestination.Clipboard:
+                return 'export-clipboard';
+            case Enums_1.ExportDestination.Excel:
+                return 'export-excel';
+            case Enums_1.ExportDestination.JSON:
+                return 'export-json';
+            case Enums_1.ExportDestination.Table:
+                return 'export-table';
+        }
+    }
     async export(report, exportDestination) {
         var _a;
         const cleanupExportProcess = () => {

package/src/Strategy/Fdc3Module.js

@@ -31,6 +31,7 @@ class Fdc3Module extends AdaptableModuleBase_1.AdaptableModuleBase {
             contextMenuItems.sort((a, b) => a.label.localeCompare(b.label));
             if (contextMenuItems.length > 1) {
                 const groupMenuItem = {
+                    name: 'parent',
                     module: this.moduleInfo.ModuleName,
                     label: 'FDC3',
                     icon: {
@@ -48,6 +49,7 @@ class Fdc3Module extends AdaptableModuleBase_1.AdaptableModuleBase {
         var _a, _b, _c;
         const { intentType, contextType } = intentConfig;
         const menuItem = {
+            name: 'fdc3-raise-intent',
             label: `Raise ${intentType}`,
             onClick: () => {
                 this.getFdc3Api().raiseIntentFromRow(rowNode, intentType, contextType);
@@ -67,6 +69,7 @@ class Fdc3Module extends AdaptableModuleBase_1.AdaptableModuleBase {
         var _a, _b, _c;
         const { contextType } = contextConfig;
         const menuItem = {
+            name: 'fdc3-broadcast',
             label: `Broadcast ${this.getFdc3Api().getContextLabel(contextType)}`,
             onClick: () => {
                 this.getFdc3Api().broadcastFromRow(rowNode, contextType);

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

@@ -15,11 +15,11 @@ const FlashingCellWizard_1 = require("../View/FlashingCell/Wizard/FlashingCellWi
 const getObjectTagsViewItems_1 = require("./Utilities/getObjectTagsViewItems");
 const getFlashingTargetViewItems_1 = require("./Utilities/FlashingCell/getFlashingTargetViewItems");
 const getFlashingCellStyleViewItems_1 = require("./Utilities/FlashingCell/getFlashingCellStyleViewItems");
-const Helper_1 = require("../Utilities/Helpers/Helper");
-const updateSingleToMultiplePredicates_1 = require("./Utilities/updateSingleToMultiplePredicates");
 class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.FlashingCellModuleId, ModuleConstants.FlashingCellFriendlyName, 'lightning', 'FlashingAlert', 'Flash cells when they change', api);
+    }
+    onAdaptableReady() {
         this.api.internalApi
             .getDataService()
             .on('CellDataChanged', (cellDataChangedInfo) => {
@@ -42,19 +42,6 @@ class FlashingCellModule extends AdaptableModuleBase_1.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 = (0, Helper_1.cloneObject)(flashingCell);
-                (0, updateSingleToMultiplePredicates_1.updateSingleToMultiplePredicates)(preparedFlashingCell.Rule);
-                this.api.flashingCellApi.editFlashingCellDefinition(preparedFlashingCell);
-            }
-        });
-    }
     getModuleAdaptableObjects(config) {
         return this.api.flashingCellApi.getFlashingCellDefinitions(config);
     }
@@ -86,11 +73,11 @@ class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 });
                 if (flashingCellForCurrentColumn) {
                     return [
-                        this.createColumnMenuItemReduxAction('Remove Flashing Cell', this.moduleInfo.Glyph, FlashingCellRedux.FlashingCellDefinitionDelete(flashingCellForCurrentColumn)),
+                        this.createMenuItemReduxAction('flashing-cell-delete', 'Delete Flashing Cell', this.moduleInfo.Glyph, FlashingCellRedux.FlashingCellDefinitionDelete(flashingCellForCurrentColumn)),
                     ];
                 }
                 return [
-                    this.createColumnMenuItemReduxAction('Add Flashing Cell', this.moduleInfo.Glyph, FlashingCellRedux.FlashingCellDefinitionAdd({
+                    this.createMenuItemReduxAction('flashing-cell-add', 'Add Flashing Cell', this.moduleInfo.Glyph, FlashingCellRedux.FlashingCellDefinitionAdd({
                         Scope: {
                             ColumnIds: [column.columnId],
                         },
@@ -112,11 +99,11 @@ class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     if (flashingCellForRow.flashTarget === 'row' ||
                         (Array.isArray(flashingCellForRow === null || flashingCellForRow === void 0 ? void 0 : flashingCellForRow.flashTarget) &&
                             flashingCellForRow.flashTarget.includes('row'))) {
-                        items.push(this.createColumnMenuItemReduxAction('Clear Flashing Row', this.moduleInfo.Glyph, SystemRedux.SystemFlashingCellDelete(flashingCellForRow)));
+                        items.push(this.createMenuItemReduxAction('flashing-row-clear', 'Clear Flashing Row', this.moduleInfo.Glyph, SystemRedux.SystemFlashingCellDelete(flashingCellForRow)));
                     }
                 }
                 else if (flashingCellForCell && flashingCellForCell.flashTarget === 'cell') {
-                    items.push(this.createColumnMenuItemReduxAction('Clear Flashing Cell', this.moduleInfo.Glyph, SystemRedux.SystemFlashingCellDelete(flashingCellForCell)));
+                    items.push(this.createMenuItemReduxAction('flashing-cell-clear', 'Clear Flashing Cell', this.moduleInfo.Glyph, SystemRedux.SystemFlashingCellDelete(flashingCellForCell)));
                 }
             }
         }

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

@@ -14,8 +14,6 @@ const getFormatColumnStyleViewItems_1 = require("./Utilities/FormatColumn/getFor
 const getObjectTagsViewItems_1 = require("./Utilities/getObjectTagsViewItems");
 const getRuleViewItems_1 = require("./Utilities/getRuleViewItems");
 const MoveFormatColumn_1 = require("../View/FormatColumn/MoveFormatColumn");
-const Helper_1 = require("../Utilities/Helpers/Helper");
-const updateSingleToMultiplePredicates_1 = require("./Utilities/updateSingleToMultiplePredicates");
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/ArrayExtensions"));
 class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
@@ -43,51 +41,6 @@ class FormatColumnModule extends AdaptableModuleBase_1.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 = (0, Helper_1.cloneObject)(formatColumn);
-                (0, updateSingleToMultiplePredicates_1.updateSingleToMultiplePredicates)(preparedFormatColumn.Rule);
-                this.api.formatColumnApi.editFormatColumn(preparedFormatColumn);
-            }
-        });
-    }
     addColumnMenuItems(column) {
         let returnColumnMenuItems = [];
         if (column && this.isModuleEditable() && !column.isSparkline) {
@@ -96,12 +49,12 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 action: 'New',
                 source: 'ColumnMenu',
             };
-            const createFormatColumnMenuItem = this.createColumnMenuItemShowPopup('Create', this.moduleInfo.Popup, 'plus', createPopupParam);
+            const createFormatColumnMenuItem = this.createMenuItemShowPopup('format-column-add', 'Create', this.moduleInfo.Popup, 'plus', createPopupParam);
             const formatColumnsForColumn = this.api.formatColumnApi.getFormatColumnsForColumnId(column.columnId);
             //  .filter((fc) => this.api.scopeApi.isSingleColumnScope(fc.Scope));
             // if no formats then just show Create
             if (ArrayExtensions_1.default.IsNullOrEmpty(formatColumnsForColumn)) {
-                returnColumnMenuItems.push(this.createColumnMenuItemShowPopup('Create Format Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, createPopupParam));
+                returnColumnMenuItems.push(this.createMenuItemShowPopup('format-column-add', 'Create Format Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, createPopupParam));
                 // if 1 format then show a Create and an Edit
             }
             else if (formatColumnsForColumn.length == 1) {
@@ -111,8 +64,9 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     value: formatColumnsForColumn[0],
                     source: 'ColumnMenu',
                 };
-                const editFormatColumnMenuItem = this.createColumnMenuItemShowPopup('Edit', this.moduleInfo.Popup, 'edit', editPopupParam);
+                const editFormatColumnMenuItem = this.createMenuItemShowPopup('format-column-edit', 'Edit', this.moduleInfo.Popup, 'edit', editPopupParam);
                 returnColumnMenuItems.push({
+                    name: 'parent',
                     label: 'Format Column',
                     module: this.moduleInfo.ModuleName,
                     isVisible: true,
@@ -127,8 +81,9 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 const moduleInfo = this.api.internalApi
                     .getModuleService()
                     .getModuleInfoByModule('FormatColumn');
-                const editFormatColumnMenuItem = this.createColumnMenuItemReduxAction('Show Current', this.moduleInfo.Glyph, PopupRedux.PopupShowScreen('FormatColumn', moduleInfo.Popup));
+                const editFormatColumnMenuItem = this.createMenuItemReduxAction('format-column-edit', 'Show Current', this.moduleInfo.Glyph, PopupRedux.PopupShowScreen('FormatColumn', moduleInfo.Popup));
                 returnColumnMenuItems.push({
+                    name: 'parent',
                     label: 'Format Column',
                     module: this.moduleInfo.ModuleName,
                     isVisible: true,

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

@@ -21,36 +21,6 @@ class FreeTextColumnModule extends AdaptableModuleBase_1.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
@@ -62,7 +32,7 @@ class FreeTextColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     source: 'ColumnMenu',
                 };
                 return [
-                    this.createColumnMenuItemShowPopup('Edit Free Text Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam),
+                    this.createMenuItemShowPopup('free-text-column-edit', 'Edit Free Text Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam),
                 ];
             }
         }

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

@@ -6,47 +6,10 @@ const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
 const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
 const EditCurrentQueryButton_1 = require("../View/NamedQuery/EditCurrentQueryButton");
 const GridFilterStatusbar_1 = require("../View/GridFilter/GridFilterStatusbar");
-const StringExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/StringExtensions"));
 class GridFilterModule extends AdaptableModuleBase_1.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_1.default.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/GridInfoModule.js

@@ -15,6 +15,7 @@ class GridInfoModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (this.isModuleAvailable()) {
             return [
                 this.createMainMenuItemShowPopup({
+                    Name: 'grid-info-show',
                     Label: 'Grid Info',
                     ComponentName: this.moduleInfo.Popup,
                     Icon: this.moduleInfo.Glyph,
@@ -26,6 +27,7 @@ class GridInfoModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (this.isModuleAvailable()) {
             return [
                 this.createMainMenuItemShowPopup({
+                    Name: 'grid-info-show',
                     Label: 'Grid Info',
                     ComponentName: this.moduleInfo.Popup,
                     Icon: this.moduleInfo.Glyph,

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

@@ -7,16 +7,17 @@ import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { AdaptableModuleView, IModule, TeamSharingReferences } from './Interface/IModule';
 import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
+import { AggregatedScalarLiveValue } from '../Utilities/Services/AggregatedScalarLiveValue';
 export declare class LayoutModule extends AdaptableModuleBase implements IModule {
+    cachedCellSummary: Map<string, AggregatedScalarLiveValue>;
     protected LayoutState: LayoutState;
     constructor(api: AdaptableApi);
-    updateOldConfig(): void;
-    private clearUnsuportedFeaturesFromLayout;
+    onAdaptableReady(): void;
+    rowSummariesSubscribtions(): 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;
@@ -44,4 +45,9 @@ export declare class LayoutModule extends AdaptableModuleBase implements IModule
     getViewProperties(): AdaptableModuleView;
     handleLayoutChange(): void;
     getReferencedNamedQueryNames(layout: Layout): string[];
+    /**
+     *
+     * @param colId optional to evaluate only one column
+     */
+    private evaluateRowSummary;
 }