@adaptabletools/adaptable-cjs 22.0.0-canary.1 → 22.0.0-canary.3

package/src/View/Components/Buttons/ButtonClear.d.ts

@@ -3,6 +3,7 @@ import { SimpleButtonProps } from '../../../components/SimpleButton';
 export interface ClearButtonProps extends SimpleButtonProps {
     showText?: boolean;
     showIcon?: boolean;
+    variant?: SimpleButtonProps['variant'];
 }
 export declare class ButtonClear extends React.Component<ClearButtonProps, {}> {
     render(): React.JSX.Element;

package/src/View/Components/Buttons/EntityListActionButtons.js

@@ -14,6 +14,24 @@ const stopPropagation = (e) => {
     e.stopPropagation();
 };
 class EntityListActionButtons extends React.Component {
+    static defaultProps = {
+        // Adaptable: null,
+        suspendableObject: null,
+        showEdit: true,
+        showDelete: true,
+        showShare: false,
+        showSuspend: false,
+        overrideDisableEdit: false,
+        overrideDisableDelete: false,
+        overrideDisableClone: false,
+        overrideDisableShare: false,
+        confirmDeleteAction: null,
+        entityType: '',
+        accessLevel: 'Full',
+        editSize: 'xsmall',
+        deleteSize: 'xsmall',
+        shareSize: 'xsmall',
+    };
     render() {
         const { justifyContent } = this.props;
         const justifyContentClassName = (0, clsx_1.default)({
@@ -30,21 +48,3 @@ class EntityListActionButtons extends React.Component {
     }
 }
 exports.EntityListActionButtons = EntityListActionButtons;
-EntityListActionButtons.defaultProps = {
-    // Adaptable: null,
-    suspendableObject: null,
-    showEdit: true,
-    showDelete: true,
-    showShare: false,
-    showSuspend: false,
-    overrideDisableEdit: false,
-    overrideDisableDelete: false,
-    overrideDisableClone: false,
-    overrideDisableShare: false,
-    confirmDeleteAction: null,
-    entityType: '',
-    accessLevel: 'Full',
-    editSize: 'xsmall',
-    deleteSize: 'xsmall',
-    shareSize: 'xsmall',
-};

package/src/View/Components/ColumnFilter/components/FloatingFilterValues.js

@@ -209,7 +209,7 @@ const FloatingFilterValues = (props) => {
                     ...(props.value?.length
                         ? {
                             valueContainer: {
-                                fontWeight: 'var(--ab-cmp-quickfilter-selected-options-text__font-weight)',
+                                fontWeight: 'var(--ab-cmp-floatingfilter-selected-options-text__font-weight)',
                             },
                         }
                         : {}),

package/src/View/Components/ExpressionWizard.js

@@ -13,11 +13,6 @@ const Flex_1 = require("../../components/Flex");
 class ExpressionWizard extends React.Component {
     constructor(props) {
         super(props);
-        this.handleCustomExpressionChange = (expression) => {
-            this.setState({
-                expression,
-            }, () => this.props.updateGoBackState());
-        };
         this.state = {
             // this is realy horrible but its only way to use the Expression Wizard for both Report (that has Query) and Format Column (that has Rule)
             // once we move to the new Wizard we can remove this monstrosity
@@ -47,6 +42,11 @@ class ExpressionWizard extends React.Component {
                 .getQueryLanguageService()
                 .validateBoolean(this.state.expression, ModuleConstants_1.NamedQueryModuleId).isValid);
     }
+    handleCustomExpressionChange = (expression) => {
+        this.setState({
+            expression,
+        }, () => this.props.updateGoBackState());
+    };
     canNext() {
         if (this.isValidExpression() == false) {
             return false;

package/src/View/Components/Panels/PanelDashboard/index.js

@@ -5,17 +5,17 @@ const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const Dashboard_1 = require("../../../../components/Dashboard");
 class PanelDashboard extends React.Component {
+    static defaultProps = {
+        showConfigureActionButton: true,
+        showCloseActionButton: true,
+        headerText: 'Module',
+        onClose: null,
+        onConfigure: null,
+        accessLevel: 'Full',
+    };
     render() {
         const { headerText, showConfigureActionButton, showCloseActionButton, onConfigure, onClose, accessLevel, children, } = this.props;
         return (React.createElement(Dashboard_1.DashboardToolbar, { title: headerText, onConfigure: onConfigure, showConfigure: showConfigureActionButton, showClose: showCloseActionButton, onClose: onClose, accessLevel: accessLevel }, children));
     }
 }
 exports.PanelDashboard = PanelDashboard;
-PanelDashboard.defaultProps = {
-    showConfigureActionButton: true,
-    showCloseActionButton: true,
-    headerText: 'Module',
-    onClose: null,
-    onConfigure: null,
-    accessLevel: 'Full',
-};

package/src/View/Components/Panels/PanelToolPanel/index.js

@@ -11,6 +11,13 @@ const ButtonMaximise_1 = require("../../Buttons/ButtonMaximise");
 const twMerge_1 = require("../../../../twMerge");
 const Flex_1 = require("../../../../components/Flex");
 class PanelToolPanel extends React.Component {
+    static defaultProps = {
+        headerText: '',
+        onClose: null,
+        onConfigure: null,
+        onMinimiseChanged: null,
+        isMinimised: true,
+    };
     render() {
         const { useDefaultPanelStyle, isMinimised, onMinimiseChanged, headerText, onClose, onConfigure, ...props } = this.props;
         let header = (React.createElement(React.Fragment, null,
@@ -43,10 +50,3 @@ class PanelToolPanel extends React.Component {
     }
 }
 exports.PanelToolPanel = PanelToolPanel;
-PanelToolPanel.defaultProps = {
-    headerText: '',
-    onClose: null,
-    onConfigure: null,
-    onMinimiseChanged: null,
-    isMinimised: true,
-};

package/src/View/Components/Selectors/BulkUpdateValueSelector.js

@@ -3,15 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BulkUpdateValueSelector = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
-const FieldWrap_1 = tslib_1.__importDefault(require("../../../components/FieldWrap"));
+const react_1 = require("react");
+const DropdownButton_1 = tslib_1.__importDefault(require("../../../components/DropdownButton"));
 const UIHelper_1 = tslib_1.__importDefault(require("../../UIHelper"));
 const AdaptableInput_1 = tslib_1.__importDefault(require("../AdaptableInput"));
 const PermittedValuesSelector_1 = require("./PermittedValuesSelector");
-const Select_1 = require("../../../components/Select");
 const AdaptableContext_1 = require("../../AdaptableContext");
-const react_1 = require("react");
 const clsx_1 = tslib_1.__importDefault(require("clsx"));
 const Flex_1 = require("../../../components/Flex");
+const icons_1 = require("../../../components/icons");
+const InputGroup_1 = require("../../../components/InputGroup");
 const BulkUpdateValueSelector = (props) => {
     const [valueType, setValueType] = React.useState('existing');
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
@@ -21,8 +22,8 @@ const BulkUpdateValueSelector = (props) => {
     // TODO = this seems to be called whenever we edit a cell
     // which is then triggering a get all values
     // not sure that we need to
-    const permittedValueSelector = (React.createElement(Flex_1.Box, null,
-        React.createElement(PermittedValuesSelector_1.PermittedValuesSelector, { allowNewValues: true, searchable: 'inline', disabled: props.disabled || !props.selectedColumn, value: props.selectedColumnValue === '' ? null : props.selectedColumnValue, columnId: columnId, placeholder: isDateType ? 'Select' : 'Select or type new value', loadValues: (0, react_1.useCallback)(({ currentSearchValue }) => {
+    const permittedValueSelector = (React.createElement(Flex_1.Box, { className: 'twa:flex-1' },
+        React.createElement(PermittedValuesSelector_1.PermittedValuesSelector, { allowNewValues: true, searchable: 'inline', disabled: props.disabled || !props.selectedColumn, value: props.selectedColumnValue === '' ? null : props.selectedColumnValue, columnId: columnId, placeholder: 'Select value', loadValues: (0, react_1.useCallback)(({ currentSearchValue }) => {
                 if (!columnId || !props.selectedGridCells.length) {
                     return Promise.resolve([]);
                 }
@@ -45,17 +46,17 @@ const BulkUpdateValueSelector = (props) => {
             : 'Enter Value', autoFocus: true, disabled: props.disabled, className: "twa:w-full", value: props.selectedColumnValue, onChange: (e) => {
             props.onColumnValueChange(e.target.value);
         } }));
-    let valueTypeSelector = null;
-    if (isDateType) {
-        valueTypeSelector = (React.createElement(Select_1.Select, { "aria-label": "Bulk Update Value Selector", options: [
-                { label: 'New', value: 'new' },
-                { label: 'Existing', value: 'existing' },
-            ], value: valueType, onChange: (value) => {
-                setValueType(value);
-            } }));
-    }
-    return (React.createElement(FieldWrap_1.default, { className: (0, clsx_1.default)('twa:overflow-visible twa:max-w-full', props.className), style: props.style }, isDateType ? (React.createElement(React.Fragment, null,
-        valueType === 'new' ? input : permittedValueSelector,
-        valueTypeSelector)) : (permittedValueSelector)));
+    return (React.createElement(Flex_1.Flex, { className: (0, clsx_1.default)('twa:overflow-visible twa:max-w-full', props.className), style: props.style }, isDateType ? (React.createElement(React.Fragment, null,
+        React.createElement(InputGroup_1.InputGroup, { Component: Flex_1.Flex, "data-id": "bulk-update-input-wrapper", className: "twa:w-full" },
+            React.createElement(DropdownButton_1.default, { "aria-label": "Bulk Update Value Selector", "data-id": "bulk-update-value-type-selector", "data-value": valueType, columns: ['label'], variant: "outlined", tone: "neutral", items: [
+                    { label: 'New', icon: React.createElement(icons_1.Icon, { name: "edit" }), onClick: () => setValueType('new') },
+                    {
+                        label: 'Existing',
+                        icon: React.createElement(icons_1.Icon, { name: "grid" }),
+                        onClick: () => setValueType('existing'),
+                    },
+                ] },
+                React.createElement(React.Fragment, null, valueType === 'existing' ? React.createElement(icons_1.Icon, { name: "grid" }) : React.createElement(icons_1.Icon, { name: "edit" }))),
+            valueType === 'new' ? input : permittedValueSelector))) : (permittedValueSelector)));
 };
 exports.BulkUpdateValueSelector = BulkUpdateValueSelector;

package/src/View/Components/StyleComponent.js

@@ -133,6 +133,14 @@ const StyleComponent = (props) => {
         }
         setComponentStyle(newStyle);
     };
+    const onAlignmentChange = (alignment) => {
+        const newStyle = { ...componentStyle };
+        newStyle.Alignment = alignment;
+        if (alignment == 'Default') {
+            delete newStyle.Alignment;
+        }
+        setComponentStyle(newStyle);
+    };
     const Cmp = props.headless ? Flex_1.Box : Panel_1.default;
     const headerText = props.headerText ?? 'Style';
     const cmpProps = props.headless
@@ -220,7 +228,18 @@ const StyleComponent = (props) => {
                             ], value: componentStyle.FontSize?.toString() ?? '', onChange: (value) => onFontSizeChange(value) }))) : (React.createElement(Flex_1.Flex, { flexDirection: "row", alignItems: "center", className: "twa:gap-2 twa:flex-wrap" }, fontSizes.map((enumName) => {
                         return (React.createElement(Radio_1.default, { onClick: () => onFontSizeChange(enumName), checked: (enumName == 'Default' && !componentStyle.FontSize) ||
                                 componentStyle.FontSize === enumName, key: enumName }, enumName));
-                    }))))))),
+                    }))),
+                    React.createElement("span", null, "Alignment"),
+                    React.createElement(Toggle_1.ToggleGroup, null,
+                        React.createElement(Toggle_1.Toggle, { icon: "align-left", pressed: componentStyle.Alignment === 'Left', onPressedChange: (pressed) => pressed
+                                ? onAlignmentChange('Left')
+                                : onAlignmentChange('Default') }),
+                        React.createElement(Toggle_1.Toggle, { icon: "align-center", pressed: componentStyle.Alignment === 'Center', onPressedChange: (pressed) => pressed
+                                ? onAlignmentChange('Center')
+                                : onAlignmentChange('Default') }),
+                        React.createElement(Toggle_1.Toggle, { icon: "align-right", pressed: componentStyle.Alignment === 'Right', onPressedChange: (pressed) => pressed
+                                ? onAlignmentChange('Right')
+                                : onAlignmentChange('Default') })))))),
         !props.hidePreview && (React.createElement(Card_1.Card, { shadow: false },
             React.createElement(Card_1.Card.Title, null, "Preview"),
             React.createElement(Card_1.Card.Body, { className: "twa:grid twa:place-items-center" },

package/src/View/Components/ToolPanel/AdaptableToolPanel.js

@@ -226,6 +226,8 @@ const getAdaptableToolPanelAgGridComponent = (adaptable) => {
         };
     }
     return class AdaptableToolPanelAgGridComponent {
+        gui;
+        unmountReactRoot;
         init(params) {
             const api = adaptable.api;
             this.gui = document.createElement('div');

package/src/View/CustomSort/CustomSortSummary.js

@@ -20,19 +20,6 @@ const CustomSortWizard_1 = require("./Wizard/CustomSortWizard");
 class CustomSortSummaryComponent extends React.Component {
     constructor(props) {
         super(props);
-        this.onFinishWizard = (customSort) => {
-            if (this.props.CustomSorts.find((x) => x.ColumnId == customSort.ColumnId)) {
-                this.props.onEditCustomSort(customSort);
-            }
-            else {
-                this.props.onAddCustomSort(customSort);
-            }
-            this.setState({
-                editedAdaptableObject: null,
-                wizardStartIndex: 0,
-                wizardStatus: EditableConfigEntityState_1.WizardStatus.None,
-            });
-        };
         this.state = UIHelper_1.UIHelper.getEmptyConfigState();
     }
     render() {
@@ -80,6 +67,19 @@ class CustomSortSummaryComponent extends React.Component {
             wizardStatus: EditableConfigEntityState_1.WizardStatus.None,
         });
     }
+    onFinishWizard = (customSort) => {
+        if (this.props.CustomSorts.find((x) => x.ColumnId == customSort.ColumnId)) {
+            this.props.onEditCustomSort(customSort);
+        }
+        else {
+            this.props.onAddCustomSort(customSort);
+        }
+        this.setState({
+            editedAdaptableObject: null,
+            wizardStartIndex: 0,
+            wizardStatus: EditableConfigEntityState_1.WizardStatus.None,
+        });
+    };
     canFinishWizard() {
         let customSort = this.state.editedAdaptableObject;
         return (StringExtensions_1.StringExtensions.IsNotNullOrEmpty(customSort.ColumnId) &&

package/src/View/Dashboard/DashboardPopup.js

@@ -73,18 +73,17 @@ class DashboardPopupComponent extends React.Component {
             React.createElement(Flex_1.Flex, { flexDirection: "column", className: "twa:h-full twa:gap-4" },
                 areDashboardSettingsVisible && (React.createElement(React.Fragment, null,
                     React.createElement(Card_1.Card, null,
-                        React.createElement(Card_1.Card.Title, { gap: 8 },
-                            "Display Settings",
-                            React.createElement(ToggleButton_1.ToggleButton, { className: "twa:self-end", onChange: (visible) => this.props.onSetDashboardHidden(!visible), checked: !this.props.IsHidden, "data-name": "dashboard-visibility" }, this.props.IsHidden ? 'Hidden' : 'Visible')),
+                        React.createElement(Card_1.Card.Title, { gap: 8 }, "Display Settings"),
                         React.createElement(Card_1.Card.Body, { gap: 2, className: "twa:p-2" },
-                            React.createElement(ToggleButton_1.ToggleButton, { disabled: this.props.IsFloating, className: "twa:w-24", onChange: (expanded) => this.props.onSetDashboardCollapsed(!expanded), checked: !this.props.IsCollapsed, "data-name": "expand-state" }, this.props.IsCollapsed ? 'Collapsed' : 'Expanded'),
+                            React.createElement(ToggleButton_1.ToggleButton, { className: "twa:w-24", onChange: (visible) => this.props.onSetDashboardHidden(!visible), checked: !this.props.IsHidden, "data-name": "dashboard-visibility" }, this.props.IsHidden ? 'Hidden' : 'Visible'),
+                            this.props.DashboardState.Tabs?.length > 0 ? (React.createElement(ToggleButton_1.ToggleButton, { disabled: this.props.IsFloating, className: "twa:w-24", onChange: (expanded) => this.props.onSetDashboardCollapsed(!expanded), checked: !this.props.IsCollapsed, "data-name": "expand-state" }, this.props.IsCollapsed ? 'Collapsed' : 'Expanded')) : null,
                             this.props.api.optionsApi.getDashboardOptions().canFloat ? (React.createElement(ToggleButton_1.ToggleButton, { className: "twa:w-24", onChange: (pinned) => this.props.onSetDashboardFloating(!pinned), checked: !this.props.IsFloating, "data-name": "floating" }, this.props.IsFloating ? 'Floating' : 'Pinned')) : null)))),
                 React.createElement(Card_1.Card, { className: "twa:flex-1 twa:overflow-hidden", gap: 0 },
                     React.createElement(Card_1.Card.Title, null, "Contents"),
                     React.createElement(Card_1.Card.Body, { className: "twa:p-2" },
                         React.createElement(Tabs_1.Tabs, { className: "twa:flex-1 twa:min-h-0" },
                             React.createElement(Tabs_1.Tabs.Tab, { value: "pinned-toolbars" }, "Pinned Toolbars"),
-                            React.createElement(Tabs_1.Tabs.Tab, { value: "tabbed-toolbars" }, "Tabbed Toolbars"),
+                            React.createElement(Tabs_1.Tabs.Tab, { value: "tabbed-toolbars" }, "Tabs & Toolbars"),
                             React.createElement(Tabs_1.Tabs.Tab, { value: "buttons" }, "Buttons"),
                             React.createElement(Tabs_1.Tabs.Content, { value: "pinned-toolbars", className: contentCls },
                                 React.createElement(PinnedToolbarsSelector_1.PinnedToolbarsSelector, null)),

package/src/View/Export/ExportDestinationPicker.js

@@ -16,7 +16,7 @@ const ExportDestinationPicker = ({ reportName, reportFormat, viewType, }) => {
     };
     const supportedDestinations = exportApi.getSupportedExportDestinations(reportFormat);
     if (supportedDestinations.length === 0 || supportedDestinations.length === 1) {
-        return (react_1.default.createElement(ButtonExport_1.ButtonExport, { className: (0, clsx_1.default)(viewType !== 'StatusBar' ? 'twa:mr-[20px]' : undefined, 'twa:pr-0'), onClick: () => handleExport(supportedDestinations[0]), tooltip: "Export Report", disabled: reportName == undefined || reportFormat == undefined }));
+        return (react_1.default.createElement(ButtonExport_1.ButtonExport, { className: (0, clsx_1.default)(viewType !== 'StatusBar' ? '' : undefined, ''), onClick: () => handleExport(supportedDestinations[0]), tooltip: "Export Report", disabled: reportName == undefined || reportFormat == undefined }));
     }
     const destinationItems = supportedDestinations.map((destination) => ({
         label: destination,

package/src/View/Export/ExportStatusBar.js

@@ -8,14 +8,16 @@ const ReportNameSelector_1 = require("./ReportNameSelector");
 const ReportFormatSelector_1 = require("./ReportFormatSelector");
 const ExportDestinationPicker_1 = require("./ExportDestinationPicker");
 const AdaptableContext_1 = require("../AdaptableContext");
+const Flex_1 = require("../../components/Flex");
 const ExportStatusBar = () => {
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
     const exportApi = adaptable.api.exportApi;
     const currentReportName = (0, react_redux_1.useSelector)((state) => state.Export.CurrentReport);
     const currentFormat = (0, react_redux_1.useSelector)((state) => state.Export.CurrentFormat);
     return (react_1.default.createElement(react_1.default.Fragment, null,
-        react_1.default.createElement(ReportNameSelector_1.ReportNameSelector, { viewType: "StatusBar", size: 'small', reportName: currentReportName, onReportNameSelected: (reportName) => exportApi.selectReport(reportName) }),
-        react_1.default.createElement(ReportFormatSelector_1.ReportFormatSelector, { viewType: "StatusBar", size: 'small', reportName: currentReportName, reportFormat: currentFormat, onReportFormatSelected: (reportFormat) => exportApi.selectFormat(reportFormat) }),
+        react_1.default.createElement(Flex_1.Flex, { className: "twa:gap-1" },
+            react_1.default.createElement(ReportNameSelector_1.ReportNameSelector, { viewType: "StatusBar", reportName: currentReportName, onReportNameSelected: (reportName) => exportApi.selectReport(reportName) }),
+            react_1.default.createElement(ReportFormatSelector_1.ReportFormatSelector, { viewType: "StatusBar", reportName: currentReportName, reportFormat: currentFormat, onReportFormatSelected: (reportFormat) => exportApi.selectFormat(reportFormat) })),
         react_1.default.createElement(ExportDestinationPicker_1.ExportDestinationPicker, { viewType: "StatusBar", reportName: currentReportName, reportFormat: currentFormat })));
 };
 exports.ExportStatusBar = ExportStatusBar;

package/src/View/Export/ExportViewPanel.js

@@ -19,6 +19,7 @@ const ReportNameSelector_1 = require("./ReportNameSelector");
 const ReportFormatSelector_1 = require("./ReportFormatSelector");
 const ExportDestinationPicker_1 = require("./ExportDestinationPicker");
 const Flex_1 = require("../../components/Flex");
+const clsx_1 = tslib_1.__importDefault(require("clsx"));
 const ExportViewPanel = (props) => {
     const dispatch = (0, react_redux_1.useDispatch)();
     const exportApi = props.api.exportApi;
@@ -30,28 +31,34 @@ const ExportViewPanel = (props) => {
     const deleteMessage = currentReport
         ? `Are you sure you want to delete '${currentReport.Name}'?`
         : 'Are you sure you want to delete this report?';
-    const elementType = props.viewType === 'Toolbar' ? 'DashboardToolbar' : 'ToolPanel';
-    return (React.createElement(Flex_1.Flex, { flexDirection: "row", className: `ab-${elementType}__Export__panel twa:gap-2`, flexWrap: props.viewType === 'ToolPanel' ? 'wrap' : 'nowrap' },
+    const isToolbar = props.viewType === 'Toolbar';
+    const elementType = isToolbar ? 'DashboardToolbar' : 'ToolPanel';
+    return (React.createElement(Flex_1.Flex, { flexDirection: "row", className: (0, clsx_1.default)(`ab-${elementType}__CellSummary__wrap twa:gap-2 twa:flex-row`, {
+            'twa:min-w-[486px] twa:flex-nowrap': isToolbar,
+            'twa:flex-1 twa:flex-wrap': !isToolbar,
+        }) },
         React.createElement(ReportNameSelector_1.ReportNameSelector, { viewType: props.viewType, reportName: currentReportName, userReports: userReports, onReportNameSelected: (reportName) => exportApi.selectReport(reportName) }),
         React.createElement(ReportFormatSelector_1.ReportFormatSelector, { viewType: props.viewType, reportName: currentReportName, reportFormat: currentFormat, onReportFormatSelected: (reportFormat) => exportApi.selectFormat(reportFormat) }),
         React.createElement(Flex_1.Flex, { className: (0, join_1.default)(accessLevel == 'ReadOnly' ? GeneralConstants.READ_ONLY_STYLE : '', `ab-${elementType}__Export__controls twa:w-full`) },
-            React.createElement(ExportDestinationPicker_1.ExportDestinationPicker, { viewType: props.viewType, reportName: currentReportName, reportFormat: currentFormat }),
-            React.createElement(ButtonEdit_1.ButtonEdit, { onClick: () => dispatch(PopupRedux.PopupShowScreen(ModuleConstants.ExportModuleId, props.moduleInfo.Popup, {
-                    action: 'Edit',
-                    source: 'Toolbar',
-                })), tooltip: "Edit Report", className: `ab-${elementType}__Export__edit`, disabled: currentReport == null, accessLevel: accessLevel }),
-            React.createElement(ButtonNew_1.ButtonNew, { variant: "text", className: `ab-${elementType}__Export__new`, tone: "neutral", children: null, onClick: () => dispatch(PopupRedux.PopupShowScreen(ModuleConstants.ExportModuleId, props.moduleInfo.Popup, {
-                    action: 'New',
-                    source: 'Toolbar',
-                })), tooltip: "Create New Report", accessLevel: props.accessLevel }),
-            React.createElement(ButtonDelete_1.ButtonDelete, { tooltip: "Delete Report", className: `ab-${elementType}__Export__delete`, disabled: currentReport == null, ConfirmAction: ExportRedux.ReportDelete(currentReport), ConfirmationMsg: deleteMessage, ConfirmationTitle: 'Delete Report', accessLevel: accessLevel }),
-            props.api.entitlementApi.isModuleFullEntitlement('Schedule') && (React.createElement(ButtonSchedule_1.ButtonSchedule, { className: `ab-${elementType}__Export__schedule twa:ml-1`, onClick: () => {
-                    const reportSchedule = ObjectFactory_1.default.CreateReportSchedule(currentReportName, currentFormat);
-                    dispatch(PopupRedux.PopupShowScreen(ModuleConstants.ScheduleModuleId, 'SchedulePopup', {
+            React.createElement(Flex_1.Flex, { className: "twa:min-w-[44px]" },
+                React.createElement(ExportDestinationPicker_1.ExportDestinationPicker, { viewType: props.viewType, reportName: currentReportName, reportFormat: currentFormat })),
+            React.createElement(Flex_1.Flex, null,
+                React.createElement(ButtonEdit_1.ButtonEdit, { onClick: () => dispatch(PopupRedux.PopupShowScreen(ModuleConstants.ExportModuleId, props.moduleInfo.Popup, {
+                        action: 'Edit',
+                        source: 'Toolbar',
+                    })), tooltip: "Edit Report", className: `ab-${elementType}__Export__edit`, disabled: currentReport == null, accessLevel: accessLevel }),
+                React.createElement(ButtonNew_1.ButtonNew, { variant: "text", className: `ab-${elementType}__Export__new`, tone: "neutral", children: null, onClick: () => dispatch(PopupRedux.PopupShowScreen(ModuleConstants.ExportModuleId, props.moduleInfo.Popup, {
                         action: 'New',
                         source: 'Toolbar',
-                        value: reportSchedule,
-                    }));
-                }, tooltip: "Schedule", disabled: currentReport == null, accessLevel: props.accessLevel })))));
+                    })), tooltip: "Create New Report", accessLevel: props.accessLevel }),
+                React.createElement(ButtonDelete_1.ButtonDelete, { tooltip: "Delete Report", className: `ab-${elementType}__Export__delete`, disabled: currentReport == null, ConfirmAction: ExportRedux.ReportDelete(currentReport), ConfirmationMsg: deleteMessage, ConfirmationTitle: 'Delete Report', accessLevel: accessLevel }),
+                props.api.entitlementApi.isModuleFullEntitlement('Schedule') && (React.createElement(ButtonSchedule_1.ButtonSchedule, { className: `ab-${elementType}__Export__schedule`, onClick: () => {
+                        const reportSchedule = ObjectFactory_1.default.CreateReportSchedule(currentReportName, currentFormat);
+                        dispatch(PopupRedux.PopupShowScreen(ModuleConstants.ScheduleModuleId, 'SchedulePopup', {
+                            action: 'New',
+                            source: 'Toolbar',
+                            value: reportSchedule,
+                        }));
+                    }, tooltip: "Schedule", disabled: currentReport == null, accessLevel: props.accessLevel }))))));
 };
 exports.ExportViewPanel = ExportViewPanel;

package/src/View/FormatColumn/FormatColumnSummary.js

@@ -19,19 +19,6 @@ const FormatColumnWizard_1 = require("./Wizard/FormatColumnWizard");
 class FormatColumnSummaryComponent extends React.Component {
     constructor(props) {
         super(props);
-        this.onFinishWizard = (formatColumn) => {
-            if (this.props.FormatColumns.find((x) => x.Uuid == formatColumn.Uuid)) {
-                this.props.onEditFormatColumn(formatColumn);
-            }
-            else {
-                this.props.onAddFormatColumn(formatColumn);
-            }
-            this.setState({
-                editedAdaptableObject: null,
-                wizardStartIndex: 0,
-                wizardStatus: EditableConfigEntityState_1.WizardStatus.None,
-            });
-        };
         this.state = UIHelper_1.UIHelper.getEmptyConfigState();
     }
     render() {
@@ -74,6 +61,19 @@ class FormatColumnSummaryComponent extends React.Component {
             wizardStatus: EditableConfigEntityState_1.WizardStatus.None,
         });
     }
+    onFinishWizard = (formatColumn) => {
+        if (this.props.FormatColumns.find((x) => x.Uuid == formatColumn.Uuid)) {
+            this.props.onEditFormatColumn(formatColumn);
+        }
+        else {
+            this.props.onAddFormatColumn(formatColumn);
+        }
+        this.setState({
+            editedAdaptableObject: null,
+            wizardStartIndex: 0,
+            wizardStatus: EditableConfigEntityState_1.WizardStatus.None,
+        });
+    };
     canFinishWizard() {
         let formatColumn = this.state.editedAdaptableObject;
         return formatColumn.Scope != undefined && UIHelper_1.UIHelper.IsNotEmptyStyle(formatColumn.Style);

package/src/View/FormatColumn/Wizard/FormatColumnSettingsWizardSection.js

@@ -7,16 +7,11 @@ const FormLayout_1 = tslib_1.__importStar(require("../../../components/FormLayou
 const CheckBox_1 = require("../../../components/CheckBox");
 const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
 const Tag_1 = require("../../../components/Tag");
-const ToggleGroup_1 = require("../../../components/Toggle/ToggleGroup");
-const Toggle_1 = require("../../../components/Toggle/Toggle");
 const Radio_1 = tslib_1.__importStar(require("../../../components/Radio"));
 const Flex_1 = require("../../../components/Flex");
 const Card_1 = require("../../../components/Card");
 const renderFormatColumnSettingsSummary = (data) => {
     return (React.createElement(Flex_1.Box, { className: "twa:p-2" },
-        React.createElement(Flex_1.Box, null,
-            "Cell alignment ",
-            React.createElement(Tag_1.Tag, null, data.CellAlignment ?? 'default')),
         React.createElement(Flex_1.Box, { className: "twa:mt-3" },
             "Data Rows ",
             React.createElement(Tag_1.Tag, null, data.RowScope?.ExcludeDataRows ? 'no' : 'yes')),
@@ -40,13 +35,6 @@ const renderFormatColumnSettingsSummary = (data) => {
 exports.renderFormatColumnSettingsSummary = renderFormatColumnSettingsSummary;
 const FormatColumnSettingsWizardSection = (props) => {
     const { data } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
-    const onCellAlignmentSelectChanged = (CellAlignment) => {
-        const newData = { ...data, CellAlignment };
-        if (CellAlignment === null) {
-            delete newData.CellAlignment;
-        }
-        props.onChange(newData);
-    };
     const onExcludeDataRowsChanged = (ExcludeDataRows) => {
         props.onChange({
             ...data,
@@ -88,17 +76,6 @@ const FormatColumnSettingsWizardSection = (props) => {
         React.createElement(Card_1.Card.Body, null,
             React.createElement(Flex_1.Flex, { flexDirection: "row" },
                 React.createElement(FormLayout_1.default, null,
-                    React.createElement(FormLayout_1.FormRow, { label: "Cell Alignment" },
-                        React.createElement(ToggleGroup_1.ToggleGroup, null,
-                            React.createElement(Toggle_1.Toggle, { icon: "align-left", pressed: data.CellAlignment === 'Left', onPressedChange: (pressed) => pressed
-                                    ? onCellAlignmentSelectChanged('Left')
-                                    : onCellAlignmentSelectChanged(null) }),
-                            React.createElement(Toggle_1.Toggle, { icon: "align-center", pressed: data.CellAlignment === 'Center', onPressedChange: (pressed) => pressed
-                                    ? onCellAlignmentSelectChanged('Center')
-                                    : onCellAlignmentSelectChanged(null) }),
-                            React.createElement(Toggle_1.Toggle, { icon: "align-right", pressed: data.CellAlignment === 'Right', onPressedChange: (pressed) => pressed
-                                    ? onCellAlignmentSelectChanged('Right')
-                                    : onCellAlignmentSelectChanged(null) }))),
                     data.Target === 'cell' && (React.createElement(React.Fragment, null,
                         React.createElement(FormLayout_1.FormRow, { label: "Exclude Data Rows:" },
                             React.createElement(Flex_1.Flex, { alignItems: "center", className: "twa:ml-2" },

package/src/View/FormatColumn/Wizard/FormatColumnStyleWizardSection.js

@@ -13,7 +13,6 @@ const isFormatColumnStyleValid = (data, api) => {
     if (data.Style &&
         UIHelper_1.default.IsEmptyStyle(data.Style) &&
         data.DisplayFormat === undefined &&
-        data.CellAlignment === undefined &&
         !api.columnScopeApi.isSingleBooleanColumnScope(data.Scope)) {
         return 'No format applied';
     }
@@ -25,7 +24,8 @@ const toStyle = (data) => {
         ...(0, StyleHelper_1.convertAdaptableStyleToCSS)(data.Style ?? {}),
         borderWidth: data.Style?.BorderColor ? 2 : 0,
         borderStyle: 'solid',
-        textAlign: data.CellAlignment ? data.CellAlignment.toLowerCase() : undefined,
+        // ToDO abcdefg
+        textAlign: data.Style?.Alignment ? data.Style.Alignment.toLowerCase() : undefined,
     };
 };
 const renderFormatColumnStyleWizardSummary = (data) => {

package/src/View/FreeTextColumn/FreeTextColumnSummary.js

@@ -19,19 +19,6 @@ const FreeTextColumnWizard_1 = require("./Wizard/FreeTextColumnWizard");
 class FreeTextColumnSummaryComponent extends React.Component {
     constructor(props) {
         super(props);
-        this.onFinishWizard = (FreeTextColumn) => {
-            if (this.props.FreeTextColumns.find((x) => x.ColumnId == FreeTextColumn.ColumnId)) {
-                this.props.onEditFreeTextColumn(FreeTextColumn);
-            }
-            else {
-                this.props.onAddFreeTextColumn(FreeTextColumn);
-            }
-            this.setState({
-                editedAdaptableObject: null,
-                wizardStartIndex: 0,
-                wizardStatus: EditableConfigEntityState_1.WizardStatus.None,
-            });
-        };
         this.state = UIHelper_1.UIHelper.getEmptyConfigState();
     }
     render() {
@@ -72,6 +59,19 @@ class FreeTextColumnSummaryComponent extends React.Component {
             wizardStatus: EditableConfigEntityState_1.WizardStatus.None,
         });
     }
+    onFinishWizard = (FreeTextColumn) => {
+        if (this.props.FreeTextColumns.find((x) => x.ColumnId == FreeTextColumn.ColumnId)) {
+            this.props.onEditFreeTextColumn(FreeTextColumn);
+        }
+        else {
+            this.props.onAddFreeTextColumn(FreeTextColumn);
+        }
+        this.setState({
+            editedAdaptableObject: null,
+            wizardStartIndex: 0,
+            wizardStatus: EditableConfigEntityState_1.WizardStatus.None,
+        });
+    };
     canFinishWizard() {
         let FreeTextColumn = this.state.editedAdaptableObject;
         return StringExtensions_1.StringExtensions.IsNotNullOrEmpty(FreeTextColumn.ColumnId);