@adaptabletools/adaptable 11.1.3 → 11.1.6

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/Redux/Store/AdaptableStore.js

@@ -201,6 +201,14 @@ class AdaptableStore {
             ConfigConstants.POPUP,
             ConfigConstants.PLUGINS,
         ];
+        const didPersistentStateChange = (state, newState) => {
+            return Object.keys(newState).some((key) => {
+                if (nonPersistentReduxKeys.includes(key)) {
+                    return false;
+                }
+                return (state === null || state === void 0 ? void 0 : state[key]) !== (newState === null || newState === void 0 ? void 0 : newState[key]);
+            });
+        };
         // this is now VERY BADLY NAMED!
         let rootReducer = AdaptableReduxMerger_1.mergeReducer(rootReducerWithResetManagement, exports.LOAD_STATE);
         const composeEnhancers = (x) => x;
@@ -214,7 +222,9 @@ class AdaptableStore {
             const emitterArg = { action, state, newState };
             this.emitter.emit(action.type, emitterArg);
             const finalState = emitterArg.newState;
-            const shouldPersist = !((_b = (_a = state === null || state === void 0 ? void 0 : state.System) === null || _a === void 0 ? void 0 : _a.License) === null || _b === void 0 ? void 0 : _b.disablePersistence) &&
+            const shouldPersist = state !== finalState &&
+                didPersistentStateChange(state, finalState) &&
+                !((_b = (_a = state === null || state === void 0 ? void 0 : state.System) === null || _a === void 0 ? void 0 : _a.License) === null || _b === void 0 ? void 0 : _b.disablePersistence) &&
                 !NON_PERSIST_ACTIONS[action.type] &&
                 !init &&
                 !this.loadStorageInProgress;

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);
         });
@@ -153,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,
+                                currentCell: 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/Helpers/FormatHelper.js

@@ -87,6 +87,12 @@ function StringFormatter(input, options = {}) {
         return undefined;
     }
     let s = input;
+    if (options.Prefix !== undefined) {
+        s = options.Prefix + s;
+    }
+    if (options.Suffix !== undefined) {
+        s = s + options.Suffix;
+    }
     if (options.Case !== undefined) {
         if (options.Case == 'Lower') {
             s = s.toLowerCase();

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;

package/src/Utilities/Services/CalculatedColumnExpressionService.js

@@ -6,11 +6,11 @@ const LoggingHelper_1 = require("../Helpers/LoggingHelper");
 const ModuleConstants_1 = require("../Constants/ModuleConstants");
 const scalarAggregationHelper_1 = require("../ExpressionFunctions/scalarAggregationHelper");
 class CalculatedColumnExpressionService {
-    constructor(adaptable) {
-        this.adaptable = adaptable;
+    constructor(adaptableApi) {
+        this.adaptableApi = adaptableApi;
         this.aggregatedScalarCalculatedColumnsMap = new Map();
-        this.adaptable = adaptable;
-        this.adaptable.api.internalApi
+        this.adaptableApi = adaptableApi;
+        this.adaptableApi.internalApi
             .getDataService()
             .on('CellDataChanged', (cellDataChangedInfo) => {
             if (cellDataChangedInfo.trigger === 'aggChange') {
@@ -27,7 +27,7 @@ class CalculatedColumnExpressionService {
                 }
             });
             if (refreshedCalculatedColumns.length) {
-                this.adaptable.api.gridApi.refreshCells(null, refreshedCalculatedColumns);
+                this.adaptableApi.gridApi.refreshCells(null, refreshedCalculatedColumns);
             }
         });
     }
@@ -39,8 +39,8 @@ class CalculatedColumnExpressionService {
                 // we definitely don't want to aggregate everything only to get the data type
                 return Enums_1.DataType.Number;
             }
-            let firstRowNode = this.adaptable.api.gridApi.getFirstRowNode();
-            let firstRowValue = this.adaptable.api.internalApi
+            let firstRowNode = this.adaptableApi.gridApi.getFirstRowNode();
+            let firstRowValue = this.adaptableApi.internalApi
                 .getQueryLanguageService()
                 .evaluateScalarExpression(calculatedColumnQuery.ScalarExpression, ModuleConstants_1.CalculatedColumnModuleId, firstRowNode);
             if (firstRowValue instanceof Date) {
@@ -57,7 +57,7 @@ class CalculatedColumnExpressionService {
             }
         }
         catch (e) {
-            LoggingHelper_1.LogAdaptableWarning(`Invalid CalculatedColumn expression ${this.adaptable.api.queryLanguageApi.getAdaptableQueryExpression(calculatedColumnQuery)} :: ${e}`);
+            LoggingHelper_1.LogAdaptableWarning(`Invalid CalculatedColumn expression ${this.adaptableApi.queryLanguageApi.getAdaptableQueryExpression(calculatedColumnQuery)} :: ${e}`);
             return Enums_1.DataType.Number;
         }
     }
@@ -65,8 +65,8 @@ class CalculatedColumnExpressionService {
         if (calculatedColumnQuery.ScalarExpression) {
             try {
                 // TODO AFL add a cached validation for ScalarExpression, just like for all the other types
-                let firstRowNode = this.adaptable.getFirstRowNode();
-                this.adaptable.api.internalApi
+                let firstRowNode = this.adaptableApi.gridApi.getFirstRowNode();
+                this.adaptableApi.internalApi
                     .getQueryLanguageService()
                     .evaluateScalarExpression(calculatedColumnQuery.ScalarExpression, ModuleConstants_1.CalculatedColumnModuleId, firstRowNode);
                 return true;
@@ -77,7 +77,7 @@ class CalculatedColumnExpressionService {
             }
         }
         if (calculatedColumnQuery.AggregatedScalarExpression) {
-            const validationResult = this.adaptable.api.internalApi
+            const validationResult = this.adaptableApi.internalApi
                 .getQueryLanguageService()
                 .validateAggregatedScalar(calculatedColumnQuery.AggregatedScalarExpression, ModuleConstants_1.CalculatedColumnModuleId);
             return validationResult.isValid;
@@ -88,12 +88,12 @@ class CalculatedColumnExpressionService {
     evaluateCalculatedColumnQuery(calculatedColumn, node) {
         var _a, _b, _c, _d, _e;
         try {
-            if (this.adaptable.api.gridApi.isGroupRowNode(node)) {
+            if (this.adaptableApi.gridApi.isGroupRowNode(node)) {
                 return undefined;
             }
             // no validation here, this function has to be as performant as possible
             if ((_a = calculatedColumn === null || calculatedColumn === void 0 ? void 0 : calculatedColumn.Query) === null || _a === void 0 ? void 0 : _a.ScalarExpression) {
-                return this.adaptable.api.internalApi
+                return this.adaptableApi.internalApi
                     .getQueryLanguageService()
                     .evaluateScalarExpression(calculatedColumn.Query.ScalarExpression, ModuleConstants_1.CalculatedColumnModuleId, node);
             }
@@ -112,10 +112,10 @@ class CalculatedColumnExpressionService {
         // if there is already an aggregated scalar, delete it (possible when editing)
         this.destroyAggregatedScalarCalculatedColumn(calculatedColumn);
         if ((_a = calculatedColumn.Query) === null || _a === void 0 ? void 0 : _a.AggregatedScalarExpression) {
-            const aggregationConfig = this.adaptable.api.internalApi
+            const aggregationConfig = this.adaptableApi.internalApi
                 .getQueryLanguageService()
                 .evaluateAggregatedScalarExpression(calculatedColumn.Query.AggregatedScalarExpression, ModuleConstants_1.CalculatedColumnModuleId);
-            const aggregatedScalarCalculatedColumn = new AggregatedScalarCalculatedColumn(aggregationConfig.value, calculatedColumn, this.adaptable);
+            const aggregatedScalarCalculatedColumn = new AggregatedScalarCalculatedColumn(aggregationConfig.value, calculatedColumn, this.adaptableApi);
             this.aggregatedScalarCalculatedColumnsMap.set(calculatedColumn.Uuid, aggregatedScalarCalculatedColumn);
         }
     }
@@ -128,10 +128,10 @@ class CalculatedColumnExpressionService {
 }
 exports.CalculatedColumnExpressionService = CalculatedColumnExpressionService;
 class AggregatedScalarCalculatedColumn {
-    constructor(expressionEvaluation, calculatedColumn, adaptable) {
+    constructor(expressionEvaluation, calculatedColumn, adaptableApi) {
         this.expressionEvaluation = expressionEvaluation;
         this.calculatedColumn = calculatedColumn;
-        this.adaptable = adaptable;
+        this.adaptableApi = adaptableApi;
         this.aggregationResult = this.computeAggregatedValue(expressionEvaluation);
         // currently we support only one reducer
         this.aggregationReducerName = Object.keys(expressionEvaluation.aggregationParams.reducers)[0];
@@ -153,7 +153,7 @@ class AggregatedScalarCalculatedColumn {
         return this.expressionEvaluation.columnDependencies;
     }
     computeAggregatedValue(expressionEvaluation) {
-        const gridData = this.adaptable.api.gridApi.getGridData();
+        const gridData = this.adaptableApi.gridApi.getGridData();
         if (!expressionEvaluation.cumulateOver) {
             return scalarAggregationHelper_1.aggregate(expressionEvaluation.aggregationParams, gridData);
         }
@@ -174,7 +174,7 @@ class AggregatedScalarCalculatedColumn {
             if (!expressionEvaluation.aggregationParams.groupBy) {
                 expressionEvaluation.aggregationParams.groupBy = [];
             }
-            const gridPrimaryKey = this.adaptable.adaptableOptions.primaryKey;
+            const gridPrimaryKey = this.adaptableApi.internalApi.getAdaptableOptions().primaryKey;
             // !! aggregationParams mutated
             expressionEvaluation.aggregationParams.groupBy.push({ field: gridPrimaryKey });
             // 3. cumulate
@@ -185,7 +185,7 @@ class AggregatedScalarCalculatedColumn {
         var _a, _b;
         if ((_a = this.expressionEvaluation.aggregationParams.groupBy) === null || _a === void 0 ? void 0 : _a.length) {
             const groupColumns = this.expressionEvaluation.aggregationParams.groupBy.map((groupByParam) => groupByParam.field);
-            const groupKeys = groupColumns.map((groupColumnName) => this.adaptable.api.gridApi.getRawValueFromRowNode(rowNode, groupColumnName));
+            const groupKeys = groupColumns.map((groupColumnName) => this.adaptableApi.gridApi.getRawValueFromRowNode(rowNode, groupColumnName));
             return (_b = this.aggregationResult.deepMap.get(groupKeys)) === null || _b === void 0 ? void 0 : _b.reducerResults[this.aggregationReducerName];
         }
         return this.aggregationResult.reducerResults[this.aggregationReducerName];

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

@@ -1,10 +1,10 @@
-import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { IEntitlementService } from './Interface/IEntitlementService';
 import { AdaptableModule } from '../../PredefinedConfig/Common/Types';
 import { AccessLevel } from '../../PredefinedConfig/Common/Entitlement';
+import { AdaptableApi } from '../../../types';
 export declare class EntitlementService implements IEntitlementService {
-    private adaptable;
-    constructor(adaptable: IAdaptable);
+    private adaptableApi;
+    constructor(adaptableApi: AdaptableApi);
     setModulesEntitlements(): void;
     isModuleHiddenEntitlement(adaptableModule: AdaptableModule): boolean;
     isModuleFullEntitlement(adaptableModule: AdaptableModule): boolean;

package/src/Utilities/Services/EntitlementService.js

@@ -2,12 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EntitlementService = void 0;
 class EntitlementService {
-    constructor(adaptable) {
-        this.adaptable = adaptable;
-        this.adaptable = adaptable;
+    constructor(adaptableApi) {
+        this.adaptableApi = adaptableApi;
+        this.adaptableApi = adaptableApi;
     }
     setModulesEntitlements() {
-        this.adaptable.adaptableModules.forEach((module) => {
+        this.adaptableApi.internalApi
+            .getModuleService()
+            .getModuleCollection()
+            .forEach((module) => {
             module.setModuleEntitlement();
         });
     }
@@ -21,15 +24,16 @@ class EntitlementService {
         return this.getEntitlementAccessLevelForModule(adaptableModule) == 'ReadOnly';
     }
     getEntitlementAccessLevelForModule(adaptableModule) {
-        let entitlementOptions = this.adaptable.adaptableOptions.entitlementOptions;
+        let adaptableOptions = this.adaptableApi.internalApi.getAdaptableOptions();
+        let entitlementOptions = adaptableOptions.entitlementOptions;
         if (entitlementOptions) {
             const defaultAccessLevel = typeof entitlementOptions.defaultAccessLevel === 'function'
-                ? entitlementOptions.defaultAccessLevel(this.adaptable.adaptableOptions.userName, this.adaptable.adaptableOptions.adaptableId)
+                ? entitlementOptions.defaultAccessLevel(adaptableOptions.userName, adaptableOptions.adaptableId)
                 : entitlementOptions.defaultAccessLevel;
             const moduleEntitlements = entitlementOptions.moduleEntitlements;
             if (moduleEntitlements) {
                 if (typeof moduleEntitlements === 'function') {
-                    const dynamicModuleEntitlement = moduleEntitlements(adaptableModule, this.adaptable.adaptableOptions.userName, this.adaptable.adaptableOptions.adaptableId, defaultAccessLevel);
+                    const dynamicModuleEntitlement = moduleEntitlements(adaptableModule, adaptableOptions.userName, adaptableOptions.adaptableId, defaultAccessLevel);
                     return dynamicModuleEntitlement !== null && dynamicModuleEntitlement !== void 0 ? dynamicModuleEntitlement : defaultAccessLevel;
                 }
                 else {
@@ -48,7 +52,7 @@ class EntitlementService {
         if (this.isModuleHiddenEntitlement('GridInfo')) {
             return false;
         }
-        return this.adaptable.api.internalApi
+        return this.adaptableApi.internalApi
             .getAdaptableOptions()
             .userInterfaceOptions.gridInfoSections.includes(section);
     }

package/src/Utilities/Services/Interface/IReportService.d.ts

@@ -8,7 +8,7 @@ export interface IReportService extends IAdaptableService {
     IsSystemReport(reportName: string): boolean;
     IsSystemReportActive(reportName: SystemReportName): boolean;
     IsSystemExportDestinationActive(exportDestination: SystemExportDestination): boolean;
-    GetReportColumnScopeShortDescription(report: Report): string;
+    GetReportColumnScopeShortDescription(report: Report): string[];
     GetReportColumnScopeLongDescription(report: Report): string;
     GetReportExpressionDescription(Report: Report, cols: AdaptableColumn[]): string;
     GetReportColumnsForReport(report: Report): AdaptableColumn[];