@adaptabletools/adaptable 11.1.2 → 11.1.5

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/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;

package/src/View/Export/ExportViewPanel.js

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

package/src/View/GridInfo/AdaptableObjectsSummary.js

@@ -19,7 +19,7 @@ exports.AdaptableObjectsSummary = () => {
         if (!(items === null || items === void 0 ? void 0 : items.length)) {
             return null;
         }
-        return (React.createElement("div", null,
+        return (React.createElement("div", { key: module.moduleInfo.ModuleName },
             React.createElement("b", null, module.moduleInfo.FriendlyName),
             (items === null || items === void 0 ? void 0 : items.length) && React.createElement(AdaptableObjectList_1.AdaptableObjectList, { items: items, module: module })));
     })));

package/src/View/GridInfo/GridInfoPopup.js

@@ -100,10 +100,10 @@ exports.GridInfoPopup = (props) => {
     const showRadioButtons = [showGridSummary, showAdaptableOptions, showColumnInfo, showAdaptableObjects].filter((item) => item).length > 1;
     return (React.createElement(PopupPanel_1.PopupPanel, { headerText: 'Grid Info', glyphicon: 'info-sign' },
         React.createElement(rebass_1.Flex, { marginBottom: 2, padding: 3 }, showRadioButtons && (React.createElement(React.Fragment, null,
-            showGridSummary && (React.createElement(Radio_1.default, { "data-name": "radioButton-GridSummary", marginRight: 3, value: "GridSummary", checked: state.ActiveTab == 'GridSummary', onChange: (_, e) => onShowGridSummaryChanged('GridSummary') }, "Grid Summary")),
-            showAdaptableOptions && (React.createElement(Radio_1.default, { "data-name": "radioButton-AdaptableOptions", marginRight: 3, value: "AdaptableOptions", checked: state.ActiveTab == 'AdaptableOptions', onChange: (_, e) => onShowGridSummaryChanged('AdaptableOptions') }, "Adaptable Options")),
-            showColumnInfo && (React.createElement(Radio_1.default, { "data-name": "radioButton-Column", marginRight: 3, value: "Column", checked: state.ActiveTab == 'ColumnInfo', onChange: (_, e) => onShowGridSummaryChanged('ColumnInfo') }, "Column Info")),
-            showAdaptableObjects && (React.createElement(Radio_1.default, { "data-name": "radioButton-Column", value: "Column", checked: state.ActiveTab == 'AdaptableObjectsSummary', onChange: (_, e) => onShowGridSummaryChanged('AdaptableObjectsSummary') }, "Adaptable Objects"))))),
+            showGridSummary && (React.createElement(Radio_1.default, { "data-name": "radioButton-GridSummary", marginRight: 3, value: "GridSummary", checked: state.ActiveTab == 'GridSummary', onChange: (_, e) => onShowGridSummaryChanged('GridSummary') }, "Summary")),
+            showAdaptableOptions && (React.createElement(Radio_1.default, { "data-name": "radioButton-AdaptableOptions", marginRight: 3, value: "AdaptableOptions", checked: state.ActiveTab == 'AdaptableOptions', onChange: (_, e) => onShowGridSummaryChanged('AdaptableOptions') }, "Options")),
+            showColumnInfo && (React.createElement(Radio_1.default, { "data-name": "radioButton-Column", marginRight: 3, value: "Column", checked: state.ActiveTab == 'ColumnInfo', onChange: (_, e) => onShowGridSummaryChanged('ColumnInfo') }, "Columns")),
+            showAdaptableObjects && (React.createElement(Radio_1.default, { "data-name": "radioButton-Column", value: "Column", checked: state.ActiveTab == 'AdaptableObjectsSummary', onChange: (_, e) => onShowGridSummaryChanged('AdaptableObjectsSummary') }, "Objects"))))),
         state.ActiveTab == 'GridSummary' && (React.createElement(rebass_1.Box, { margin: 2 },
             React.createElement(AdaptableObjectCollection_1.AdaptableObjectCollection, { colItems: propValueColItems, items: gridSummaries }))),
         state.ActiveTab == 'AdaptableOptions' && React.createElement(AdaptableOptionsComponent_1.AdaptableOptionsComponent, { api: props.api }),

package/src/View/Layout/Wizard/LayoutEditor/index.js

@@ -347,10 +347,7 @@ exports.LayoutEditor = React.memo((props) => {
                                 React.createElement(icons_1.Icon, { name: "clear" }))));
                     } })),
             React.createElement(ListPanel, { className: "ab-LayoutEditor__PivotListPanel", header: React.createElement(rebass_1.Flex, { width: "100%", flexDirection: "row", justifyContent: "space-between", alignItems: "center" },
-                    React.createElement(rebass_1.Text, null, "Pivoted Columns"),
-                    React.createElement(CheckBox_1.CheckBox, { mt: 0, mb: 0, checked: layout.EnablePivot, onChange: (checked) => {
-                            setLayout(Object.assign(Object.assign({}, layout), { EnablePivot: checked }));
-                        } }, "Enable")), bodyProps: { padding: 0 } },
+                    React.createElement(rebass_1.Text, null, "Pivoted Columns")), bodyProps: { padding: 0 } },
                 React.createElement(PivotList_1.PivotList, { pivotColumns: layout.PivotColumns, onPivotColumnsChange: onPivotColumnsChange, isDropDisabled: state.dropDisabledOnPivot, onReady: (dragEnd) => {
                         onDragEndRef.current.pivotList = dragEnd;
                     }, renderItem: (colId, clear) => {

package/src/View/Layout/Wizard/LayoutEditorWizard.js

@@ -12,6 +12,7 @@ const AdaptablePopover_1 = require("../../AdaptablePopover");
 const rebass_1 = require("rebass");
 const Panel_1 = tslib_1.__importDefault(require("../../../components/Panel"));
 const ColumnLabels_1 = require("./LayoutEditor/ColumnLabels");
+const CheckBox_1 = require("../../../components/CheckBox");
 class LayoutEditorWizard extends React.Component {
     constructor(props) {
         super(props);
@@ -80,7 +81,11 @@ class LayoutEditorWizard extends React.Component {
                                 ' '),
                             this.state.errorMessage ? (React.createElement(FormLayout_1.FormRow, { label: "" },
                                 React.createElement(ErrorBox_1.default, null, this.state.errorMessage))) : null)),
-                    React.createElement(rebass_1.Flex, { flex: 1, pr: 2, alignItems: "center", justifyContent: "end" },
+                    React.createElement(rebass_1.Flex, { flex: 1, alignItems: "center", justifyContent: "flex-end" },
+                        React.createElement(CheckBox_1.CheckBox, { mt: 0, mb: 0, checked: this.state.layout.EnablePivot, onChange: (checked) => {
+                                this.updateLayout({ EnablePivot: checked });
+                            } }, "Enable Pivot Layout")),
+                    React.createElement(rebass_1.Flex, { width: 120, pr: 2, alignItems: "center", justifyContent: "end" },
                         React.createElement(rebass_1.Text, { mr: 2 }, "Legend"),
                         React.createElement(AdaptablePopover_1.AdaptablePopover, { popoverMinWidth: 200, bodyText: [
                                 React.createElement(Panel_1.default, { variant: "modern", header: "Legend: Column Behaviour", className: "ab-LayoutEditor__LegendPanel", style: {

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

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

package/src/View/SmartEdit/SmartEditPopup.js

@@ -27,6 +27,7 @@ class SmartEditPopupComponent extends React.Component {
         this.props.onSmartEditCheckSelectedCells();
     }
     render() {
+        var _a, _b, _c;
         let col;
         if (this.props.PreviewInfo) {
             col = this.props.PreviewInfo.column;
@@ -34,7 +35,7 @@ class SmartEditPopupComponent extends React.Component {
         let globalValidationMessage = PreviewHelper_1.PreviewHelper.GetValidationMessage(this.props.PreviewInfo, `${this.props.SmartEditValue}`);
         let showPanel = this.props.PreviewInfo && StringExtensions_1.StringExtensions.IsNotNullOrEmpty(`${this.props.SmartEditValue}`);
         let previewPanel = showPanel ? (React.createElement(PreviewResultsPanel_1.PreviewResultsPanel, { style: { flex: '1 1 100%', overflow: 'initial', height: '100%' }, previewInfo: this.props.PreviewInfo, api: this.props.api, selectedColumn: col, showPanel: showPanel, showHeader: true })) : null;
-        let operationMenuItems = EnumExtensions_1.EnumExtensions.getNames(Enums_1.MathOperation).map((mathOperation, index) => {
+        const operationMenuItems = EnumExtensions_1.EnumExtensions.getNames(Enums_1.MathOperation).map((mathOperation, index) => {
             return {
                 label: mathOperation,
                 onClick: () => {
@@ -42,6 +43,15 @@ class SmartEditPopupComponent extends React.Component {
                 },
             };
         });
+        const customOperations = (_c = (_b = (_a = this.props.api.internalApi.getAdaptableOptions()) === null || _a === void 0 ? void 0 : _a.editOptions) === null || _b === void 0 ? void 0 : _b.smartEdit) === null || _c === void 0 ? void 0 : _c.customOperations;
+        if (customOperations === null || customOperations === void 0 ? void 0 : customOperations.length) {
+            operationMenuItems.push(...customOperations.map((operation) => {
+                return {
+                    onClick: () => this.props.onSmartEditOperationChange(operation),
+                    label: operation.Name,
+                };
+            }));
+        }
         return (React.createElement(PanelWithImage_1.PanelWithImage, { flex: 1, style: { height: '100%' }, variant: "primary", bodyProps: {
                 style: { display: 'flex', flexFlow: 'column' },
             }, bodyScroll: true, glyphicon: this.props.moduleInfo.Glyph, header: this.props.moduleInfo.FriendlyName, infoLink: this.props.moduleInfo.HelpPage, infoLinkDisabled: !this.props.api.internalApi.isDocumentationLinksDisplayed(), onKeyDown: (e) => {
@@ -50,7 +60,9 @@ class SmartEditPopupComponent extends React.Component {
                 }
             } },
             React.createElement(rebass_1.Flex, { flexDirection: "row", padding: 2, "data-name": "smart-edit-operation" },
-                React.createElement(DropdownButton_1.default, { items: operationMenuItems, columns: ['label'], onMouseDown: preventDefault }, Enums_1.MathOperation[this.props.MathOperation]),
+                React.createElement(DropdownButton_1.default, { items: operationMenuItems, columns: ['label'], onMouseDown: preventDefault }, typeof this.props.SmartEditOperation === 'object'
+                    ? this.props.SmartEditOperation.Name
+                    : this.props.SmartEditOperation),
                 React.createElement(Input_1.default, { value: this.props.SmartEditValue.toString(), marginLeft: 2, marginRight: 2, type: "number", placeholder: "Enter a Number", onChange: (e) => this.onSmartEditValueChange(e) }),
                 React.createElement(SimpleButton_1.default, { tone: this.getButtonStyle(), variant: "raised", disabled: StringExtensions_1.StringExtensions.IsNullOrEmpty(`${this.props.SmartEditValue}`) ||
                         (this.props.PreviewInfo &&
@@ -87,7 +99,7 @@ class SmartEditPopupComponent extends React.Component {
 function mapStateToProps(state, ownProps) {
     return {
         SmartEditValue: state.System.SmartEditValue,
-        MathOperation: state.System.SmartEditOperation,
+        SmartEditOperation: state.System.SmartEditOperation,
         PreviewInfo: state.System.SmartEditPreviewInfo,
     };
 }

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

@@ -2,16 +2,16 @@ import { ViewPanelProps } from '../Components/SharedProps/ViewPanelProps';
 import * as SystemRedux from '../../Redux/ActionsReducers/SystemRedux';
 import * as SmartEditRedux from '../../Redux/ActionsReducers/SmartEditRedux';
 import { PreviewInfo } from '../../Utilities/Interface/Preview';
-import { MathOperation } from '../../PredefinedConfig/Common/Enums';
 import * as React from 'react';
+import { SmartEditOperation } from '../../AdaptableOptions/SmartEdit';
 export interface SmartEditViewPanelComponentProps extends ViewPanelProps {
     SmartEditValue: number | undefined;
-    MathOperation: 'Add' | 'Subtract' | 'Multiply' | 'Divide' | undefined;
+    SmartEditOperation: SmartEditOperation | undefined;
     IsValidSelection: boolean;
     PreviewInfo: PreviewInfo;
     InPivotMode: Boolean;
     onSmartEditValueChange: (value: number) => SystemRedux.SmartEditChangeValueAction;
-    onSmartEditOperationChange: (MathOperation: MathOperation) => SystemRedux.SmartEditChangeOperationAction;
+    onSmartEditOperationChange: (MathOperation: SmartEditOperation) => SystemRedux.SmartEditChangeOperationAction;
     onSmartEditCheckSelectedCells: () => SystemRedux.SmartEditCheckCellSelectionAction;
     onRunSmartEdit: () => SmartEditRedux.SmartEditRunAction;
 }
@@ -28,7 +28,6 @@ declare class SmartEditViewPanelComponent extends React.Component<SmartEditViewP
     private onSmartEditValueChange;
     private getStatusColour;
     private onApplyClick;
-    private onchangeMathOperation;
     onApplySmartEdit(): any;
 }
 export declare let SmartEditViewPanelControl: import("react-redux").ConnectedComponent<typeof SmartEditViewPanelComponent, any>;

package/src/View/SmartEdit/SmartEditViewPanel.js

@@ -39,17 +39,27 @@ class SmartEditViewPanelComponent extends React.Component {
         (_a = this.cleanupEvent) === null || _a === void 0 ? void 0 : _a.call(this);
     }
     render() {
+        var _a, _b, _c;
         let statusColour = this.getStatusColour();
         let selectedColumn = StringExtensions_1.StringExtensions.IsNotNullOrEmpty(this.state.SelectedColumnId)
             ? this.props.api.columnApi.getColumnFromId(this.state.SelectedColumnId)
             : null;
         let previewPanel = (React.createElement(PreviewResultsPanel_1.PreviewResultsPanel, { previewInfo: this.props.PreviewInfo, api: this.props.api, selectedColumn: selectedColumn, showPanel: true, showHeader: false }));
-        let operationMenuItems = EnumExtensions_1.EnumExtensions.getNames(Enums_1.MathOperation).map((mathOperation, index) => {
+        const operationMenuItems = EnumExtensions_1.EnumExtensions.getNames(Enums_1.MathOperation).map((mathOperation, index) => {
             return {
                 onClick: () => this.props.onSmartEditOperationChange(mathOperation),
                 label: mathOperation,
             };
         });
+        const customOperations = (_c = (_b = (_a = this.props.api.internalApi.getAdaptableOptions()) === null || _a === void 0 ? void 0 : _a.editOptions) === null || _b === void 0 ? void 0 : _b.smartEdit) === null || _c === void 0 ? void 0 : _c.customOperations;
+        if (customOperations === null || customOperations === void 0 ? void 0 : customOperations.length) {
+            operationMenuItems.push(...customOperations.map((operation) => {
+                return {
+                    onClick: () => this.props.onSmartEditOperationChange(operation),
+                    label: operation.Name,
+                };
+            }));
+        }
         const applyButtonStyle = {
             color: statusColour,
             fill: 'currentColor',
@@ -60,7 +70,9 @@ class SmartEditViewPanelComponent extends React.Component {
         const elementType = this.props.viewType === 'Toolbar' ? 'DashboardToolbar' : 'ToolPanel';
         return (React.createElement(rebass_1.Flex, { flexDirection: "row", className: `ab-${elementType}__SmartEdit__wrap`, flexWrap: this.props.viewType === 'ToolPanel' ? 'wrap' : 'nowrap' },
             React.createElement(rebass_1.Flex, null,
-                React.createElement(DropdownButton_1.default, { className: `ab-${elementType}__SmartEdit__select`, marginRight: 2, items: operationMenuItems, style: { fontSize: 'small' }, columns: ['label'], disabled: shouldDisable, variant: "outlined" }, this.props.MathOperation),
+                React.createElement(DropdownButton_1.default, { className: `ab-${elementType}__SmartEdit__select`, marginRight: 2, items: operationMenuItems, style: { fontSize: 'small' }, columns: ['label'], disabled: shouldDisable, variant: "outlined" }, typeof this.props.SmartEditOperation === 'object'
+                    ? this.props.SmartEditOperation.Name
+                    : this.props.SmartEditOperation),
                 React.createElement(Input_1.default, { style: {
                         width: '5rem',
                     }, className: `ab-${elementType}__SmartEdit__select-value`, value: this.props.SmartEditValue.toString(), type: "number", placeholder: "Enter a Number", step: "any", onChange: (e) => this.onSmartEditValueChange(e), disabled: shouldDisable, marginRight: 2 })),
@@ -94,9 +106,6 @@ class SmartEditViewPanelComponent extends React.Component {
     onApplyClick() {
         this.onApplySmartEdit();
     }
-    onchangeMathOperation(mathOperation) {
-        this.props.onSmartEditOperationChange(mathOperation);
-    }
     onApplySmartEdit() {
         this.props.onRunSmartEdit();
     }
@@ -104,7 +113,7 @@ class SmartEditViewPanelComponent extends React.Component {
 function mapStateToProps(state, ownProps) {
     return {
         SmartEditValue: state.System.SmartEditValue,
-        MathOperation: state.System.SmartEditOperation,
+        SmartEditOperation: state.System.SmartEditOperation,
         IsValidSelection: state.System.IsValidSmartEditSelection,
         PreviewInfo: state.System.SmartEditPreviewInfo,
         InPivotMode: state.Grid.IsGridInPivotMode,

package/src/View/Wizard/OnePageAdaptableWizard.js

@@ -162,7 +162,7 @@ exports.OnePageAdaptableWizard = (props) => {
                                 navIndexMap.set(navIndex, index);
                                 const active = index === currentSection;
                                 const disabled = false; //!active && !currentSectionValid;
-                                return (React.createElement(rebass_1.Flex, { className: "ab-OnePageWizard__section-title", flexDirection: "row", style: {
+                                return (React.createElement(rebass_1.Flex, { className: "ab-OnePageWizard__section-title", "data-name": section.title, flexDirection: "row", style: {
                                         cursor: disabled ? 'auto' : 'pointer',
                                         zIndex: 10,
                                         transition: 'color 0.2s',

package/src/agGrid/Adaptable.d.ts

@@ -131,6 +131,7 @@ export declare class Adaptable implements IAdaptable {
     private getAlertRowClass;
     private getAlertRowStyle;
     private getFlashingCellStyle;
+    private getFlashingCellClass;
     private getCellHighlightStyle;
     private getRowHighlightStyle;
     private getRowHighlightClass;
@@ -165,8 +166,8 @@ export declare class Adaptable implements IAdaptable {
         [key: string]: boolean;
     }): GridCell[];
     private addDistinctColumnValue;
-    private isInternallyRenderedColumn;
-    getDisplayValue(id: any, columnId: string): string | undefined;
+    private isCustomRenderedColumn;
+    getDisplayValue(primaryKey: any, columnId: string): string | undefined;
     getGridCellFromRowNode(rowNode: RowNode, columnId: string): GridCell | undefined;
     getDisplayValueFromRowNode(rowNode: RowNode, columnId: string): string | undefined;
     getDisplayValueFromRawValue(columnId: string, rawValue: any): string | undefined;
@@ -313,7 +314,7 @@ export declare class Adaptable implements IAdaptable {
     getGridData(): any[];
     getFilteredData(): any[];
     loadDataSource(dataSource: any[]): void;
-    updateRows(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): Promise<RowNode[] | null | undefined>;
+    updateRows(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): Promise<RowNode[]>;
     addRows(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): Promise<RowNode[]>;
     deleteRows(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): Promise<RowNode[]>;
     getFirstGroupedColumn(): AdaptableColumn | undefined;
@@ -329,7 +330,7 @@ export declare class Adaptable implements IAdaptable {
     showQuickFilter(): void;
     hideQuickFilter(): void;
     getAgGridColumnType(columnId: string): string | string[];
-    getActiveColumnComparator(columnId: string, customSort?: CustomSort, customSortComparer?: ColumnValuesComparer): ((valueA: any, valueB: any, nodeA?: RowNode, nodeB?: RowNode, isInverted?: boolean) => number) | undefined;
+    getActiveColumnComparator(columnId: string, customSort?: CustomSort, customSortComparer?: ColumnValuesComparer): (valueA: any, valueB: any, nodeA?: RowNode, nodeB?: RowNode, isInverted?: boolean) => number | undefined;
     getAgGridLightThemeName(): string;
     getAgGridCurrentThemeName(): string;
     applyAdaptableTheme(theme: AdaptableTheme | string): void;