@adaptabletools/adaptable 11.1.3 → 11.1.4

package/src/Redux/ActionsReducers/SystemRedux.d.ts

@@ -3,16 +3,17 @@ import { SystemState } from '../../PredefinedConfig/SystemState';
 import { CellHighlightInfo } from '../../PredefinedConfig/Common/CellHighlightInfo';
 import { RowHighlightInfo } from '../../PredefinedConfig/Common/RowHighlightInfo';
 import { PreviewInfo } from '../../Utilities/Interface/Preview';
-import { ExportCustomDestinationPopup, Report } from '../../PredefinedConfig/ExportState';
+import { Report } from '../../PredefinedConfig/ExportState';
 import { BulkUpdateValidationResult } from '../../Strategy/Interface/IBulkUpdateModule';
 import { GridCell } from '../../PredefinedConfig/Selection/GridCell';
 import { AdaptableAlert } from '../../PredefinedConfig/Common/AdaptableAlert';
 import { SystemStatusMessageInfo } from '../../PredefinedConfig/Common/SystemStatusMessageInfo';
 import { CachedQuery } from '../../PredefinedConfig/QueryState';
 import { AdaptableFlashingCell } from '../../PredefinedConfig/Common/AdaptableFlashingCell';
-import { MathOperation, SummaryOperation } from '../../PredefinedConfig/Common/Enums';
+import { SummaryOperation } from '../../PredefinedConfig/Common/Enums';
 import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
 import { RowsHighlightInfo } from '../../PredefinedConfig/Common/RowsHighlightInfo';
+import { SmartEditOperation } from '../../AdaptableOptions/SmartEdit';
 export declare const FLASHING_CELL_ROW_KEY = "__ROW";
 export declare const SYSTEM_ALERT_ADD = "SYSTEM_ALERT_ADD";
 export declare const SYSTEM_ALERT_DELETE = "SYSTEM_ALERT_DELETE";
@@ -46,14 +47,6 @@ export declare const SYSTEM_SET_NEW_COLUMN_LIST_ORDER = "SYSTEM_SET_NEW_COLUMN_L
 export declare const SYSTEM_SET_LAST_APPLIED_SHORTCUT = "SYSTEM_SET_LAST_APPLIED_SHORTCUT";
 export declare const SYSTEM_CACHED_QUERY_ADD = "SYSTEM_CACHED_QUERY_ADD";
 export declare const SYSTEM_CELL_SUMMARY_CHANGE_OPERATION = "SYSTEM_CELL_SUMMARY_CHANGE_OPERATION";
-/**
- * @ReduxAction A report Destination pop-up from is opened
- */
-export declare const SYSTEM_EXPORT_CUSTOM_DESTINATION_POPUP_SHOW = "SYSTEM_EXPORT_CUSTOM_DESTINATION_POPUP_SHOW";
-/**
- * @ReduxAction A report Destination pop-up form is closed
- */
-export declare const SYSTEM_EXPORT_CUSTOM_DESTINATION_POPUP_HIDE = "SYSTEM_EXPORT_CUSTOM_DESTINATION_POPUP_HIDE";
 export declare const SYSTEM_PROGRESS_INDICATOR_SHOW = "SYSTEM_PROGRESS_INDICATOR_SHOW";
 export declare const SYSTEM_PROGRESS_INDICATOR_HIDE = "SYSTEM_PROGRESS_INDICATOR_HIDE";
 export declare const SYSTEM_LICENSE_SHOW_WATERMARK = "SYSTEM_LICENSE_SHOW_WATERMARK";
@@ -136,7 +129,7 @@ export interface SmartEditChangeValueAction extends Redux.Action {
     value: number;
 }
 export interface SmartEditChangeOperationAction extends Redux.Action {
-    smartEditOperation: MathOperation;
+    smartEditOperation: SmartEditOperation;
 }
 export interface SmartEditCheckCellSelectionAction extends Redux.Action {
 }
@@ -204,12 +197,6 @@ export interface SystemDataChangeHistorySuspendAction extends Redux.Action {
 }
 export interface SystemDataChangeHistoryResumeAction extends Redux.Action {
 }
-export interface SystemExportCustomDestinationPopupShowAction extends Redux.Action {
-    data: ExportCustomDestinationPopup;
-}
-export interface SystemExportCustomDestinationPopupHideAction extends Redux.Action {
-    data: ExportCustomDestinationPopup;
-}
 export interface SystemSettingsPanelSetAction extends Redux.Action {
     name: string;
     settings: SystemState['SettingsPanel']['0'];
@@ -233,7 +220,7 @@ export declare const SystemStatusMessageInfoAdd: (SystemStatusMessageInfo: Syste
 export declare const SystemStatusMessageInfoDelete: (SystemStatusMessageInfo: SystemStatusMessageInfo) => SystemStatusMessageInfoDeleteAction;
 export declare const SystemStatusMessageInfoDeleteAll: () => SystemStatusMessageInfoDeleteAllAction;
 export declare const SmartEditChangeValue: (value: number) => SmartEditChangeValueAction;
-export declare const SmartEditChangeOperation: (smartEditOperation: MathOperation) => SmartEditChangeOperationAction;
+export declare const SmartEditChangeOperation: (smartEditOperation: SmartEditOperation) => SmartEditChangeOperationAction;
 export declare const SmartEditCheckCellSelection: () => SmartEditCheckCellSelectionAction;
 export declare const SmartEditSetValidSelection: (IsValidSmartEditSelection: boolean) => SmartEditSetValidSelectionAction;
 export declare const SmartEditSetPreview: (SmartEditPreviewInfo: PreviewInfo) => SmartEditSetPreviewAction;
@@ -255,10 +242,5 @@ export declare const SystemDataChangeHistoryEnable: () => SystemDataChangeHistor
 export declare const SystemDataChangeHistoryDisable: () => SystemDataChangeHistoryDisableAction;
 export declare const SystemDataChangeHistorySuspend: () => SystemDataChangeHistorySuspendAction;
 export declare const SystemDataChangeHistoryResume: () => SystemDataChangeHistoryResumeAction;
-export declare const SystemExportCustomDestinationPopupShow: (data: ExportCustomDestinationPopup) => SystemExportCustomDestinationPopupShowAction;
-export declare const SystemExportCustomDestinationPopupHide: (data: ExportCustomDestinationPopup) => SystemExportCustomDestinationPopupHideAction;
 export declare const SystemSettingsPanelSet: (name: string, settings: SystemState['SettingsPanel']['0']) => SystemSettingsPanelSetAction;
-export declare const getSystemExportCustomDestinationPopups: (state: {
-    System: SystemState;
-}) => ExportCustomDestinationPopup[];
 export declare const SystemReducer: Redux.Reducer<SystemState>;

package/src/Redux/ActionsReducers/SystemRedux.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SystemReducer = exports.getSystemExportCustomDestinationPopups = exports.SystemSettingsPanelSet = 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.BulkUpdateChangeValue = exports.BulkUpdateSetPreview = exports.BulkUpdateSetValidSelection = exports.BulkUpdateCheckCellSelection = exports.SmartEditSetPreview = exports.SmartEditSetValidSelection = exports.SmartEditCheckCellSelection = exports.SmartEditChangeOperation = exports.SmartEditChangeValue = exports.SystemStatusMessageInfoDeleteAll = exports.SystemStatusMessageInfoDelete = exports.SystemStatusMessageInfoAdd = exports.SystemFlashingCellDeleteAll = exports.SystemFlashingCellDelete = exports.SystemFlashingCellAdd = exports.SystemAlertRemoveHighlight = exports.SystemAlertDeleteAll = exports.SystemAlertDelete = exports.SystemAlertAdd = exports.SystemHighlightRowDeleteAll = exports.SystemHighlightRowsDelete = exports.SystemHighlightRowDelete = exports.SystemHighlightRowsAdd = exports.SystemHighlightRowAdd = exports.SystemHighlightCellDeleteAll = exports.SystemHighlightCellDelete = exports.SystemHighlightCellAdd = exports.SYSTEM_SETTINGS_PANEL_SET = 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_ROW_DELETE_ALL = exports.SYSTEM_HIGHLIGHT_ROWS_DELETE = exports.SYSTEM_HIGHLIGHT_ROW_DELETE = exports.SYSTEM_HIGHLIGHT_ROWS_ADD = exports.SYSTEM_HIGHLIGHT_ROW_ADD = exports.SYSTEM_HIGHLIGHT_CELL_DELETE_ALL = exports.SYSTEM_HIGHLIGHT_CELL_DELETE = exports.SYSTEM_HIGHLIGHT_CELL_ADD = 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_CELL_DELETE_ALL = exports.SYSTEM_FLASHING_CELL_DELETE = exports.SYSTEM_FLASHING_CELL_ADD = exports.SYSTEM_ALERT_REMOVE_HIGHLIGHT = exports.SYSTEM_ALERT_DELETE_ALL = exports.SYSTEM_ALERT_DELETE = exports.SYSTEM_ALERT_ADD = exports.FLASHING_CELL_ROW_KEY = void 0;
+exports.SystemReducer = exports.SystemSettingsPanelSet = 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.BulkUpdateChangeValue = exports.BulkUpdateSetPreview = exports.BulkUpdateSetValidSelection = exports.BulkUpdateCheckCellSelection = exports.SmartEditSetPreview = exports.SmartEditSetValidSelection = exports.SmartEditCheckCellSelection = exports.SmartEditChangeOperation = exports.SmartEditChangeValue = exports.SystemStatusMessageInfoDeleteAll = exports.SystemStatusMessageInfoDelete = exports.SystemStatusMessageInfoAdd = exports.SystemFlashingCellDeleteAll = exports.SystemFlashingCellDelete = exports.SystemFlashingCellAdd = exports.SystemAlertRemoveHighlight = exports.SystemAlertDeleteAll = exports.SystemAlertDelete = exports.SystemAlertAdd = exports.SystemHighlightRowDeleteAll = exports.SystemHighlightRowsDelete = exports.SystemHighlightRowDelete = exports.SystemHighlightRowsAdd = exports.SystemHighlightRowAdd = exports.SystemHighlightCellDeleteAll = exports.SystemHighlightCellDelete = exports.SystemHighlightCellAdd = exports.SYSTEM_SETTINGS_PANEL_SET = 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_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_ROW_DELETE_ALL = exports.SYSTEM_HIGHLIGHT_ROWS_DELETE = exports.SYSTEM_HIGHLIGHT_ROW_DELETE = exports.SYSTEM_HIGHLIGHT_ROWS_ADD = exports.SYSTEM_HIGHLIGHT_ROW_ADD = exports.SYSTEM_HIGHLIGHT_CELL_DELETE_ALL = exports.SYSTEM_HIGHLIGHT_CELL_DELETE = exports.SYSTEM_HIGHLIGHT_CELL_ADD = 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_CELL_DELETE_ALL = exports.SYSTEM_FLASHING_CELL_DELETE = exports.SYSTEM_FLASHING_CELL_ADD = exports.SYSTEM_ALERT_REMOVE_HIGHLIGHT = exports.SYSTEM_ALERT_DELETE_ALL = exports.SYSTEM_ALERT_DELETE = exports.SYSTEM_ALERT_ADD = exports.FLASHING_CELL_ROW_KEY = void 0;
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
+const Enums_1 = require("../../PredefinedConfig/Common/Enums");
 const Helper_1 = require("../../Utilities/Helpers/Helper");
 /*
 Bit of a mixed bag of actions but essentially its those that are related to Strategies but where we DONT want to persist state
@@ -52,14 +53,6 @@ exports.SYSTEM_SET_LAST_APPLIED_SHORTCUT = 'SYSTEM_SET_LAST_APPLIED_SHORTCUT';
 exports.SYSTEM_CACHED_QUERY_ADD = 'SYSTEM_CACHED_QUERY_ADD';
 // Cell Summary
 exports.SYSTEM_CELL_SUMMARY_CHANGE_OPERATION = 'SYSTEM_CELL_SUMMARY_CHANGE_OPERATION';
-/**
- * @ReduxAction A report Destination pop-up from is opened
- */
-exports.SYSTEM_EXPORT_CUSTOM_DESTINATION_POPUP_SHOW = 'SYSTEM_EXPORT_CUSTOM_DESTINATION_POPUP_SHOW';
-/**
- * @ReduxAction A report Destination pop-up form is closed
- */
-exports.SYSTEM_EXPORT_CUSTOM_DESTINATION_POPUP_HIDE = 'SYSTEM_EXPORT_CUSTOM_DESTINATION_POPUP_HIDE';
 // Progress Indicator
 exports.SYSTEM_PROGRESS_INDICATOR_SHOW = 'SYSTEM_PROGRESS_INDICATOR_SHOW';
 exports.SYSTEM_PROGRESS_INDICATOR_HIDE = 'SYSTEM_PROGRESS_INDICATOR_HIDE';
@@ -230,25 +223,13 @@ exports.SystemDataChangeHistorySuspend = () => ({
 exports.SystemDataChangeHistoryResume = () => ({
     type: exports.SYSTEM_DATA_CHANGE_HISTORY_RESUME,
 });
-exports.SystemExportCustomDestinationPopupShow = (data) => ({
-    type: exports.SYSTEM_EXPORT_CUSTOM_DESTINATION_POPUP_SHOW,
-    data,
-});
-exports.SystemExportCustomDestinationPopupHide = (data) => ({
-    type: exports.SYSTEM_EXPORT_CUSTOM_DESTINATION_POPUP_HIDE,
-    data,
-});
 exports.SystemSettingsPanelSet = (name, settings) => ({
     type: exports.SYSTEM_SETTINGS_PANEL_SET,
     name,
     settings,
 });
-exports.getSystemExportCustomDestinationPopups = (state) => { var _a; return (_a = state === null || state === void 0 ? void 0 : state.System.Export.CustomDestinationPopups) !== null && _a !== void 0 ? _a : []; };
 const initialState = {
     AdaptableAlerts: GeneralConstants_1.EMPTY_ARRAY,
-    Export: {
-        CustomDestinationPopups: GeneralConstants_1.EMPTY_ARRAY,
-    },
     AdaptableFlashingCells: {},
     AdaptableFlashingCellsMap: {},
     SystemStatusMessages: GeneralConstants_1.EMPTY_ARRAY,
@@ -264,7 +245,7 @@ const initialState = {
     CachedQueries: GeneralConstants_1.EMPTY_ARRAY,
     BulkUpdateValue: GeneralConstants_1.EMPTY_STRING,
     SmartEditValue: 1,
-    SmartEditOperation: 'Multiply',
+    SmartEditOperation: Enums_1.MathOperation.Multiply,
     CellSummaryOperation: GeneralConstants_1.CELL_SUMMARY_DEFAULT_OPERATION,
     ProgressIndicator: { active: false, label: '' },
     License: {
@@ -280,7 +261,6 @@ const initialState = {
     SettingsPanel: {},
 };
 exports.SystemReducer = (state = initialState, action) => {
-    var _a;
     let alerts;
     let systemStatusMessages;
     switch (action.type) {
@@ -519,15 +499,6 @@ exports.SystemReducer = (state = initialState, action) => {
         case exports.SYSTEM_LICENSE_DISABLE_PERSISTENCE: {
             return Object.assign(Object.assign({}, state), { License: Object.assign(Object.assign({}, state.License), { disablePersistence: true }) });
         }
-        // this allows multiple export forms to be open at the same time
-        // you may have scheduled multiple exports at the same time
-        case exports.SYSTEM_EXPORT_CUSTOM_DESTINATION_POPUP_SHOW:
-            return Object.assign(Object.assign({}, state), { Export: Object.assign(Object.assign({}, state.Export), { CustomDestinationPopups: [
-                        ...(state.Export.CustomDestinationPopups || []),
-                        action.data,
-                    ] }) });
-        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_ADD: {
             const actionTypedAdd = action;
             const cellDataChangedInfo = actionTypedAdd.changeInfo;

package/src/Strategy/AlertModule.js

@@ -141,10 +141,13 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         const numberOfChangedRows = gridDataChangedInfo.rowNodes.length;
         const actionName = rowAdded ? 'Added' : 'Removed';
         const alertHeader = numberOfChangedRows > 1 ? `${actionName} Rows` : `${actionName} Row `;
-        const alertMessage = numberOfChangedRows > 1
+        const dynamicAlertMessage = numberOfChangedRows > 1
             ? `${numberOfChangedRows} rows were ${actionName.toLowerCase()}`
             : `${numberOfChangedRows} row was ${actionName.toLowerCase()}`;
         alertDefinitions === null || alertDefinitions === void 0 ? void 0 : alertDefinitions.forEach((alertDefinition) => {
+            const alertMessage = alertDefinition.MessageText
+                ? alertDefinition.MessageText
+                : dynamicAlertMessage;
             const alert = ObjectFactory_1.default.CreateRowChangedAlert(alertHeader, alertMessage, alertDefinition, gridDataChangedInfo);
             this.api.alertApi.displayAlert(alert);
         });

package/src/Strategy/ExportModule.js

@@ -7,7 +7,6 @@ const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/Mod
 const Enums_1 = require("../PredefinedConfig/Common/Enums");
 const Helper_1 = require("../Utilities/Helpers/Helper");
 const ExportRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/ExportRedux"));
-const SystemRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/SystemRedux"));
 const GeneralConstants_1 = require("../Utilities/Constants/GeneralConstants");
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/ArrayExtensions"));
 const LoggingHelper_1 = require("../Utilities/Helpers/LoggingHelper");
@@ -89,9 +88,20 @@ class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     .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,
+                    this.api.internalApi.dispatchReduxAction(PopupRedux.PopupShowForm({
+                        Id: 'export-destination-form',
+                        Form: customDestination === null || customDestination === void 0 ? void 0 : customDestination.form,
+                        prepareContext: (context) => {
+                            // we want to give the current popup time to close
+                            // and we reopen with a delay in case this button action causes another popup
+                            return new Promise((resolve) => {
+                                setTimeout(() => {
+                                    const preparedContext = Object.assign(Object.assign({}, context), { report,
+                                        customDestination, reportData: this.api.internalApi.getReportService().getReportData(report) });
+                                    resolve(preparedContext);
+                                }, 20);
+                            });
+                        },
                     }));
                 }
                 else if (customDestination) {

package/src/Strategy/SmartEditModule.d.ts

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

package/src/Strategy/SmartEditModule.js

@@ -122,19 +122,30 @@ class SmartEditModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 if (column) {
                     selectedCellInfo.gridCells.forEach((selectedCell) => {
                         let newValue;
-                        switch (smartEditOperation) {
-                            case Enums_1.MathOperation.Add:
-                                newValue = Number(selectedCell.rawValue) + smartEditValue;
-                                break;
-                            case Enums_1.MathOperation.Subtract:
-                                newValue = Number(selectedCell.rawValue) - smartEditValue;
-                                break;
-                            case Enums_1.MathOperation.Multiply:
-                                newValue = Number(selectedCell.rawValue) * smartEditValue;
-                                break;
-                            case Enums_1.MathOperation.Divide:
-                                newValue = Number(selectedCell.rawValue) / smartEditValue;
-                                break;
+                        if (typeof smartEditOperation === 'object') {
+                            newValue = smartEditOperation.Operation({
+                                smartEditValue,
+                                column,
+                                adaptableApi: this.api,
+                                selectedCell,
+                                value: selectedCell.rawValue,
+                            });
+                        }
+                        else {
+                            switch (smartEditOperation) {
+                                case Enums_1.MathOperation.Add:
+                                    newValue = Number(selectedCell.rawValue) + smartEditValue;
+                                    break;
+                                case Enums_1.MathOperation.Subtract:
+                                    newValue = Number(selectedCell.rawValue) - smartEditValue;
+                                    break;
+                                case Enums_1.MathOperation.Multiply:
+                                    newValue = Number(selectedCell.rawValue) * smartEditValue;
+                                    break;
+                                case Enums_1.MathOperation.Divide:
+                                    newValue = Number(selectedCell.rawValue) / smartEditValue;
+                                    break;
+                            }
                         }
                         //avoid the 0.0000000000x
                         if (newValue) {

package/src/Utilities/ExpressionFunctions/booleanExpressionFunctions.js

@@ -226,8 +226,10 @@ exports.booleanExpressionFunctions = {
             var _a;
             const searchTerm = expressionFunctionUtils_1.getStringValue(context, String(args[0]));
             return (_a = context.api) === null || _a === void 0 ? void 0 : _a.columnApi.getColumns().some((column) => {
-                var _a;
-                const value = (_a = context.api) === null || _a === void 0 ? void 0 : _a.gridApi.getNormalisedValueFromRowNode(context.node, column.columnId);
+                var _a, _b;
+                const value = column.dataType === 'Date'
+                    ? // for Date columns use the display value, as we do a textual comparison
+                     (_a = context.api) === null || _a === void 0 ? void 0 : _a.gridApi.getDisplayValueFromRowNode(context.node, column.columnId) : (_b = context.api) === null || _b === void 0 ? void 0 : _b.gridApi.getNormalisedValueFromRowNode(context.node, column.columnId);
                 const columnValue = expressionFunctionUtils_1.getStringValue(context, String(value));
                 return columnValue.indexOf(searchTerm) !== -1;
             });

package/src/Utilities/ExpressionFunctions/scalarExpressionFunctions.js

@@ -93,9 +93,6 @@ exports.scalarExpressionFunctions = {
             if (!column.queryable) {
                 throw new ExpressionEvaluationError_1.ExpressionEvaluationError('COL', `Column name "${columnId}" is not queryable`);
             }
-            // return context.api?.gridApi.getNormalisedValueFromRowNode(context.node, columnId);
-            // const gridCell = context.api?.gridApi.getGridCellFromRowNode(context.node, columnId);
-            // return gridCell.rawValue;
             return (_b = context.api) === null || _b === void 0 ? void 0 : _b.gridApi.getRawValueFromRowNode(context.node, columnId);
         },
         description: 'Returns the value of a column',

package/src/Utilities/Interface/MessagePopups.d.ts

@@ -3,6 +3,7 @@ import { ModuleParams } from '../../View/Components/SharedProps/ModuleViewPopupP
 import { AdaptableModule } from '../../PredefinedConfig/Common/Types';
 import { AdaptableMessageType } from '../../PredefinedConfig/Common/AdaptableMessageType';
 import { AdaptableAlert } from '../../PredefinedConfig/Common/AdaptableAlert';
+import { AdaptableForm, ButtonContext } from '../../types';
 export interface UIConfirmation {
     Header: string;
     Msg: string;
@@ -71,3 +72,14 @@ export interface WindowPopup {
         Icon?: string;
     }[];
 }
+export interface FormPopup {
+    FormList: {
+        Id: string;
+        FormProps: any;
+        /**
+         * Allows to customise the context before submitting the form
+         */
+        prepareContext?: (context: ButtonContext) => Promise<ButtonContext> | ButtonContext;
+        Form: AdaptableForm<ButtonContext>;
+    }[];
+}

package/src/View/AdaptableView.js

@@ -12,10 +12,10 @@ const AdaptablePopupConfirmation_1 = require("./Components/Popups/AdaptablePopup
 const AdaptableLoadingScreen_1 = require("./Components/Popups/AdaptableLoadingScreen");
 const renderWithAdaptableContext_1 = require("./renderWithAdaptableContext");
 const License_1 = require("./License");
-const ExportCustomDestinationFormPopups_1 = require("./Export/ExportCustomDestinationFormPopups");
 const ProgressIndicator_1 = require("../components/ProgressIndicator/ProgressIndicator");
 const react_toastify_1 = require("react-toastify");
 const WindowPopups_1 = require("./Components/Popups/WindowPopups/WindowPopups");
+const FormPopups_1 = require("./Components/Popups/FormPopups/FormPopups");
 class AdaptableView extends React.Component {
     render() {
         var _a, _b, _c, _d;
@@ -26,11 +26,11 @@ class AdaptableView extends React.Component {
             this.props.PopupState.PromptPopup.ShowPromptPopup && (React.createElement(AdaptablePopupPrompt_1.AdaptablePopupPrompt, { message: this.props.PopupState.PromptPopup.Message, header: this.props.PopupState.PromptPopup.Header, onClose: this.props.onClosePromptPopup, onConfirm: this.props.onConfirmPromptPopup, onConfirmActionCreator: this.props.PopupState.PromptPopup.ConfirmActionCreator, defaultValue: this.props.PopupState.PromptPopup.DefaultValue })),
             React.createElement(AdaptablePopupConfirmation_1.AdaptablePopupConfirmation, { header: this.props.PopupState.ConfirmationPopup.Header, messsage: this.props.PopupState.ConfirmationPopup.Msg, showPopup: this.props.PopupState.ConfirmationPopup.ShowConfirmationPopup, cancelButtonText: this.props.PopupState.ConfirmationPopup.CancelButtonText, confirmButtonText: this.props.PopupState.ConfirmationPopup.ConfirmButtonText, onCancel: this.props.onCancelConfirmationPopup, onConfirm: this.props.onConfirmConfirmationPopup, showInputBox: this.props.PopupState.ConfirmationPopup.ShowInputBox, messageType: this.props.PopupState.ConfirmationPopup.MessageType, api: this.props.AdaptableApi }),
             Boolean(this.props.PopupState.ScreenPopup.ShowScreenPopup) && (React.createElement(AdaptablePopup_1.AdaptablePopup, { componentName: this.props.PopupState.ScreenPopup.ComponentName, componentModule: this.props.PopupState.ScreenPopup.ComponentModule, onHide: this.props.onCloseScreenPopup, api: this.props.AdaptableApi, onClearParams: () => this.props.onClearPopupParams(), moduleParams: this.props.PopupState.ScreenPopup.Params, moduleProps: this.props.PopupState.ScreenPopup.PopupProps })),
-            React.createElement(ExportCustomDestinationFormPopups_1.ExportCustomDestinationFormPopups, { api: this.props.AdaptableApi }),
             React.createElement(react_toastify_1.ToastContainer, { limit: this.props.AdaptableApi.internalApi.getAdaptableOptions().notificationsOptions
                     .maxNotifications, closeButton: false, icon: false, theme: "colored" }),
             (watermark === null || watermark === void 0 ? void 0 : watermark.show) && React.createElement(License_1.LicenseWatermark, null, watermark === null || watermark === void 0 ? void 0 : watermark.text),
             React.createElement(WindowPopups_1.WindowPopups, null),
+            React.createElement(FormPopups_1.FormPopups, null),
             React.createElement(ProgressIndicator_1.ProgressIndicator, null)));
     }
 }

package/src/View/Components/Popups/FormPopups/FormPopups.d.ts

@@ -0,0 +1,10 @@
+import * as React from 'react';
+import { AdaptableForm, ButtonContext } from '../../../../../types';
+export interface FormDialogProps {
+    id: string;
+    formProps: any;
+    prepareContext: (context: ButtonContext) => Promise<ButtonContext> | ButtonContext;
+    form: AdaptableForm<ButtonContext>;
+}
+export declare const FormDialog: React.FunctionComponent<FormDialogProps>;
+export declare const FormPopups: React.FunctionComponent;

package/src/View/Components/Popups/FormPopups/FormPopups.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FormPopups = exports.FormDialog = void 0;
+const tslib_1 = require("tslib");
+const React = tslib_1.__importStar(require("react"));
+const react_redux_1 = require("react-redux");
+const rebass_1 = require("rebass");
+const AdaptableFormComponent_1 = require("../../../../components/AdaptableFormComponent");
+const Dialog_1 = tslib_1.__importDefault(require("../../../../components/Dialog"));
+const AdaptableForm_1 = require("../../../../PredefinedConfig/Common/AdaptableForm");
+const PopupRedux_1 = require("../../../../Redux/ActionsReducers/PopupRedux");
+const AdaptableContext_1 = require("../../../AdaptableContext");
+exports.FormDialog = ({ id, formProps, form, prepareContext, }) => {
+    const dispatch = react_redux_1.useDispatch();
+    const adaptable = AdaptableContext_1.useAdaptable();
+    const [data, setData] = React.useState(() => {
+        return AdaptableForm_1.getDefaultAdaptableFormData(form);
+    });
+    const handleDismiss = () => {
+        dispatch(PopupRedux_1.PopupHideForm(id));
+    };
+    const context = Object.assign({ adaptableApi: adaptable.api, formData: data }, formProps);
+    return (React.createElement(Dialog_1.default, { isOpen: true, showCloseButton: false, style: { minHeight: 'auto', minWidth: 400 }, onDismiss: handleDismiss },
+        React.createElement(rebass_1.Box, { padding: 4 },
+            React.createElement(AdaptableFormComponent_1.AdaptableFormComponent, { formDef: form, data: data, context: context, onChange: setData, api: adaptable.api, displayTitle: true, onButtonClick: async (button) => {
+                    var _a;
+                    handleDismiss();
+                    const preparedContext = typeof prepareContext === 'function' ? await prepareContext(context) : context;
+                    (_a = button.onClick) === null || _a === void 0 ? void 0 : _a.call(button, button, preparedContext);
+                } }))));
+};
+exports.FormPopups = () => {
+    const forms = react_redux_1.useSelector((state) => state.Popup.FormPopup.FormList);
+    return (React.createElement(React.Fragment, null, forms.map((form) => {
+        return (React.createElement(exports.FormDialog, { key: form.Id, prepareContext: form.prepareContext, id: form.Id, formProps: form.FormProps, form: form.Form }));
+    })));
+};

package/src/View/Components/Popups/WindowPopups/WindowPopups.js

@@ -23,7 +23,7 @@ exports.WindowPopups = () => {
         const Component = (_a = windowFactory_1.windowFactory[windowItem.Id]) !== null && _a !== void 0 ? _a : NoopComponent;
         const _g = (_b = windowItem === null || windowItem === void 0 ? void 0 : windowItem.PopupProps) !== null && _b !== void 0 ? _b : {}, { windowModalProps } = _g, restPopupProps = tslib_1.__rest(_g, ["windowModalProps"]);
         const handleDismiss = () => {
-            dispatch(PopupRedux_1.PopupWindowHide(windowItem.Id));
+            dispatch(PopupRedux_1.PopupHideWindow(windowItem.Id));
         };
         const size = (_d = (_c = windowModalSettings === null || windowModalSettings === void 0 ? void 0 : windowModalSettings[windowItem.Id]) === null || _c === void 0 ? void 0 : _c.size) !== null && _d !== void 0 ? _d : Utilities_1.getWindowPopupSize();
         const position = (_f = (_e = windowModalSettings === null || windowModalSettings === void 0 ? void 0 : windowModalSettings[windowItem.Id]) === null || _e === void 0 ? void 0 : _e.position) !== null && _f !== void 0 ? _f : Utilities_1.getMiddlePosition(size);

package/src/View/DataSource/DataSourceViewPanel.d.ts

@@ -1,11 +1,11 @@
 import { ViewPanelProps } from '../Components/SharedProps/ViewPanelProps';
 import { DataSource } from '../../PredefinedConfig/DataSourceState';
-import * as DataSourceRedux from '../../Redux/ActionsReducers/DataSourceRedux';
 import * as React from 'react';
+import * as Redux from 'redux';
 export interface DataSourceViewPanelComponentProps extends ViewPanelProps {
     CurrentDataSourceName: string;
     DataSources: DataSource[];
-    onSelectDataSource: (DataSource: DataSource) => DataSourceRedux.DataSourceSelectAction;
+    onSelectDataSource: (DataSource: DataSource) => Redux.Action;
 }
 interface DataSourceViewPanelComponentState {
     CurrentDataSource: DataSource;
@@ -15,5 +15,5 @@ declare class DataSourceViewPanelComponent extends React.Component<DataSourceVie
     render(): JSX.Element;
     onSelectedDataSourceChanged(dataSourceName: string): void;
 }
-export declare let DataSourceViewPanelControl: import("react-redux").ConnectedComponent<typeof DataSourceViewPanelComponent, any>;
+export declare let DataSourceViewPanelControl: import("react-redux").ConnectedComponent<typeof DataSourceViewPanelComponent, Pick<React.ClassAttributes<DataSourceViewPanelComponent> & DataSourceViewPanelComponentProps, "ref" | "key">>;
 export {};

package/src/View/DataSource/DataSourceViewPanel.js

@@ -8,6 +8,7 @@ const StringExtensions_1 = require("../../Utilities/Extensions/StringExtensions"
 const rebass_1 = require("rebass");
 const DropdownButton_1 = tslib_1.__importDefault(require("../../components/DropdownButton"));
 const react_redux_1 = require("react-redux");
+const PopupRedux_1 = require("../../Redux/ActionsReducers/PopupRedux");
 class DataSourceViewPanelComponent extends React.Component {
     constructor(props) {
         super(props);
@@ -22,11 +23,7 @@ class DataSourceViewPanelComponent extends React.Component {
         let currentDataSourceName = this.state.CurrentDataSource == null
             ? selectDataSourceString
             : this.state.CurrentDataSource.Name;
-        let availableDataSources = this.props.DataSources
-            // .filter(
-            //   s => s.Name != currentDataSourceName
-            // )
-            .map((dataSource, index) => {
+        let availableDataSources = this.props.DataSources.map((dataSource) => {
             return {
                 value: dataSource.Name,
                 label: dataSource.Name,
@@ -44,16 +41,11 @@ class DataSourceViewPanelComponent extends React.Component {
         else {
             let newDataSource = this.props.DataSources.find((ds) => ds.Name == dataSourceName);
             this.setState({ CurrentDataSource: newDataSource });
-            if (newDataSource.Form) {
-                alert('have params');
-            }
-            else {
-                this.props.onSelectDataSource(newDataSource);
-            }
+            this.props.onSelectDataSource(newDataSource);
         }
     }
 }
-function mapStateToProps(state, ownProps) {
+function mapStateToProps(state) {
     return {
         CurrentDataSourceName: state.DataSource.CurrentDataSource,
         DataSources: state.DataSource.DataSources,
@@ -61,7 +53,17 @@ function mapStateToProps(state, ownProps) {
 }
 function mapDispatchToProps(dispatch) {
     return {
-        onSelectDataSource: (dataSource) => dispatch(DataSourceRedux.DataSourceSelect(dataSource)),
+        onSelectDataSource: (dataSource) => {
+            if (dataSource.Form) {
+                return dispatch(PopupRedux_1.PopupShowForm({
+                    Id: 'data-source-form',
+                    Form: dataSource.Form,
+                }));
+            }
+            else {
+                return dispatch(DataSourceRedux.DataSourceSelect(dataSource));
+            }
+        },
     };
 }
 exports.DataSourceViewPanelControl = react_redux_1.connect(mapStateToProps, mapDispatchToProps)(DataSourceViewPanelComponent);

package/src/View/Export/ExportViewPanel.d.ts

@@ -1,8 +1,7 @@
 import { ViewPanelProps } from '../Components/SharedProps/ViewPanelProps';
-import { ExportCustomDestinationPopup, Report, ReportSchedule } from '../../PredefinedConfig/ExportState';
+import { Report, ReportSchedule } from '../../PredefinedConfig/ExportState';
 import { ExportDestination } from '../../PredefinedConfig/Common/Enums';
 import * as ExportRedux from '../../Redux/ActionsReducers/ExportRedux';
-import * as SystemRedux from '../../Redux/ActionsReducers/SystemRedux';
 import * as PopupRedux from '../../Redux/ActionsReducers/PopupRedux';
 import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
 import * as React from 'react';
@@ -13,7 +12,6 @@ export interface ExportViewPanelComponentProps extends ViewPanelProps {
     onNewReport: (popup: string) => PopupRedux.PopupShowScreenAction;
     onEditReport: (popup: string) => PopupRedux.PopupShowScreenAction;
     onNewReportSchedule: (reportSchedule: ReportSchedule) => PopupRedux.PopupShowScreenAction;
-    showCustomDestinationForm: (data: ExportCustomDestinationPopup) => SystemRedux.SystemExportCustomDestinationPopupShowAction;
     Columns: AdaptableColumn[];
     Reports: Report[] | undefined;
     CurrentReport: string | undefined;

package/src/View/Export/ExportViewPanel.js

@@ -4,7 +4,6 @@ exports.ExportViewPanelControl = void 0;
 const tslib_1 = require("tslib");
 const Enums_1 = require("../../PredefinedConfig/Common/Enums");
 const ExportRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/ExportRedux"));
-const SystemRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/SystemRedux"));
 const PopupRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/PopupRedux"));
 const React = tslib_1.__importStar(require("react"));
 const StringExtensions_1 = require("../../Utilities/Extensions/StringExtensions");
@@ -74,22 +73,8 @@ class ExportViewPanelComponent extends React.Component {
         if (currentReport != null) {
             deleteMessage = deleteMessage + currentReport.Name + "'?";
         }
-        const getCurrentCustomDestination = () => {
-            return this.isCustomDestination(currentDestination) ? currentDestination : undefined;
-        };
         const onApplyExport = () => {
-            const currentCustomDestination = getCurrentCustomDestination();
-            if (currentCustomDestination === null || currentCustomDestination === void 0 ? void 0 : currentCustomDestination.form) {
-                this.props.showCustomDestinationForm({
-                    ExportDestination: currentCustomDestination,
-                    ReportName: this.props.CurrentReport,
-                });
-            }
-            else {
-                this.props.onApplyExport(currentReport, this.isCustomDestination(currentDestination)
-                    ? currentDestination.name
-                    : currentDestination);
-            }
+            this.props.onApplyExport(currentReport, this.isCustomDestination(currentDestination) ? currentDestination.name : currentDestination);
         };
         const elementType = this.props.viewType === 'Toolbar' ? 'DashboardToolbar' : 'ToolPanel';
         return (React.createElement(rebass_1.Flex, { style: { gap: 5 }, flexDirection: "row", className: `ab-${elementType}__Export__wrap`, flexWrap: this.props.viewType === 'ToolPanel' ? 'wrap' : 'nowrap' },
@@ -153,7 +138,6 @@ function mapDispatchToProps(dispatch) {
             source: 'Toolbar',
             value: reportSchedule,
         })),
-        showCustomDestinationForm: (data) => dispatch(SystemRedux.SystemExportCustomDestinationPopupShow(data)),
     };
 }
 exports.ExportViewPanelControl = react_redux_1.connect(mapStateToProps, mapDispatchToProps)(ExportViewPanelComponent);

package/src/View/SmartEdit/SmartEditPopup.d.ts

@@ -1,15 +1,15 @@
 import * as React from 'react';
 import * as SmartEditRedux from '../../Redux/ActionsReducers/SmartEditRedux';
 import * as SystemRedux from '../../Redux/ActionsReducers/SystemRedux';
-import { MathOperation } from '../../PredefinedConfig/Common/Enums';
 import { ModuleViewPopupProps } from '../Components/SharedProps/ModuleViewPopupProps';
 import { PreviewInfo } from '../../Utilities/Interface/Preview';
+import { SmartEditOperation } from '../../AdaptableOptions/SmartEdit';
 interface SmartEditPopupProps extends ModuleViewPopupProps<SmartEditPopupComponent> {
     SmartEditValue: number;
-    MathOperation: 'Add' | 'Subtract' | 'Multiply' | 'Divide';
+    SmartEditOperation: SmartEditOperation;
     PreviewInfo: PreviewInfo;
     onSmartEditValueChange: (value: number) => SystemRedux.SmartEditChangeValueAction;
-    onSmartEditOperationChange: (MathOperation: MathOperation) => SystemRedux.SmartEditChangeOperationAction;
+    onSmartEditOperationChange: (SmartEditOperation: SmartEditOperation) => SystemRedux.SmartEditChangeOperationAction;
     onSmartEditCheckSelectedCells: () => SystemRedux.SmartEditCheckCellSelectionAction;
     onRunSmartEdit: () => SmartEditRedux.SmartEditRunAction;
 }