@adaptabletools/adaptable 10.0.2 → 10.0.4-canary.2

package/src/Strategy/ExportModule.d.ts

@@ -3,7 +3,7 @@ import { IExportModule } from './Interface/IExportModule';
 import { ExportDestination } from '../PredefinedConfig/Common/Enums';
 import { Report } from '../PredefinedConfig/ExportState';
 import { TeamSharingImportInfo } from '../PredefinedConfig/TeamSharingState';
-import { AdaptableMenuItem, MenuContext } from '../PredefinedConfig/Common/Menu';
+import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
 export declare class ExportModule extends AdaptableModuleBase implements IExportModule {
@@ -12,7 +12,7 @@ export declare class ExportModule extends AdaptableModuleBase implements IExport
     getExplicitlyReferencedColumnIds(report: Report): string[];
     getReferencedNamedQueryNames(report: Report): string[];
     updateOldConfig(): void;
-    addContextMenuItems(menuContext: MenuContext): AdaptableMenuItem[] | undefined;
+    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     export(report: Report, exportDestination: ExportDestination | string): void;
     private isCustomDestination;
     private convertReportToJSON;
@@ -24,6 +24,4 @@ export declare class ExportModule extends AdaptableModuleBase implements IExport
     getTeamSharingAction(): TeamSharingImportInfo<Report>;
     private isEmptyReportData;
     private showEmptyExportWarning;
-    private showExportIndicator;
-    private hideExportIndicator;
 }

package/src/Strategy/ExportModule.js

@@ -14,7 +14,6 @@ const LoggingHelper_1 = require("../Utilities/Helpers/LoggingHelper");
 const StringExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/StringExtensions"));
 const PopupRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/PopupRedux"));
 const ObjectFactory_1 = require("../Utilities/ObjectFactory");
-const SystemRedux_1 = require("../Redux/ActionsReducers/SystemRedux");
 class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.ExportModuleId, 'Export', 'export-data', 'ExportPopup', 'Export data from the Grid to numerous locations in numerous formatso', api);
@@ -27,7 +26,7 @@ class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             this.api.scopeApi.scopeHasColumns(report.Scope)) {
             return this.api.scopeApi
                 .getColumnsForScope(report.Scope)
-                .map((adaptableColumn) => adaptableColumn.ColumnId);
+                .map((adaptableColumn) => adaptableColumn.columnId);
         }
         return [];
     }
@@ -53,68 +52,72 @@ class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         this.api.exportApi.editReports(reportsToEdit);
     }
     addContextMenuItems(menuContext) {
-        let menuItemClickFunction = undefined;
-        if (!menuContext.isRowGroupColumn && this.isModuleAvailable() && menuContext.selectedCellInfo) {
-            if (ArrayExtensions_1.default.IsNotNullOrEmpty(menuContext.selectedCellInfo.columns) &&
-                ArrayExtensions_1.default.IsNotNullOrEmpty(menuContext.selectedCellInfo.gridCells)) {
-                let selectedCellReport = this.api.exportApi.getReportByName(GeneralConstants_1.SELECTED_CELLS_REPORT);
-                let clickFunction = () => {
-                    this.export(selectedCellReport, Enums_1.ExportDestination.Excel);
-                };
-                menuItemClickFunction = this.createColumnMenuItemClickFunction('Export Selected Cells', this.moduleInfo.Glyph, clickFunction);
-            }
+        const canExport = !menuContext.isRowGroupColumn &&
+            this.isModuleAvailable() &&
+            menuContext.selectedCellInfo &&
+            ArrayExtensions_1.default.IsNotNullOrEmpty(menuContext.selectedCellInfo.columns) &&
+            ArrayExtensions_1.default.IsNotNullOrEmpty(menuContext.selectedCellInfo.gridCells);
+        if (!canExport) {
+            return;
+        }
+        const selectedCellReport = this.api.exportApi.getReportByName(GeneralConstants_1.SELECTED_CELLS_REPORT);
+        const menuItems = [];
+        for (const destination of this.api.exportApi.getAvailableExportDestinations()) {
+            menuItems.push(this.createColumnMenuItemClickFunction(destination, this.moduleInfo.Glyph, () => this.export(selectedCellReport, destination)));
+        }
+        for (const customDestination of this.api.exportApi.getAllCustomDestination()) {
+            menuItems.push(this.createColumnMenuItemClickFunction(customDestination.name, this.moduleInfo.Glyph, () => this.export(selectedCellReport, customDestination.name)));
         }
-        return [menuItemClickFunction];
+        return [
+            {
+                label: 'Export Selected Cells',
+                isVisible: true,
+                icon: this.moduleInfo.Glyph,
+                subItems: menuItems,
+            },
+        ];
     }
     export(report, exportDestination) {
-        this.showExportIndicator(`${report.Name} Export in progress...`);
-        // setTimeout required to give the export indicator a head-start to render
-        setTimeout(() => {
+        this.api.internalApi.executeWithProgressIndicator(`${report.Name} Export in progress...`, () => {
             var _a;
-            try {
-                if (this.isCustomDestination(exportDestination)) {
-                    const customDestination = (_a = this.api.internalApi
-                        .getAdaptableOptions()
-                        .exportOptions.customDestinations) === null || _a === void 0 ? void 0 : _a.find((cd) => cd.name == exportDestination);
-                    if (customDestination === null || customDestination === void 0 ? void 0 : customDestination.form) {
-                        this.api.internalApi.dispatchReduxAction(SystemRedux.SystemExportCustomDestinationPopupShow({
-                            ReportName: report.Name,
-                            ExportDestination: customDestination,
-                        }));
-                    }
-                    else if (customDestination) {
-                        customDestination.onExport(report, this.api.internalApi.getReportService().getReportData(report));
-                    }
+            if (this.isCustomDestination(exportDestination)) {
+                const customDestination = (_a = this.api.internalApi
+                    .getAdaptableOptions()
+                    .exportOptions.customDestinations) === null || _a === void 0 ? void 0 : _a.find((cd) => cd.name == exportDestination);
+                if (customDestination === null || customDestination === void 0 ? void 0 : customDestination.form) {
+                    this.api.internalApi.dispatchReduxAction(SystemRedux.SystemExportCustomDestinationPopupShow({
+                        ReportName: report.Name,
+                        ExportDestination: customDestination,
+                    }));
                 }
-                else {
-                    switch (exportDestination) {
-                        case Enums_1.ExportDestination.Excel:
-                            if (report.Name === GeneralConstants_1.VISUAL_DATA_REPORT) {
-                                // WYSIWYG is fully delegated to the ag-grid excel export
-                                this.api.exportApi.exportVisualDataToExcel();
-                            }
-                            else {
-                                this.convertReportToExcel(report);
-                            }
-                            break;
-                        case Enums_1.ExportDestination.Clipboard:
-                            this.copyToClipboard(report);
-                            break;
-                        case Enums_1.ExportDestination.CSV:
-                            this.convertReportToCsv(report);
-                            break;
-                        case Enums_1.ExportDestination.JSON:
-                            this.convertReportToJSON(report);
-                            break;
-                    }
+                else if (customDestination) {
+                    customDestination.onExport(report, this.api.internalApi.getReportService().getReportData(report));
                 }
-                this.hideExportIndicator();
             }
-            catch (error) {
-                this.hideExportIndicator();
-                throw error;
+            else {
+                switch (exportDestination) {
+                    case Enums_1.ExportDestination.Excel:
+                        if (report.Name === GeneralConstants_1.VISUAL_DATA_REPORT) {
+                            // WYSIWYG is fully delegated to the ag-grid excel export
+                            this.api.exportApi.exportVisualDataToExcel();
+                        }
+                        else {
+                            this.convertReportToExcel(report);
+                        }
+                        break;
+                    case Enums_1.ExportDestination.Clipboard:
+                        this.copyToClipboard(report);
+                        break;
+                    case Enums_1.ExportDestination.CSV:
+                        this.convertReportToCsv(report);
+                        break;
+                    case Enums_1.ExportDestination.JSON:
+                        this.convertReportToJSON(report);
+                        break;
+                }
             }
-        }, 16);
+            this.api.internalApi.hideProgressIndicator();
+        });
     }
     isCustomDestination(exportDestination) {
         if (Object.values(Enums_1.ExportDestination).some((val) => val === exportDestination)) {
@@ -183,11 +186,5 @@ class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             alertDefinition: ObjectFactory_1.ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
         }));
     }
-    showExportIndicator(label) {
-        this.api.internalApi.dispatchReduxAction(SystemRedux_1.SystemProgressIndicatorShow(label));
-    }
-    hideExportIndicator() {
-        this.api.internalApi.dispatchReduxAction(SystemRedux_1.SystemProgressIndicatorHide());
-    }
 }
 exports.ExportModule = ExportModule;

package/src/Strategy/FilterModule.d.ts

@@ -1,6 +1,6 @@
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
-import { AdaptableMenuItem, MenuContext } from '../PredefinedConfig/Common/Menu';
+import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
 import { TeamSharingImportInfo } from '../PredefinedConfig/TeamSharingState';
 import { ColumnFilter } from '../PredefinedConfig/FilterState';
 import { IModule } from './Interface/IModule';
@@ -12,7 +12,7 @@ export declare class FilterModule extends AdaptableModuleBase implements IModule
     getExplicitlyReferencedColumnIds(columnFilter: ColumnFilter): string[];
     hasNamedQueryReferences(): boolean;
     handleAdaptableReady(): void;
-    addContextMenuItems(menuContext: MenuContext): AdaptableMenuItem[] | undefined;
+    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
     getTeamSharingAction(): TeamSharingImportInfo<ColumnFilter>;
 }

package/src/Strategy/FilterModule.js

@@ -32,7 +32,7 @@ class FilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         let menuItemClickFunction = undefined;
         if (!menuContext.isRowGroupColumn && this.isModuleAvailable()) {
             if (menuContext.adaptableColumn &&
-                menuContext.adaptableColumn.Filterable &&
+                menuContext.adaptableColumn.filterable &&
                 menuContext.isSingleSelectedColumn &&
                 menuContext.gridCell != null) {
                 let isMultiple = menuContext.selectedCellInfo.gridCells.length > 1;
@@ -42,7 +42,7 @@ class FilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     })
                     : [menuContext.gridCell.primaryKeyValue];
                 let clickFunction = () => {
-                    this.api.filterApi.createColumnFilterForCell(menuContext.adaptableColumn.ColumnId, pkValues);
+                    this.api.filterApi.createColumnFilterForCell(menuContext.adaptableColumn.columnId, pkValues);
                 };
                 menuItemClickFunction = this.createColumnMenuItemClickFunction(isMultiple ? 'Filter on Cell Values' : 'Filter on Cell Value', this.moduleInfo.Glyph, clickFunction);
             }
@@ -53,14 +53,14 @@ class FilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         let baseMenuItems = [];
         if (column && this.api.gridApi.isQuickFilterAvailable()) {
             const isFilterVisible = this.api.filterApi.isQuickFilterVisible();
-            if (this.isModuleEditable() && this.api.columnApi.usesAdaptableQuickFilter(column.ColumnId)) {
+            if (this.isModuleEditable() && this.api.columnApi.usesAdaptableQuickFilter(column.columnId)) {
                 baseMenuItems.push(this.createColumnMenuItemReduxAction(isFilterVisible ? 'Hide Quick Filter Bar' : 'Show Quick Filter Bar', isFilterVisible ? 'unchecked' : 'check', isFilterVisible ? FilterRedux.QuickFilterBarHide() : FilterRedux.QuickFilterBarShow()));
             }
         }
         if (column && this.canCreateColumnMenuItem(column, 'ReadOnly', 'filter')) {
             let existingColumnFilter = this.api.filterApi
                 .getAllColumnFilter()
-                .find((x) => x.ColumnId == column.ColumnId);
+                .find((x) => x.ColumnId == column.columnId);
             if (existingColumnFilter) {
                 baseMenuItems.push(this.createColumnMenuItemReduxAction('Clear Filter', this.moduleInfo.Glyph, FilterRedux.ColumnFilterClear(existingColumnFilter)));
             }

package/src/Strategy/FormatColumnModule.js

@@ -18,7 +18,7 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (this.api.scopeApi.scopeHasColumns(formatColumn.Scope)) {
             return this.api.scopeApi
                 .getColumnsForScope(formatColumn.Scope)
-                .map((adaptableColumn) => adaptableColumn.ColumnId);
+                .map((adaptableColumn) => adaptableColumn.columnId);
         }
         return [];
     }
@@ -133,7 +133,7 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (formatColumn) {
             return formatColumn;
         }
-        // special columns (CalculatedColumn & FreeTextColumns) are not yet part of the underlying AG-Grid colDefs
+        // special columns (Calculated, FreeText, Action) are not yet part of AG-GridS colDefs
         // so we have to check if the given columnId is a special column
         const isSpecialColumn = !!this.api.calculatedColumnApi.getCalculatedColumnForColumnId(columnId) ||
             !!this.api.freeTextColumnApi.getFreeTextColumnById(columnId);
@@ -148,7 +148,7 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     addColumnMenuItems(column) {
         var _a;
         let returnColumnMenuItems = [];
-        if (column && this.isModuleEditable() && !column.IsSparkline) {
+        if (column && this.isModuleEditable() && !column.isSparkline) {
             // not fullproof as might be an All but its generally pretty good
             let formatColumn = this.api.formatColumnApi.getFormatColumnForColumn(column);
             let formatExists = formatColumn
@@ -165,8 +165,8 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 value: formatColumn,
             };
             returnColumnMenuItems.push(this.createColumnMenuItemShowPopup(label + 'Format Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam));
-            if (column.DataType == 'Boolean' && !this.api.columnApi.isFreeTextColumn(column.ColumnId)) {
-                let formatColumn = this.api.formatColumnApi.getFormatColumnForColumnId(column.ColumnId);
+            if (column.dataType == 'Boolean' && !this.api.columnApi.isFreeTextColumn(column.columnId)) {
+                let formatColumn = this.api.formatColumnApi.getFormatColumnForColumnId(column.columnId);
                 let hasCheckBox = formatColumn && ((_a = formatColumn.ColumnStyle) === null || _a === void 0 ? void 0 : _a.CheckBoxStyle);
                 if (hasCheckBox) {
                     returnColumnMenuItems.push(this.createColumnMenuItemClickFunction('Remove Checkbox', 'check-box-outline', () => {
@@ -188,7 +188,7 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                         returnColumnMenuItems.push(this.createColumnMenuItemClickFunction('Show as Checkbox', 'check-box', () => {
                             let newFormatColumn = {
                                 Scope: {
-                                    ColumnIds: [column.ColumnId],
+                                    ColumnIds: [column.columnId],
                                 },
                                 ColumnStyle: {
                                     CheckBoxStyle: true,

package/src/Strategy/FreeTextColumnModule.js

@@ -24,7 +24,7 @@ class FreeTextColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (column && this.isModuleEditable()) {
             if (this.api.freeTextColumnApi
                 .getAllFreeTextColumn()
-                .find((ftc) => ftc.ColumnId == column.ColumnId)) {
+                .find((ftc) => ftc.ColumnId == column.columnId)) {
                 let popupParam = {
                     column: column,
                     action: 'Edit',

package/src/Strategy/GridInfoModule.d.ts

@@ -1,5 +1,5 @@
 import { AdaptableModuleBase } from './AdaptableModuleBase';
-import { AdaptableMenuItem, MenuContext } from '../PredefinedConfig/Common/Menu';
+import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
 import { IModule } from './Interface/IModule';
 import { AdaptableApi } from '../Api/AdaptableApi';
@@ -8,5 +8,5 @@ export declare class GridInfoModule extends AdaptableModuleBase implements IModu
     constructor(api: AdaptableApi);
     getViewAccessLevel(): AccessLevel;
     addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
-    addContextMenuItems(menuContext: MenuContext): AdaptableMenuItem[] | undefined;
+    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
 }

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

@@ -1,5 +1,5 @@
 import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
-import { AdaptableMenuItem, MenuContext } from '../../PredefinedConfig/Common/Menu';
+import { AdaptableMenuItem, ContextMenuContext } from '../../PredefinedConfig/Common/Menu';
 import { AdaptableModule } from '../../PredefinedConfig/Common/Types';
 import { TeamSharingImportInfo } from '../../PredefinedConfig/TeamSharingState';
 import { AdaptableObject } from '../../PredefinedConfig/Common/AdaptableObject';
@@ -35,7 +35,7 @@ export interface IModule {
     AccessLevel: AccessLevel;
     addModuleMenuItem(source: 'ModuleMenu' | 'ModuleButton'): AdaptableMenuItem | undefined;
     addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
-    addContextMenuItems(menuContext: MenuContext): AdaptableMenuItem[] | undefined;
+    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     setModuleEntitlement(): void;
     isModuleAvailable(): boolean;
     isModuleEditable(): boolean;

package/src/Strategy/LayoutModule.d.ts

@@ -1,6 +1,6 @@
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { LayoutState, Layout } from '../PredefinedConfig/LayoutState';
-import { AdaptableMenuItem, MenuContext } from '../PredefinedConfig/Common/Menu';
+import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
 import { TeamSharingImportInfo } from '../PredefinedConfig/TeamSharingState';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
 import { AdaptableApi } from '../Api/AdaptableApi';
@@ -14,6 +14,6 @@ export declare class LayoutModule extends AdaptableModuleBase implements IModule
     hasNamedQueryReferences(): boolean;
     handleAdaptableReady(): void;
     addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
-    addContextMenuItems(menuContext: MenuContext): AdaptableMenuItem[] | undefined;
+    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     getTeamSharingAction(): TeamSharingImportInfo<Layout>;
 }

package/src/Strategy/LayoutModule.js

@@ -38,19 +38,32 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     addColumnMenuItems(column) {
         let returnColumnMenuItems = [];
         if (this.isModuleEditable()) {
-            returnColumnMenuItems.push(this.createColumnMenuItemShowPopup('Edit Layout', this.moduleInfo.Popup, this.moduleInfo.Glyph, {
-                action: 'Edit',
-                source: 'ColumnMenu',
-            }));
-            if (column && column.Hideable) {
-                returnColumnMenuItems.push(this.createColumnMenuItemClickFunction('Hide Column', 'hide-column', () => {
-                    this.api.columnApi.hideColumn(column.ColumnId);
+            const isReadOnlyLayout = this.api.layoutApi.isCurrentLayoutReadOnly();
+            if (!isReadOnlyLayout) {
+                returnColumnMenuItems.push(this.createColumnMenuItemShowPopup('Edit Layout', this.moduleInfo.Popup, this.moduleInfo.Glyph, {
+                    action: 'Edit',
+                    source: 'ColumnMenu',
                 }));
             }
+            if (column) {
+                if (!isReadOnlyLayout) {
+                    returnColumnMenuItems.push(this.createColumnMenuItemClickFunction('Change Caption', 'edit', () => {
+                        let newname = prompt('Enter a new Caption for the Column');
+                        if (newname) {
+                            this.api.layoutApi.setColumnCaption(column.columnId, newname);
+                        }
+                    }));
+                }
+                if (column.hideable) {
+                    returnColumnMenuItems.push(this.createColumnMenuItemClickFunction('Hide Column', 'hide-column', () => {
+                        this.api.columnApi.hideColumn(column.columnId);
+                    }));
+                }
+            }
             let selectMenuItems = [];
             if (column) {
                 selectMenuItems.push(this.createColumnMenuItemClickFunction('Column', 'column-chooser', () => {
-                    this.api.columnApi.selectColumn(column.ColumnId);
+                    this.api.columnApi.selectColumn(column.columnId);
                 }));
             }
             selectMenuItems.push(this.createColumnMenuItemClickFunction('Whole Grid', this.moduleInfo.Glyph, () => {
@@ -67,7 +80,7 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     addContextMenuItems(menuContext) {
         let returnColumnMenuItems = [];
-        if (this.isModuleEditable()) {
+        if (this.isModuleEditable() && !this.api.layoutApi.isCurrentLayoutReadOnly()) {
             returnColumnMenuItems.push(this.createColumnMenuItemShowPopup('Edit Layout', this.moduleInfo.Popup, this.moduleInfo.Glyph, {
                 action: 'Edit',
                 source: 'ColumnMenu',

package/src/Strategy/PlusMinusModule.js

@@ -22,7 +22,7 @@ class PlusMinusModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (this.api.scopeApi.scopeHasColumns(plusMinusNudge.Scope)) {
             return this.api.scopeApi
                 .getColumnsForScope(plusMinusNudge.Scope)
-                .map((adaptableColumn) => adaptableColumn.ColumnId);
+                .map((adaptableColumn) => adaptableColumn.columnId);
         }
         return [];
     }
@@ -52,7 +52,7 @@ class PlusMinusModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         this.shouldHandleKeyDown = ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(plusMinusNudges);
     }
     addColumnMenuItems(column) {
-        if (column && this.isModuleEditable() && column.DataType == 'Number') {
+        if (column && this.isModuleEditable() && column.dataType == 'Number') {
             let popupParam = {
                 column: column,
                 action: 'New',
@@ -86,15 +86,14 @@ class PlusMinusModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         let failedPreventEdits = [];
         let side = direction == 'up' ? 1 : -1;
         cellsToUpdate.forEach((gridCell) => {
-            let selectedColumn = this.api.columnApi.getColumnFromId(gridCell.columnId);
-            if (selectedColumn &&
-                selectedColumn.DataType == Enums_1.DataType.Number &&
-                !selectedColumn.ReadOnly) {
+            if (gridCell.column &&
+                gridCell.column.dataType == Enums_1.DataType.Number &&
+                !gridCell.column.readOnly) {
                 let foundRule;
                 let replacementGridCell;
                 plusMinusNudges.forEach((pmr) => {
                     if (!foundRule) {
-                        if (this.api.scopeApi.isColumnInScope(selectedColumn, pmr.Scope)) {
+                        if (this.api.scopeApi.isColumnInScope(gridCell.column, pmr.Scope)) {
                             if (this.api.gridApi.areCellsEditable([gridCell])) {
                                 //for aggrid as we are getting strings sometimes
                                 if (typeof gridCell.rawValue != 'number') {
@@ -109,7 +108,7 @@ class PlusMinusModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                                     //   computedValue=   parseFloat(computedValue.toFixed(12));
                                     replacementGridCell = {
                                         primaryKeyValue: gridCell.primaryKeyValue,
-                                        columnId: gridCell.columnId,
+                                        column: gridCell.column,
                                         rawValue: computedValue,
                                         displayValue: computedValue,
                                         normalisedValue: computedValue,
@@ -124,7 +123,7 @@ class PlusMinusModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     const dataChangedEvent = this.api.internalApi.buildDataChangedInfo({
                         oldValue: Number(gridCell.rawValue),
                         newValue: replacementGridCell.rawValue,
-                        columnId: gridCell.columnId,
+                        column: gridCell.column,
                         primaryKeyValue: gridCell.primaryKeyValue,
                         rowNode: gridCell.rowNode,
                         trigger: 'edit',

package/src/Strategy/SmartEditModule.d.ts

@@ -4,13 +4,13 @@ import { IModuleActionReturn } from './Interface/IModuleActionReturn';
 import { ISmartEditModule } from './Interface/ISmartEditModule';
 import { PreviewInfo } from '../Utilities/Interface/Preview';
 import { GridCell } from '../PredefinedConfig/Selection/GridCell';
-import { AdaptableMenuItem, MenuContext } from '../PredefinedConfig/Common/Menu';
+import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { AccessLevel } from '../PredefinedConfig/Common/Entitlement';
 export declare class SmartEditModule extends AdaptableModuleBase implements ISmartEditModule {
     constructor(api: AdaptableApi);
     getViewAccessLevel(): AccessLevel;
-    addContextMenuItems(menuContext: MenuContext): AdaptableMenuItem[] | undefined;
+    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     ApplySmartEdit(newValues: GridCell[]): void;
     CheckCorrectCellSelection(): IModuleActionReturn<boolean>;
     BuildPreviewValues(smartEditValue: number, smartEditOperation: MathOperation): PreviewInfo;

package/src/Strategy/SmartEditModule.js

@@ -23,8 +23,8 @@ class SmartEditModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         let menuItemShowPopup = undefined;
         if (!menuContext.isRowGroupColumn && this.isModuleEditable()) {
             if (menuContext.adaptableColumn &&
-                menuContext.adaptableColumn.DataType == Enums_1.DataType.Number &&
-                !menuContext.adaptableColumn.ReadOnly &&
+                menuContext.adaptableColumn.dataType == Enums_1.DataType.Number &&
+                !menuContext.adaptableColumn.readOnly &&
                 menuContext.isSelectedCell &&
                 menuContext.isSingleSelectedColumn &&
                 this.api.gridApi.areCellsEditable(menuContext.selectedCellInfo.gridCells)) {
@@ -75,7 +75,7 @@ class SmartEditModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         }
         let column = selectedCellInfo.columns[0];
         if (column) {
-            if (column.DataType != Enums_1.DataType.Number) {
+            if (column.dataType != Enums_1.DataType.Number) {
                 return {
                     Alert: {
                         header: 'Smart Edit Error',
@@ -84,7 +84,7 @@ class SmartEditModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     },
                 };
             }
-            if (column.ReadOnly) {
+            if (column.readOnly) {
                 return {
                     Alert: {
                         header: 'Smart Edit Error',
@@ -109,12 +109,11 @@ class SmartEditModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     BuildPreviewValues(smartEditValue, smartEditOperation) {
         let selectedCellInfo = this.api.gridApi.getSelectedCellInfo();
         let previewResults = [];
-        let columnId = '';
+        let column;
         if (!this.api.internalApi.isGridInPivotMode()) {
             if (ArrayExtensions_1.default.IsNotNullOrEmpty(selectedCellInfo.columns)) {
-                let column = selectedCellInfo.columns[0];
+                column = this.api.columnApi.getColumnFromId(selectedCellInfo.columns[0].columnId);
                 if (column) {
-                    columnId = column.ColumnId;
                     selectedCellInfo.gridCells.forEach((selectedCell) => {
                         let newValue;
                         switch (smartEditOperation) {
@@ -138,7 +137,7 @@ class SmartEditModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                         let dataChangedEvent = this.api.internalApi.buildDataChangedInfo({
                             oldValue: Number(selectedCell.rawValue),
                             newValue: newValue,
-                            columnId: selectedCell.columnId,
+                            column: selectedCell.column,
                             primaryKeyValue: selectedCell.primaryKeyValue,
                             rowNode: selectedCell.rowNode,
                             trigger: 'edit',
@@ -159,7 +158,7 @@ class SmartEditModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             }
         }
         return {
-            columnId: columnId,
+            column: column,
             previewResults: previewResults,
             previewValidationSummary: PreviewHelper_1.PreviewHelper.GetPreviewValidationSummary(previewResults),
         };

package/src/Strategy/SystemStatusModule.d.ts

@@ -1,10 +1,10 @@
 import { AdaptableModuleBase } from './AdaptableModuleBase';
-import { AdaptableMenuItem, MenuContext } from '../PredefinedConfig/Common/Menu';
+import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
 import { IModule } from './Interface/IModule';
 import { AdaptableApi } from '../Api/AdaptableApi';
 export declare class SystemStatusModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
     addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
-    addContextMenuItems(menuContext: MenuContext): AdaptableMenuItem[] | undefined;
+    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
 }

package/src/Utilities/Constants/GeneralConstants.d.ts

@@ -25,6 +25,7 @@ export declare const SYSTEM_STATUS_DEFAULT_MAX_MESSAGES_IN_STORE: number;
 export declare const CHART_DEFAULT_REFRESH_RATE: number;
 export declare const QUICK_SEARCH_DEFAULT_BACK_COLOR: string;
 export declare const QUICK_SEARCH_DEFAULT_FORE_COLOR: string;
+export declare const QUICK_SEARCH_DEBOUNCE_TIME: number;
 export declare const CELL_SUMMARY_DEFAULT_OPERATION: SummaryOperation | string;
 export declare const SYSTEM_DEFAULT_CHART_VISIBILITY: ChartVisibility;
 export declare const SYSTEM_DEFAULT_SYSTEM_STATUS_TYPE: AdaptableMessageType;

package/src/Utilities/Constants/GeneralConstants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.THEME_STYLE = exports.SELECTED_ROWS_REPORT = exports.SELECTED_CELLS_REPORT = exports.CURRENT_DATA_REPORT = exports.ALL_DATA_REPORT = exports.VISUAL_DATA_REPORT = exports.SYSTEM_THEMES = exports.SMART_EDIT_MATH_OPERATION_STATE_PROPERTY = exports.SMART_EDIT_VALUE_STATE_PROPERTY = exports.QUICK_SEARCH_STYLE_STATE_PROPERTY = exports.QUICK_SEARCH_TEXT_STATE_PROPERTY = exports.CURRENT_THEME_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_DURATION_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_DOWN_COLOR_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_UP_COLOR_STATE_PROPERTY = exports.CURRENT_REPORT_STATE_PROPERTY = exports.CURRENT_DATA_SOURCE_STATE_PROPERTY = exports.CURRENT_LAYOUT_STATE_PROPERTY = exports.SUMMARY_OPERATION_STATE_PROPERTY = exports.CURRENT_CHART_NAME_STATE_PROPERTY = exports.ALERT_DEFAULT_LOG_TO_CONSOLE = exports.ALERT_DEFAULT_HIGHLIGHT_ROW = exports.ALERT_DEFAULT_HIGHLIGHT_CELL = exports.ALERT_DEFAULT_SHOW_POPUP = exports.ALERT_DEFAULT_MESSAGE_TYPE = exports.ALERT_DEFAULT_RANGE_OPERAND_TYPE = exports.PLUS_MINUS_DEFAULT_NUDGE_VALUE = exports.CHART_DEFAULT_YAXIS_TOTAL = exports.DEFAULT_LIVE_REPORT_THROTTLE_TIME = exports.THEME_DEFAULT_CURRENT_THEME = exports.SYSTEM_DEFAULT_SYSTEM_STATUS_TYPE = exports.SYSTEM_DEFAULT_CHART_VISIBILITY = exports.CELL_SUMMARY_DEFAULT_OPERATION = exports.QUICK_SEARCH_DEFAULT_FORE_COLOR = exports.QUICK_SEARCH_DEFAULT_BACK_COLOR = exports.CHART_DEFAULT_REFRESH_RATE = exports.SYSTEM_STATUS_DEFAULT_MAX_MESSAGES_IN_STORE = exports.AG_GRID_GROUPED_COLUMN = exports.HALF_SECOND = exports.AB_SPECIAL_COLUMN = exports.EMPTY_ARRAY = exports.EMPTY_STRING = exports.FILTER_THROTTLE = exports.FILTER_NEVER = exports.FILTER_ALWAYS = exports.ALL_COLUMN_VALUES = exports.READ_ONLY_STYLE = exports.MENU_PREFIX = exports.ADAPTABLE = exports.ADAPTABLE_ID = exports.USER_NAME = exports.DARK_THEME = exports.LIGHT_THEME = exports.DEFAULT_LAYOUT = exports.MISSING_COLUMN = exports.AUTOGENERATED_PK_COLUMN = void 0;
+exports.THEME_STYLE = exports.SELECTED_ROWS_REPORT = exports.SELECTED_CELLS_REPORT = exports.CURRENT_DATA_REPORT = exports.ALL_DATA_REPORT = exports.VISUAL_DATA_REPORT = exports.SYSTEM_THEMES = exports.SMART_EDIT_MATH_OPERATION_STATE_PROPERTY = exports.SMART_EDIT_VALUE_STATE_PROPERTY = exports.QUICK_SEARCH_STYLE_STATE_PROPERTY = exports.QUICK_SEARCH_TEXT_STATE_PROPERTY = exports.CURRENT_THEME_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_DURATION_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_DOWN_COLOR_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_UP_COLOR_STATE_PROPERTY = exports.CURRENT_REPORT_STATE_PROPERTY = exports.CURRENT_DATA_SOURCE_STATE_PROPERTY = exports.CURRENT_LAYOUT_STATE_PROPERTY = exports.SUMMARY_OPERATION_STATE_PROPERTY = exports.CURRENT_CHART_NAME_STATE_PROPERTY = exports.ALERT_DEFAULT_LOG_TO_CONSOLE = exports.ALERT_DEFAULT_HIGHLIGHT_ROW = exports.ALERT_DEFAULT_HIGHLIGHT_CELL = exports.ALERT_DEFAULT_SHOW_POPUP = exports.ALERT_DEFAULT_MESSAGE_TYPE = exports.ALERT_DEFAULT_RANGE_OPERAND_TYPE = exports.PLUS_MINUS_DEFAULT_NUDGE_VALUE = exports.CHART_DEFAULT_YAXIS_TOTAL = exports.DEFAULT_LIVE_REPORT_THROTTLE_TIME = exports.THEME_DEFAULT_CURRENT_THEME = exports.SYSTEM_DEFAULT_SYSTEM_STATUS_TYPE = exports.SYSTEM_DEFAULT_CHART_VISIBILITY = exports.CELL_SUMMARY_DEFAULT_OPERATION = exports.QUICK_SEARCH_DEBOUNCE_TIME = exports.QUICK_SEARCH_DEFAULT_FORE_COLOR = exports.QUICK_SEARCH_DEFAULT_BACK_COLOR = exports.CHART_DEFAULT_REFRESH_RATE = exports.SYSTEM_STATUS_DEFAULT_MAX_MESSAGES_IN_STORE = exports.AG_GRID_GROUPED_COLUMN = exports.HALF_SECOND = exports.AB_SPECIAL_COLUMN = exports.EMPTY_ARRAY = exports.EMPTY_STRING = exports.FILTER_THROTTLE = exports.FILTER_NEVER = exports.FILTER_ALWAYS = exports.ALL_COLUMN_VALUES = exports.READ_ONLY_STYLE = exports.MENU_PREFIX = exports.ADAPTABLE = exports.ADAPTABLE_ID = exports.USER_NAME = exports.DARK_THEME = exports.LIGHT_THEME = exports.DEFAULT_LAYOUT = exports.MISSING_COLUMN = exports.AUTOGENERATED_PK_COLUMN = void 0;
 const Enums_1 = require("../../PredefinedConfig/Common/Enums");
 const ChartEnums_1 = require("../../PredefinedConfig/Common/ChartEnums");
 const UIHelper_1 = require("../../View/UIHelper");
@@ -35,6 +35,7 @@ exports.CHART_DEFAULT_REFRESH_RATE = 3; // refresh the chart every 3 seconds if
 // Quick Search
 exports.QUICK_SEARCH_DEFAULT_BACK_COLOR = UIHelper_1.getHexForName(UIHelper_1.LIGHT_YELLOW);
 exports.QUICK_SEARCH_DEFAULT_FORE_COLOR = UIHelper_1.getHexForName(UIHelper_1.BLACK);
+exports.QUICK_SEARCH_DEBOUNCE_TIME = 350;
 // Cells Summary
 exports.CELL_SUMMARY_DEFAULT_OPERATION = Enums_1.SummaryOperation.Sum;
 // system

package/src/Utilities/Constants/ModuleConstants.d.ts

@@ -4,29 +4,29 @@ export declare const BulkUpdateModuleId: ModuleConstants;
 export declare const CalculatedColumnModuleId: ModuleConstants;
 export declare const CellSummaryModuleId: ModuleConstants;
 export declare const ChartModuleId: ModuleConstants;
-export declare const FilterModuleId: ModuleConstants;
 export declare const ConditionalStyleModuleId: ModuleConstants;
 export declare const CustomSortModuleId: ModuleConstants;
 export declare const DashboardModuleId: ModuleConstants;
+export declare const DataChangeHistoryModuleId: ModuleConstants;
 export declare const DataSourceModuleId: ModuleConstants;
 export declare const ExportModuleId: ModuleConstants;
+export declare const FilterModuleId: ModuleConstants;
 export declare const FormatColumnModuleId: ModuleConstants;
 export declare const FreeTextColumnModuleId: ModuleConstants;
-export declare const OpenFinModuleId: ModuleConstants;
 export declare const Glue42ModuleId: ModuleConstants;
+export declare const GridInfoModuleId: ModuleConstants;
 export declare const IPushPullModuleId: ModuleConstants;
 export declare const LayoutModuleId: ModuleConstants;
-export declare const GridInfoModuleId: ModuleConstants;
-export declare const SparklineColumnModuleId: ModuleConstants;
+export declare const OpenFinModuleId: ModuleConstants;
 export declare const PlusMinusModuleId: ModuleConstants;
+export declare const QueryModuleId: ModuleConstants;
 export declare const QuickSearchModuleId: ModuleConstants;
 export declare const ScheduleModuleId: ModuleConstants;
 export declare const ShortcutModuleId: ModuleConstants;
 export declare const SmartEditModuleId: ModuleConstants;
+export declare const SparklineColumnModuleId: ModuleConstants;
 export declare const StateManagementModuleId: ModuleConstants;
 export declare const SystemStatusModuleId: ModuleConstants;
 export declare const TeamSharingModuleId: ModuleConstants;
 export declare const ThemeModuleId: ModuleConstants;
 export declare const ToolPanelModuleId: ModuleConstants;
-export declare const QueryModuleId: ModuleConstants;
-export declare const DataChangeHistoryModuleId: ModuleConstants;