@adaptabletools/adaptable 10.0.0-canary.3 → 10.0.3

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.d.ts

@@ -55,8 +55,8 @@ export declare const SYSTEM_PROGRESS_INDICATOR_SHOW = "SYSTEM_PROGRESS_INDICATOR
 export declare const SYSTEM_PROGRESS_INDICATOR_HIDE = "SYSTEM_PROGRESS_INDICATOR_HIDE";
 export declare const SYSTEM_LICENSE_SHOW_WATERMARK = "SYSTEM_LICENSE_SHOW_WATERMARK";
 export declare const SYSTEM_LICENSE_DISABLE_PERSISTENCE = "SYSTEM_LICENSE_DISABLE_PERSISTENCE";
-export declare const SYSTEM_DATA_CHANGE_HISTORY_ENTRY_ADD = "SYSTEM_DATA_CHANGE_HISTORY_ENTRY_ADD";
-export declare const SYSTEM_DATA_CHANGE_HISTORY_ENTRY_DELETE = "SYSTEM_DATA_CHANGE_HISTORY_ENTRY_DELETE";
+export declare const SYSTEM_DATA_CHANGE_HISTORY_ADD = "SYSTEM_DATA_CHANGE_HISTORY_ADD";
+export declare const SYSTEM_DATA_CHANGE_HISTORY_UNDO = "SYSTEM_DATA_CHANGE_HISTORY_UNDO";
 export declare const SYSTEM_DATA_CHANGE_HISTORY_ENABLE = "SYSTEM_DATA_CHANGE_HISTORY_ENABLE";
 export declare const SYSTEM_DATA_CHANGE_HISTORY_DISABLE = "SYSTEM_DATA_CHANGE_HISTORY_DISABLE";
 export declare const SYSTEM_DATA_CHANGE_HISTORY_SUSPEND = "SYSTEM_DATA_CHANGE_HISTORY_SUSPEND";
@@ -177,10 +177,10 @@ export interface SystemLicenseShowWatermarkAction extends Redux.Action {
 }
 export interface SystemLicenseDisablePersistenceAction extends Redux.Action {
 }
-export interface SystemDataChangeHistoryEntryAddAction extends Redux.Action {
+export interface SystemDataChangeHistoryAddAction extends Redux.Action {
     changeInfo: DataChangedInfo;
 }
-export interface SystemDataChangeHistoryEntryDeleteAction extends Redux.Action {
+export interface SystemDataChangeHistoryUndoAction extends Redux.Action {
     changeInfo: DataChangedInfo;
 }
 export interface SystemDataChangeHistoryEnableAction extends Redux.Action {
@@ -229,8 +229,8 @@ export declare const SystemProgressIndicatorShow: (label: string) => SystemProgr
 export declare const SystemProgressIndicatorHide: () => SystemProgressIndicatorHideAction;
 export declare const SystemLicenseShowWatermark: (text: string) => SystemLicenseShowWatermarkAction;
 export declare const SystemLicenseDisablePersistence: () => SystemLicenseDisablePersistenceAction;
-export declare const SystemDataChangeHistoryEntryAdd: (changeInfo: DataChangedInfo) => SystemDataChangeHistoryEntryAddAction;
-export declare const SystemDataChangeHistoryEntryDelete: (changeInfo: DataChangedInfo) => SystemDataChangeHistoryEntryDeleteAction;
+export declare const SystemDataChangeHistoryAdd: (changeInfo: DataChangedInfo) => SystemDataChangeHistoryAddAction;
+export declare const SystemDataChangeHistoryUndo: (changeInfo: DataChangedInfo) => SystemDataChangeHistoryUndoAction;
 export declare const SystemDataChangeHistoryEnable: () => SystemDataChangeHistoryEnableAction;
 export declare const SystemDataChangeHistoryDisable: () => SystemDataChangeHistoryDisableAction;
 export declare const SystemDataChangeHistorySuspend: () => SystemDataChangeHistorySuspendAction;

package/src/Redux/ActionsReducers/SystemRedux.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SystemReducer = exports.getSystemExportCustomDestinationPopups = exports.SystemExportCustomDestinationPopupHide = exports.SystemExportCustomDestinationPopupShow = exports.SystemDataChangeHistoryResume = exports.SystemDataChangeHistorySuspend = exports.SystemDataChangeHistoryDisable = exports.SystemDataChangeHistoryEnable = exports.SystemDataChangeHistoryEntryDelete = exports.SystemDataChangeHistoryEntryAdd = exports.SystemLicenseDisablePersistence = exports.SystemLicenseShowWatermark = exports.SystemProgressIndicatorHide = exports.SystemProgressIndicatorShow = exports.SystemCellSummaryChangeOperation = exports.SystemCachedQueryAdd = exports.SetLastAppliedShortcut = exports.SetNewColumnListOrder = exports.ChartSetChartVisibility = exports.ChartSetChartData = exports.BulkUpdateChangeValue = exports.BulkUpdateSetPreview = exports.BulkUpdateSetValidSelection = exports.BulkUpdateCheckCellSelection = exports.SmartEditSetPreview = exports.SmartEditSetValidSelection = exports.SmartEditCheckCellSelection = exports.SmartEditChangeOperation = exports.SmartEditChangeValue = exports.SystemStatusMessageInfoDeleteAll = exports.SystemStatusMessageInfoDelete = exports.SystemStatusMessageInfoAdd = exports.SystemFlashingAlertDeleteAll = exports.SystemFlashingAlertDelete = exports.SystemFlashingAlertAdd = exports.SystemAlertRemoveHighlight = exports.SystemAlertDeleteAll = exports.SystemAlertDelete = exports.SystemAlertAdd = exports.SystemHighlightCellDeleteAll = exports.SystemHighlightCellDelete = exports.SystemHighlightCellAdd = exports.SYSTEM_DATA_CHANGE_HISTORY_RESUME = exports.SYSTEM_DATA_CHANGE_HISTORY_SUSPEND = exports.SYSTEM_DATA_CHANGE_HISTORY_DISABLE = exports.SYSTEM_DATA_CHANGE_HISTORY_ENABLE = exports.SYSTEM_DATA_CHANGE_HISTORY_ENTRY_DELETE = exports.SYSTEM_DATA_CHANGE_HISTORY_ENTRY_ADD = exports.SYSTEM_LICENSE_DISABLE_PERSISTENCE = exports.SYSTEM_LICENSE_SHOW_WATERMARK = exports.SYSTEM_PROGRESS_INDICATOR_HIDE = exports.SYSTEM_PROGRESS_INDICATOR_SHOW = exports.SYSTEM_EXPORT_CUSTOM_DESTINATION_POPUP_HIDE = exports.SYSTEM_EXPORT_CUSTOM_DESTINATION_POPUP_SHOW = exports.SYSTEM_CELL_SUMMARY_CHANGE_OPERATION = exports.SYSTEM_CACHED_QUERY_ADD = exports.SYSTEM_SET_LAST_APPLIED_SHORTCUT = exports.SYSTEM_SET_NEW_COLUMN_LIST_ORDER = exports.SYSTEM_HIGHLIGHT_CELL_DELETE_ALL = exports.SYSTEM_HIGHLIGHT_CELL_DELETE = exports.SYSTEM_HIGHLIGHT_CELL_ADD = exports.SYSTEM_CHART_SET_CHART_VISIBILITY = exports.SYSTEM_CHART_SET_CHART_DATA = exports.SYSTEM_BULK_UPDATE_CHANGE_VALUE = exports.SYSTEM_BULK_UPDATE_SET_PREVIEW = exports.SYSTEM_BULK_UPDATE_SET_VALID_SELECTION = exports.SYSTEM_BULK_UPDATE_CHECK_CELL_SELECTION = exports.SYSTEM_SMART_EDIT_CHANGE_OPERATION = exports.SYSTEM_SMART_EDIT_CHANGE_VALUE = exports.SYSTEM_SMARTEDIT_SET_PREVIEW = exports.SYSTEM_SMARTEDIT_SET_VALID_SELECTION = exports.SYSTEM_SMARTEDIT_FETCH_PREVIEW = exports.SYSTEM_SMARTEDIT_CHECK_CELL_SELECTION = exports.SYSTEM_STATUS_MESSAGE_INFO_DELETE_ALL = exports.SYSTEM_STATUS_MESSAGE_INFO_DELETE = exports.SYSTEM_STATUS_MESSAGE_INFO_ADD = exports.SYSTEM_FLASHING_ALERT_DELETE_ALL = exports.SYSTEM_FLASHING_ALERT_DELETE = exports.SYSTEM_FLASHING_ALERT_ADD = exports.SYSTEM_ALERT_REMOVE_HIGHLIGHT = exports.SYSTEM_ALERT_DELETE_ALL = exports.SYSTEM_ALERT_DELETE = exports.SYSTEM_ALERT_ADD = exports.FLASHING_ALERT_ROW_KEY = void 0;
+exports.SystemReducer = exports.getSystemExportCustomDestinationPopups = exports.SystemExportCustomDestinationPopupHide = exports.SystemExportCustomDestinationPopupShow = exports.SystemDataChangeHistoryResume = exports.SystemDataChangeHistorySuspend = exports.SystemDataChangeHistoryDisable = exports.SystemDataChangeHistoryEnable = exports.SystemDataChangeHistoryUndo = exports.SystemDataChangeHistoryAdd = exports.SystemLicenseDisablePersistence = exports.SystemLicenseShowWatermark = exports.SystemProgressIndicatorHide = exports.SystemProgressIndicatorShow = exports.SystemCellSummaryChangeOperation = exports.SystemCachedQueryAdd = exports.SetLastAppliedShortcut = exports.SetNewColumnListOrder = exports.ChartSetChartVisibility = exports.ChartSetChartData = exports.BulkUpdateChangeValue = exports.BulkUpdateSetPreview = exports.BulkUpdateSetValidSelection = exports.BulkUpdateCheckCellSelection = exports.SmartEditSetPreview = exports.SmartEditSetValidSelection = exports.SmartEditCheckCellSelection = exports.SmartEditChangeOperation = exports.SmartEditChangeValue = exports.SystemStatusMessageInfoDeleteAll = exports.SystemStatusMessageInfoDelete = exports.SystemStatusMessageInfoAdd = exports.SystemFlashingAlertDeleteAll = exports.SystemFlashingAlertDelete = exports.SystemFlashingAlertAdd = exports.SystemAlertRemoveHighlight = exports.SystemAlertDeleteAll = exports.SystemAlertDelete = exports.SystemAlertAdd = exports.SystemHighlightCellDeleteAll = exports.SystemHighlightCellDelete = exports.SystemHighlightCellAdd = exports.SYSTEM_DATA_CHANGE_HISTORY_RESUME = exports.SYSTEM_DATA_CHANGE_HISTORY_SUSPEND = exports.SYSTEM_DATA_CHANGE_HISTORY_DISABLE = exports.SYSTEM_DATA_CHANGE_HISTORY_ENABLE = exports.SYSTEM_DATA_CHANGE_HISTORY_UNDO = exports.SYSTEM_DATA_CHANGE_HISTORY_ADD = exports.SYSTEM_LICENSE_DISABLE_PERSISTENCE = exports.SYSTEM_LICENSE_SHOW_WATERMARK = exports.SYSTEM_PROGRESS_INDICATOR_HIDE = exports.SYSTEM_PROGRESS_INDICATOR_SHOW = exports.SYSTEM_EXPORT_CUSTOM_DESTINATION_POPUP_HIDE = exports.SYSTEM_EXPORT_CUSTOM_DESTINATION_POPUP_SHOW = exports.SYSTEM_CELL_SUMMARY_CHANGE_OPERATION = exports.SYSTEM_CACHED_QUERY_ADD = exports.SYSTEM_SET_LAST_APPLIED_SHORTCUT = exports.SYSTEM_SET_NEW_COLUMN_LIST_ORDER = exports.SYSTEM_HIGHLIGHT_CELL_DELETE_ALL = exports.SYSTEM_HIGHLIGHT_CELL_DELETE = exports.SYSTEM_HIGHLIGHT_CELL_ADD = exports.SYSTEM_CHART_SET_CHART_VISIBILITY = exports.SYSTEM_CHART_SET_CHART_DATA = exports.SYSTEM_BULK_UPDATE_CHANGE_VALUE = exports.SYSTEM_BULK_UPDATE_SET_PREVIEW = exports.SYSTEM_BULK_UPDATE_SET_VALID_SELECTION = exports.SYSTEM_BULK_UPDATE_CHECK_CELL_SELECTION = exports.SYSTEM_SMART_EDIT_CHANGE_OPERATION = exports.SYSTEM_SMART_EDIT_CHANGE_VALUE = exports.SYSTEM_SMARTEDIT_SET_PREVIEW = exports.SYSTEM_SMARTEDIT_SET_VALID_SELECTION = exports.SYSTEM_SMARTEDIT_FETCH_PREVIEW = exports.SYSTEM_SMARTEDIT_CHECK_CELL_SELECTION = exports.SYSTEM_STATUS_MESSAGE_INFO_DELETE_ALL = exports.SYSTEM_STATUS_MESSAGE_INFO_DELETE = exports.SYSTEM_STATUS_MESSAGE_INFO_ADD = exports.SYSTEM_FLASHING_ALERT_DELETE_ALL = exports.SYSTEM_FLASHING_ALERT_DELETE = exports.SYSTEM_FLASHING_ALERT_ADD = exports.SYSTEM_ALERT_REMOVE_HIGHLIGHT = exports.SYSTEM_ALERT_DELETE_ALL = exports.SYSTEM_ALERT_DELETE = exports.SYSTEM_ALERT_ADD = exports.FLASHING_ALERT_ROW_KEY = void 0;
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 const Helper_1 = require("../../Utilities/Helpers/Helper");
 /*
@@ -63,8 +63,8 @@ exports.SYSTEM_PROGRESS_INDICATOR_HIDE = 'SYSTEM_PROGRESS_INDICATOR_HIDE';
 exports.SYSTEM_LICENSE_SHOW_WATERMARK = 'SYSTEM_LICENSE_SHOW_WATERMARK';
 exports.SYSTEM_LICENSE_DISABLE_PERSISTENCE = 'SYSTEM_LICENSE_DISABLE_PERSISTENCE';
 // Change History
-exports.SYSTEM_DATA_CHANGE_HISTORY_ENTRY_ADD = 'SYSTEM_DATA_CHANGE_HISTORY_ENTRY_ADD';
-exports.SYSTEM_DATA_CHANGE_HISTORY_ENTRY_DELETE = 'SYSTEM_DATA_CHANGE_HISTORY_ENTRY_DELETE';
+exports.SYSTEM_DATA_CHANGE_HISTORY_ADD = 'SYSTEM_DATA_CHANGE_HISTORY_ADD';
+exports.SYSTEM_DATA_CHANGE_HISTORY_UNDO = 'SYSTEM_DATA_CHANGE_HISTORY_UNDO';
 exports.SYSTEM_DATA_CHANGE_HISTORY_ENABLE = 'SYSTEM_DATA_CHANGE_HISTORY_ENABLE';
 exports.SYSTEM_DATA_CHANGE_HISTORY_DISABLE = 'SYSTEM_DATA_CHANGE_HISTORY_DISABLE';
 exports.SYSTEM_DATA_CHANGE_HISTORY_SUSPEND = 'SYSTEM_DATA_CHANGE_HISTORY_SUSPEND';
@@ -193,12 +193,12 @@ exports.SystemLicenseShowWatermark = (text) => ({
 exports.SystemLicenseDisablePersistence = () => ({
     type: exports.SYSTEM_LICENSE_DISABLE_PERSISTENCE,
 });
-exports.SystemDataChangeHistoryEntryAdd = (changeInfo) => ({
-    type: exports.SYSTEM_DATA_CHANGE_HISTORY_ENTRY_ADD,
+exports.SystemDataChangeHistoryAdd = (changeInfo) => ({
+    type: exports.SYSTEM_DATA_CHANGE_HISTORY_ADD,
     changeInfo,
 });
-exports.SystemDataChangeHistoryEntryDelete = (changeInfo) => ({
-    type: exports.SYSTEM_DATA_CHANGE_HISTORY_ENTRY_DELETE,
+exports.SystemDataChangeHistoryUndo = (changeInfo) => ({
+    type: exports.SYSTEM_DATA_CHANGE_HISTORY_UNDO,
     changeInfo,
 });
 exports.SystemDataChangeHistoryEnable = () => ({
@@ -465,7 +465,7 @@ exports.SystemReducer = (state = initialState, action) => {
                     ] }) });
         case exports.SYSTEM_EXPORT_CUSTOM_DESTINATION_POPUP_HIDE:
             return Object.assign(Object.assign({}, state), { Export: Object.assign(Object.assign({}, state.Export), { CustomDestinationPopups: (_a = state.Export.CustomDestinationPopups) === null || _a === void 0 ? void 0 : _a.filter((data) => data !== action.data) }) });
-        case exports.SYSTEM_DATA_CHANGE_HISTORY_ENTRY_ADD: {
+        case exports.SYSTEM_DATA_CHANGE_HISTORY_ADD: {
             const actionTypedAdd = action;
             const dataChangedInfo = actionTypedAdd.changeInfo;
             const uniqueKey = getDataChangeHistoryKey(dataChangedInfo);
@@ -473,9 +473,9 @@ exports.SystemReducer = (state = initialState, action) => {
             updatedDataChangeHistoryLogs[uniqueKey] = dataChangedInfo;
             return Object.assign(Object.assign({}, state), { DataChangeHistory: Object.assign(Object.assign({}, state.DataChangeHistory), { logs: updatedDataChangeHistoryLogs }) });
         }
-        case exports.SYSTEM_DATA_CHANGE_HISTORY_ENTRY_DELETE: {
-            const actionTypedAdd = action;
-            const dataChangedInfo = actionTypedAdd.changeInfo;
+        case exports.SYSTEM_DATA_CHANGE_HISTORY_UNDO: {
+            const actionTypedUndo = action;
+            const dataChangedInfo = actionTypedUndo.changeInfo;
             const uniqueKey = getDataChangeHistoryKey(dataChangedInfo);
             const updatedDataChangeHistoryLogs = Object.assign({}, state.DataChangeHistory.logs);
             delete updatedDataChangeHistoryLogs[uniqueKey];

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,
@@ -1162,6 +1166,14 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     });
                     return returnAction;
                 }
+                /*******************
+                 * DATA CHANGE HISTORY ACTIONS
+                 *******************/
+                case SystemRedux.SYSTEM_DATA_CHANGE_HISTORY_UNDO:
+                    const actionTypedUndo = action;
+                    const dataChangedInfo = actionTypedUndo.changeInfo;
+                    adaptable.api.gridApi.undoCellEdit(dataChangedInfo);
+                    return next(action);
                 /*******************
                  * SYSTEM (INTERNAL) ACTIONS
                  *******************/

package/src/Strategy/AlertModule.js

@@ -272,7 +272,7 @@ 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(this.api.columnApi.getFriendlyNameFromColumnId(dataChangedInfo.columnId), this.api.alertApi.getAlertDescription(alertDefinition, dataChangedInfo), alertDefinition, dataChangedInfo);
         });
     }
     showFlashingAlertsForDefinitions(dataChangedInfo, flashingAlertDefinitions = []) {

package/src/Strategy/DataChangeHistoryModule.js

@@ -11,7 +11,7 @@ class DataChangeHistoryModule extends AdaptableModuleBase_1.AdaptableModuleBase
         this.api.internalApi.getDataService().on('DataChanged', (dataChangedInfo) => {
             if (dataChangedInfo.trigger !== 'undo') {
                 if (this.shouldLogDataChange(dataChangedInfo)) {
-                    this.api.internalApi.dispatchReduxAction(SystemRedux_1.SystemDataChangeHistoryEntryAdd(dataChangedInfo));
+                    this.api.internalApi.dispatchReduxAction(SystemRedux_1.SystemDataChangeHistoryAdd(dataChangedInfo));
                 }
             }
         });

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);
@@ -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/Utilities/Defaults/DefaultAdaptableOptions.js

@@ -101,10 +101,6 @@ exports.DefaultAdaptableOptions = {
         hideColumnWhenGrouped: false,
         autoOrderGroupedColumns: true,
         alternativeModuleNames: undefined,
-        dataChangeTrackingOptions: {
-            dataChangeTrackingType: 'WhenRequired',
-            maxTimeframeSize: 28800000,
-        },
         currentCalendar: 'United Kingdom',
         cellSummaryOperations: undefined,
         customSortComparers: undefined,
@@ -135,6 +131,7 @@ exports.DefaultAdaptableOptions = {
         useAdaptableQuickFilter: true,
         clearFiltersOnStartUp: false,
         quickFilterTrigger: 'mouseenter',
+        quickFilterValuesTrigger: 'mouseenter',
         filterActionOnUserDataChange: {
             applyFilter: GeneralConstants.FILTER_ALWAYS,
             throttleDelay: 0,
@@ -216,6 +213,7 @@ exports.DefaultAdaptableOptions = {
         moduleExpressionFunctions: undefined,
         queryableColumns: undefined,
         performExpressionValidation: true,
+        maxTimeframeSize: 28800000,
     },
     dataChangeHistoryOptions: {
         activeByDefault: false,

package/src/Utilities/ExpressionFunctions/observableExpressionFunctions.js

@@ -9,6 +9,7 @@ const ExpressionEvaluationError_1 = require("../../parser/src/ExpressionEvaluati
 const expressionFunctionUtils_1 = require("./expressionFunctionUtils");
 // numeric value(digits) followed by a single 's', 'm' or 'h' letter (case insensitive)
 const TIMEFRAME_REGEX = /^(\d+)(s|m|h)$/i;
+const SYSTEM_MAX_TIMEFRAME_SIZE = 86400000; // 24h
 exports.observableExpressionFunctions = {
     WHERE: {
         handler(args, context) {
@@ -193,11 +194,8 @@ exports.observableExpressionFunctions = {
             if (!duration) {
                 throw new ExpressionEvaluationError_1.ExpressionEvaluationError('TIMEFRAME', `timeframe expression is invalid`);
             }
-            // check if the given duration is greater than the generally defined maxTimeframe size (in DataChangeTrackingOptions)
-            const maxTimeframeSize = context.api.internalApi.getDataService().dataChangeMaxTimeframeSize;
-            if (duration > maxTimeframeSize) {
-                duration = maxTimeframeSize;
-            }
+            // check if the given duration is greater than the generally defined maxTimeframe size
+            duration = getMaxTimeframeSize(duration, context);
             const result = {
                 type: 'config',
                 name: 'TIMEFRAME',
@@ -417,3 +415,11 @@ const getSlidingTimeframe$ = (source$, timeframeDuration, onTimeframeEnter, onTi
         return rxjs_1.of(enter$, exit$).pipe(operators_1.mergeAll());
     }));
 };
+const getMaxTimeframeSize = (expressionValue, context) => {
+    let maxTimeframeSize = context.api.internalApi.getAdaptableOptions().queryLanguageOptions
+        .maxTimeframeSize;
+    if (maxTimeframeSize > SYSTEM_MAX_TIMEFRAME_SIZE) {
+        maxTimeframeSize = SYSTEM_MAX_TIMEFRAME_SIZE;
+    }
+    return expressionValue > maxTimeframeSize ? maxTimeframeSize : expressionValue;
+};

package/src/Utilities/Helpers/DateHelper.d.ts

@@ -1,4 +1,10 @@
 export declare const isValidDate: (date: Date) => boolean;
+/**
+ * Checks if the data contains a value that represents a valid date.
+ *
+ * @param data any kind of data
+ */
+export declare const isValueValidDate: (data: any) => boolean;
 export declare const dateToISO: (date: Date | number | string) => string;
-export declare const parseToISO: (date: string | Date | number, dateFormat: string) => string;
-export declare const parseDate: (date: string, dateFormat: string) => Date | undefined;
+export declare const parseToISO: (date: string | Date | number, dateFormat?: string) => string;
+export declare const parseDateValue: (dateValue: string | Date | number, dateFormat?: string) => Date | undefined;

package/src/Utilities/Helpers/DateHelper.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseDate = exports.parseToISO = exports.dateToISO = exports.isValidDate = void 0;
+exports.parseDateValue = exports.parseToISO = exports.dateToISO = exports.isValueValidDate = exports.isValidDate = void 0;
 const tslib_1 = require("tslib");
 const parseISO_1 = tslib_1.__importDefault(require("date-fns/parseISO"));
 const parse_1 = tslib_1.__importDefault(require("date-fns/parse"));
@@ -9,30 +9,52 @@ const FormatHelper_1 = require("./FormatHelper");
 exports.isValidDate = (date) => {
     return date instanceof Date && !isNaN(date.getTime());
 };
+/**
+ * Checks if the data contains a value that represents a valid date.
+ *
+ * @param data any kind of data
+ */
+exports.isValueValidDate = (data) => {
+    if (!data || typeof data === 'boolean') {
+        return false;
+    }
+    const date = new Date(data);
+    return !isNaN(date.getTime());
+};
 exports.dateToISO = (date) => {
     return FormatHelper_1.DateFormatter(date, { Pattern: 'yyyy-MM-dd' });
 };
 exports.parseToISO = (date, dateFormat) => {
-    let dateInstance = date instanceof Date
-        ? date
-        : typeof date === 'number'
-            ? new Date(date)
-            : exports.parseDate(date, dateFormat);
-    let valid = dateInstance && exports.isValidDate(dateInstance);
-    if (!valid) {
-        dateInstance = new Date(date);
-        valid = exports.isValidDate(dateInstance);
-    }
-    return valid ? exports.dateToISO(dateInstance) : '';
+    const dateInstance = exports.parseDateValue(date, dateFormat);
+    return exports.isValidDate(dateInstance) ? exports.dateToISO(dateInstance) : '';
 };
-exports.parseDate = (date, dateFormat) => {
-    let d = parse_1.default(date, dateFormat, new Date());
-    if (!exports.isValidDate(d)) {
-        d = parseISO_1.default(date);
+exports.parseDateValue = (dateValue, dateFormat) => {
+    if (dateValue == undefined) {
+        return undefined;
+    }
+    if (dateValue instanceof Date) {
+        return !isNaN(dateValue.getTime()) ? dateValue : undefined;
+    }
+    let dateInstance;
+    if (typeof dateValue === 'number') {
+        dateInstance = new Date(dateValue);
+    }
+    else {
+        // typeof dateValue === 'string'
+        if (dateFormat) {
+            dateInstance = parse_1.default(dateValue, dateFormat, new Date());
+        }
+        else {
+            dateInstance = parseISO_1.default(dateValue);
+        }
+        if (!exports.isValidDate(dateInstance)) {
+            // last chance: try to use the native Date.parse(), https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/parse
+            dateInstance = new Date(Date.parse(dateValue));
+        }
     }
-    if (!exports.isValidDate(d)) {
-        LoggingHelper_1.LogAdaptableError(`Invalid date value "${date}" - cannot be converted to a Date instance. Please make sure you specify adaptableOptions.userInterfaceOptions.dateInputOptions.dateFormat correctly.`);
-        d = undefined;
+    if (!exports.isValidDate(dateInstance)) {
+        LoggingHelper_1.LogAdaptableError(`Invalid date value "${dateValue}" - cannot be converted to a Date instance. Please make sure you specify adaptableOptions.userInterfaceOptions.dateInputOptions.dateFormat correctly.`);
+        dateInstance = undefined;
     }
-    return d;
+    return dateInstance;
 };

package/src/Utilities/ObjectFactory.d.ts

@@ -61,7 +61,7 @@ export declare function CreateEmptySchedule(): Schedule;
 export declare function CreateEmptyShortcut(): Shortcut;
 export declare function CreateEmptyConditionalStyle(): ConditionalStyle;
 export declare function CreateEmptyFormatColumn(): FormatColumn;
-export declare function CreateEmptyFreeTextColumn(): FreeTextColumn;
+export declare function CreateEmptyFreeTextColumn(isFilterable: boolean): FreeTextColumn;
 export declare function CreateEmptyLayout(layout?: Partial<Layout> & {
     Name: string;
 }, adaptableColumns?: AdaptableColumn[]): Layout;

package/src/Utilities/ObjectFactory.js

@@ -74,6 +74,8 @@ function CreateEmptyCalculatedColumn(isFilterable) {
             Sortable: true,
             Pivotable: true,
             Aggregatable: true,
+            SuppressMenu: false,
+            SuppressMovable: false,
         },
     };
 }
@@ -334,13 +336,23 @@ function CreateEmptyFormatColumn() {
     };
 }
 exports.CreateEmptyFormatColumn = CreateEmptyFormatColumn;
-function CreateEmptyFreeTextColumn() {
+function CreateEmptyFreeTextColumn(isFilterable) {
     return {
         Uuid: Uuid_1.createUuid(),
         ColumnId: GeneralConstants_1.EMPTY_STRING,
         DefaultValue: GeneralConstants_1.EMPTY_STRING,
         FreeTextStoredValues: [],
         TextEditor: 'Inline',
+        FreeTextColumnSettings: {
+            Filterable: isFilterable,
+            Resizable: true,
+            Groupable: true,
+            Sortable: true,
+            Pivotable: true,
+            Aggregatable: true,
+            SuppressMenu: false,
+            SuppressMovable: false,
+        },
     };
 }
 exports.CreateEmptyFreeTextColumn = CreateEmptyFreeTextColumn;

package/src/Utilities/Services/AlertService.d.ts

@@ -10,6 +10,7 @@ export declare class AlertService implements IAlertService {
     onReactiveAlertTriggered: (callback: EmitterCallback) => (() => void);
     createReactiveAlert(alertDefinition: AlertDefinition | FlashingAlertDefinition, isFlashingAlert?: boolean): void;
     deleteReactiveAlert(alertDefinition: AlertDefinition | FlashingAlertDefinition): void;
+    destroy(): void;
     private isValidExpression;
     private evaluateReactiveExpression;
 }

package/src/Utilities/Services/AlertService.js

@@ -53,6 +53,11 @@ class AlertService {
             this.reactiveAlertsMap.delete(alertDefinition.Uuid);
         }
     }
+    destroy() {
+        this.emitter.clearListeners();
+        this.emitter = null;
+        this.reactiveAlertsMap.forEach((alertsSubscriptionInfo) => alertsSubscriptionInfo.subscription.unsubscribe());
+    }
     isValidExpression(rule, isFlashingAlert) {
         return rule.ObservableExpression
             ? this.adaptable.api.queryLanguageApi.isValidObservableExpression(rule.ObservableExpression, ModuleConstants_1.AlertModuleId, `Invalid ${isFlashingAlert ? 'Flashing' : ''}Alert rule with observable expression `)

package/src/Utilities/Services/DataService.d.ts

@@ -6,12 +6,8 @@ import { Observable } from 'rxjs';
 export declare class DataService implements IDataService {
     private adaptable;
     private emitter;
-    private dataChangeTrackingOptions;
     private readonly dataChangeLogSubject$;
-    private readonly dataChangeLogReplaySubject$;
     dataChangeLog$: Observable<DataChangedInfo>;
-    dataChangeLogReplay$: Observable<DataChangedInfo>;
-    readonly dataChangeMaxTimeframeSize: number;
     private undoChangeLog;
     private undoChangeTimers;
     constructor(adaptable: IAdaptable);

package/src/Utilities/Services/DataService.js

@@ -17,13 +17,6 @@ class DataService {
         this.emitter = new Emitter_1.default();
         this.dataChangeLogSubject$ = new rxjs_1.Subject();
         this.dataChangeLog$ = this.dataChangeLogSubject$.asObservable();
-        this.dataChangeTrackingOptions = this.adaptable.adaptableOptions.generalOptions.dataChangeTrackingOptions;
-        this.dataChangeMaxTimeframeSize =
-            this.dataChangeTrackingOptions.maxTimeframeSize > MAX_TIMEFRAME_SIZE
-                ? MAX_TIMEFRAME_SIZE
-                : this.dataChangeTrackingOptions.maxTimeframeSize;
-        this.dataChangeLogReplaySubject$ = new rxjs_1.ReplaySubject(Number.POSITIVE_INFINITY, this.dataChangeMaxTimeframeSize);
-        this.dataChangeLogReplay$ = this.dataChangeLogReplaySubject$.asObservable();
         this.undoChangeLog = new Map();
         this.undoChangeTimers = new Map();
     }
@@ -68,17 +61,8 @@ class DataService {
         return JSON.stringify({ primaryKeyValue, columnId, previousValue, newValue });
     }
     logDataChange(dataChangedInfo) {
-        if (this.dataChangeTrackingOptions.dataChangeTrackingType === 'Never') {
-            return;
-        }
-        if (this.dataChangeTrackingOptions.dataChangeTrackingType === 'WhenRequired' ||
-            this.dataChangeTrackingOptions.dataChangeTrackingType === 'Always') {
-            const dataChangeLogEntry = this.extractDataChangeLogEntry(dataChangedInfo);
-            this.dataChangeLogSubject$.next(dataChangeLogEntry);
-            if (this.dataChangeTrackingOptions.dataChangeTrackingType === 'Always') {
-                this.dataChangeLogReplaySubject$.next(dataChangeLogEntry);
-            }
-        }
+        const dataChangeLogEntry = this.extractDataChangeLogEntry(dataChangedInfo);
+        this.dataChangeLogSubject$.next(dataChangeLogEntry);
     }
     extractDataChangeLogEntry(dataChangedInfo) {
         // create rowData snapshot