@adaptabletools/adaptable 11.1.2 → 11.1.5

package/src/Redux/ActionsReducers/PopupRedux.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PopupReducer = exports.PopupClearParam = exports.PopupCancelConfirmation = exports.PopupConfirmConfirmation = exports.PopupShowConfirmation = exports.PopupConfirmPrompt = exports.PopupHidePrompt = exports.PopupShowPrompt = exports.PopupHideLoading = exports.PopupShowLoading = exports.PopupHideAlert = exports.PopupShowAlert = exports.PopupWindowHide = exports.PopupShowWindow = exports.PopupHideScreen = exports.PopupShowScreen = exports.POPUP_WINDOW_HIDE_SCREEN = exports.POPUP_WINDOW_SHOW_SCREEN = exports.POPUP_CLEAR_PARAM = exports.POPUP_CANCEL_CONFIRMATION = exports.POPUP_CONFIRM_CONFIRMATION = exports.POPUP_SHOW_CONFIRMATION = exports.POPUP_CONFIRM_PROMPT = exports.POPUP_HIDE_PROMPT = exports.POPUP_SHOW_PROMPT = exports.POPUP_HIDE_ALERT = exports.POPUP_SHOW_ALERT = exports.POPUP_HIDE_LOADING = exports.POPUP_SHOW_LOADING = exports.POPUP_HIDE_SCREEN = exports.POPUP_SHOW_SCREEN = void 0;
+exports.PopupReducer = exports.PopupClearParam = exports.PopupCancelConfirmation = exports.PopupConfirmConfirmation = exports.PopupShowConfirmation = exports.PopupConfirmPrompt = exports.PopupHidePrompt = exports.PopupShowPrompt = exports.PopupHideLoading = exports.PopupShowLoading = exports.PopupHideAlert = exports.PopupShowAlert = exports.PopupHideForm = exports.PopupShowForm = exports.PopupHideWindow = exports.PopupShowWindow = exports.PopupHideScreen = exports.PopupShowScreen = exports.POPUP_HIDE_FORM = exports.POPUP_SHOW_FORM = exports.POPUP_HIDE_WINDOW = exports.POPUP_SHOW_WINDOW = exports.POPUP_CLEAR_PARAM = exports.POPUP_CANCEL_CONFIRMATION = exports.POPUP_CONFIRM_CONFIRMATION = exports.POPUP_SHOW_CONFIRMATION = exports.POPUP_CONFIRM_PROMPT = exports.POPUP_HIDE_PROMPT = exports.POPUP_SHOW_PROMPT = exports.POPUP_HIDE_ALERT = exports.POPUP_SHOW_ALERT = exports.POPUP_HIDE_LOADING = exports.POPUP_SHOW_LOADING = exports.POPUP_HIDE_SCREEN = exports.POPUP_SHOW_SCREEN = void 0;
 exports.POPUP_SHOW_SCREEN = 'POPUP_SHOW_SCREEN';
 exports.POPUP_HIDE_SCREEN = 'POPUP_HIDE_SCREEN';
 exports.POPUP_SHOW_LOADING = 'POPUP_SHOW_LOADING';
@@ -14,8 +14,10 @@ exports.POPUP_SHOW_CONFIRMATION = 'POPUP_SHOW_CONFIRMATION';
 exports.POPUP_CONFIRM_CONFIRMATION = 'POPUP_CONFIRM_CONFIRMATION';
 exports.POPUP_CANCEL_CONFIRMATION = 'POPUP_CANCEL_CONFIRMATION';
 exports.POPUP_CLEAR_PARAM = 'POPUP_CLEAR_PARAM';
-exports.POPUP_WINDOW_SHOW_SCREEN = 'POPUP_WINDOW_SHOW_SCREEN';
-exports.POPUP_WINDOW_HIDE_SCREEN = 'POPUP_WINDOW_HIDE_SCREEN';
+exports.POPUP_SHOW_WINDOW = 'POPUP_SHOW_WINDOW';
+exports.POPUP_HIDE_WINDOW = 'POPUP_HIDE_WINDOW';
+exports.POPUP_SHOW_FORM = 'POPUP_SHOW_FORM';
+exports.POPUP_HIDE_FORM = 'POPUP_FORM_HIDE';
 exports.PopupShowScreen = (componentModule, componentName, params, popupProps) => ({
     type: exports.POPUP_SHOW_SCREEN,
     ComponentModule: componentModule,
@@ -27,14 +29,25 @@ exports.PopupHideScreen = () => ({
     type: exports.POPUP_HIDE_SCREEN,
 });
 exports.PopupShowWindow = (config) => ({
-    type: exports.POPUP_WINDOW_SHOW_SCREEN,
+    type: exports.POPUP_SHOW_WINDOW,
     Id: config.Id,
     Title: config.Title,
     PopupProps: config.PopupProps,
     Icon: config.Icon,
 });
-exports.PopupWindowHide = (id) => ({
-    type: exports.POPUP_WINDOW_HIDE_SCREEN,
+exports.PopupHideWindow = (id) => ({
+    type: exports.POPUP_HIDE_WINDOW,
+    Id: id,
+});
+exports.PopupShowForm = (config) => ({
+    type: exports.POPUP_SHOW_FORM,
+    Id: config.Id,
+    Form: config.Form,
+    FormProps: config.FormProps,
+    prepareContext: config.prepareContext,
+});
+exports.PopupHideForm = (id) => ({
+    type: exports.POPUP_HIDE_FORM,
     Id: id,
 });
 exports.PopupShowAlert = (alert) => {
@@ -117,6 +130,9 @@ const initialState = {
     WindowPopup: {
         PopupList: [],
     },
+    FormPopup: {
+        FormList: [],
+    },
 };
 exports.PopupReducer = (state = initialState, action) => {
     switch (action.type) {
@@ -258,7 +274,7 @@ exports.PopupReducer = (state = initialState, action) => {
             };
             return Object.assign({}, state, { ScreenPopup: newScreenPopup });
         }
-        case exports.POPUP_WINDOW_SHOW_SCREEN: {
+        case exports.POPUP_SHOW_WINDOW: {
             const showWindowAction = action;
             const windowSettings = {
                 Id: showWindowAction.Id,
@@ -273,10 +289,28 @@ exports.PopupReducer = (state = initialState, action) => {
             const PopupList = [...state.WindowPopup.PopupList, windowSettings];
             return Object.assign(Object.assign({}, state), { WindowPopup: Object.assign(Object.assign({}, state.WindowPopup), { PopupList }) });
         }
-        case exports.POPUP_WINDOW_HIDE_SCREEN: {
+        case exports.POPUP_HIDE_WINDOW: {
             const PopupList = state.WindowPopup.PopupList.filter((windowPopup) => windowPopup.Id !== action.Id);
             return Object.assign(Object.assign({}, state), { WindowPopup: Object.assign(Object.assign({}, state.WindowPopup), { PopupList }) });
         }
+        case exports.POPUP_SHOW_FORM: {
+            const showWindowAction = action;
+            const windowSettings = {
+                Id: showWindowAction.Id,
+                FormProps: showWindowAction.FormProps,
+                Form: showWindowAction.Form,
+                prepareContext: showWindowAction.prepareContext,
+            };
+            if (state.FormPopup.FormList.some((windowPopup) => windowPopup.Id === windowSettings.Id)) {
+                return state;
+            }
+            const FormList = [...state.FormPopup.FormList, windowSettings];
+            return Object.assign(Object.assign({}, state), { FormPopup: Object.assign(Object.assign({}, state.WindowPopup), { FormList }) });
+        }
+        case exports.POPUP_HIDE_FORM: {
+            const FormList = state.FormPopup.FormList.filter((form) => form.Id !== action.Id);
+            return Object.assign(Object.assign({}, state), { FormPopup: Object.assign(Object.assign({}, state.WindowPopup), { FormList }) });
+        }
         default:
             return state;
     }

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

@@ -83,12 +83,31 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             // TODO: state does not clear
             this.api.internalApi.clearFlashingCellState();
         }
-        //migrate alert definitions with `AggregationExpression` (now `AggregatedBooleanExpression`)
         (_a = alertState.AlertDefinitions) === null || _a === void 0 ? void 0 : _a.forEach((alertDefinition) => {
-            // @ts-ignore
-            const obsoleteAggregationExpression = alertDefinition.Rule['AggregationExpression'];
-            if (obsoleteAggregationExpression) {
-                alertDefinition.Rule.AggregatedBooleanExpression = obsoleteAggregationExpression;
+            // if ShowPopup then change to DisplayNotificate
+            if (alertDefinition.AlertProperties &&
+                alertDefinition.AlertProperties.ShowPopup &&
+                alertDefinition.AlertProperties.ShowPopup == true &&
+                !alertDefinition.AlertProperties.DisplayNotification) {
+                alertDefinition.AlertProperties.DisplayNotification = true;
+                alertDefinition.AlertProperties.ShowPopup = undefined;
+            }
+            // if no rule but a predicate then use that
+            if (!alertDefinition.Rule) {
+                if (alertDefinition.Predicate && alertDefinition.Predicate != undefined) {
+                    const predicate = alertDefinition.Predicate;
+                    alertDefinition.Rule = {
+                        Predicate: predicate,
+                    };
+                    alertDefinition.Predicate = undefined;
+                }
+            }
+            else {
+                //migrate alert definitions with `AggregationExpression` (now `AggregatedBooleanExpression`)
+                const obsoleteAggregationExpression = alertDefinition.Rule['AggregationExpression'];
+                if (obsoleteAggregationExpression) {
+                    alertDefinition.Rule.AggregatedBooleanExpression = obsoleteAggregationExpression;
+                }
             }
         });
     }
@@ -122,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);
         });
@@ -134,9 +156,7 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         var _a;
         // the row node data is most probably stale because the reactive queries buffer the changed data
         // so we have to refresh it
-        reactiveAlertInfo.dataChangeLogEntry.rowNode = this.api.internalApi
-            .getAdaptableInstance()
-            .getRowNodeForPrimaryKey(reactiveAlertInfo.dataChangeLogEntry.primaryKeyValue);
+        reactiveAlertInfo.dataChangeLogEntry.rowNode = this.api.gridApi.getRowNodeForPrimaryKey(reactiveAlertInfo.dataChangeLogEntry.primaryKeyValue);
         reactiveAlertInfo.dataChangeLogEntry.rowData = (_a = reactiveAlertInfo.dataChangeLogEntry.rowNode) === null || _a === void 0 ? void 0 : _a.data;
         if (reactiveAlertInfo.type === 'alert') {
             this.showAlertForDefinitions(reactiveAlertInfo.dataChangeLogEntry, [

package/src/Strategy/CalculatedColumnModule.js

@@ -77,7 +77,7 @@ class CalculatedColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 values: [calculateColumn.FriendlyName],
             },
             getExpressionViewItems_1.getExpressionViewItems(calculateColumn.Query),
-        ];
+        ].filter(Boolean);
         if (ArrayExtensions_1.default.IsNotNullOrEmpty(settingsTags)) {
             items.push({
                 name: 'Settings',

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/Strategy/Utilities/getExportColumnsViewItems.js

@@ -4,6 +4,6 @@ exports.getExportColumnsViewItems = void 0;
 exports.getExportColumnsViewItems = (report, api) => {
     return {
         name: 'Columns',
-        values: [api.internalApi.getReportService().GetReportColumnScopeShortDescription(report)],
+        values: [...api.internalApi.getReportService().GetReportColumnScopeShortDescription(report)],
     };
 };

package/src/Utilities/ExpressionFunctions/aggregatedBooleanExpressionFunctions.js

@@ -195,7 +195,7 @@ const getSumAggregation$ = (source$, initialSum) => {
 };
 const getColumnValueSum = (column, context) => {
     let sum = 0;
-    context.api.internalApi.getAdaptableInstance().forAllRowNodesDo((rowNode) => {
+    context.api.internalApi.forAllRowNodesDo((rowNode) => {
         var _a;
         // if there is a WHERE clause defined, check if the current rowNode satisfies the condition
         if (context.filterFn && !context.filterFn(rowNode)) {

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/observableExpressionFunctions.js

@@ -233,7 +233,7 @@ const getDataChangedInfoStub = (context) => {
     }
     else {
         // if there is a WHERE clause defined, find the first rowNode which satisfies the condition
-        context.api.internalApi.getAdaptableInstance().forAllRowNodesDo((rowNode) => {
+        context.api.internalApi.forAllRowNodesDo((rowNode) => {
             if (!rowNodeStub) {
                 if (context.filterFn(rowNode)) {
                     rowNodeStub = rowNode;

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/Utilities/Services/AlertService.d.ts

@@ -1,12 +1,12 @@
 import { IAlertService } from './Interface/IAlertService';
 import { AlertDefinition } from '../../PredefinedConfig/AlertState';
 import { EmitterCallback } from '../Emitter';
-import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
+import { AdaptableApi } from '../../types';
 export declare class AlertService implements IAlertService {
-    private adaptable;
+    private adaptableApi;
     private emitter;
     private reactiveAlertsMap;
-    constructor(adaptable: IAdaptable);
+    constructor(adaptableApi: AdaptableApi);
     onReactiveAlertTriggered: (callback: EmitterCallback) => (() => void);
     createReactiveAlert(alertDefinition: AlertDefinition): void;
     deleteReactiveAlert(alertDefinition: AlertDefinition): void;

package/src/Utilities/Services/AlertService.js

@@ -7,8 +7,8 @@ const rxjs_1 = require("rxjs");
 const LoggingHelper_1 = require("../Helpers/LoggingHelper");
 const ModuleConstants_1 = require("../Constants/ModuleConstants");
 class AlertService {
-    constructor(adaptable) {
-        this.adaptable = adaptable;
+    constructor(adaptableApi) {
+        this.adaptableApi = adaptableApi;
         this.reactiveAlertsMap = new Map();
         this.onReactiveAlertTriggered = (callback) => {
             return this.emitter.on('ReactiveAlertTriggered', callback);
@@ -58,17 +58,17 @@ class AlertService {
     }
     isValidExpression(rule) {
         return rule.ObservableExpression
-            ? this.adaptable.api.queryLanguageApi.isValidObservableExpression(rule.ObservableExpression, ModuleConstants_1.AlertModuleId, `Invalid Alert rule with observable expression `)
+            ? this.adaptableApi.queryLanguageApi.isValidObservableExpression(rule.ObservableExpression, ModuleConstants_1.AlertModuleId, `Invalid Alert rule with observable expression `)
             : rule.AggregatedBooleanExpression
-                ? this.adaptable.api.queryLanguageApi.isValidAggregatedBooleanExpression(rule.AggregatedBooleanExpression, ModuleConstants_1.AlertModuleId, `Invalid Alert rule with aggregation expression `)
+                ? this.adaptableApi.queryLanguageApi.isValidAggregatedBooleanExpression(rule.AggregatedBooleanExpression, ModuleConstants_1.AlertModuleId, `Invalid Alert rule with aggregation expression `)
                 : false;
     }
     evaluateReactiveExpression(rule) {
         return rule.ObservableExpression
-            ? this.adaptable.api.internalApi
+            ? this.adaptableApi.internalApi
                 .getQueryLanguageService()
                 .evaluateObservableExpression(rule.ObservableExpression, ModuleConstants_1.AlertModuleId)
-            : this.adaptable.api.internalApi
+            : this.adaptableApi.internalApi
                 .getQueryLanguageService()
                 .evaluateAggregatedBooleanExpression(rule.AggregatedBooleanExpression, ModuleConstants_1.AlertModuleId);
     }

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

@@ -1,11 +1,11 @@
-import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { ICalculatedColumnExpressionService } from './Interface/ICalculatedColumnExpressionService';
 import { RowNode } from '@ag-grid-community/all-modules';
 import { AdaptableCalculatedColumnQuery, CalculatedColumn } from '../../PredefinedConfig/CalculatedColumnState';
+import { AdaptableApi } from '../../../types';
 export declare class CalculatedColumnExpressionService implements ICalculatedColumnExpressionService {
-    private adaptable;
+    private adaptableApi;
     private aggregatedScalarCalculatedColumnsMap;
-    constructor(adaptable: IAdaptable);
+    constructor(adaptableApi: AdaptableApi);
     getCalculatedColumnDataType(calculatedColumnQuery: AdaptableCalculatedColumnQuery): 'String' | 'Number' | 'Boolean' | 'Date';
     isCalculatedColumnQueryValid(calculatedColumnQuery: AdaptableCalculatedColumnQuery): boolean;
     evaluateCalculatedColumnQuery(calculatedColumn: CalculatedColumn, node: RowNode): any;