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

package/src/Strategy/ExportModule.js

@@ -3,7 +3,7 @@ import * as ModuleConstants from '../Utilities/Constants/ModuleConstants';
 import { ExportDestination } from '../PredefinedConfig/Common/Enums';
 import { Helper } from '../Utilities/Helpers/Helper';
 import * as ExportRedux from '../Redux/ActionsReducers/ExportRedux';
-import { SELECTED_CELLS_REPORT, SELECTED_ROWS_REPORT, VISUAL_DATA_REPORT, } from '../Utilities/Constants/GeneralConstants';
+import { ALL_DATA_REPORT, CURRENT_DATA_REPORT, SELECTED_CELLS_REPORT, SELECTED_ROWS_REPORT, VISUAL_DATA_REPORT, } from '../Utilities/Constants/GeneralConstants';
 import ArrayExtensions from '../Utilities/Extensions/ArrayExtensions';
 import StringExtensions from '../Utilities/Extensions/StringExtensions';
 import * as PopupRedux from '../Redux/ActionsReducers/PopupRedux';
@@ -14,7 +14,7 @@ import { getExportRowsViewItems } from './Utilities/Export/getExportRowsViewItem
 import { ReportExportDropdown } from '../View/Export/ReportExportDropdown';
 import { getObjectTagsViewItems } from './Utilities/getObjectTagsViewItems';
 import { ExportSelector } from '../View/Export/ExportSelector';
-import { SystemProgressIndicatorShow, SystemVisualExportBegin, SystemVisualExportEnd, } from '../Redux/ActionsReducers/SystemRedux';
+import { SystemVisualExportBegin, SystemVisualExportEnd, } from '../Redux/ActionsReducers/SystemRedux';
 import { SHOW_EXPORT_TABLE } from '../View/Components/Popups/WindowPopups/windowFactory';
 import { createUuid } from '../PredefinedConfig/Uuid';
 import { waitForTimeout } from '../Utilities/waitForTimeout';
@@ -40,78 +40,75 @@ export class ExportModule extends AdaptableModuleBase {
         }
         return this.api.namedQueryApi.internalApi.getReferencedNamedQueryNames(report.Query.BooleanExpression);
     }
-    addContextMenuItems(menuContext) {
+    createContextMenuItems(menuContext) {
         const canExport = !menuContext.isRowGroupColumn && this.isModuleAvailable();
         if (!canExport) {
             return;
         }
         let returnMenuItems = [];
-        let selectedCellmenuItems = [];
-        let selectedRowmenuItems = [];
-        const canExportCells = menuContext.selectedCellInfo &&
+        const availableSystemReports = this.api.exportApi.getAvailableSystemReports();
+        if (availableSystemReports.includes(VISUAL_DATA_REPORT)) {
+            returnMenuItems.push(this.createMenuItemClickFunction('export-visual-data-excel', 'Excel', this.moduleInfo.Glyph, () => this.export(this.api.exportApi.getReportByName(VISUAL_DATA_REPORT), ExportDestination.Excel)));
+        }
+        if (availableSystemReports.includes(ALL_DATA_REPORT)) {
+            const allDataReport = this.api.exportApi.getReportByName(ALL_DATA_REPORT);
+            returnMenuItems.push(...this.buildReportMenuItems(allDataReport));
+        }
+        if (availableSystemReports.includes(CURRENT_DATA_REPORT)) {
+            const currentDataReport = this.api.exportApi.getReportByName(CURRENT_DATA_REPORT);
+            returnMenuItems.push(...this.buildReportMenuItems(currentDataReport));
+        }
+        const canExportCells = availableSystemReports.includes(SELECTED_CELLS_REPORT) &&
+            menuContext.selectedCellInfo &&
             ArrayExtensions.IsNotNullOrEmpty(menuContext.selectedCellInfo.columns) &&
             ArrayExtensions.IsNotNullOrEmpty(menuContext.selectedCellInfo.gridCells);
-        const canExportRows = menuContext.selectedRowInfo &&
+        if (canExportCells) {
+            const selectedCellReport = this.api.exportApi.getReportByName(SELECTED_CELLS_REPORT);
+            returnMenuItems.push(...this.buildReportMenuItems(selectedCellReport));
+        }
+        const canExportRows = availableSystemReports.includes(SELECTED_ROWS_REPORT) &&
+            menuContext.selectedRowInfo &&
             ArrayExtensions.IsNotNullOrEmpty(menuContext.selectedRowInfo.gridRows) &&
             menuContext.gridCell &&
             menuContext.gridCell.primaryKeyValue &&
             menuContext.isSelectedRow;
-        if (canExportCells) {
-            const selectedCellReport = this.api.exportApi.getReportByName(SELECTED_CELLS_REPORT);
-            selectedCellmenuItems = this.buildReportMenuItems(selectedCellReport);
-        }
         if (canExportRows) {
             const selectedRowReport = this.api.exportApi.getReportByName(SELECTED_ROWS_REPORT);
-            selectedRowmenuItems = this.buildReportMenuItems(selectedRowReport);
-        }
-        // if only selected cells then just do one level
-        if (canExportCells && !canExportRows) {
-            returnMenuItems.push(this.buildExportMenuItem('Export Selected Cells', selectedCellmenuItems));
-            // if only selected Rows then just do one level
-        }
-        else if (canExportRows && !canExportCells) {
-            returnMenuItems.push(this.buildExportMenuItem('Export Selected Rows', selectedRowmenuItems));
-        }
-        // if both selected Cells and Rows then add a new level
-        else if (canExportRows && canExportCells) {
-            const exportSelectedCellsMenuItem = this.buildExportMenuItem('Cells', selectedCellmenuItems);
-            const exportSelectedRowsMenuItem = this.buildExportMenuItem('Rows', selectedRowmenuItems);
-            returnMenuItems.push(this.buildExportMenuItem('Export Selected', [
-                exportSelectedCellsMenuItem,
-                exportSelectedRowsMenuItem,
-            ]));
+            returnMenuItems.push(...this.buildReportMenuItems(selectedRowReport));
         }
         return returnMenuItems;
     }
     buildReportMenuItems(report) {
+        // a bit convoluted, but ce la vie, that's what happens when you use enums instead of union types
+        // convert to lowercase and replace empty spaces with hyphens
+        const adjustName = (name = '') => {
+            const result = name.replace(/ /g, '-');
+            return result.toLowerCase();
+        };
+        const getMenuItemName = (reportName, destination) => {
+            return `export-${adjustName(reportName)}-${adjustName(destination)}`;
+        };
         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(getMenuItemName(report.Name, 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(getMenuItemName(report.Name, customDestination.name), customDestination.name, this.moduleInfo.Glyph, () => this.export(report, customDestination.name)));
         }
         return menuItems;
     }
-    buildExportMenuItem(label, subItems) {
-        return {
-            label: label,
-            module: this.moduleInfo.ModuleName,
-            isVisible: true,
-            icon: { name: this.moduleInfo.Glyph },
-            subItems: subItems,
-        };
-    }
     async export(report, exportDestination) {
         var _a;
         const cleanupExportProcess = () => {
             this.api.internalApi.dispatchReduxAction(SystemVisualExportEnd());
-            this.api.internalApi.hideProgressIndicator();
+            this.api.userInterfaceApi.hideProgressIndicator();
         };
         if (report.Name === VISUAL_DATA_REPORT) {
             this.api.internalApi.dispatchReduxAction(SystemVisualExportBegin());
         }
-        this.api.internalApi.dispatchReduxAction(SystemProgressIndicatorShow(`${report.Name} Export in progress...`));
+        this.api.userInterfaceApi.showProgressIndicator({
+            text: `${report.Name} Export in progress...`,
+        });
         try {
             // waitForTimeout required to give the ProgressIndicator rendering a head-start (see rAF in ProgressIndicator implementation)
             await waitForTimeout(16);

package/src/Strategy/Fdc3Module.d.ts

@@ -4,7 +4,7 @@ import { AdaptableApi } from '../Api/AdaptableApi';
 import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
 export declare class Fdc3Module extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
-    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
+    createContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     private buildRaiseIntentMenuItem;
     private buildBroadcastMenuItem;
     private getFdc3Api;

package/src/Strategy/Fdc3Module.js

@@ -4,7 +4,7 @@ export class Fdc3Module extends AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.Fdc3ModuleId, ModuleConstants.Fdc3FriendlyName, 'fdc3', null, 'The FDC3 Module - handles the FDC3 integration', api);
     }
-    addContextMenuItems(menuContext) {
+    createContextMenuItems(menuContext) {
         if (!this.isModuleAvailable()) {
             return;
         }
@@ -25,18 +25,6 @@ export class Fdc3Module extends AdaptableModuleBase {
                 contextMenuItems.push(this.buildBroadcastMenuItem(broadcastConfig, currentRowNode));
             });
             contextMenuItems.sort((a, b) => a.label.localeCompare(b.label));
-            if (contextMenuItems.length > 1) {
-                const groupMenuItem = {
-                    module: this.moduleInfo.ModuleName,
-                    label: 'FDC3',
-                    icon: {
-                        name: 'fdc3',
-                    },
-                    isVisible: true,
-                    subItems: contextMenuItems,
-                };
-                return [groupMenuItem];
-            }
             return contextMenuItems;
         }
     }
@@ -44,6 +32,7 @@ export class Fdc3Module extends 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);
@@ -63,6 +52,7 @@ export class Fdc3Module extends 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,15 +9,14 @@ 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[];
     getExplicitlyReferencedColumnIds(alertDefinition: FlashingCellDefinition): string[];
     getReferencedNamedQueryNames(alertDefinition: FlashingCellDefinition): string[];
-    addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
-    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
+    createColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
+    createContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     protected handleCellDataChanged(cellDataChangedInfo: CellDataChangedInfo): void;
     private showFlashingCellsForDefinitions;
     private isFlashingTargetOnlyAggChange;

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);
     }
@@ -73,7 +60,7 @@ export class FlashingCellModule extends AdaptableModuleBase {
         }
         return this.api.namedQueryApi.internalApi.getReferencedNamedQueryNames(queryExpression);
     }
-    addColumnMenuItems(column) {
+    createColumnMenuItems(column) {
         if (column && this.isModuleEditable()) {
             if (!this.api.columnApi.isCalculatedColumn(column.columnId)) {
                 const flashingCellDefinitions = this.api.flashingCellApi.getFlashingCellDefinitions();
@@ -82,11 +69,11 @@ export class FlashingCellModule extends 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],
                         },
@@ -98,7 +85,7 @@ export class FlashingCellModule extends AdaptableModuleBase {
             }
         }
     }
-    addContextMenuItems(menuContext) {
+    createContextMenuItems(menuContext) {
         const items = [];
         if (!menuContext.isRowGroupColumn && this.isModuleAvailable()) {
             if (menuContext.adaptableColumn && menuContext.rowNode) {
@@ -108,11 +95,11 @@ export class FlashingCellModule extends 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,9 +13,7 @@ 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;
+    createColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
     getTeamSharingAction(): TeamSharingImportInfo<FormatColumn>;
     toView(formatColumn: FormatColumn): AdaptableObjectView;
     toViewAll(): AdaptableObjectView[];

package/src/Strategy/FormatColumnModule.js

@@ -10,9 +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) {
         super(ModuleConstants.FormatColumnModuleId, ModuleConstants.FormatColumnFriendlyName, 'color-palette', 'FormatColumnPopup', 'Create a column style, display format or cell alignment', api);
@@ -39,99 +36,38 @@ 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);
+    createColumnMenuItems(column) {
+        if (!column || !this.isModuleEditable() || column.isSparkline) {
+            return;
         }
-        // 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) {
-            let createPopupParam = {
+        let createPopupParam = {
+            column: column,
+            action: 'New',
+            source: 'ColumnMenu',
+        };
+        const createFormatColumnMenuItem = this.createMenuItemShowPopup('format-column-add', 'Create', this.moduleInfo.Popup, 'plus', createPopupParam);
+        returnColumnMenuItems.push(this.createMenuItemShowPopup('format-column-add', 'Create Format Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, createPopupParam));
+        const formatColumnsForColumn = this.api.formatColumnApi.getFormatColumnsForColumnId(column.columnId);
+        if (formatColumnsForColumn.length === 1) {
+            let editPopupParam = {
                 column: column,
-                action: 'New',
+                action: 'Edit',
+                value: formatColumnsForColumn[0],
                 source: 'ColumnMenu',
             };
-            const createFormatColumnMenuItem = this.createColumnMenuItemShowPopup('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.IsNullOrEmpty(formatColumnsForColumn)) {
-                returnColumnMenuItems.push(this.createColumnMenuItemShowPopup('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) {
-                let editPopupParam = {
-                    column: column,
-                    action: 'Edit',
-                    value: formatColumnsForColumn[0],
-                    source: 'ColumnMenu',
-                };
-                const editFormatColumnMenuItem = this.createColumnMenuItemShowPopup('Edit', this.moduleInfo.Popup, 'edit', editPopupParam);
-                returnColumnMenuItems.push({
-                    label: 'Format Column',
-                    module: this.moduleInfo.ModuleName,
-                    isVisible: true,
-                    icon: { name: this.moduleInfo.Glyph },
-                    subItems: [createFormatColumnMenuItem, editFormatColumnMenuItem],
-                });
-                // if more than one then display a Create and a Show
-                // we should probably do the Show better - perhaps use Column Info in some way?
-                // or to filter the format columns ?
-            }
-            else {
-                const moduleInfo = this.api.internalApi
-                    .getModuleService()
-                    .getModuleInfoByModule('FormatColumn');
-                const editFormatColumnMenuItem = this.createColumnMenuItemReduxAction('Show Current', this.moduleInfo.Glyph, PopupRedux.PopupShowScreen('FormatColumn', moduleInfo.Popup));
-                returnColumnMenuItems.push({
-                    label: 'Format Column',
-                    module: this.moduleInfo.ModuleName,
-                    isVisible: true,
-                    icon: { name: this.moduleInfo.Glyph },
-                    subItems: [createFormatColumnMenuItem, editFormatColumnMenuItem],
-                });
-            }
+            const editFormatColumnMenuItem = this.createMenuItemShowPopup('format-column-edit', 'Edit', this.moduleInfo.Popup, 'edit', editPopupParam);
+            returnColumnMenuItems.push(editFormatColumnMenuItem);
+        }
+        else if (formatColumnsForColumn.length > 1) {
+            // if more than one then display a Create and a Show
+            // we should probably do the Show better - perhaps use Column Info in some way?
+            // or to filter the format columns ?
+            const moduleInfo = this.api.internalApi
+                .getModuleService()
+                .getModuleInfoByModule('FormatColumn');
+            const editFormatColumnMenuItem = this.createMenuItemReduxAction('format-column-edit', 'Show Current', this.moduleInfo.Glyph, PopupRedux.PopupShowScreen('FormatColumn', moduleInfo.Popup));
+            returnColumnMenuItems.push(editFormatColumnMenuItem);
         }
         return returnColumnMenuItems;
     }

package/src/Strategy/FreeTextColumnModule.d.ts

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

package/src/Strategy/FreeTextColumnModule.js

@@ -17,37 +17,7 @@ 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) {
+    createColumnMenuItems(column) {
         if (column && this.isModuleEditable()) {
             if (this.api.freeTextColumnApi
                 .getFreeTextColumns()
@@ -58,7 +28,7 @@ export class FreeTextColumnModule extends 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

@@ -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/GridInfoModule.d.ts

@@ -7,6 +7,6 @@ import { AccessLevel } from '../PredefinedConfig/Common/Entitlement';
 export declare class GridInfoModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
     getViewAccessLevel(): AccessLevel;
-    addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
-    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
+    createColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
+    createContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
 }

package/src/Strategy/GridInfoModule.js

@@ -2,15 +2,16 @@ import { AdaptableModuleBase } from './AdaptableModuleBase';
 import * as ModuleConstants from '../Utilities/Constants/ModuleConstants';
 export class GridInfoModule extends AdaptableModuleBase {
     constructor(api) {
-        super(ModuleConstants.GridInfoModuleId, ModuleConstants.GridInfoFriendlyName, 'align-justify', 'GridInfoPopup', 'Display information about the Grid, the Options selected and all columns', api);
+        super(ModuleConstants.GridInfoModuleId, ModuleConstants.GridInfoFriendlyName, 'grid-info', 'GridInfoPopup', 'Display information about the Grid, the Options selected and all columns', api);
     }
     getViewAccessLevel() {
         return 'Full';
     }
-    addColumnMenuItems(column) {
+    createColumnMenuItems(column) {
         if (this.isModuleAvailable()) {
             return [
                 this.createMainMenuItemShowPopup({
+                    Name: 'grid-info-show',
                     Label: 'Grid Info',
                     ComponentName: this.moduleInfo.Popup,
                     Icon: this.moduleInfo.Glyph,
@@ -18,10 +19,11 @@ export class GridInfoModule extends AdaptableModuleBase {
             ];
         }
     }
-    addContextMenuItems(menuContext) {
+    createContextMenuItems(menuContext) {
         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

@@ -141,9 +141,9 @@ export interface AdaptableModuleView {
 export interface IModule {
     moduleInfo: ModuleInfo;
     AccessLevel: AccessLevel;
-    addModuleMenuItem(source: 'ModuleMenu' | 'ModuleButton'): AdaptableMenuItem | undefined;
-    addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
-    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
+    createModuleMenuItem(source: 'ModuleMenu' | 'ModuleButton'): AdaptableMenuItem | undefined;
+    createColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
+    createContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     setModuleEntitlement(): void;
     isModuleAvailable(): boolean;
     isModuleEditable(): boolean;
@@ -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.