@adaptabletools/adaptable 11.1.3 → 11.1.6

package/src/Utilities/Services/TeamSharingService.js

@@ -3,18 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TeamSharingService = void 0;
 const Uuid_1 = require("../../PredefinedConfig/Uuid");
 class TeamSharingService {
-    constructor(adaptable) {
-        this.adaptable = adaptable;
-        if (adaptable.adaptableOptions.teamSharingOptions.updateInterval > 0) {
+    constructor(adaptableApi) {
+        this.adaptableApi = adaptableApi;
+        const teamSharingOptions = adaptableApi.internalApi.getAdaptableOptions().teamSharingOptions;
+        if (teamSharingOptions.updateInterval > 0) {
             // convert minutes to millis
-            const updateInterval = adaptable.adaptableOptions.teamSharingOptions.updateInterval * 60000;
+            const updateInterval = teamSharingOptions.updateInterval * 60000;
             this.updateCheckTimerId = setInterval(() => {
-                this.adaptable.api.teamSharingApi.checkForUpdates();
+                this.adaptableApi.teamSharingApi.checkForUpdates();
             }, updateInterval);
         }
     }
     buildSharedEntityWithDependencies(adaptableObject, module, configuration) {
-        const sharingUserName = this.adaptable.adaptableOptions.userName;
+        const sharingUserName = this.adaptableApi.internalApi.getAdaptableOptions().userName;
         const sharingTimestamp = new Date().getTime();
         const createdSharedEntities = [];
         this.createSharedEntity(adaptableObject, module, configuration, sharingUserName, sharingTimestamp, createdSharedEntities);
@@ -62,7 +63,9 @@ class TeamSharingService {
         // either ADD or EDIT(in which case the user will need to confirm the overwrite)
         const getSharedEntityImportAction = (sharedEntity) => {
             const { Module, Entity } = sharedEntity;
-            const importInfo = this.adaptable.ModuleService.getTeamSharingAction(Module);
+            const importInfo = this.adaptableApi.internalApi
+                .getModuleService()
+                .getTeamSharingAction(Module);
             if (importInfo === null || importInfo === void 0 ? void 0 : importInfo.ModuleEntities.some((moduleEntity) => moduleEntity.Uuid === Entity.Uuid)) {
                 configOverwriteNeedsConfirmation = true;
                 return importInfo === null || importInfo === void 0 ? void 0 : importInfo.EditAction(Entity);
@@ -71,7 +74,7 @@ class TeamSharingService {
                 return importInfo === null || importInfo === void 0 ? void 0 : importInfo.AddAction(Entity);
             }
         };
-        const existingSharedEntities = this.adaptable.api.teamSharingApi.getSharedEntities();
+        const existingSharedEntities = this.adaptableApi.teamSharingApi.getSharedEntities();
         const sharedEntityDependencyTree = this.getSharedEntityDependencyTree(importedSharedEntity, existingSharedEntities);
         const importSteps = sharedEntityDependencyTree.map((sharedEntity) => ({
             sharedEntity,
@@ -81,13 +84,13 @@ class TeamSharingService {
     }
     getSharedEntityLocalAndRemoteRevisions(changedAdaptableObjectId, remoteSharedEntities) {
         var _a, _b, _c, _d;
-        const localRevision = (_b = (_a = this.adaptable.api.teamSharingApi.getTeamSharingState().ActiveSharedEntityMap[changedAdaptableObjectId]) === null || _a === void 0 ? void 0 : _a.Revision) !== null && _b !== void 0 ? _b : -1;
+        const localRevision = (_b = (_a = this.adaptableApi.teamSharingApi.getTeamSharingState().ActiveSharedEntityMap[changedAdaptableObjectId]) === null || _a === void 0 ? void 0 : _a.Revision) !== null && _b !== void 0 ? _b : -1;
         const remoteRevision = (_d = (_c = remoteSharedEntities.find((sharedEntity) => sharedEntity.Entity.Uuid === changedAdaptableObjectId)) === null || _c === void 0 ? void 0 : _c.Revision) !== null && _d !== void 0 ? _d : -1;
         return [localRevision, remoteRevision];
     }
     getStaleActiveSharedEntities() {
-        const sharedEntities = this.adaptable.api.teamSharingApi.getSharedEntities();
-        const activeEntities = this.adaptable.api.teamSharingApi.getTeamSharingState().ActiveSharedEntityMap;
+        const sharedEntities = this.adaptableApi.teamSharingApi.getSharedEntities();
+        const activeEntities = this.adaptableApi.teamSharingApi.getTeamSharingState().ActiveSharedEntityMap;
         const result = {};
         sharedEntities
             .filter((sharedEntity) => sharedEntity.Type === 'Active')
@@ -105,21 +108,21 @@ class TeamSharingService {
         return result;
     }
     showUpdateNotifications() {
-        const { updateNotification } = this.adaptable.adaptableOptions.teamSharingOptions;
+        const { updateNotification } = this.adaptableApi.internalApi.getAdaptableOptions().teamSharingOptions;
         if (!updateNotification) {
             return;
         }
         Object.values(this.getStaleActiveSharedEntities()).forEach((sharedEntityActiveInfo) => {
             const notificationMessage = `Active share ${sharedEntityActiveInfo.sharedEntity.Module} has a new Revision: ${sharedEntityActiveInfo.sharedEntity.Revision}`;
             if (updateNotification === 'Alert' || updateNotification === 'AlertWithNotification') {
-                this.adaptable.api.alertApi.showAlert('TeamSharing', notificationMessage, 'Info', {
+                this.adaptableApi.alertApi.showAlert('TeamSharing', notificationMessage, 'Info', {
                     DisplayNotification: updateNotification === 'AlertWithNotification',
                 });
             }
             if (updateNotification === 'SystemStatus') {
-                this.adaptable.api.systemStatusApi.setInfoSystemStatus(`TeamSharing: ${notificationMessage}`);
+                this.adaptableApi.systemStatusApi.setInfoSystemStatus(`TeamSharing: ${notificationMessage}`);
             }
-            this.adaptable.api.teamSharingApi.fireTeamSharingEntityChangedEvent(sharedEntityActiveInfo.sharedEntity);
+            this.adaptableApi.teamSharingApi.fireTeamSharingEntityChangedEvent(sharedEntityActiveInfo.sharedEntity);
         });
     }
     destroy() {
@@ -174,7 +177,7 @@ class TeamSharingService {
         return Array.from(result.values());
     }
     getTeamSharingReferences(adaptableObject, module) {
-        return this.adaptable.api.internalApi
+        return this.adaptableApi.internalApi
             .getModuleService()
             .getModuleById(module)
             .getTeamSharingReferences(adaptableObject);

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

@@ -1,10 +1,10 @@
-import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
 import { IValidationService } from './Interface/IValidationService';
 import { AlertDefinition } from '../../PredefinedConfig/AlertState';
+import { AdaptableApi } from '../../../types';
 export declare class ValidationService implements IValidationService {
-    private adaptable;
-    constructor(adaptable: IAdaptable);
+    private adaptableApi;
+    constructor(adaptableApi: AdaptableApi);
     getValidationRulesForDataChange(cellDataChangedInfo: CellDataChangedInfo): AlertDefinition[];
     performValidation(cellDataChangedInfo: CellDataChangedInfo): boolean;
     private IsAlertDefinitionTriggered;

package/src/Utilities/Services/ValidationService.js

@@ -6,9 +6,9 @@ const ArrayExtensions_1 = require("../Extensions/ArrayExtensions");
 const StringExtensions_1 = tslib_1.__importDefault(require("../Extensions/StringExtensions"));
 const ModuleConstants_1 = require("../Constants/ModuleConstants");
 class ValidationService {
-    constructor(adaptable) {
-        this.adaptable = adaptable;
-        this.adaptable = adaptable;
+    constructor(adaptableApi) {
+        this.adaptableApi = adaptableApi;
+        this.adaptableApi = adaptableApi;
     }
     // Not sure where to put this: was in the Module but might be better here until I can work out a way of having an event with a callback...
     getValidationRulesForDataChange(cellDataChangedInfo) {
@@ -16,15 +16,15 @@ class ValidationService {
         if (cellDataChangedInfo.oldValue == cellDataChangedInfo.newValue) {
             return [];
         }
-        let editingRules = this.adaptable.api.alertApi
+        let editingRules = this.adaptableApi.alertApi
             .getAlertDefinitionsWithPreventEdit()
-            .filter((v) => this.adaptable.api.scopeApi.isColumnInScope(cellDataChangedInfo.column, v.Scope));
+            .filter((v) => this.adaptableApi.scopeApi.isColumnInScope(cellDataChangedInfo.column, v.Scope));
         let failedValidations = [];
         if (ArrayExtensions_1.ArrayExtensions.IsNotEmpty(editingRules)) {
             editingRules.forEach((alertDefinition) => {
                 if (alertDefinition.Rule.BooleanExpression) {
                     let isSatisfiedExpression = cellDataChangedInfo.rowNode != null &&
-                        this.adaptable.api.internalApi
+                        this.adaptableApi.internalApi
                             .getQueryLanguageService()
                             .evaluateBooleanExpression(alertDefinition.Rule.BooleanExpression, ModuleConstants_1.AlertModuleId, cellDataChangedInfo.rowNode);
                     if (isSatisfiedExpression) {
@@ -50,24 +50,25 @@ class ValidationService {
                 alertDefinition: failedRules[0],
                 cellDataChangedInfo: cellDataChangedInfo,
             };
-            this.adaptable.api.alertApi.publishAlertFiredEvent(alert);
+            this.adaptableApi.alertApi.publishAlertFiredEvent(alert);
             return false;
         }
         return true;
     }
     IsAlertDefinitionTriggered(alertDefinition, dataChangedEvent) {
-        return this.adaptable.api.predicateApi.handlePredicate(alertDefinition.Rule.Predicate, {
+        return this.adaptableApi.predicateApi.handlePredicate(alertDefinition.Rule.Predicate, {
             value: dataChangedEvent.newValue,
             oldValue: dataChangedEvent.oldValue,
-            displayValue: this.adaptable.getDisplayValueFromRowNode(dataChangedEvent.rowNode, dataChangedEvent.column.columnId),
+            displayValue: this.adaptableApi.gridApi.getDisplayValueFromRowNode(dataChangedEvent.rowNode, dataChangedEvent.column.columnId),
             node: dataChangedEvent.rowNode,
             column: dataChangedEvent.column,
         }, false);
     }
     performServerValidation(cellDataChangedInfo, config) {
         return () => {
-            this.adaptable.adaptableOptions.editOptions
-                .validateOnServer(cellDataChangedInfo)
+            this.adaptableApi.internalApi
+                .getAdaptableOptions()
+                .editOptions.validateOnServer(cellDataChangedInfo)
                 .then((validationResult) => {
                 var _a, _b;
                 if (validationResult.NewValue === undefined) {
@@ -82,11 +83,12 @@ class ValidationService {
                     if (!row) {
                         return;
                     }
-                    row[(_b = this.adaptable.api.columnApi.getAgGridColumnFieldForAdaptableColumn(cellDataChangedInfo.column.columnId)) !== null && _b !== void 0 ? _b : cellDataChangedInfo.column.columnId] = validationResult.NewValue;
-                    this.adaptable.api.gridApi.updateGridData([row]);
+                    row[(_b = this.adaptableApi.columnApi.getAgGridColumnFieldForAdaptableColumn(cellDataChangedInfo.column.columnId)) !== null && _b !== void 0 ? _b : cellDataChangedInfo.column.columnId] = validationResult.NewValue;
+                    this.adaptableApi.gridApi.updateGridData([row]);
                     if (StringExtensions_1.default.IsNotNullOrEmpty(validationResult.ValidationMessage) &&
-                        this.adaptable.adaptableOptions.editOptions.displayServerValidationMessages) {
-                        this.adaptable.api.alertApi.showAlertInfo('Server Validation Message', validationResult.ValidationMessage);
+                        this.adaptableApi.internalApi.getAdaptableOptions().editOptions
+                            .displayServerValidationMessages) {
+                        this.adaptableApi.alertApi.showAlertInfo('Server Validation Message', validationResult.ValidationMessage);
                     }
                 }
                 config.onServerValidationCompleted();
@@ -95,9 +97,9 @@ class ValidationService {
         };
     }
     createValidationDescription(alertDefinition) {
-        return (this.adaptable.api.scopeApi.getScopeDescription(alertDefinition.Scope) +
+        return (this.adaptableApi.scopeApi.getScopeDescription(alertDefinition.Scope) +
             ' ' +
-            this.adaptable.api.predicateApi.predicateToString(alertDefinition.Rule.Predicate));
+            this.adaptableApi.predicateApi.predicateToString(alertDefinition.Rule.Predicate));
     }
     createValidationMessage(alertDefinition) {
         let returnMessage = this.createValidationDescription(alertDefinition);

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/Alert/Wizard/AlertBehaviourWizardSection.js

@@ -9,6 +9,39 @@ const CheckBox_1 = require("../../../components/CheckBox");
 const CodeBlock_1 = require("../../../components/CodeBlock");
 const rebass_1 = require("rebass");
 const ValueSelector_1 = require("../../Components/ValueSelector");
+const StyleComponent_1 = require("../../Components/StyleComponent");
+const DropdownButton_1 = tslib_1.__importDefault(require("../../../components/DropdownButton"));
+const ObjectFactory_1 = tslib_1.__importDefault(require("../../../Utilities/ObjectFactory"));
+const AdaptableContext_1 = require("../../AdaptableContext");
+const StylePreview_1 = require("../../../components/StylePreview");
+const HighlightStyle = (props) => {
+    const adaptable = AdaptableContext_1.useAdaptable();
+    const options = [
+        {
+            label: 'Use Message Type',
+            onClick: () => {
+                props.onChange(true);
+            },
+        },
+        {
+            label: 'Custom Style',
+            onClick: () => {
+                const initialStyle = ObjectFactory_1.default.CreateEmptyStyle();
+                props.onChange(initialStyle);
+            },
+        },
+    ];
+    return (React.createElement(React.Fragment, null,
+        React.createElement(rebass_1.Flex, null,
+            React.createElement(CheckBox_1.CheckBox, { mr: 2, style: { alignItems: 'flex-start' }, checked: Boolean(props.highlight), onChange: (checked) => {
+                    props.onChange(checked);
+                } }, props.label),
+            Boolean(props.highlight) && (React.createElement(DropdownButton_1.default, { items: options }, typeof props.highlight === 'boolean' ? (React.createElement(rebass_1.Text, { fontSize: 2, mt: 1 }, "Use Message Type")) : (React.createElement(rebass_1.Text, { fontSize: 2, mt: 1 }, "Custom Style"))))),
+        typeof props.highlight === 'object' && (React.createElement(rebass_1.Box, { paddingLeft: 3 },
+            React.createElement(StyleComponent_1.StyleComponent, { headless: true, api: adaptable.api, Style: props.highlight, UpdateStyle: (style) => {
+                    props.onChange(style);
+                } })))));
+};
 // both used in wizard and list view
 exports.renderAlertBehaviourSummary = (alert, api, allowWrap = false) => {
     const { AlertProperties = {} } = alert;
@@ -31,7 +64,15 @@ exports.renderAlertBehaviourSummary = (alert, api, allowWrap = false) => {
     if (!values.length) {
         values.push({ label: 'No behaviour selected', id: 'none' });
     }
-    return (React.createElement(ValueSelector_1.ValueOptionsTags, { allowWrap: allowWrap, options: values, value: values.map((v) => v.id), readOnly: true, toIdentifier: (x) => x.id, toLabel: (x) => React.createElement(React.Fragment, null, x.label) }));
+    return (React.createElement(ValueSelector_1.ValueOptionsTags, { allowWrap: allowWrap, options: values, value: values.map((v) => v.id), readOnly: true, toIdentifier: (x) => x.id, toLabel: (x) => {
+            if (x.id === 'highlightCell' && typeof AlertProperties.HighlightCell === 'object') {
+                return (React.createElement(StylePreview_1.StylePreview, { padding: 0, mt: 0, styleObject: AlertProperties.HighlightCell }, "Highlight Cell"));
+            }
+            if (x.id === 'highlightRow' && typeof AlertProperties.HighlightRow === 'object') {
+                return (React.createElement(StylePreview_1.StylePreview, { padding: 0, mt: 0, styleObject: AlertProperties.HighlightRow }, "Highlight Row"));
+            }
+            return React.createElement(React.Fragment, null, x.label);
+        } }));
 };
 exports.AlertBehaviourWizardSection = (props) => {
     const { data, api } = OnePageAdaptableWizard_1.useOnePageWizardContext();
@@ -52,16 +93,12 @@ exports.AlertBehaviourWizardSection = (props) => {
                 } },
                 "Prevent Cell Edit",
                 React.createElement(rebass_1.Text, { fontSize: 2, mt: 1 }, "(automatically undo data change which triggered Alert)"))),
-            cellChangedAlert && (React.createElement(CheckBox_1.CheckBox, { style: { alignItems: 'flex-start' }, checked: Boolean(AlertProperties.HighlightCell), onChange: (HighlightCell) => {
+            cellChangedAlert && (React.createElement(HighlightStyle, { highlight: AlertProperties.HighlightCell, label: "Highlight Cell", onChange: (HighlightCell) => {
                     onChange({ HighlightCell });
-                } },
-                "Highlight Cell",
-                React.createElement(rebass_1.Text, { fontSize: 2, mt: 1 }, "(using the Alert message type)"))),
-            rowAddedAlert && (React.createElement(CheckBox_1.CheckBox, { style: { alignItems: 'flex-start' }, checked: Boolean(AlertProperties.HighlightRow), onChange: (HighlightRow) => {
+                } })),
+            rowAddedAlert && (React.createElement(HighlightStyle, { highlight: AlertProperties.HighlightRow, label: "Highlight Row", onChange: (HighlightRow) => {
                     onChange({ HighlightRow });
-                } },
-                "Highlight Row",
-                React.createElement(rebass_1.Text, { fontSize: 2, mt: 1 }, "(using the Alert message type)"))),
+                } })),
             cellChangedAlert && (React.createElement(CheckBox_1.CheckBox, { checked: AlertProperties.JumpToCell, onChange: (JumpToCell) => {
                     onChange({ JumpToCell });
                 } }, "Jump To Cell")),

package/src/View/Alert/Wizard/AlertWizard.js

@@ -78,7 +78,7 @@ exports.AlertWizard = (props) => {
         };
         if (alertDefinition.AlertForm && typeof alertDefinition.AlertForm !== 'string') {
             const alertButtons = (_a = alertDefinition.AlertForm) === null || _a === void 0 ? void 0 : _a.Buttons;
-            alertButtons.forEach((alertButton) => {
+            alertButtons === null || alertButtons === void 0 ? void 0 : alertButtons.forEach((alertButton) => {
                 const alertAction = alertButton.Action;
                 if (Array.isArray(alertAction)) {
                     alertButton.Action = alertAction
@@ -89,29 +89,27 @@ exports.AlertWizard = (props) => {
                     alertButton.Action = mapValidButtonActions(alertAction);
                 }
             });
-            // map Alert Properties(Behaviour)
-            if (isCellChangeAlert) {
-                alertDefinition.AlertProperties.HighlightCell =
-                    alertDefinition.AlertProperties.HighlightRow;
-                delete alertDefinition.AlertProperties.HighlightRow;
-                alertDefinition.AlertProperties.JumpToCell = alertDefinition.AlertProperties.JumpToRow;
-                delete alertDefinition.AlertProperties.JumpToRow;
-            }
-            if (isAddedRowChangeAlert) {
-                alertDefinition.AlertProperties.HighlightRow =
-                    alertDefinition.AlertProperties.HighlightCell;
-                delete alertDefinition.AlertProperties.HighlightCell;
-                alertDefinition.AlertProperties.JumpToRow = alertDefinition.AlertProperties.JumpToCell;
-                delete alertDefinition.AlertProperties.JumpToCell;
-                delete alertDefinition.AlertProperties.PreventEdit;
-            }
-            if (isRemovedRowChangeAlert) {
-                delete alertDefinition.AlertProperties.PreventEdit;
-                delete alertDefinition.AlertProperties.HighlightRow;
-                delete alertDefinition.AlertProperties.JumpToRow;
-                delete alertDefinition.AlertProperties.HighlightCell;
-                delete alertDefinition.AlertProperties.JumpToCell;
-            }
+        }
+        // map Alert Properties(Behaviour)
+        if (isCellChangeAlert) {
+            alertDefinition.AlertProperties.HighlightCell = alertDefinition.AlertProperties.HighlightRow;
+            delete alertDefinition.AlertProperties.HighlightRow;
+            alertDefinition.AlertProperties.JumpToCell = alertDefinition.AlertProperties.JumpToRow;
+            delete alertDefinition.AlertProperties.JumpToRow;
+        }
+        if (isAddedRowChangeAlert) {
+            alertDefinition.AlertProperties.HighlightRow = alertDefinition.AlertProperties.HighlightCell;
+            delete alertDefinition.AlertProperties.HighlightCell;
+            alertDefinition.AlertProperties.JumpToRow = alertDefinition.AlertProperties.JumpToCell;
+            delete alertDefinition.AlertProperties.JumpToCell;
+            delete alertDefinition.AlertProperties.PreventEdit;
+        }
+        if (isRemovedRowChangeAlert) {
+            delete alertDefinition.AlertProperties.PreventEdit;
+            delete alertDefinition.AlertProperties.HighlightRow;
+            delete alertDefinition.AlertProperties.JumpToRow;
+            delete alertDefinition.AlertProperties.HighlightCell;
+            delete alertDefinition.AlertProperties.JumpToCell;
         }
         setAlertDefinition(alertDefinition);
     };

package/src/View/CalculatedColumn/Wizard/CalculatedColumnSettingsWizardSection.js

@@ -90,15 +90,15 @@ exports.CalculatedColumnSettingsWizardSection = (props) => {
                 React.createElement(rebass_1.Flex, { flexDirection: "row" },
                     React.createElement(FormLayout_1.default, null,
                         React.createElement(FormLayout_1.FormRow, { label: "Id" },
-                            React.createElement(Input_1.default, { value: data.ColumnId || '', width: 300, autoFocus: !inEdit, disabled: inEdit, type: "text", placeholder: "Enter an Id for the column", onChange: handleColumnIdChange })),
+                            React.createElement(Input_1.default, { "data-name": "column-id", value: data.ColumnId || '', width: 300, autoFocus: !inEdit, disabled: inEdit, type: "text", placeholder: "Enter an Id for the column", onChange: handleColumnIdChange })),
                         React.createElement(FormLayout_1.FormRow, { label: "Name" },
-                            React.createElement(Input_1.default, { autoFocus: inEdit, onFocus: () => {
+                            React.createElement(Input_1.default, { "data-name": "column-name", autoFocus: inEdit, onFocus: () => {
                                     setColumnNameFocused(true);
                                 }, onBlur: () => {
                                     setColumnNameFocused(false);
                                 }, value: ColumnNameFocused ? ColumnName || '' : ColumnName || ColumnId || '', width: 300, type: "text", placeholder: "Enter column name", onChange: handleColumnNameChange })),
                         React.createElement(FormLayout_1.FormRow, { label: "Type" },
-                            React.createElement(DropdownButton_1.default, { style: {
+                            React.createElement(DropdownButton_1.default, { "data-name": "column-type", style: {
                                     width: '300px',
                                     whiteSpace: 'normal',
                                     overflow: 'hidden',
@@ -109,11 +109,11 @@ exports.CalculatedColumnSettingsWizardSection = (props) => {
                                     onClick: () => handleDataTypeChange(item.value),
                                 })) }, dataType ? dataType : 'Select Data Type')),
                         React.createElement(FormLayout_1.FormRow, { label: "Width" },
-                            React.createElement(Input_1.default, { type: "number", width: 300, value: Width || '', onChange: (e) => handleSpecialColumnSettingsChange({
+                            React.createElement(Input_1.default, { "data-name": "column-width", type: "number", width: 300, value: Width || '', onChange: (e) => handleSpecialColumnSettingsChange({
                                     Width: Number(e.target.value),
                                 }) })),
                         React.createElement(FormLayout_1.FormRow, { label: "" },
-                            React.createElement(CheckBox_1.CheckBox, { onChange: (checked) => handleSpecialColumnSettingsChange({ ShowToolTip: checked }), checked: ShowToolTip }, "Show Expression as Tooltip")))))),
+                            React.createElement(CheckBox_1.CheckBox, { "data-name": "column-show-tooltip", onChange: (checked) => handleSpecialColumnSettingsChange({ ShowToolTip: checked }), checked: ShowToolTip }, "Show Expression as Tooltip")))))),
         ErrorMessage ? React.createElement(ErrorBox_1.default, { marginTop: 2 }, ErrorMessage) : null,
         React.createElement(SpecialColumnSettingsWizardStep_1.SpecialColumnSettingsWizardStep, { isEditable: false, settings: data.CalculatedColumnSettings, onChange: handleSpecialColumnSettingsChange })));
 };

package/src/View/Components/AdaptableObjectList/AdaptableObjectList.js

@@ -17,7 +17,7 @@ const SuspendToggleButton_1 = require("../Buttons/SuspendToggleButton/SuspendTog
 const ValueSelector_1 = require("../ValueSelector");
 const ICON_SIZE = 26;
 exports.AdaptableObjectListItem = (props) => {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     const adaptable = AdaptableContext_1.useAdaptable();
     const dispatch = react_redux_1.useDispatch();
     const [isEditWizardVisible, setIsEditWizardVisible] = React.useState(false);
@@ -56,8 +56,8 @@ exports.AdaptableObjectListItem = (props) => {
         });
     });
     const isEditDisabled = !Boolean(EditWizard || viewOptions.onOpenEditPopup);
-    return (React.createElement(rebass_1.Flex, { as: "li", mb: 3, className: itemClassName },
-        React.createElement(rebass_1.Box, { flex: 1, className: `${baseClassName}__rows` }, (_g = props.data.items) === null || _g === void 0 ? void 0 : _g.map((tag, index) => {
+    return (React.createElement(rebass_1.Flex, { "data-name": "adaptable-object-list-item", "data-value": props.data.abObject.Uuid, as: "li", mb: 3, className: itemClassName },
+        React.createElement(rebass_1.Box, { flex: 1, className: `${baseClassName}__rows` }, (_j = (_h = (_g = props.data.items).filter) === null || _h === void 0 ? void 0 : _h.call(_g, Boolean)) === null || _j === void 0 ? void 0 : _j.map((tag, index) => {
             var _a;
             return (React.createElement(rebass_1.Flex, { "data-name": tag.name, key: index, mb: 2, className: `${baseClassName}__row` },
                 React.createElement(rebass_1.Box, { className: `${baseClassName}__label`, mr: 3 },

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/Components/Selectors/ColumnSelector.js

@@ -37,7 +37,7 @@ class ColumnSelector extends React.Component {
         let currentColumnName = selectedColumnIds.length > 0
             ? (_a = this.props.ColumnList.find((c) => c.columnId == selectedColumnIds[0])) === null || _a === void 0 ? void 0 : _a.friendlyName : 'Select a column';
         return (React.createElement("div", { "data-name": 'column-selector' },
-            React.createElement(FormLayout_1.default, { columns: [1], style: this.props.style },
+            React.createElement(FormLayout_1.default, { columns: [{ name: 'columnSelector', style: { display: 'flex' } }], style: this.props.style },
                 React.createElement(FormLayout_1.FormRow, null,
                     React.createElement(DropdownButton_1.default, { marginRight: 2, columns: ['label'], showClearButton: currentColumnName != 'Select a column', onClear: () => this.onClearButton(), style: { width: '100%', fontSize: 'small' }, className: "ab-DashboardToolbar__Layout__select", items: sortedColumnOptions, disabled: sortedColumnOptions.length == 0 }, currentColumnName)))));
     }

package/src/View/DataChangeHistory/DataChangeHistoryPopup.js

@@ -53,9 +53,7 @@ class DataChangeHistoryPopupComponent extends React.Component {
                 this.props.api.dataChangeHistoryApi.undoDataChangeHistoryEntry(changeToBeUndone);
             }
         };
-        const currentAgGridTheme = this.props.api.internalApi
-            .getAdaptableInstance()
-            .getAgGridCurrentThemeName();
+        const currentAgGridTheme = this.props.api.themeApi.getAgGridCurrentThemeName();
         return (React.createElement(PopupPanel_1.PopupPanel, { headerText: this.props.moduleInfo.FriendlyName, glyphicon: this.props.moduleInfo.Glyph, infoLink: this.props.moduleInfo.HelpPage, infoLinkDisabled: !this.props.api.internalApi.isDocumentationLinksDisplayed() },
             React.createElement(rebass_1.Flex, { className: "ab-DataChangeHistoryPopup", flexDirection: "column", style: { height: '100%' } },
                 React.createElement(rebass_1.Flex, { style: {

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;