@adaptabletools/adaptable 22.0.0-canary.0 → 22.0.0-canary.10

package/src/View/CustomSort/Wizard/CustomSortColumnWizardSection.js

@@ -3,16 +3,28 @@ import { Tabs } from '../../../components/Tabs';
 import { Tag } from '../../../components/Tag';
 import { NewColumnSelector } from '../../Components/ColumnSelector';
 import { useOnePageAdaptableWizardContext } from '../../Wizard/OnePageAdaptableWizard';
-import { Box } from '../../../components/Flex';
+import { Box, Flex } from '../../../components/Flex';
+import FormLayout, { FormRow } from '../../../components/FormLayout';
+import Input from '../../../components/Input';
 export const renderCustomSortColumn = (data) => {
     const { api } = useOnePageAdaptableWizardContext();
     return (React.createElement(Box, { className: "twa:text-2 twa:py-2 twa:pr-2" },
-        "Custom sort column: ",
-        React.createElement(Tag, null, api.columnApi.getFriendlyNameForColumnId(data.ColumnId))));
+        React.createElement(Tag, { className: "twa:mr-2" },
+            "Name: ",
+            data.Name),
+        React.createElement(Tag, null,
+            "Column: ",
+            api.columnApi.getFriendlyNameForColumnId(data.ColumnId))));
 };
-export const isValidCustomSortColumn = (data) => {
+export const isValidCustomSortColumn = (data, allCustomSorts) => {
+    if (!data.Name) {
+        return 'A name is required.';
+    }
+    if (allCustomSorts.some((customSort) => customSort.Name === data.Name && customSort.Uuid !== data.Uuid)) {
+        return 'A Custom Sort with this name already exists.';
+    }
     if (!data.ColumnId) {
-        return 'You have to select a Column for Custom Sort';
+        return 'Please select a column for the Custom Sort.';
     }
     return true;
 };
@@ -42,14 +54,28 @@ export const CustomSortColumnWizardSection = (props) => {
             });
         });
     }, []);
-    return (React.createElement(Tabs, { style: { height: '100%' } },
-        React.createElement(Tabs.Tab, null, "Column"),
-        React.createElement(Tabs.Content, null,
-            React.createElement(NewColumnSelector, { availableColumns: sortableCols, selected: data.ColumnId ? [data.ColumnId] : [], singleSelect: true, onChange: (ids) => {
-                    props.onChange({
-                        ...data,
-                        SortedValues: [],
-                        ColumnId: ids[0],
-                    });
-                }, allowReorder: false }))));
+    const onNameChange = (event) => {
+        props.onChange({
+            ...data,
+            Name: event.target.value,
+        });
+    };
+    return (React.createElement(Flex, { flexDirection: "column", style: { height: '100%' } },
+        React.createElement(Tabs, { className: "twa:mb-3" },
+            React.createElement(Tabs.Tab, null, "Settings"),
+            React.createElement(Tabs.Content, null,
+                React.createElement(Flex, { flexDirection: "row" },
+                    React.createElement(FormLayout, { className: "twa:max-w-[300px] twa:w-full" },
+                        React.createElement(FormRow, { label: "Name" },
+                            React.createElement(Input, { className: "twa:w-full", "data-name": "custom-sort-name", onChange: onNameChange, value: data?.Name ?? '' })))))),
+        React.createElement(Tabs, { style: { flex: 1, minHeight: 0 } },
+            React.createElement(Tabs.Tab, null, "Column"),
+            React.createElement(Tabs.Content, null,
+                React.createElement(NewColumnSelector, { availableColumns: sortableCols, selected: data.ColumnId ? [data.ColumnId] : [], singleSelect: true, onChange: (ids) => {
+                        props.onChange({
+                            ...data,
+                            SortedValues: [],
+                            ColumnId: ids[0],
+                        });
+                    }, allowReorder: false })))));
 };

package/src/View/CustomSort/Wizard/CustomSortValuesWizardSection.js

@@ -11,7 +11,7 @@ import { parseToISO } from '../../../Utilities/Helpers/DateHelper';
 import { TagList } from '../../../components/Tag';
 export const isValidCustomSortOrder = (data) => {
     if (!data.SortedValues || !data.SortedValues.length) {
-        return 'You have to specify at least one value for Custom Sort order';
+        return 'At least one value is required for the Custom Sort order.';
     }
     return true;
 };

package/src/View/CustomSort/Wizard/CustomSortWizard.js

@@ -37,14 +37,14 @@ export const CustomSortWizard = (props) => {
     };
     return (React.createElement(OnePageAdaptableWizard, { defaultCurrentSectionName: props.defaultCurrentSectionName, moduleInfo: props.moduleInfo, data: customSort, onFinish: handleFinish, onHide: props.onCloseWizard, sections: [
             {
-                isValid: isValidCustomSortColumn,
+                isValid: (data) => isValidCustomSortColumn(data, allCustomSorts),
                 renderSummary: renderCustomSortColumn,
-                details: 'Select a Column for Custom Sort',
+                details: 'Enter Name and select a Column for Custom Sort',
                 render: () => {
                     return (React.createElement(Box, { className: "twa:p-2 twa:h-full" },
-                        React.createElement(CustomSortColumnWizardSection, { isNew: props.isNew, onChange: setCustomSort })));
+                        React.createElement(CustomSortColumnWizardSection, { isNew: props.isNew, onChange: setCustomSort, allCustomSorts: allCustomSorts })));
                 },
-                title: 'Column',
+                title: 'Name & Column',
             },
             {
                 title: 'Sort Order',

package/src/View/Dashboard/CustomToolbar.js

@@ -75,7 +75,7 @@ export const CustomToolbarCmp = (props) => {
             const disabled = button.disabled && button.disabled(button, dashboardContext);
             let buttonVariant = buttonStyle && buttonStyle.variant ? buttonStyle.variant : 'outlined';
             let buttonTone = buttonStyle && buttonStyle.tone ? buttonStyle.tone : 'neutral';
-            return (React.createElement(AdaptableButtonComponent, { style: { marginLeft: index ? 'var(--ab-space-1)' : 0 }, key: index, disabled: disabled, tooltip: buttonTooltip, icon: buttonIcon, variant: buttonVariant, tone: buttonTone, className: buttonStyle?.className || '', onClick: () => {
+            return (React.createElement(AdaptableButtonComponent, { style: { marginLeft: index ? 'var(--ab-base-space)' : 0 }, key: index, disabled: disabled, tooltip: buttonTooltip, icon: buttonIcon, variant: buttonVariant, tone: buttonTone, className: buttonStyle?.className || '', onClick: () => {
                     button.onClick ? button.onClick(button, dashboardContext) : null;
                     setTimeout(() => {
                         // mutate state to force a re-rendering

package/src/View/Dashboard/DashboardPopup.js

@@ -69,18 +69,17 @@ class DashboardPopupComponent extends React.Component {
             React.createElement(Flex, { flexDirection: "column", className: "twa:h-full twa:gap-4" },
                 areDashboardSettingsVisible && (React.createElement(React.Fragment, null,
                     React.createElement(Card, null,
-                        React.createElement(Card.Title, { gap: 8 },
-                            "Display Settings",
-                            React.createElement(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.Title, { gap: 8 }, "Display Settings"),
                         React.createElement(Card.Body, { gap: 2, className: "twa:p-2" },
-                            React.createElement(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, { 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, { 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, { 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, { className: "twa:flex-1 twa:overflow-hidden", gap: 0 },
                     React.createElement(Card.Title, null, "Contents"),
                     React.createElement(Card.Body, { className: "twa:p-2" },
                         React.createElement(Tabs, { className: "twa:flex-1 twa:min-h-0" },
                             React.createElement(Tabs.Tab, { value: "pinned-toolbars" }, "Pinned Toolbars"),
-                            React.createElement(Tabs.Tab, { value: "tabbed-toolbars" }, "Tabbed Toolbars"),
+                            React.createElement(Tabs.Tab, { value: "tabbed-toolbars" }, "Tabs & Toolbars"),
                             React.createElement(Tabs.Tab, { value: "buttons" }, "Buttons"),
                             React.createElement(Tabs.Content, { value: "pinned-toolbars", className: contentCls },
                                 React.createElement(PinnedToolbarsSelector, null)),

package/src/View/DataChangeHistory/DataChangeHistoryGrid.js

@@ -160,6 +160,7 @@ const buildAdaptableOptions = (mainAdaptableInstance, adaptableContainerId, agGr
                 Revision: Date.now(),
                 FormatColumns: [
                     {
+                        Name: 'Changed At',
                         Scope: {
                             ColumnIds: ['changeInfo.changedAt'],
                         },

package/src/View/DataChangeHistory/DataChangeHistoryViewPanel.js

@@ -27,7 +27,7 @@ export const DataChangeHistoryViewPanelControl = (props) => {
     const enabled = changeHistoryMode === 'ACTIVE';
     const disabled = changeHistoryMode === 'INACTIVE';
     const suspended = changeHistoryMode === 'SUSPENDED';
-    const gap = props.gap ?? 'var(--ab-space-1)';
+    const gap = props.gap ?? 'var(--ab-base-space)';
     const buttonsPaddingY = props.buttonsPaddingY ?? 2;
     const buttonPanel = (React.createElement(Flex, { className: "ab-DataChangeHistoryPanel--button-panel", style: { gap: gap, paddingBlock: buttonsPaddingY } },
         disabled && (React.createElement(ButtonPlay, { "aria-label": "Enable Data Change History", className: "ab-DataChangeHistoryPanel--button-activate", "data-name": 'data-change-history--button-activate', tooltip: '', onClick: () => onChangeHistoryEnable() })),

package/src/View/Export/ExportDestinationPicker.js

@@ -12,7 +12,7 @@ export const ExportDestinationPicker = ({ reportName, reportFormat, viewType, })
     };
     const supportedDestinations = exportApi.getSupportedExportDestinations(reportFormat);
     if (supportedDestinations.length === 0 || supportedDestinations.length === 1) {
-        return (React.createElement(ButtonExport, { className: clsx(viewType !== 'StatusBar' ? 'twa:mr-[20px]' : undefined, 'twa:pr-0'), onClick: () => handleExport(supportedDestinations[0]), tooltip: "Export Report", disabled: reportName == undefined || reportFormat == undefined }));
+        return (React.createElement(ButtonExport, { className: clsx(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

@@ -4,13 +4,15 @@ import { ReportNameSelector } from './ReportNameSelector';
 import { ReportFormatSelector } from './ReportFormatSelector';
 import { ExportDestinationPicker } from './ExportDestinationPicker';
 import { useAdaptable } from '../AdaptableContext';
+import { Flex } from '../../components/Flex';
 export const ExportStatusBar = () => {
     const adaptable = useAdaptable();
     const exportApi = adaptable.api.exportApi;
     const currentReportName = useSelector((state) => state.Export.CurrentReport);
     const currentFormat = useSelector((state) => state.Export.CurrentFormat);
     return (React.createElement(React.Fragment, null,
-        React.createElement(ReportNameSelector, { viewType: "StatusBar", size: 'small', reportName: currentReportName, onReportNameSelected: (reportName) => exportApi.selectReport(reportName) }),
-        React.createElement(ReportFormatSelector, { viewType: "StatusBar", size: 'small', reportName: currentReportName, reportFormat: currentFormat, onReportFormatSelected: (reportFormat) => exportApi.selectFormat(reportFormat) }),
+        React.createElement(Flex, { className: "twa:gap-1" },
+            React.createElement(ReportNameSelector, { viewType: "StatusBar", reportName: currentReportName, onReportNameSelected: (reportName) => exportApi.selectReport(reportName) }),
+            React.createElement(ReportFormatSelector, { viewType: "StatusBar", reportName: currentReportName, reportFormat: currentFormat, onReportFormatSelected: (reportFormat) => exportApi.selectFormat(reportFormat) })),
         React.createElement(ExportDestinationPicker, { viewType: "StatusBar", reportName: currentReportName, reportFormat: currentFormat })));
 };

package/src/View/Export/ExportViewPanel.js

@@ -15,6 +15,7 @@ import { ReportNameSelector } from './ReportNameSelector';
 import { ReportFormatSelector } from './ReportFormatSelector';
 import { ExportDestinationPicker } from './ExportDestinationPicker';
 import { Flex } from '../../components/Flex';
+import clsx from 'clsx';
 export const ExportViewPanel = (props) => {
     const dispatch = useDispatch();
     const exportApi = props.api.exportApi;
@@ -26,27 +27,33 @@ export 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, { 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, { flexDirection: "row", className: clsx(`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, { viewType: props.viewType, reportName: currentReportName, userReports: userReports, onReportNameSelected: (reportName) => exportApi.selectReport(reportName) }),
         React.createElement(ReportFormatSelector, { viewType: props.viewType, reportName: currentReportName, reportFormat: currentFormat, onReportFormatSelected: (reportFormat) => exportApi.selectFormat(reportFormat) }),
         React.createElement(Flex, { className: join(accessLevel == 'ReadOnly' ? GeneralConstants.READ_ONLY_STYLE : '', `ab-${elementType}__Export__controls twa:w-full`) },
-            React.createElement(ExportDestinationPicker, { viewType: props.viewType, reportName: currentReportName, reportFormat: currentFormat }),
-            React.createElement(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, { 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, { 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, { className: `ab-${elementType}__Export__schedule twa:ml-1`, onClick: () => {
-                    const reportSchedule = ObjectFactory.CreateReportSchedule(currentReportName, currentFormat);
-                    dispatch(PopupRedux.PopupShowScreen(ModuleConstants.ScheduleModuleId, 'SchedulePopup', {
+            React.createElement(Flex, { className: "twa:min-w-[44px]" },
+                React.createElement(ExportDestinationPicker, { viewType: props.viewType, reportName: currentReportName, reportFormat: currentFormat })),
+            React.createElement(Flex, null,
+                React.createElement(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, { 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, { 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, { className: `ab-${elementType}__Export__schedule`, onClick: () => {
+                        const reportSchedule = ObjectFactory.CreateReportSchedule(currentReportName, currentFormat);
+                        dispatch(PopupRedux.PopupShowScreen(ModuleConstants.ScheduleModuleId, 'SchedulePopup', {
+                            action: 'New',
+                            source: 'Toolbar',
+                            value: reportSchedule,
+                        }));
+                    }, tooltip: "Schedule", disabled: currentReport == null, accessLevel: props.accessLevel }))))));
 };

package/src/View/FlashingCell/Wizard/FlashingCellSettingsWizardSection.d.ts

@@ -1,10 +1,11 @@
 import * as React from 'react';
-import { FlashingCellDefinition } from '../../../types';
+import { AdaptableApi, FlashingCellDefinition } from '../../../types';
 type FlashingAlertDurationWizardSectionProps = {
     readOnly?: boolean;
     flashingCell?: FlashingCellDefinition;
     onChange: (data: FlashingCellDefinition) => void;
 };
+export declare const isSettingsValid: (data: FlashingCellDefinition, api: AdaptableApi) => true | "Name is required" | "A Flashing Cell already exists with that name";
 export declare const renderFlashingAlertSettingsSummary: (flashingAlert: FlashingCellDefinition) => React.JSX.Element;
 export declare const FlashingAlertSettingsWizardSection: (props: FlashingAlertDurationWizardSectionProps) => React.JSX.Element;
 export {};

package/src/View/FlashingCell/Wizard/FlashingCellSettingsWizardSection.js

@@ -2,15 +2,30 @@ import * as React from 'react';
 import { useRef } from 'react';
 import Input from '../../../components/Input';
 import usePrevious from '../../../components/utils/usePrevious';
-import Radio from '../../../components/Radio';
 import { Tabs } from '../../../components/Tabs';
 import { useOnePageAdaptableWizardContext } from '../../Wizard/OnePageAdaptableWizard';
 import { CodeBlock } from '../../../components/CodeBlock';
 import FormLayout, { FormRow } from '../../../components/FormLayout';
 import { CheckBox } from '../../../components/CheckBox';
 import { Box, Flex } from '../../../components/Flex';
+import { Tag } from '../../../components/Tag';
+import { SummaryText } from '../../Wizard/OnePageAdaptableWizard';
+export const isSettingsValid = (data, api) => {
+    if (!data.Name?.trim()) {
+        return 'Name is required';
+    }
+    const allFlashingCells = api.flashingCellApi.getFlashingCellDefinitions();
+    const isDuplicateName = allFlashingCells.some((fc) => fc.Name === data.Name && fc.Uuid !== data.Uuid);
+    if (isDuplicateName) {
+        return 'A Flashing Cell already exists with that name';
+    }
+    return true;
+};
 export const renderFlashingAlertSettingsSummary = (flashingAlert) => {
     return (React.createElement(React.Fragment, null,
+        React.createElement(SummaryText, null,
+            "Name ",
+            React.createElement(Tag, null, flashingAlert.Name || 'Not specified')),
         React.createElement(Box, { className: "twa:text-2" }, flashingAlert.FlashDuration === 'always' ? (React.createElement(React.Fragment, null, "Flashing is never removed")) : (React.createElement(React.Fragment, null,
             "Flashing is removed after ",
             React.createElement(CodeBlock, null, flashingAlert.FlashDuration),
@@ -20,6 +35,12 @@ export const renderFlashingAlertSettingsSummary = (flashingAlert) => {
 export const FlashingAlertSettingsWizardSection = (props) => {
     let { data: flashingCell } = useOnePageAdaptableWizardContext();
     flashingCell = flashingCell ?? props.flashingCell;
+    const handleNameChange = (event) => {
+        props.onChange({
+            ...flashingCell,
+            Name: event.target.value,
+        });
+    };
     const setDuration = (FlashDuration) => {
         props.onChange({ ...flashingCell, FlashDuration: FlashDuration });
     };
@@ -58,23 +79,22 @@ export const FlashingAlertSettingsWizardSection = (props) => {
             React.createElement(Tabs.Tab, null, "Flashing Cell Settings"),
             React.createElement(Tabs.Content, null,
                 React.createElement(FormLayout, null,
-                    React.createElement(FormRow, { label: "Duration Type" },
-                        React.createElement(Radio, { "data-name": "duration-type-always", className: "twa:mr-3", checked: duration == 'always', tabIndex: -1, onChange: () => handleTypeChange('always') }, "Always"),
-                        React.createElement(Radio, { "data-name": "duration-type-number", checked: duration !== 'always', tabIndex: -1, onChange: () => handleTypeChange('number') }, "Limited (ms)")),
-                    React.createElement(FormRow, { label: "" },
-                        duration !== 'always' && (React.createElement(Flex, { flexDirection: "row", alignItems: "baseline" },
-                            React.createElement(Box, { className: "twa:text-2 twa:mr-2" }, "After"),
-                            React.createElement(Input, { "data-name": "duration-input", readOnly: props.readOnly, type: "text", name: "value", ref: inputRef, className: "twa:mt-2 twa:mr-1", value: duration, onChange: (event) => {
-                                    const value = event.target.value;
-                                    setDuration(isNaN(Number(value)) ? 500 : Number(value));
-                                } }),
-                            React.createElement(Box, { className: "twa:text-2" }, "milliseconds"))),
-                        duration === 'always' && (React.createElement(Box, { className: "twa:text-3 twa:h-[43px]" }, "Persists the flashing style indeterminately - can be removed manually"))),
+                    React.createElement(FormRow, { label: "Name" },
+                        React.createElement(Input, { "data-name": "flashing-cell-name", className: "twa:flex-1 twa:mr-3", onChange: handleNameChange, placeholder: "Enter Name", value: flashingCell.Name ?? '' })),
                     React.createElement(FormRow, { label: "Flash Target" },
                         React.createElement(CheckBox, { "data-name": "flashing-target", onChange: (checked) => handleTargetChange('cell', checked), className: "twa:mr-3", checked: flashingCell?.FlashTarget === 'cell' ||
                                 flashingCell?.FlashTarget?.includes?.('cell'), tabIndex: -1 }, "Cell"),
                         React.createElement(CheckBox, { "data-name": "flashing-target-row", className: "twa:mr-3", onChange: (checked) => handleTargetChange('row', checked), checked: flashingCell?.FlashTarget === 'row' ||
                                 flashingCell?.FlashTarget?.includes?.('row'), tabIndex: -1 }, "Row"),
                         React.createElement(CheckBox, { "data-name": "flashing-target-aggFuncCell", onChange: (checked) => handleTargetChange('aggFuncCell', checked), checked: flashingCell?.FlashTarget === 'aggFuncCell' ||
-                                flashingCell?.FlashTarget?.includes?.('aggFuncCell'), tabIndex: -1 }, "Aggregated Function Cell")))))));
+                                flashingCell?.FlashTarget?.includes?.('aggFuncCell'), tabIndex: -1 }, "Aggregated Function Cell")),
+                    React.createElement(FormRow, { label: "Duration" },
+                        React.createElement(Flex, { alignItems: "center" },
+                            React.createElement(CheckBox, { "data-name": "duration-always", checked: duration === 'always', onChange: (checked) => handleTypeChange(checked ? 'always' : 'number'), className: "twa:mr-4", tabIndex: -1 }, "Always"),
+                            duration !== 'always' && (React.createElement(React.Fragment, null,
+                                React.createElement(Input, { "data-name": "duration-input", readOnly: props.readOnly, type: "number", name: "value", ref: inputRef, className: "twa:w-20 twa:mr-2", value: duration, onChange: (event) => {
+                                        const value = event.target.value;
+                                        setDuration(isNaN(Number(value)) ? 500 : Number(value));
+                                    } }),
+                                React.createElement(Box, { className: "twa:text-2" }, "ms"))))))))));
 };

package/src/View/FlashingCell/Wizard/FlashingCellWizard.js

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { useState, useCallback } from 'react';
 import { OnePageAdaptableWizard, OnePageWizardSummary } from '../../Wizard/OnePageAdaptableWizard';
-import { FlashingAlertSettingsWizardSection, renderFlashingAlertSettingsSummary, } from './FlashingCellSettingsWizardSection';
+import { FlashingAlertSettingsWizardSection, renderFlashingAlertSettingsSummary, isSettingsValid, } from './FlashingCellSettingsWizardSection';
 import { cloneObject } from '../../../Utilities/Helpers/Helper';
 import { FlashingAlertRulesWizardSection, renderFlashingAlertRulesSummary, } from './FlashingCellRulesWizardSection';
 import { FlashingAlertStyleWizardSection, renderFlashingAlertStyleSummary, } from './FlashingCellStyleWizardSection';
@@ -17,7 +17,7 @@ import { ObjectTagsWizardSection, renderObjectTagsSummary, } from '../../Wizard/
 import { Box } from '../../../components/Flex';
 export const FlashingCellWizard = (props) => {
     const { api } = useAdaptable();
-    const [flashingCell, setFlashingCell] = useState(() => {
+    const [flashingCell, doSetFlashingCell] = useState(() => {
         let flashingCell = props.data
             ? cloneObject(props.data)
             : ObjectFactory.CreateEmptyFlashingCellDefinition();
@@ -33,9 +33,12 @@ export const FlashingCellWizard = (props) => {
         }
         return flashingCell;
     });
+    const setFlashingCell = useCallback((data) => {
+        doSetFlashingCell(data);
+    }, []);
     const updateProperty = (propName) => {
         return (value) => {
-            setFlashingCell((flashingCell) => {
+            doSetFlashingCell((flashingCell) => {
                 flashingCell = { ...flashingCell, [propName]: value };
                 return flashingCell;
             });
@@ -57,6 +60,14 @@ export const FlashingCellWizard = (props) => {
         props.onFinishWizard(flashingCell);
     };
     return (React.createElement(OnePageAdaptableWizard, { defaultCurrentSectionName: props.defaultCurrentSectionName, moduleInfo: props.moduleInfo, data: flashingCell, onHide: props.onCloseWizard, onFinish: handleFinish, sections: [
+            {
+                details: 'Set Name, Duration and Target Properties',
+                isValid: isSettingsValid,
+                render: () => (React.createElement(Box, { className: "twa:p-2" },
+                    React.createElement(FlashingAlertSettingsWizardSection, { onChange: setFlashingCell }))),
+                renderSummary: renderFlashingAlertSettingsSummary,
+                title: 'Settings',
+            },
             {
                 details: 'Specify which data changes should trigger Cell Flashing',
                 isValid: isScopeValid,
@@ -80,13 +91,6 @@ export const FlashingCellWizard = (props) => {
                 renderSummary: renderFlashingAlertStyleSummary,
                 title: 'Flash Styles',
             },
-            {
-                details: 'Set Duration and Target Properties',
-                render: () => (React.createElement(Box, { className: "twa:p-2" },
-                    React.createElement(FlashingAlertSettingsWizardSection, { onChange: setFlashingCell }))),
-                renderSummary: renderFlashingAlertSettingsSummary,
-                title: 'Settings',
-            },
             {
                 details: 'Select Flashing Cell Tags',
                 title: 'Tags',

package/src/View/FlashingCell/Wizard/isValidFlashingCellRules.js

@@ -1,7 +1,7 @@
 import { isAdaptableRuleValid } from '../../Components/EntityRulesEditor/Utilities';
 export const isValidFlashingCellRules = (flashingCell, api, context) => {
     if (!flashingCell.Rule?.Predicates?.length && !flashingCell.Rule.BooleanExpression) {
-        return 'No Rule defined for Flashing Cell';
+        return 'A rule is required for the Flashing Cell.';
     }
     const isRuleValid = isAdaptableRuleValid(flashingCell, api, context);
     if (typeof isRuleValid === 'string') {

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

@@ -3,16 +3,15 @@ import FormLayout, { FormRow } from '../../../components/FormLayout';
 import { CheckBox } from '../../../components/CheckBox';
 import { useOnePageAdaptableWizardContext } from '../../Wizard/OnePageAdaptableWizard';
 import { Tag } from '../../../components/Tag';
-import { ToggleGroup } from '../../../components/Toggle/ToggleGroup';
-import { Toggle } from '../../../components/Toggle/Toggle';
 import Radio, { RadioGroup } from '../../../components/Radio';
 import { Box, Flex } from '../../../components/Flex';
-import { Card } from '../../../components/Card';
+import { Tabs } from '../../../components/Tabs';
+import Input from '../../../components/Input';
 export const renderFormatColumnSettingsSummary = (data) => {
     return (React.createElement(Box, { className: "twa:p-2" },
-        React.createElement(Box, null,
-            "Cell alignment ",
-            React.createElement(Tag, null, data.CellAlignment ?? 'default')),
+        React.createElement(Box, { className: "twa:mt-3" },
+            "Name ",
+            React.createElement(Tag, null, data.Name)),
         React.createElement(Box, { className: "twa:mt-3" },
             "Data Rows ",
             React.createElement(Tag, null, data.RowScope?.ExcludeDataRows ? 'no' : 'yes')),
@@ -35,12 +34,11 @@ export const renderFormatColumnSettingsSummary = (data) => {
 };
 export const FormatColumnSettingsWizardSection = (props) => {
     const { data } = useOnePageAdaptableWizardContext();
-    const onCellAlignmentSelectChanged = (CellAlignment) => {
-        const newData = { ...data, CellAlignment };
-        if (CellAlignment === null) {
-            delete newData.CellAlignment;
-        }
-        props.onChange(newData);
+    const onNameChange = (event) => {
+        props.onChange({
+            ...data,
+            Name: event.target.value,
+        });
     };
     const onExcludeDataRowsChanged = (ExcludeDataRows) => {
         props.onChange({
@@ -78,43 +76,40 @@ export const FormatColumnSettingsWizardSection = (props) => {
             },
         });
     };
-    return (React.createElement(Card, null,
-        React.createElement(Card.Title, null, "Settings"),
-        React.createElement(Card.Body, null,
-            React.createElement(Flex, { flexDirection: "row" },
-                React.createElement(FormLayout, null,
-                    React.createElement(FormRow, { label: "Cell Alignment" },
-                        React.createElement(ToggleGroup, null,
-                            React.createElement(Toggle, { icon: "align-left", pressed: data.CellAlignment === 'Left', onPressedChange: (pressed) => pressed
-                                    ? onCellAlignmentSelectChanged('Left')
-                                    : onCellAlignmentSelectChanged(null) }),
-                            React.createElement(Toggle, { icon: "align-center", pressed: data.CellAlignment === 'Center', onPressedChange: (pressed) => pressed
-                                    ? onCellAlignmentSelectChanged('Center')
-                                    : onCellAlignmentSelectChanged(null) }),
-                            React.createElement(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(FormRow, { label: "Exclude Data Rows:" },
-                            React.createElement(Flex, { alignItems: "center", className: "twa:ml-2" },
-                                React.createElement(CheckBox, { "data-name": "exclude-data-rows-checkbox", checked: data.RowScope?.ExcludeDataRows, onChange: onExcludeDataRowsChanged, className: "twa:mr-2" }))),
-                        React.createElement(FormRow, { label: "Exclude Group Rows:" },
-                            React.createElement(Flex, { alignItems: "center", className: "twa:ml-2" },
-                                React.createElement(CheckBox, { "data-name": "exclude-grouped-rows-checkbox", checked: data.RowScope?.ExcludeGroupRows, onChange: onExcludeGroupedRowsChanged, className: "twa:mr-2" }))),
-                        React.createElement(FormRow, { label: "Exclude Row Summaries:" },
-                            React.createElement(Flex, { alignItems: "center", className: "twa:ml-2" },
-                                React.createElement(CheckBox, { "data-name": "exclude-summary-rows-checkbox", checked: data.RowScope?.ExcludeSummaryRows, onChange: onExcludeSummaryRowsChanged, className: "twa:mr-2" }))),
-                        React.createElement(FormRow, { label: "Exclude Total Rows:" },
-                            React.createElement(Flex, { alignItems: "center", className: "twa:ml-2" },
-                                React.createElement(CheckBox, { "data-name": "exclude-total-rows-checkbox", checked: data.RowScope?.ExcludeTotalRows, onChange: onExcludeTotalRowsChanged, className: "twa:mr-2" }))))),
-                    React.createElement(FormRow, { label: "Apply on Column Group:" },
-                        React.createElement(RadioGroup, { value: data.ColumnGroupScope || 'Both', name: "columnGroupScope", orientation: "horizontal", onRadioChange: (columnGroupScope) => {
-                                props.onChange({
-                                    ...data,
-                                    ColumnGroupScope: columnGroupScope,
-                                });
-                            } },
-                            React.createElement(Radio, { className: "twa:ml-1", value: "Both" }, "Always"),
-                            React.createElement(Radio, { className: "twa:ml-4", value: "Expanded" }, "Expanded"),
-                            React.createElement(Radio, { className: "twa:ml-4", value: "Collapsed" }, "Collapsed"))))))));
+    return (React.createElement(Flex, { flexDirection: "column", style: { height: '100%' } },
+        React.createElement(Tabs, { className: "twa:mb-3" },
+            React.createElement(Tabs.Tab, null, "Settings"),
+            React.createElement(Tabs.Content, null,
+                React.createElement(Flex, { flexDirection: "row" },
+                    React.createElement(FormLayout, { className: "twa:max-w-[300px] twa:w-full" },
+                        React.createElement(FormRow, { label: "Name" },
+                            React.createElement(Input, { className: "twa:w-full", "data-name": "format-column-name", onChange: onNameChange, value: data?.Name ?? '' })))))),
+        React.createElement(Tabs, null,
+            React.createElement(Tabs.Tab, null, "Configuration"),
+            React.createElement(Tabs.Content, null,
+                React.createElement(Flex, { flexDirection: "row" },
+                    React.createElement(FormLayout, null,
+                        data.Target === 'cell' && (React.createElement(React.Fragment, null,
+                            React.createElement(FormRow, { label: "Exclude Data Rows:" },
+                                React.createElement(Flex, { alignItems: "center", className: "twa:ml-2" },
+                                    React.createElement(CheckBox, { "data-name": "exclude-data-rows-checkbox", checked: data.RowScope?.ExcludeDataRows, onChange: onExcludeDataRowsChanged, className: "twa:mr-2" }))),
+                            React.createElement(FormRow, { label: "Exclude Group Rows:" },
+                                React.createElement(Flex, { alignItems: "center", className: "twa:ml-2" },
+                                    React.createElement(CheckBox, { "data-name": "exclude-grouped-rows-checkbox", checked: data.RowScope?.ExcludeGroupRows, onChange: onExcludeGroupedRowsChanged, className: "twa:mr-2" }))),
+                            React.createElement(FormRow, { label: "Exclude Row Summaries:" },
+                                React.createElement(Flex, { alignItems: "center", className: "twa:ml-2" },
+                                    React.createElement(CheckBox, { "data-name": "exclude-summary-rows-checkbox", checked: data.RowScope?.ExcludeSummaryRows, onChange: onExcludeSummaryRowsChanged, className: "twa:mr-2" }))),
+                            React.createElement(FormRow, { label: "Exclude Total Rows:" },
+                                React.createElement(Flex, { alignItems: "center", className: "twa:ml-2" },
+                                    React.createElement(CheckBox, { "data-name": "exclude-total-rows-checkbox", checked: data.RowScope?.ExcludeTotalRows, onChange: onExcludeTotalRowsChanged, className: "twa:mr-2" }))))),
+                        React.createElement(FormRow, { label: "Apply on Column Group:" },
+                            React.createElement(RadioGroup, { value: data.ColumnGroupScope || 'Both', name: "columnGroupScope", orientation: "horizontal", onRadioChange: (columnGroupScope) => {
+                                    props.onChange({
+                                        ...data,
+                                        ColumnGroupScope: columnGroupScope,
+                                    });
+                                } },
+                                React.createElement(Radio, { className: "twa:ml-1", value: "Both" }, "Always"),
+                                React.createElement(Radio, { className: "twa:ml-4", value: "Expanded" }, "When Expanded"),
+                                React.createElement(Radio, { className: "twa:ml-4", value: "Collapsed" }, "When Collapsed")))))))));
 };

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

@@ -8,7 +8,6 @@ export const isFormatColumnStyleValid = (data, api) => {
     if (data.Style &&
         UIHelper.IsEmptyStyle(data.Style) &&
         data.DisplayFormat === undefined &&
-        data.CellAlignment === undefined &&
         !api.columnScopeApi.isSingleBooleanColumnScope(data.Scope)) {
         return 'No format applied';
     }
@@ -19,7 +18,8 @@ const toStyle = (data) => {
         ...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,
     };
 };
 export const renderFormatColumnStyleWizardSummary = (data) => {