@adaptabletools/adaptable 10.0.0 → 10.0.4-canary.0

package/src/PredefinedConfig/Selection/GridRow.d.ts

@@ -25,19 +25,27 @@ export interface GridRow {
  */
 export interface RowInfo {
     /**
-     * Whether Row is a Master Row (in a Master-Detail grid)
+     * Is Row  a Master Row (in a Master-Detail grid)
      */
     isMaster?: boolean;
     /**
-     * Whether - if a Group Row - it is currently expanded
+     * Is Row expanded (if a group row)
      */
     isExpanded?: boolean;
     /**
-     * Whether Row is a Row Group
+     * Is Row grouped
      */
     isGroup?: boolean;
+    /**
+     * Is Row selected
+     */
+    isSelected?: boolean;
+    /**
+     * Is Row displayed (ie. filtered, not necessarily in viewport)
+     */
+    isDisplayed?: boolean;
     /**
      * What level the Row is (if Row Grouping is active)
      */
-    level?: number;
+    rowGroupLevel?: number;
 }

package/src/PredefinedConfig/SystemState.d.ts

@@ -14,7 +14,6 @@ import { CachedQuery } from './QueryState';
 import { AdaptableFlashingAlert } from './Common/AdaptableFlashingAlert';
 import { TypeUuid } from './Uuid';
 import { SummaryOperation } from './Common/Enums';
-import { ProgressIndicator } from '../Utilities/Interface/ProgressIndicator';
 import { ExportCustomDestinationPopup } from './ExportState';
 export type { IPushPullReport, IPushPullDomain };
 export type { Glue42Report };
@@ -63,3 +62,7 @@ export interface SystemState extends InternalState, IPushPullState, Glue42State,
         suspendTime: Date;
     };
 }
+export interface ProgressIndicator {
+    active: boolean;
+    label: string;
+}

package/src/Redux/ActionsReducers/SystemRedux.js

@@ -497,6 +497,6 @@ exports.SystemReducer = (state = initialState, action) => {
             return state;
     }
 };
-const getDataChangeHistoryKey = ({ columnId, primaryKeyValue }) => {
+const getDataChangeHistoryKey = ({ column: columnId, primaryKeyValue, }) => {
     return JSON.stringify({ columnId, primaryKeyValue });
 };

package/src/Redux/Store/AdaptableReduxMerger.js

@@ -8,6 +8,7 @@ const isArray_1 = tslib_1.__importDefault(require("lodash-es/isArray"));
 const extend_1 = tslib_1.__importDefault(require("lodash-es/extend"));
 const isObject_1 = tslib_1.__importDefault(require("lodash-es/isObject"));
 const isAdaptableObject_1 = require("../../Utilities/isAdaptableObject");
+const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
 function customizer(objValue, srcValue) {
     if (isArray_1.default(objValue)) {
         if (!Array.isArray(srcValue)) {
@@ -55,7 +56,12 @@ function MergeStateFunction(oldState, newState) {
     // add source 'Config' only to predefined objects
     const config = AddStateSource(oldState, 'Config');
     // source 'User' will be added to all other objects, after the merge (see bottom of this function)
-    const state = newState;
+    let state = newState;
+    if (!state || typeof state !== 'object') {
+        // in case loadState returns something different than an empty object
+        LoggingHelper_1.LogAdaptableWarning('State is something different that expected, expected object, received: ', state);
+        state = {};
+    }
     // any Module in config that doesn't exist in state will be added
     for (const configModuleName in config) {
         (_a = state[configModuleName]) !== null && _a !== void 0 ? _a : (state[configModuleName] = config[configModuleName]);

package/src/Redux/Store/AdaptableStore.js

@@ -43,6 +43,7 @@ const PreviewHelper_1 = require("../../Utilities/Helpers/PreviewHelper");
 const StringExtensions_1 = require("../../Utilities/Extensions/StringExtensions");
 const Emitter_1 = tslib_1.__importDefault(require("../../Utilities/Emitter"));
 const AdaptableToaster_1 = require("../../View/Components/Popups/AdaptableToaster");
+const SystemRedux_1 = require("../ActionsReducers/SystemRedux");
 exports.INIT_STATE = 'INIT_STATE';
 exports.LOAD_STATE = 'LOAD_STATE';
 const NON_PERSIST_ACTIONS = {
@@ -50,6 +51,9 @@ const NON_PERSIST_ACTIONS = {
     '@@INIT': true,
     '@@redux/init': true,
     [exports.INIT_STATE]: true,
+    // progress indicators should NOT interfere with state management as it may lead to race conditions due to load/persist state being async
+    [SystemRedux_1.SYSTEM_PROGRESS_INDICATOR_SHOW]: true,
+    [SystemRedux_1.SYSTEM_PROGRESS_INDICATOR_HIDE]: true,
 };
 exports.InitState = () => ({
     type: exports.INIT_STATE,
@@ -382,7 +386,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     if (((_c = actionTyped.alert.alertDefinition.AlertProperties) === null || _c === void 0 ? void 0 : _c.HighlightCell) &&
                         actionTyped.alert.dataChangedInfo) {
                         let rowNode = actionTyped.alert.dataChangedInfo.rowNode;
-                        adaptable.refreshCells([rowNode], [actionTyped.alert.dataChangedInfo.columnId], true);
+                        adaptable.refreshCells([rowNode], [actionTyped.alert.dataChangedInfo.column.columnId], true);
                     }
                     return ret;
                 }
@@ -398,7 +402,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         var _a;
                         if (((_a = alert.alertDefinition.AlertProperties) === null || _a === void 0 ? void 0 : _a.HighlightCell) && alert.dataChangedInfo) {
                             let rowNode = alert.dataChangedInfo.rowNode;
-                            adaptable.refreshCells([rowNode], [alert.dataChangedInfo.columnId], true);
+                            adaptable.refreshCells([rowNode], [alert.dataChangedInfo.column.columnId], true);
                         }
                     });
                     return ret;
@@ -412,7 +416,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     let ret = next(action);
                     if (actionTyped.alert.dataChangedInfo) {
                         let rowNode = actionTyped.alert.dataChangedInfo.rowNode;
-                        adaptable.refreshCells([rowNode], [actionTyped.alert.dataChangedInfo.columnId], true);
+                        adaptable.refreshCells([rowNode], [actionTyped.alert.dataChangedInfo.column.columnId], true);
                     }
                     return ret;
                 }

package/src/Strategy/AdaptableModuleBase.js

@@ -118,26 +118,26 @@ class AdaptableModuleBase {
             return false;
         }
         if (StringExtensions_1.StringExtensions.IsNotNullOrEmpty(functionType)) {
-            if (functionType == 'sort' && !column.IsSparkline) {
-                return column.Sortable;
+            if (functionType == 'sort' && !column.isSparkline) {
+                return column.sortable;
             }
             else if (functionType == 'editable') {
-                return !column.ReadOnly;
+                return !column.readOnly;
             }
             else if (functionType == 'style') {
-                return !column.IsSparkline;
+                return !column.isSparkline;
             }
             else if (functionType == 'sparkline') {
-                return column.IsSparkline;
+                return column.isSparkline;
             }
             else if (functionType == 'numeric') {
-                return column.DataType == Enums_1.DataType.Number;
+                return column.dataType == Enums_1.DataType.Number;
             }
             else if (functionType == 'filter') {
-                return column.Filterable;
+                return column.filterable;
             }
             else if (functionType == 'quickfilter') {
-                return this.api.columnApi.usesAdaptableQuickFilter(column.ColumnId);
+                return this.api.columnApi.usesAdaptableQuickFilter(column.columnId);
             }
         }
         return true;

package/src/Strategy/AlertModule.js

@@ -22,7 +22,8 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             }
             if (this.api.internalApi.getAdaptableOptions().notificationsOptions
                 .dataChangeDetectionPolicy === 'formattedValue') {
-                const { oldValue, newValue, columnId } = dataChangedInfo;
+                const { oldValue, newValue } = dataChangedInfo;
+                const columnId = dataChangedInfo.column.columnId;
                 const oldFormattedValue = this.api.gridApi.getFormattedValueFromRawValue(columnId, oldValue);
                 const newFormattedValue = this.api.gridApi.getFormattedValueFromRawValue(columnId, newValue);
                 if (oldFormattedValue === newFormattedValue) {
@@ -50,7 +51,7 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         else if (this.api.scopeApi.scopeHasColumns(alertDefinition.Scope)) {
             return this.api.scopeApi
                 .getColumnsForScope(alertDefinition.Scope)
-                .map((adaptableColumn) => adaptableColumn.ColumnId);
+                .map((adaptableColumn) => adaptableColumn.columnId);
         }
         return [];
     }
@@ -192,7 +193,7 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     addColumnMenuItems(column) {
         if (column && this.isModuleEditable()) {
-            if (!this.api.columnApi.isCalculatedColumn(column.ColumnId)) {
+            if (!this.api.columnApi.isCalculatedColumn(column.columnId)) {
                 const flashingAlertDefinitions = this.api.alertApi.getFlashingAlertDefinitions();
                 const flashingAlertForCurrentColumn = flashingAlertDefinitions.find((flashingAlertDefinition) => {
                     return this.api.scopeApi.isColumnInScope(column, flashingAlertDefinition.Scope);
@@ -205,7 +206,7 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 return [
                     this.createColumnMenuItemReduxAction('Add Flashing Alert', this.moduleInfo.Glyph, AlertRedux.FlashingAlertDefinitionAdd({
                         Scope: {
-                            ColumnIds: [column.ColumnId],
+                            ColumnIds: [column.columnId],
                         },
                         Rule: {
                             Predicate: { PredicateId: 'Any' },
@@ -229,7 +230,7 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     }
                 }
                 const flashingAlertForRow = this.api.internalApi.getAdaptableFlashingAlertFor(menuContext.primaryKeyValue);
-                const flashingAlertForCell = this.api.internalApi.getAdaptableFlashingAlertFor(menuContext.primaryKeyValue, menuContext.adaptableColumn.ColumnId);
+                const flashingAlertForCell = this.api.internalApi.getAdaptableFlashingAlertFor(menuContext.primaryKeyValue, menuContext.adaptableColumn.columnId);
                 if (flashingAlertForRow && flashingAlertForRow.flashTarget === 'row') {
                     items.push(this.createColumnMenuItemReduxAction('Clear Flashing Alert for Row', this.moduleInfo.Glyph, SystemRedux.SystemFlashingAlertDelete(flashingAlertForRow)));
                 }
@@ -272,12 +273,12 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     showAlertForDefinitions(dataChangedInfo, alertDefinitions = []) {
         alertDefinitions.forEach((alertDefinition) => {
             // might be better to do a single alert with all the messages?
-            this.api.alertApi.showAlert(this.api.columnApi.getFriendlyNameFromColumnId(dataChangedInfo.columnId), this.api.alertApi.getAlertDescription(alertDefinition), alertDefinition, dataChangedInfo);
+            this.api.alertApi.showAlert(dataChangedInfo.column.friendlyName, this.api.alertApi.getAlertDescription(alertDefinition, dataChangedInfo), alertDefinition, dataChangedInfo);
         });
     }
     showFlashingAlertsForDefinitions(dataChangedInfo, flashingAlertDefinitions = []) {
-        const allColumnIds = this.api.columnApi.getColumns().map((c) => c.ColumnId);
-        const columnDataType = this.api.columnApi.getColumnDataTypeFromColumnId(dataChangedInfo.columnId);
+        const allColumnIds = this.api.columnApi.getColumns().map((c) => c.columnId);
+        const columnDataType = dataChangedInfo.column.dataType;
         const numeric = columnDataType === 'Number';
         const isComparableType = numeric || columnDataType === 'Date';
         let up = false;
@@ -292,7 +293,7 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         }
         flashingAlertDefinitions.forEach((flashingAlertDefinition) => {
             const flashTarget = this.api.alertApi.getFlashingAlertFlashTarget(flashingAlertDefinition);
-            const flashColumnIds = { [dataChangedInfo.columnId]: true };
+            const flashColumnIds = { [dataChangedInfo.column.columnId]: true };
             if (flashTarget === 'row') {
                 allColumnIds.forEach((colId) => {
                     flashColumnIds[colId] = true;
@@ -319,7 +320,7 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     getBaseAlertDefinitionsForDataChange(dataChangedEvent, definitions, defaultNoPredicateReturn = false) {
         let relatedAlertDefinitions = definitions
-            .filter((v) => this.api.scopeApi.isColumnInScope(this.api.columnApi.getColumnFromId(dataChangedEvent.columnId), v.Scope))
+            .filter((v) => this.api.scopeApi.isColumnInScope(dataChangedEvent.column, v.Scope))
             .filter((alertDefinition) => !AdaptableQuery_1.isReactiveQuery(alertDefinition.Rule));
         let triggeredAlerts = [];
         if (ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(relatedAlertDefinitions)) {
@@ -353,7 +354,7 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             // TODO send real display value
             displayValue: null,
             node: dataChangedEvent.rowNode,
-            column: this.api.columnApi.getColumnFromId(dataChangedEvent.columnId),
+            column: dataChangedEvent.column,
         }, defaultNoPredicateReturn);
     }
     getTeamSharingAction() {

package/src/Strategy/BulkUpdateModule.js

@@ -20,7 +20,7 @@ class BulkUpdateModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         let menuItemShowPopup = undefined;
         if (!menuContext.isRowGroupColumn && this.isModuleEditable()) {
             if (menuContext.adaptableColumn &&
-                !menuContext.adaptableColumn.ReadOnly &&
+                !menuContext.adaptableColumn.readOnly &&
                 menuContext.isSelectedCell &&
                 menuContext.isSingleSelectedColumn &&
                 this.api.gridApi.areCellsEditable(menuContext.selectedCellInfo.gridCells)) {
@@ -70,7 +70,7 @@ class BulkUpdateModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             };
         }
         let selectedColumn = selectedCellInfo.columns[0];
-        if (selectedColumn && selectedColumn.ReadOnly) {
+        if (selectedColumn && selectedColumn.readOnly) {
             return {
                 IsValid: false,
                 Alert: {
@@ -102,9 +102,9 @@ class BulkUpdateModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         let columnId = '';
         if (!this.api.internalApi.isGridInPivotMode()) {
             if (selectedCellInfo != null && selectedCellInfo.columns.length > 0) {
-                columnId = selectedCellInfo.columns[0].ColumnId;
+                columnId = selectedCellInfo.columns[0].columnId;
                 let typedBulkUpdateValue;
-                switch (selectedCellInfo.columns[0].DataType) {
+                switch (selectedCellInfo.columns[0].dataType) {
                     case Enums_1.DataType.Number:
                         typedBulkUpdateValue = Number(bulkUpdateValue);
                         break;
@@ -119,7 +119,7 @@ class BulkUpdateModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     const dataChangedInfo = this.api.internalApi.buildDataChangedInfo({
                         oldValue: selectedCell.rawValue,
                         newValue: typedBulkUpdateValue,
-                        columnId: selectedCell.columnId,
+                        column: selectedCell.column,
                         primaryKeyValue: selectedCell.primaryKeyValue,
                         rowNode: selectedCell.rowNode,
                         trigger: 'edit',

package/src/Strategy/CalculatedColumnModule.js

@@ -40,7 +40,7 @@ class CalculatedColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (column && this.isModuleEditable()) {
             if (this.api.calculatedColumnApi
                 .getAllCalculatedColumn()
-                .find((cc) => cc.ColumnId == column.ColumnId)) {
+                .find((cc) => cc.ColumnId == column.columnId)) {
                 let popupParam = {
                     column: column,
                     action: 'Edit',

package/src/Strategy/CellSummaryModule.js

@@ -38,14 +38,14 @@ class CellSummaryModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             let allValues = [];
             let numericColumns = [];
             selectedCellInfo.columns.map((c) => {
-                if (c && c.DataType == Enums_1.DataType.Number) {
-                    numericColumns.push(c.ColumnId);
+                if (c && c.dataType == Enums_1.DataType.Number) {
+                    numericColumns.push(c.columnId);
                 }
             });
             selectedCellInfo.gridCells.forEach((selectedCell) => {
                 let value = selectedCell.rawValue;
                 allValues.push(value);
-                if (ArrayExtensions_1.ArrayExtensions.ContainsItem(numericColumns, selectedCell.columnId)) {
+                if (ArrayExtensions_1.ArrayExtensions.ContainsItem(numericColumns, selectedCell.column.columnId)) {
                     let valueAsNumber = Number(value);
                     // possible that its not a number despite it being a numeric column
                     if (!isNaN(Number(valueAsNumber))) {

package/src/Strategy/ConditionalStyleModule.js

@@ -22,7 +22,7 @@ class ConditionalStyleModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         else if (this.api.scopeApi.scopeHasColumns(conditionalStyle.Scope)) {
             return this.api.scopeApi
                 .getColumnsForScope(conditionalStyle.Scope)
-                .map((adaptableColumn) => adaptableColumn.ColumnId);
+                .map((adaptableColumn) => adaptableColumn.columnId);
         }
         return [];
     }
@@ -73,7 +73,7 @@ class ConditionalStyleModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         this.api.conditionalStyleApi.editConditionalStyles(oldConditionalStyles);
     }
     addColumnMenuItems(column) {
-        if (column && this.isModuleEditable() && !column.IsSparkline) {
+        if (column && this.isModuleEditable() && !column.isSparkline) {
             let conditionalStyles = this.api.conditionalStyleApi.getConditionalStylesForColumn(column);
             let firstConditionalStyle = ArrayExtensions_1.default.IsNotNullOrEmpty(conditionalStyles)
                 ? conditionalStyles.find((cs) => this.api.scopeApi.isColumnInScopeColumns(column, cs.Scope))
@@ -160,7 +160,7 @@ class ConditionalStyleModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             value: value,
             oldValue: null,
             displayValue: column
-                ? this.api.gridApi.getDisplayValueFromRowNode(node, column.ColumnId)
+                ? this.api.gridApi.getDisplayValueFromRowNode(node, column.columnId)
                 : value,
             node: node,
             column: column,

package/src/Strategy/CustomSortModule.js

@@ -19,10 +19,10 @@ class CustomSortModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return false;
     }
     addColumnMenuItems(column) {
-        if (column && this.isModuleEditable() && column.Sortable) {
+        if (column && this.isModuleEditable() && column.sortable) {
             let customSort = this.api.customSortApi
                 .getAllCustomSort()
-                .find((x) => x.ColumnId == column.ColumnId);
+                .find((x) => x.ColumnId == column.columnId);
             let label = customSort ? 'Edit ' : 'Create ';
             // dont show a menu item if there is a custom sort that uses a comparer function
             const columnSortComparer = this.api.internalApi.getCustomSortComparer(column);

package/src/Strategy/ExportModule.d.ts

@@ -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.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 [];
     }
@@ -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/LayoutModule.js

@@ -42,15 +42,15 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 action: 'Edit',
                 source: 'ColumnMenu',
             }));
-            if (column && column.Hideable) {
+            if (column && column.hideable) {
                 returnColumnMenuItems.push(this.createColumnMenuItemClickFunction('Hide Column', 'hide-column', () => {
-                    this.api.columnApi.hideColumn(column.ColumnId);
+                    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, () => {