@adaptabletools/adaptable 23.0.0-canary.4 → 23.0.0-canary.5

package/src/View/Export/Wizard/ScheduledReportSettings.js

@@ -1,9 +1,9 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import FormLayout, { FormRow } from '../../../components/FormLayout';
 import Input from '../../../components/Input';
-import { Tabs } from '../../../components/Tabs';
-import { Box } from '../../../components/Flex';
+import { Box, Flex } from '../../../components/Flex';
 import { SingleSelect } from '../../../components/NewSelect';
+import { Card } from '../../../components/Card';
+import { Tag } from '../../../components/Tag';
 export const ScheduledReportSettings = (props) => {
     const handleNameChange = (event) => {
         props.onChange({
@@ -23,14 +23,14 @@ export const ScheduledReportSettings = (props) => {
         label: reportName,
         value: reportName,
     }));
-    return (_jsx(Box, { "data-name": "scheduled-report-settings", children: _jsxs(Tabs, { autoFocus: false, className: "twa:mb-3", children: [_jsx(Tabs.Tab, { children: "Settings" }), _jsx(Tabs.Content, { children: _jsxs(FormLayout, { children: [props.allReportNames && (_jsx(FormRow, { label: "Report", children: _jsx(Box, { className: "twa:max-w-[300px]", children: _jsx(SingleSelect, { className: "twa:w-full", "data-name": "select-report", items: reportOptions, value: props.reportSchedule?.ReportName || undefined, placeholder: "Select Report", onValueChange: (value) => props.onChange({
-                                            ...props.reportSchedule,
-                                            ReportName: value,
-                                        }) }) }) })), _jsx(FormRow, { label: "Name", children: _jsx(Input, { "data-name": "schedule-name", className: "twa:w-[300px]", onChange: handleNameChange, placeholder: "Enter Schedule Name", type: "string", value: props.reportSchedule?.Name ?? '' }) }), _jsx(FormRow, { label: "Format", children: _jsx(Box, { className: "twa:max-w-[300px]", children: _jsx(SingleSelect, { className: "twa:w-full", "data-name": "select-format", items: formatOptions, value: props.reportSchedule?.ReportFormat, placeholder: "Select Format", onValueChange: (value) => props.onChange({
-                                            ...props.reportSchedule,
-                                            ReportFormat: value,
-                                        }) }) }) }), _jsx(FormRow, { label: "Destination", children: _jsx(Box, { className: "twa:max-w-[300px]", children: _jsx(SingleSelect, { className: "twa:w-full", "data-name": "select-destination", items: destinationOptions, value: props.reportSchedule?.ExportDestination, placeholder: "Select Destination", onValueChange: (value) => props.onChange({
-                                            ...props.reportSchedule,
-                                            ExportDestination: value,
-                                        }) }) }) })] }) })] }) }));
+    return (_jsxs(Flex, { flexDirection: "column", className: "twa:gap-3 twa:p-3", "data-name": "scheduled-report-settings", children: [props.fixedReportName ? (_jsxs(Card, { shadow: false, children: [_jsxs(Card.Title, { children: [_jsx(Box, { className: "twa:font-medium", children: "Report" }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "The report that will be exported on this schedule" })] }), _jsx(Card.Body, { children: _jsx(Tag, { children: props.fixedReportName }) })] })) : null, props.allReportNames ? (_jsxs(Card, { shadow: false, children: [_jsxs(Card.Title, { children: [_jsx(Box, { className: "twa:font-medium", children: "Report" }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "Choose which report to export on this schedule" })] }), _jsx(Card.Body, { className: "twa:p-1", children: _jsx(SingleSelect, { className: "twa:max-w-[300px]", "data-name": "select-report", items: reportOptions, value: props.reportSchedule?.ReportName || undefined, placeholder: "Select Report", onValueChange: (value) => props.onChange({
+                                ...props.reportSchedule,
+                                ReportName: value,
+                            }) }) })] })) : null, _jsxs(Card, { shadow: false, children: [_jsxs(Card.Title, { children: [_jsx(Box, { className: "twa:font-medium", children: "Name" }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "Provide a unique name for this scheduled export" })] }), _jsx(Card.Body, { className: "twa:p-1", children: _jsx(Input, { "data-name": "schedule-name", className: "twa:max-w-[300px] twa:w-full", onChange: handleNameChange, placeholder: "Enter Schedule Name", type: "string", value: props.reportSchedule?.Name ?? '' }) })] }), _jsxs(Card, { shadow: false, children: [_jsxs(Card.Title, { children: [_jsx(Box, { className: "twa:font-medium", children: "Format" }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "Choose the export file format" })] }), _jsx(Card.Body, { className: "twa:p-1", children: _jsx(SingleSelect, { className: "twa:max-w-[300px]", "data-name": "select-format", items: formatOptions, value: props.reportSchedule?.ReportFormat, placeholder: "Select Format", onValueChange: (value) => props.onChange({
+                                ...props.reportSchedule,
+                                ReportFormat: value,
+                            }) }) })] }), _jsxs(Card, { shadow: false, children: [_jsxs(Card.Title, { children: [_jsx(Box, { className: "twa:font-medium", children: "Destination" }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "Choose where the exported report is sent" })] }), _jsx(Card.Body, { className: "twa:p-1", children: _jsx(SingleSelect, { className: "twa:max-w-[300px]", "data-name": "select-destination", items: destinationOptions, value: props.reportSchedule?.ExportDestination, placeholder: "Select Destination", onValueChange: (value) => props.onChange({
+                                ...props.reportSchedule,
+                                ExportDestination: value,
+                            }) }) })] })] }));
 };

package/src/View/Export/Wizard/ScheduledReportWizard.js

@@ -1,10 +1,9 @@
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
 import { useDispatch } from 'react-redux';
 import * as ExportRedux from '../../../Redux/ActionsReducers/ExportRedux';
 import ObjectFactory from '../../../Utilities/ObjectFactory';
-import { OnePageAdaptableWizard, OnePageWizardSummary, SummaryText, useOnePageAdaptableWizardContext, } from '../../Wizard/OnePageAdaptableWizard';
-import { Tag } from '../../../components/Tag';
+import { OnePageAdaptableWizard, OnePageWizardSummary, useOnePageAdaptableWizardContext, } from '../../Wizard/OnePageAdaptableWizard';
 import { isScheduleValid, ScheduleBuilderWizard, } from '../../Schedule/Wizard/ScheduleScheduleWizard';
 import { ScheduleScheduleSummary } from '../../Schedule/Wizard/ScheduleScheduleSummary';
 import { ObjectTagsWizardSection, renderObjectTagsSummary, } from '../../Wizard/ObjectTagsWizardSection';
@@ -46,7 +45,7 @@ export const ScheduledReportWizard = (props) => {
                 title: 'Settings',
                 isValid: (data, api) => isReportScheduleSettingsValid(data, api),
                 renderSummary: () => _jsx(ScheduledReportSettingsSummary, {}),
-                render: () => (_jsx(Box, { className: "twa:p-3", children: _jsx(ScheduledReportSettingsSection, { onChange: setReportSchedule, reportName: reportName }) })),
+                render: () => (_jsx(ScheduledReportSettingsSection, { onChange: setReportSchedule, reportName: reportName })),
             },
             {
                 title: 'Schedule',
@@ -76,5 +75,5 @@ const ScheduledReportSettingsSection = (props) => {
     const allReportNames = fixedReportName
         ? undefined
         : api.exportApi.internalApi.getAllAvailableReportNames();
-    return (_jsxs(_Fragment, { children: [fixedReportName && (_jsxs(SummaryText, { children: ["Report: ", _jsx(Tag, { children: fixedReportName })] })), _jsx(ScheduledReportSettings, { reportSchedule: data, onChange: props.onChange, allFormats: allFormats ?? [], allDestinations: allDestinations ?? [], allReportNames: allReportNames })] }));
+    return (_jsx(ScheduledReportSettings, { reportSchedule: data, onChange: props.onChange, allFormats: allFormats ?? [], allDestinations: allDestinations ?? [], allReportNames: allReportNames, fixedReportName: fixedReportName }));
 };

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

@@ -2,6 +2,8 @@ import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-run
 import { useOnePageAdaptableWizardContext } from '../../Wizard/OnePageAdaptableWizard';
 import { CodeBlock } from '../../../components/CodeBlock';
 import { EntityRulesEditor, EntityRulesSummary } from '../../Components/EntityRulesEditor';
+import { Box, Flex } from '../../../components/Flex';
+import { Card } from '../../../components/Card';
 export const renderFlashingAlertRulesSummary = (flashingAlert) => {
     const { api: { flashingCellApi }, } = useOnePageAdaptableWizardContext();
     const FlashTarget = flashingAlert.FlashTarget ?? flashingCellApi.getFlashingCellFlashTarget(flashingAlert);
@@ -14,10 +16,10 @@ export const renderFlashingAlertRulesSummary = (flashingAlert) => {
 export const FlashingAlertRulesWizardSection = (props) => {
     const { data, api, moduleInfo } = useOnePageAdaptableWizardContext();
     const predicateDefs = api.flashingCellApi.getFlashingCellPredicateDefsForScope(data.Scope);
-    return (_jsx(EntityRulesEditor, { module: moduleInfo.ModuleName, defaultPredicateId: "AnyChange", data: data, predicateDefs: predicateDefs, getPredicateDefsForColId: (colId) => api.flashingCellApi.getFlashingCellPredicateDefsForScope({ ColumnIds: [colId] }), onChange: props.onChange, showAggregation: false, showObservable: false, showBoolean: true, showPredicate: true, descriptions: {
-            selectPredicate: 'Select an Flashing Cell Rule - to be applied when data changes',
-            useBooleanQuery: (_jsxs(_Fragment, { children: ["Use an BooleanQuery if ", _jsx("i", { children: "Scope" }), " is 'All Columns' - so any data change may be evaluated in a complex BooleanExpression"] })),
-            useObservableQuery: (_jsxs(_Fragment, { children: ["Use an ObservableQuery if ", _jsx("i", { children: "Scope" }), " is 'All Columns' - so any data change may be evaluated in a complex ObservableExpression"] })),
-            useAggregationQuery: (_jsxs(_Fragment, { children: ["Use an AggregatedBooleanQuery if ", _jsx("i", { children: "Scope" }), " is 'All Columns' - so any data change may be evaluated in a complex AggregatedBooleanExpression"] })),
-        } }));
+    return (_jsx(Flex, { flexDirection: "column", className: "twa:h-full twa:gap-3 twa:p-3", children: _jsxs(Card, { shadow: false, className: "twa:flex-1 twa:min-h-0", children: [_jsxs(Card.Title, { children: [_jsx(Box, { className: "twa:font-medium", children: "Rule" }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "Build the rule that determines when cells should flash on a data change" })] }), _jsx(Card.Body, { className: "twa:flex-1 twa:min-h-0", children: _jsx(EntityRulesEditor, { module: moduleInfo.ModuleName, defaultPredicateId: "AnyChange", data: data, predicateDefs: predicateDefs, getPredicateDefsForColId: (colId) => api.flashingCellApi.getFlashingCellPredicateDefsForScope({ ColumnIds: [colId] }), onChange: props.onChange, showAggregation: false, showObservable: false, showBoolean: true, showPredicate: true, descriptions: {
+                            selectPredicate: 'Select a Flashing Cell Rule - to be applied when data changes',
+                            useBooleanQuery: (_jsxs(_Fragment, { children: ["Use an BooleanQuery if ", _jsx("i", { children: "Scope" }), " is 'All Columns' - so any data change may be evaluated in a complex BooleanExpression"] })),
+                            useObservableQuery: (_jsxs(_Fragment, { children: ["Use an ObservableQuery if ", _jsx("i", { children: "Scope" }), " is 'All Columns' - so any data change may be evaluated in a complex ObservableExpression"] })),
+                            useAggregationQuery: (_jsxs(_Fragment, { children: ["Use an AggregatedBooleanQuery if ", _jsx("i", { children: "Scope" }), " is 'All Columns' - so any data change may be evaluated in a complex AggregatedBooleanExpression"] })),
+                        } }) })] }) }));
 };

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

@@ -1,32 +1,31 @@
-import { jsx as _jsx } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
 import { NewScopeComponent } from '../../Components/NewScopeComponent';
 import { useOnePageAdaptableWizardContext } from '../../Wizard/OnePageAdaptableWizard';
-import { Flex } from '../../../components/Flex';
+import { Box, Flex } from '../../../components/Flex';
 import { isScopeColumnIds } from '../../../AdaptableState/Common/ColumnScope';
 export const FlashingAlertScopeWizardSection = (props) => {
     const { data, api } = useOnePageAdaptableWizardContext();
     const availableColumns = React.useMemo(() => api.columnApi
         .getUIAvailableColumns()
         .filter((column) => !column.isActionColumn && !api.columnApi.isFdc3Column(column.columnId)), [api]);
-    return (_jsx(Flex, { flexDirection: "column", className: "twa:p-2 twa:h-full", children: _jsx(NewScopeComponent, { descriptions: {
-                rowScope: 'Changes anywhere in the row will trigger an Flashing Cell',
-                columnScope: 'Changes in selected columns will trigger an Flashing Cell',
-            }, scopeColumns: availableColumns, scope: data.Scope, updateScope: (Scope) => {
-                const newData = { ...data, Scope };
-                if (newData.Rule.Predicates) {
-                    const validPredicateIds = new Set(api.flashingCellApi.getFlashingCellPredicateDefsForScope(Scope).map((def) => def.id));
-                    newData.Rule = {
-                        Predicates: newData.Rule.Predicates.filter((p) => validPredicateIds.has(p.PredicateId)).filter((predicate) => {
-                            // if there are more than 1 column, then we must eliminate the IN/NotIn predicates
-                            // TODO: this should NOT be required, but the ColumnValueSelector does NOT support creatable values right now
-                            if (isScopeColumnIds(Scope) && Scope.ColumnIds.length > 1) {
-                                return predicate.PredicateId !== 'In' && predicate.PredicateId !== 'NotIn';
-                            }
-                            return true;
-                        }),
-                    };
-                }
-                props.onChange(newData);
-            } }) }));
+    return (_jsxs(Flex, { flexDirection: "column", className: "twa:h-full", children: [_jsxs(Flex, { flexDirection: "row", alignItems: "center", className: "twa:p-2 twa:gap-3 twa:border-b twa:mb-2 twa:border-b-foreground/20", children: [_jsx(Box, { className: "twa:text-5 twa:font-medium", children: "Columns" }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:max-w-[520px]", children: "Specify which data changes should trigger cell flashing" })] }), _jsx(Box, { className: "twa:flex-1 twa:min-h-0 twa:overflow-auto twa:p-2", children: _jsx(NewScopeComponent, { descriptions: {
+                        rowScope: 'Changes anywhere in the row will trigger a Flashing Cell',
+                        columnScope: 'Changes in selected columns will trigger a Flashing Cell',
+                        dataTypeScope: 'Changes in columns with these Data Types will trigger a Flashing Cell',
+                    }, scopeColumns: availableColumns, scope: data.Scope, updateScope: (Scope) => {
+                        const newData = { ...data, Scope };
+                        if (newData.Rule.Predicates) {
+                            const validPredicateIds = new Set(api.flashingCellApi.getFlashingCellPredicateDefsForScope(Scope).map((def) => def.id));
+                            newData.Rule = {
+                                Predicates: newData.Rule.Predicates.filter((p) => validPredicateIds.has(p.PredicateId)).filter((predicate) => {
+                                    if (isScopeColumnIds(Scope) && Scope.ColumnIds.length > 1) {
+                                        return predicate.PredicateId !== 'In' && predicate.PredicateId !== 'NotIn';
+                                    }
+                                    return true;
+                                }),
+                            };
+                        }
+                        props.onChange(newData);
+                    } }) })] }));
 };

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

@@ -3,14 +3,14 @@ import * as React from 'react';
 import { useRef } from 'react';
 import Input from '../../../components/Input';
 import usePrevious from '../../../components/utils/usePrevious';
-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';
+import { Card } from '../../../components/Card';
+import { TypeRadio } from '../../Wizard/TypeRadio';
 export const isSettingsValid = (data, api) => {
     if (!data.Name?.trim()) {
         return 'Name is required';
@@ -22,8 +22,17 @@ export const isSettingsValid = (data, api) => {
     }
     return true;
 };
+const formatFlashTarget = (flashTarget) => {
+    if (!flashTarget) {
+        return 'Not specified';
+    }
+    if (typeof flashTarget === 'string') {
+        return flashTarget;
+    }
+    return flashTarget.join(', ');
+};
 export const renderFlashingAlertSettingsSummary = (flashingAlert) => {
-    return (_jsxs(_Fragment, { children: [_jsxs(SummaryText, { children: ["Name ", _jsx(Tag, { children: flashingAlert.Name || 'Not specified' })] }), _jsx(Box, { className: "twa:text-2", children: flashingAlert.FlashDuration === 'always' ? (_jsx(_Fragment, { children: "Flashing is never removed" })) : (_jsxs(_Fragment, { children: ["Flashing is removed after ", _jsx(CodeBlock, { children: flashingAlert.FlashDuration }), ' ', "milliseconds"] })) })] }));
+    return (_jsxs(_Fragment, { children: [_jsxs(SummaryText, { children: ["Name ", _jsx(Tag, { children: flashingAlert.Name || 'Not specified' })] }), _jsx(Box, { className: "twa:text-2", children: flashingAlert.FlashDuration === 'always' ? (_jsx(_Fragment, { children: "Flashing is never removed" })) : (_jsxs(_Fragment, { children: ["Flashing is removed after ", _jsx(CodeBlock, { children: flashingAlert.FlashDuration }), ' ', "milliseconds"] })) }), _jsxs(SummaryText, { children: ["Flash Target ", _jsx(Tag, { children: formatFlashTarget(flashingAlert.FlashTarget) })] })] }));
 };
 export const FlashingAlertSettingsWizardSection = (props) => {
     let { data: flashingCell } = useOnePageAdaptableWizardContext();
@@ -46,7 +55,7 @@ export const FlashingAlertSettingsWizardSection = (props) => {
             inputRef.current?.focus();
         }
     }, [duration, oldDuration]);
-    const handleTypeChange = (type) => {
+    const handleDurationTypeChange = (type) => {
         setDuration(type === 'number' ? numberDuration.current : 'always');
     };
     const handleTargetChange = (type, checked) => {
@@ -67,11 +76,11 @@ export const FlashingAlertSettingsWizardSection = (props) => {
             FlashTarget,
         });
     };
-    return (_jsxs(Flex, { flexDirection: "column", "data-name": "plus-minus-column-settings", className: "twa:h-full", children: [_jsxs(Tabs, { autoFocus: false, className: "twa:p-2", children: [_jsx(Tabs.Tab, { children: "Flashing Cell Settings" }), _jsx(Tabs.Content, { children: _jsx(FormLayout, { children: _jsx(FormRow, { label: "Name", children: _jsx(Input, { "data-name": "flashing-cell-name", className: "twa:flex-1 twa:mr-3", onChange: handleNameChange, placeholder: "Enter Name", value: flashingCell.Name ?? '' }) }) }) })] }), _jsxs(Tabs, { autoFocus: false, className: "twa:p-2", children: [_jsx(Tabs.Tab, { children: "Flash Duration" }), _jsx(Tabs.Content, { children: _jsx(FormLayout, { children: _jsx(FormRow, { label: "", children: _jsxs(Flex, { alignItems: "center", children: [_jsx(CheckBox, { "data-name": "duration-always", checked: duration === 'always', onChange: (checked) => handleTypeChange(checked ? 'always' : 'number'), className: "twa:mr-4", tabIndex: -1, children: "Always" }), duration !== 'always' && (_jsxs(_Fragment, { children: [_jsx(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));
-                                                    } }), _jsx(Box, { className: "twa:text-2", children: "ms" })] }))] }) }) }) })] }), ' ', _jsxs(Tabs, { autoFocus: false, className: "twa:p-2", children: [_jsx(Tabs.Tab, { children: "Flash Target" }), _jsx(Tabs.Content, { children: _jsx(FormLayout, { children: _jsxs(FormRow, { label: "", children: [_jsx(CheckBox, { "data-name": "flashing-target", onChange: (checked) => handleTargetChange('cell', checked), className: "twa:mr-3", checked: flashingCell?.FlashTarget === 'cell' ||
-                                            flashingCell?.FlashTarget?.includes?.('cell'), tabIndex: -1, children: "Cell" }), _jsx(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, children: "Row" }), _jsx(CheckBox, { "data-name": "flashing-target-aggFuncCell", onChange: (checked) => handleTargetChange('aggFuncCell', checked), checked: flashingCell?.FlashTarget === 'aggFuncCell' ||
-                                            flashingCell?.FlashTarget?.includes?.('aggFuncCell'), tabIndex: -1, children: "Aggregated Function Cell" })] }) }) })] })] }));
+    const isTargetChecked = (type) => flashingCell?.FlashTarget === type || flashingCell?.FlashTarget?.includes?.(type);
+    return (_jsx(Box, { "data-name": "flashing-cell-settings", children: _jsxs(Flex, { flexDirection: "column", className: "twa:gap-3 twa:p-3", children: [_jsxs(Card, { shadow: false, children: [_jsxs(Card.Title, { children: [_jsx(Box, { className: "twa:font-medium", children: "Name" }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "Provide a unique name for the Flashing Cell rule" })] }), _jsx(Card.Body, { className: "twa:p-1", children: _jsx(Input, { "data-name": "flashing-cell-name", className: "twa:max-w-[300px] twa:w-full", onChange: handleNameChange, placeholder: "Enter Name", value: flashingCell.Name ?? '' }) })] }), _jsxs(Card, { shadow: false, children: [_jsxs(Card.Title, { children: [_jsx(Box, { className: "twa:font-medium", children: "Flash Duration" }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "Choose how long the flash style remains visible after a change" })] }), _jsx(Card.Body, { children: _jsxs(Flex, { flexDirection: "column", className: "twa:gap-3", children: [_jsx(TypeRadio, { "data-name": "duration-always", text: "Always", description: "The flash style is never removed automatically", checked: duration === 'always', onClick: () => handleDurationTypeChange('always') }), _jsx(TypeRadio, { "data-name": "duration-timed", text: "Timed", description: "The flash style is removed after a set number of milliseconds", checked: duration !== 'always', onClick: () => handleDurationTypeChange('number') }), duration !== 'always' ? (_jsxs(Flex, { alignItems: "center", className: "twa:ml-6", children: [_jsx(Input, { "data-name": "duration-input", readOnly: props.readOnly, type: "number", name: "value", ref: inputRef, className: "twa:w-24 twa:mr-2", value: duration, onChange: (event) => {
+                                                    const value = event.target.value;
+                                                    const parsed = Number(value);
+                                                    numberDuration.current = isNaN(parsed) ? 500 : parsed;
+                                                    setDuration(numberDuration.current);
+                                                } }), _jsx(Box, { className: "twa:text-2", children: "ms" })] })) : null] }) })] }), _jsxs(Card, { shadow: false, children: [_jsxs(Card.Title, { children: [_jsx(Box, { className: "twa:font-medium", children: "Flash Target" }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "Choose which parts of the grid flash when a change occurs" })] }), _jsx(Card.Body, { children: _jsxs(Flex, { flexDirection: "column", children: [_jsx(CheckBox, { "data-name": "flashing-target", onChange: (checked) => handleTargetChange('cell', checked), checked: isTargetChecked('cell'), children: "Cell" }), _jsx(CheckBox, { "data-name": "flashing-target-row", onChange: (checked) => handleTargetChange('row', checked), checked: isTargetChecked('row'), children: "Row" }), _jsx(CheckBox, { "data-name": "flashing-target-aggFuncCell", onChange: (checked) => handleTargetChange('aggFuncCell', checked), checked: isTargetChecked('aggFuncCell'), children: "Aggregated Function Cell" })] }) })] })] }) }));
 };

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

@@ -1,14 +1,30 @@
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useOnePageAdaptableWizardContext } from '../../Wizard/OnePageAdaptableWizard';
-import { Tabs } from '../../../components/Tabs';
 import { StyleComponent } from '../../Components/StyleComponent';
 import { StylePreview } from '../../../components/StylePreview';
-import { Box } from '../../../components/Flex';
-const changeStyle = _jsx(Box, { className: "twa:text-2 twa:inline-block", children: "Change style" });
+import { Box, Flex } from '../../../components/Flex';
+import { Card } from '../../../components/Card';
+const FLASH_STYLE_CARDS = [
+    {
+        key: 'UpChangeStyle',
+        title: 'Up Change Style',
+        description: 'Style applied when a cell value increases',
+    },
+    {
+        key: 'DownChangeStyle',
+        title: 'Down Change Style',
+        description: 'Style applied when a cell value decreases',
+    },
+    {
+        key: 'NeutralChangeStyle',
+        title: 'Neutral Change Style',
+        description: 'Style applied when a cell value changes but not up or down (e.g. text edits)',
+    },
+];
 export const FlashingAlertStyleWizardSection = (props) => {
     let { data: flashingAlert, api } = useOnePageAdaptableWizardContext();
     flashingAlert = flashingAlert ?? props.flashingAlert;
-    return (_jsx(_Fragment, { children: _jsxs(Tabs, { defaultValue: "up", children: [_jsxs(Tabs.Tab, { value: "up", children: ["Up ", changeStyle] }), _jsx(Tabs.Content, { value: "up", children: _jsx(StyleComponent, { headless: true, api: api, Style: flashingAlert.UpChangeStyle ?? {}, UpdateStyle: (style) => props.onStyleChange('UpChangeStyle', style) }) }), _jsxs(Tabs.Tab, { value: "down", children: ["Down ", changeStyle] }), _jsx(Tabs.Content, { value: "down", children: _jsx(StyleComponent, { headless: true, api: api, Style: flashingAlert.DownChangeStyle ?? {}, UpdateStyle: (style) => props.onStyleChange('DownChangeStyle', style) }) }), _jsxs(Tabs.Tab, { value: "neutral", children: ["Neutral ", changeStyle] }), _jsx(Tabs.Content, { value: "neutral", children: _jsx(StyleComponent, { headless: true, api: api, Style: flashingAlert.NeutralChangeStyle ?? {}, UpdateStyle: (style) => props.onStyleChange('NeutralChangeStyle', style) }) })] }) }));
+    return (_jsx(Flex, { flexDirection: "column", className: "twa:gap-3 twa:p-3", children: FLASH_STYLE_CARDS.map(({ key, title, description }) => (_jsxs(Card, { shadow: false, children: [_jsxs(Card.Title, { children: [_jsx(Box, { className: "twa:font-medium", children: title }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: description })] }), _jsx(Card.Body, { children: _jsx(StyleComponent, { headless: true, api: api, Style: flashingAlert[key] ?? {}, UpdateStyle: (style) => props.onStyleChange(key, style) }) })] }, key))) }));
 };
 export const FlashingCellStyle = (props) => {
     const { data, ...boxProps } = props;

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

@@ -63,7 +63,7 @@ export const FlashingCellWizard = (props) => {
             {
                 details: 'Set Name, Duration and Target Properties',
                 isValid: isSettingsValid,
-                render: () => (_jsx(Box, { className: "twa:p-2", children: _jsx(FlashingAlertSettingsWizardSection, { onChange: setFlashingCell }) })),
+                render: () => _jsx(FlashingAlertSettingsWizardSection, { onChange: setFlashingCell }),
                 renderSummary: renderFlashingAlertSettingsSummary,
                 title: 'Settings',
             },
@@ -83,9 +83,9 @@ export const FlashingCellWizard = (props) => {
             },
             {
                 details: 'Choose Flash Styles for Up, Down and Neutral Changes',
-                render: () => (_jsx(Box, { className: "twa:p-2", children: _jsx(FlashingAlertStyleWizardSection, { onStyleChange: (styleName, style) => {
-                            updateStyles[styleName](style);
-                        } }) })),
+                render: () => (_jsx(FlashingAlertStyleWizardSection, { onStyleChange: (styleName, style) => {
+                        updateStyles[styleName](style);
+                    } })),
                 renderSummary: renderFlashingAlertStyleSummary,
                 title: 'Flash Styles',
             },

package/src/View/FormatColumn/Wizard/FormatColumnFormatWizardSection.d.ts

@@ -10,7 +10,14 @@ export interface FormatColumnFormatWizardState {
     DisplayFormat: AdaptableFormat;
     NumericFormat?: 'Percent' | 'Thousand' | 'Million' | 'Dollar' | 'Sterling' | undefined;
 }
+type DisplayFormatSummaryItem = {
+    label: string;
+    value: string;
+};
+export declare const getFormatColumnDisplayFormatSummaryItems: (data: FormatColumn) => DisplayFormatSummaryItem[];
+export declare const hasFormatColumnDisplayFormat: (data: FormatColumn) => boolean;
 export declare const getFormatColumnFormatSummaryValue: (data: FormatColumn) => string;
 export declare const renderFormatColumnFormatSummary: (data: FormatColumn) => React.JSX.Element;
 export declare const getFormatDisplayTypeForScope: (scope: ColumnScope, api: AdaptableApi) => "number" | "date" | "text" | undefined;
 export declare const FormatColumnFormatWizardSection: (props: FormatColumnFormatWizardSectionProps) => React.JSX.Element;
+export {};

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

@@ -31,24 +31,122 @@ const DateFormatPresets = [
     'yyyyMMdd',
     'HH:mm:ss',
 ];
-export const getFormatColumnFormatSummaryValue = (data) => {
-    let content = 'N/A';
+const NUMERIC_PRESET_LABELS = {
+    Percentage: 'Percentage',
+    Thousand: 'K (Thousand)',
+    Million: 'M (Million)',
+    Billion: 'B (Billion)',
+    BasisPoints: 'bps (Basis Pts)',
+    Dollar: 'Dollar',
+    Sterling: 'Sterling',
+    Euro: 'Euro',
+    Yen: 'Yen',
+    Bitcoin: 'Bitcoin',
+    Integer: 'Integer',
+    Decimal: 'Decimal',
+    Accounting: 'Accounting',
+    FXRate: 'FX Rate',
+    Scientific: 'Scientific',
+};
+const appendDisplayFormatItem = (items, label, value) => {
+    if (value == null || value === '' || value === false) {
+        return;
+    }
+    items.push({ label, value: String(value) });
+};
+const appendNumberFormatOptions = (items, options) => {
+    appendDisplayFormatItem(items, 'Fraction Digits', options.FractionDigits);
+    appendDisplayFormatItem(items, 'Fraction Separator', options.FractionSeparator);
+    appendDisplayFormatItem(items, 'Integer Digits', options.IntegerDigits);
+    appendDisplayFormatItem(items, 'Integer Separator', options.IntegerSeparator);
+    appendDisplayFormatItem(items, 'Prefix', options.Prefix);
+    appendDisplayFormatItem(items, 'Suffix', options.Suffix);
+    appendDisplayFormatItem(items, 'Content', options.Content);
+    if (options.Multiplier != null && options.Multiplier !== 1) {
+        items.push({ label: 'Multiplier', value: String(options.Multiplier) });
+    }
+    appendDisplayFormatItem(items, 'Parentheses', options.Parentheses);
+    appendDisplayFormatItem(items, 'Truncate', options.Truncate);
+    appendDisplayFormatItem(items, 'Absolute Value', options.Abs);
+    appendDisplayFormatItem(items, 'Ceiling', options.Ceiling);
+    appendDisplayFormatItem(items, 'Floor', options.Floor);
+    appendDisplayFormatItem(items, 'Round', options.Round);
+    appendDisplayFormatItem(items, 'Empty', options.Empty);
+    if (options.Notation === 'scientific') {
+        items.push({ label: 'Notation', value: 'Scientific' });
+    }
+    if (options.CustomDisplayFormats?.length) {
+        items.push({
+            label: 'Custom Formats',
+            value: options.CustomDisplayFormats.join(', '),
+        });
+    }
+};
+const appendStringFormatOptions = (items, options) => {
+    appendDisplayFormatItem(items, 'Case', options.Case);
+    appendDisplayFormatItem(items, 'Trim', options.Trim);
+    appendDisplayFormatItem(items, 'Prefix', options.Prefix);
+    appendDisplayFormatItem(items, 'Suffix', options.Suffix);
+    appendDisplayFormatItem(items, 'Content', options.Content);
+    appendDisplayFormatItem(items, 'Empty', options.Empty);
+    if (options.CustomDisplayFormats?.length) {
+        items.push({
+            label: 'Custom Formats',
+            value: options.CustomDisplayFormats.join(', '),
+        });
+    }
+};
+export const getFormatColumnDisplayFormatSummaryItems = (data) => {
+    if (data.DisplayFormat == null) {
+        return [];
+    }
+    if (isAdaptableNumericFormatPreset(data.DisplayFormat)) {
+        return [{ label: '', value: `${NUMERIC_PRESET_LABELS[data.DisplayFormat]} Preset` }];
+    }
     const resolved = resolveDisplayFormat(data.DisplayFormat);
     if (!resolved) {
-        content = 'N/A';
+        return [];
     }
-    else {
-        if (resolved.Formatter === 'NumberFormatter') {
-            content = FormatHelper.NumberFormatter(DEFAULT_DOUBLE_DISPLAY_VALUE, resolved.Options);
+    const items = [];
+    if (resolved.Formatter === 'NumberFormatter') {
+        appendNumberFormatOptions(items, resolved.Options);
+        if (!items.length) {
+            items.push({ label: '', value: 'Number Format' });
         }
-        if (resolved.Formatter === 'DateFormatter') {
-            content = FormatHelper.DateFormatter(new Date(), resolved.Options);
+        return items;
+    }
+    if (resolved.Formatter === 'DateFormatter') {
+        const options = resolved.Options;
+        appendDisplayFormatItem(items, 'Pattern', options.Pattern);
+        if (options.CustomDisplayFormats?.length) {
+            items.push({
+                label: 'Custom Formats',
+                value: options.CustomDisplayFormats.join(', '),
+            });
+        }
+        if (!items.length) {
+            items.push({ label: '', value: 'Date Format' });
         }
-        if (resolved.Formatter === 'StringFormatter') {
-            content = FormatHelper.StringFormatter(DEFAULT_STRING_DISPLAY_VALUE, resolved.Options);
+        return items;
+    }
+    if (resolved.Formatter === 'StringFormatter') {
+        appendStringFormatOptions(items, resolved.Options);
+        if (!items.length) {
+            items.push({ label: '', value: 'String Format' });
         }
+        return items;
     }
-    return content;
+    return items;
+};
+export const hasFormatColumnDisplayFormat = (data) => getFormatColumnDisplayFormatSummaryItems(data).length > 0;
+export const getFormatColumnFormatSummaryValue = (data) => {
+    const items = getFormatColumnDisplayFormatSummaryItems(data);
+    if (!items.length) {
+        return 'No Display Format';
+    }
+    return items
+        .map(({ label, value }) => (label ? `${label}: ${value}` : value))
+        .join(', ');
 };
 const renderCustomFormatter = (data, customFormatter, setFormatOption) => {
     const resolved = resolveDisplayFormat(data.DisplayFormat);
@@ -64,7 +162,14 @@ const renderCustomFormatter = (data, customFormatter, setFormatOption) => {
             } }) }, customFormatter.id));
 };
 export const renderFormatColumnFormatSummary = (data) => {
-    return _jsx(Tag, { children: getFormatColumnFormatSummaryValue(data) });
+    const items = getFormatColumnDisplayFormatSummaryItems(data);
+    if (!items.length) {
+        return _jsx(Tag, { children: "No Display Format" });
+    }
+    if (items.length === 1 && !items[0].label) {
+        return _jsx(Tag, { children: items[0].value });
+    }
+    return (_jsx(Box, { className: "twa:flex twa:flex-col twa:gap-2", children: items.map(({ label, value }) => (_jsxs(Box, { children: [label, " ", _jsx(Tag, { children: value })] }, label))) }));
 };
 export const getFormatDisplayTypeForScope = (scope, api) => {
     if (scope == undefined) {

package/src/View/FormatColumn/Wizard/FormatColumnPreview.d.ts

@@ -0,0 +1,15 @@
+import * as React from 'react';
+import { FormatColumn } from '../../../AdaptableState/FormatColumnState';
+import { AdaptableApi } from '../../../Api/AdaptableApi';
+/** Today's date as sample text — no Display Format options applied. */
+export declare const getFormatColumnPreviewDateSampleText: () => string;
+export declare const getFormatColumnStylePreviewText: (formatColumn: FormatColumn, api: AdaptableApi) => string;
+export declare const getFormatColumnPreviewSampleValue: (formatColumn: FormatColumn, api: AdaptableApi) => string | number;
+export declare const getFormatColumnPreviewText: (formatColumn: FormatColumn, api: AdaptableApi) => string;
+export declare const FormatColumnPreviewContent: React.FunctionComponent<{
+    formatColumn: FormatColumn;
+    api: AdaptableApi;
+}>;
+export declare const renderFormatColumnPreviewSummary: (formatColumn: FormatColumn, api: AdaptableApi) => React.JSX.Element;
+export declare const FormatColumnPreview: React.FunctionComponent;
+export declare const FormatColumnPreviewSummaryCard: React.FunctionComponent;

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

@@ -0,0 +1,66 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { resolveDisplayFormat } from '../../../AdaptableState/Common/AdaptableFormatPresets';
+import { DEFAULT_DOUBLE_DISPLAY_VALUE, DEFAULT_STRING_DISPLAY_VALUE, } from '../../../Utilities/Constants/GeneralConstants';
+import FormatHelper from '../../../Utilities/Helpers/FormatHelper';
+import { convertAdaptableStyleToCSS } from '../../../Utilities/Helpers/StyleHelper';
+import { Card } from '../../../components/Card';
+import { Box } from '../../../components/Flex';
+import { useOnePageAdaptableWizardContext } from '../../Wizard/OnePageAdaptableWizard';
+import { getFormatDisplayTypeForScope } from './FormatColumnFormatWizardSection';
+const toFormatColumnPreviewStyle = (formatColumn) => {
+    const style = formatColumn.Style ?? {};
+    return {
+        ...convertAdaptableStyleToCSS(style),
+        borderWidth: style.BorderColor ? 2 : 0,
+        borderStyle: 'solid',
+        textAlign: style.Alignment ? style.Alignment.toLowerCase() : undefined,
+    };
+};
+/** Today's date as sample text — no Display Format options applied. */
+export const getFormatColumnPreviewDateSampleText = () => new Date().toLocaleDateString();
+export const getFormatColumnStylePreviewText = (formatColumn, api) => {
+    const formatType = getFormatDisplayTypeForScope(formatColumn.Scope, api);
+    if (formatType === 'number') {
+        return String(DEFAULT_DOUBLE_DISPLAY_VALUE);
+    }
+    if (formatType === 'date') {
+        return getFormatColumnPreviewDateSampleText();
+    }
+    return DEFAULT_STRING_DISPLAY_VALUE;
+};
+export const getFormatColumnPreviewSampleValue = (formatColumn, api) => {
+    const formatType = getFormatDisplayTypeForScope(formatColumn.Scope, api);
+    if (formatType === 'number') {
+        return DEFAULT_DOUBLE_DISPLAY_VALUE;
+    }
+    if (formatType === 'date') {
+        return getFormatColumnPreviewDateSampleText();
+    }
+    return DEFAULT_STRING_DISPLAY_VALUE;
+};
+export const getFormatColumnPreviewText = (formatColumn, api) => {
+    const sample = getFormatColumnPreviewSampleValue(formatColumn, api);
+    const resolved = resolveDisplayFormat(formatColumn.DisplayFormat);
+    if (!resolved) {
+        return String(sample);
+    }
+    if (resolved.Formatter === 'NumberFormatter' && typeof sample === 'number') {
+        return FormatHelper.NumberFormatter(sample, resolved.Options) ?? String(sample);
+    }
+    if (resolved.Formatter === 'DateFormatter') {
+        return FormatHelper.DateFormatter(new Date(), resolved.Options) ?? String(sample);
+    }
+    if (resolved.Formatter === 'StringFormatter' && typeof sample === 'string') {
+        return FormatHelper.StringFormatter(sample, resolved.Options) ?? sample;
+    }
+    return String(sample);
+};
+export const FormatColumnPreviewContent = ({ formatColumn, api }) => (_jsx(Box, { className: "ab-FormatPreview twa:p-2 twa:inline-block", style: toFormatColumnPreviewStyle(formatColumn), children: getFormatColumnPreviewText(formatColumn, api) }));
+export const renderFormatColumnPreviewSummary = (formatColumn, api) => _jsx(FormatColumnPreviewContent, { formatColumn: formatColumn, api: api });
+export const FormatColumnPreview = () => {
+    const { data, api } = useOnePageAdaptableWizardContext();
+    return _jsx(FormatColumnPreviewContent, { formatColumn: data, api: api });
+};
+export const FormatColumnPreviewSummaryCard = () => {
+    return (_jsxs(Card, { shadow: false, children: [_jsx(Card.Title, { children: _jsx(Box, { className: "twa:font-medium", children: "Preview" }) }), _jsx(Card.Body, { className: "twa:p-1", children: _jsx(FormatColumnPreview, {}) })] }));
+};

package/src/View/FormatColumn/Wizard/FormatColumnRuleWizardSection.d.ts

@@ -1,8 +1,12 @@
 import * as React from 'react';
 import { FormatColumn } from '../../../../types';
+import { AdaptableApi } from '../../../Api/AdaptableApi';
 type FormatColumnRuleWizardSectionProps = {
     onChange: (data: FormatColumn) => void;
     defaultPredicateId: string;
 };
+export declare const hasFormatColumnCondition: (formatColumn: FormatColumn) => boolean;
+export declare const renderFormatColumnConditionSummary: (formatColumn: FormatColumn, api: AdaptableApi) => React.JSX.Element;
+export declare const renderFormatColumnConditionWizardSummary: (formatColumn: FormatColumn) => React.JSX.Element;
 export declare function FormatColumnRuleWizardSection(props: FormatColumnRuleWizardSectionProps): React.JSX.Element;
 export {};

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

@@ -2,6 +2,36 @@ import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-run
 import { useOnePageAdaptableWizardContext } from '../../Wizard/OnePageAdaptableWizard';
 import { EntityRulesEditor } from '../../Components/EntityRulesEditor';
 import HelpBlock from '../../../components/HelpBlock';
+import { Box } from '../../../components/Flex';
+import { Tag } from '../../../components/Tag';
+export const hasFormatColumnCondition = (formatColumn) => {
+    const rule = formatColumn.Rule;
+    if (!rule) {
+        return false;
+    }
+    return Boolean(rule.Predicates?.length ||
+        rule.BooleanExpression ||
+        ('ObservableExpression' in rule && rule.ObservableExpression) ||
+        ('AggregatedBooleanExpression' in rule && rule.AggregatedBooleanExpression));
+};
+export const renderFormatColumnConditionSummary = (formatColumn, api) => {
+    if (formatColumn.Target === 'columnHeader') {
+        return _jsx(Tag, { children: "No Condition" });
+    }
+    if (!hasFormatColumnCondition(formatColumn)) {
+        return _jsx(Tag, { children: "No Condition" });
+    }
+    const rule = formatColumn.Rule;
+    if (rule?.Predicates?.length) {
+        return (_jsx(Box, { className: "twa:flex twa:flex-col twa:gap-2", children: rule.Predicates.map((predicate, index) => (_jsx(Tag, { children: api.predicateApi.predicateToString(predicate) }, index))) }));
+    }
+    const expressionText = api.internalApi.getAdaptableQueryExpressionText(rule);
+    return _jsx(Tag, { children: expressionText || 'No Condition' });
+};
+export const renderFormatColumnConditionWizardSummary = (formatColumn) => {
+    const { api } = useOnePageAdaptableWizardContext();
+    return renderFormatColumnConditionSummary(formatColumn, api);
+};
 export function FormatColumnRuleWizardSection(props) {
     const { data, api, moduleInfo } = useOnePageAdaptableWizardContext();
     if (data.Target && data.Target === 'columnHeader') {