@adaptabletools/adaptable-cjs 23.0.0-canary.4 → 23.0.0-canary.6

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

@@ -67,7 +67,7 @@ const FlashingCellWizard = (props) => {
             {
                 details: 'Set Name, Duration and Target Properties',
                 isValid: FlashingCellSettingsWizardSection_1.isSettingsValid,
-                render: () => ((0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:p-2", children: (0, jsx_runtime_1.jsx)(FlashingCellSettingsWizardSection_1.FlashingAlertSettingsWizardSection, { onChange: setFlashingCell }) })),
+                render: () => (0, jsx_runtime_1.jsx)(FlashingCellSettingsWizardSection_1.FlashingAlertSettingsWizardSection, { onChange: setFlashingCell }),
                 renderSummary: FlashingCellSettingsWizardSection_1.renderFlashingAlertSettingsSummary,
                 title: 'Settings',
             },
@@ -87,9 +87,9 @@ const FlashingCellWizard = (props) => {
             },
             {
                 details: 'Choose Flash Styles for Up, Down and Neutral Changes',
-                render: () => ((0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:p-2", children: (0, jsx_runtime_1.jsx)(FlashingCellStyleWizardSection_1.FlashingAlertStyleWizardSection, { onStyleChange: (styleName, style) => {
-                            updateStyles[styleName](style);
-                        } }) })),
+                render: () => ((0, jsx_runtime_1.jsx)(FlashingCellStyleWizardSection_1.FlashingAlertStyleWizardSection, { onStyleChange: (styleName, style) => {
+                        updateStyles[styleName](style);
+                    } })),
                 renderSummary: FlashingCellStyleWizardSection_1.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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FormatColumnFormatWizardSection = exports.getFormatDisplayTypeForScope = exports.renderFormatColumnFormatSummary = exports.getFormatColumnFormatSummaryValue = void 0;
+exports.FormatColumnFormatWizardSection = exports.getFormatDisplayTypeForScope = exports.renderFormatColumnFormatSummary = exports.getFormatColumnFormatSummaryValue = exports.hasFormatColumnDisplayFormat = exports.getFormatColumnDisplayFormatSummaryItems = void 0;
 const tslib_1 = require("tslib");
 const jsx_runtime_1 = require("react/jsx-runtime");
 const uniq_1 = tslib_1.__importDefault(require("../../../Utilities/utils/uniq"));
@@ -35,24 +35,124 @@ const DateFormatPresets = [
     'yyyyMMdd',
     'HH:mm:ss',
 ];
-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(', '),
+        });
+    }
+};
+const getFormatColumnDisplayFormatSummaryItems = (data) => {
+    if (data.DisplayFormat == null) {
+        return [];
+    }
+    if ((0, AdaptableFormatPresets_1.isAdaptableNumericFormatPreset)(data.DisplayFormat)) {
+        return [{ label: '', value: `${NUMERIC_PRESET_LABELS[data.DisplayFormat]} Preset` }];
+    }
     const resolved = (0, AdaptableFormatPresets_1.resolveDisplayFormat)(data.DisplayFormat);
     if (!resolved) {
-        content = 'N/A';
+        return [];
     }
-    else {
-        if (resolved.Formatter === 'NumberFormatter') {
-            content = FormatHelper_1.default.NumberFormatter(GeneralConstants_1.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_1.default.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_1.default.StringFormatter(GeneralConstants_1.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;
+};
+exports.getFormatColumnDisplayFormatSummaryItems = getFormatColumnDisplayFormatSummaryItems;
+const hasFormatColumnDisplayFormat = (data) => (0, exports.getFormatColumnDisplayFormatSummaryItems)(data).length > 0;
+exports.hasFormatColumnDisplayFormat = hasFormatColumnDisplayFormat;
+const getFormatColumnFormatSummaryValue = (data) => {
+    const items = (0, exports.getFormatColumnDisplayFormatSummaryItems)(data);
+    if (!items.length) {
+        return 'No Display Format';
+    }
+    return items
+        .map(({ label, value }) => (label ? `${label}: ${value}` : value))
+        .join(', ');
 };
 exports.getFormatColumnFormatSummaryValue = getFormatColumnFormatSummaryValue;
 const renderCustomFormatter = (data, customFormatter, setFormatOption) => {
@@ -69,7 +169,14 @@ const renderCustomFormatter = (data, customFormatter, setFormatOption) => {
             } }) }, customFormatter.id));
 };
 const renderFormatColumnFormatSummary = (data) => {
-    return (0, jsx_runtime_1.jsx)(Tag_1.Tag, { children: (0, exports.getFormatColumnFormatSummaryValue)(data) });
+    const items = (0, exports.getFormatColumnDisplayFormatSummaryItems)(data);
+    if (!items.length) {
+        return (0, jsx_runtime_1.jsx)(Tag_1.Tag, { children: "No Display Format" });
+    }
+    if (items.length === 1 && !items[0].label) {
+        return (0, jsx_runtime_1.jsx)(Tag_1.Tag, { children: items[0].value });
+    }
+    return ((0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:flex twa:flex-col twa:gap-2", children: items.map(({ label, value }) => ((0, jsx_runtime_1.jsxs)(Flex_1.Box, { children: [label, " ", (0, jsx_runtime_1.jsx)(Tag_1.Tag, { children: value })] }, label))) }));
 };
 exports.renderFormatColumnFormatSummary = renderFormatColumnFormatSummary;
 const getFormatDisplayTypeForScope = (scope, api) => {

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,78 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FormatColumnPreviewSummaryCard = exports.FormatColumnPreview = exports.renderFormatColumnPreviewSummary = exports.FormatColumnPreviewContent = exports.getFormatColumnPreviewText = exports.getFormatColumnPreviewSampleValue = exports.getFormatColumnStylePreviewText = exports.getFormatColumnPreviewDateSampleText = void 0;
+const tslib_1 = require("tslib");
+const jsx_runtime_1 = require("react/jsx-runtime");
+const AdaptableFormatPresets_1 = require("../../../AdaptableState/Common/AdaptableFormatPresets");
+const GeneralConstants_1 = require("../../../Utilities/Constants/GeneralConstants");
+const FormatHelper_1 = tslib_1.__importDefault(require("../../../Utilities/Helpers/FormatHelper"));
+const StyleHelper_1 = require("../../../Utilities/Helpers/StyleHelper");
+const Card_1 = require("../../../components/Card");
+const Flex_1 = require("../../../components/Flex");
+const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
+const FormatColumnFormatWizardSection_1 = require("./FormatColumnFormatWizardSection");
+const toFormatColumnPreviewStyle = (formatColumn) => {
+    const style = formatColumn.Style ?? {};
+    return {
+        ...(0, StyleHelper_1.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. */
+const getFormatColumnPreviewDateSampleText = () => new Date().toLocaleDateString();
+exports.getFormatColumnPreviewDateSampleText = getFormatColumnPreviewDateSampleText;
+const getFormatColumnStylePreviewText = (formatColumn, api) => {
+    const formatType = (0, FormatColumnFormatWizardSection_1.getFormatDisplayTypeForScope)(formatColumn.Scope, api);
+    if (formatType === 'number') {
+        return String(GeneralConstants_1.DEFAULT_DOUBLE_DISPLAY_VALUE);
+    }
+    if (formatType === 'date') {
+        return (0, exports.getFormatColumnPreviewDateSampleText)();
+    }
+    return GeneralConstants_1.DEFAULT_STRING_DISPLAY_VALUE;
+};
+exports.getFormatColumnStylePreviewText = getFormatColumnStylePreviewText;
+const getFormatColumnPreviewSampleValue = (formatColumn, api) => {
+    const formatType = (0, FormatColumnFormatWizardSection_1.getFormatDisplayTypeForScope)(formatColumn.Scope, api);
+    if (formatType === 'number') {
+        return GeneralConstants_1.DEFAULT_DOUBLE_DISPLAY_VALUE;
+    }
+    if (formatType === 'date') {
+        return (0, exports.getFormatColumnPreviewDateSampleText)();
+    }
+    return GeneralConstants_1.DEFAULT_STRING_DISPLAY_VALUE;
+};
+exports.getFormatColumnPreviewSampleValue = getFormatColumnPreviewSampleValue;
+const getFormatColumnPreviewText = (formatColumn, api) => {
+    const sample = (0, exports.getFormatColumnPreviewSampleValue)(formatColumn, api);
+    const resolved = (0, AdaptableFormatPresets_1.resolveDisplayFormat)(formatColumn.DisplayFormat);
+    if (!resolved) {
+        return String(sample);
+    }
+    if (resolved.Formatter === 'NumberFormatter' && typeof sample === 'number') {
+        return FormatHelper_1.default.NumberFormatter(sample, resolved.Options) ?? String(sample);
+    }
+    if (resolved.Formatter === 'DateFormatter') {
+        return FormatHelper_1.default.DateFormatter(new Date(), resolved.Options) ?? String(sample);
+    }
+    if (resolved.Formatter === 'StringFormatter' && typeof sample === 'string') {
+        return FormatHelper_1.default.StringFormatter(sample, resolved.Options) ?? sample;
+    }
+    return String(sample);
+};
+exports.getFormatColumnPreviewText = getFormatColumnPreviewText;
+const FormatColumnPreviewContent = ({ formatColumn, api }) => ((0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "ab-FormatPreview twa:p-2 twa:inline-block", style: toFormatColumnPreviewStyle(formatColumn), children: (0, exports.getFormatColumnPreviewText)(formatColumn, api) }));
+exports.FormatColumnPreviewContent = FormatColumnPreviewContent;
+const renderFormatColumnPreviewSummary = (formatColumn, api) => (0, jsx_runtime_1.jsx)(exports.FormatColumnPreviewContent, { formatColumn: formatColumn, api: api });
+exports.renderFormatColumnPreviewSummary = renderFormatColumnPreviewSummary;
+const FormatColumnPreview = () => {
+    const { data, api } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
+    return (0, jsx_runtime_1.jsx)(exports.FormatColumnPreviewContent, { formatColumn: data, api: api });
+};
+exports.FormatColumnPreview = FormatColumnPreview;
+const FormatColumnPreviewSummaryCard = () => {
+    return ((0, jsx_runtime_1.jsxs)(Card_1.Card, { shadow: false, children: [(0, jsx_runtime_1.jsx)(Card_1.Card.Title, { children: (0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:font-medium", children: "Preview" }) }), (0, jsx_runtime_1.jsx)(Card_1.Card.Body, { className: "twa:p-1", children: (0, jsx_runtime_1.jsx)(exports.FormatColumnPreview, {}) })] }));
+};
+exports.FormatColumnPreviewSummaryCard = FormatColumnPreviewSummaryCard;

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

@@ -1,11 +1,45 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.renderFormatColumnConditionWizardSummary = exports.renderFormatColumnConditionSummary = exports.hasFormatColumnCondition = void 0;
 exports.FormatColumnRuleWizardSection = FormatColumnRuleWizardSection;
 const tslib_1 = require("tslib");
 const jsx_runtime_1 = require("react/jsx-runtime");
 const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
 const EntityRulesEditor_1 = require("../../Components/EntityRulesEditor");
 const HelpBlock_1 = tslib_1.__importDefault(require("../../../components/HelpBlock"));
+const Flex_1 = require("../../../components/Flex");
+const Tag_1 = require("../../../components/Tag");
+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));
+};
+exports.hasFormatColumnCondition = hasFormatColumnCondition;
+const renderFormatColumnConditionSummary = (formatColumn, api) => {
+    if (formatColumn.Target === 'columnHeader') {
+        return (0, jsx_runtime_1.jsx)(Tag_1.Tag, { children: "No Condition" });
+    }
+    if (!(0, exports.hasFormatColumnCondition)(formatColumn)) {
+        return (0, jsx_runtime_1.jsx)(Tag_1.Tag, { children: "No Condition" });
+    }
+    const rule = formatColumn.Rule;
+    if (rule?.Predicates?.length) {
+        return ((0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:flex twa:flex-col twa:gap-2", children: rule.Predicates.map((predicate, index) => ((0, jsx_runtime_1.jsx)(Tag_1.Tag, { children: api.predicateApi.predicateToString(predicate) }, index))) }));
+    }
+    const expressionText = api.internalApi.getAdaptableQueryExpressionText(rule);
+    return (0, jsx_runtime_1.jsx)(Tag_1.Tag, { children: expressionText || 'No Condition' });
+};
+exports.renderFormatColumnConditionSummary = renderFormatColumnConditionSummary;
+const renderFormatColumnConditionWizardSummary = (formatColumn) => {
+    const { api } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
+    return (0, exports.renderFormatColumnConditionSummary)(formatColumn, api);
+};
+exports.renderFormatColumnConditionWizardSummary = renderFormatColumnConditionWizardSummary;
 function FormatColumnRuleWizardSection(props) {
     const { data, api, moduleInfo } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
     if (data.Target && data.Target === 'columnHeader') {

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

@@ -5,6 +5,8 @@ const tslib_1 = require("tslib");
 const jsx_runtime_1 = require("react/jsx-runtime");
 const NewScopeComponent_1 = require("../../Components/NewScopeComponent");
 const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
+const AdaptableContext_1 = require("../../AdaptableContext");
+const AdaptableColumn_1 = require("../../../AdaptableState/Common/AdaptableColumn");
 const ColumnScope_1 = require("../../../AdaptableState/Common/ColumnScope");
 const Flex_1 = require("../../../components/Flex");
 const FormLayout_1 = tslib_1.__importStar(require("../../../components/FormLayout"));
@@ -33,15 +35,18 @@ const isRowKindIncluded = (data, kind) => {
 const collectIncludedRowKinds = (data) => {
     return FORMAT_COLUMN_ROW_KINDS.filter((k) => isRowKindIncluded(data, k));
 };
-const renderFormatColumnScopeSummary = (data) => {
+const FormatColumnScopeSummaryContent = ({ data, }) => {
+    const adaptable = (0, AdaptableContext_1.useAdaptable)();
+    const scopeApi = adaptable.api.columnScopeApi;
+    const scope = data.Scope;
+    const columnsInScope = scopeApi.getColumnsInScope(scope);
     const showRows = data.Target === 'cell';
     const includedKinds = collectIncludedRowKinds(data);
     const allKinds = includedKinds.length === 4;
-    return ((0, jsx_runtime_1.jsxs)(Flex_1.Box, { className: "twa:pr-2 twa:py-2", children: [(0, jsx_runtime_1.jsx)(Flex_1.Box, { children: (0, NewScopeComponent_1.renderScopeSummary)(data.Scope, {
-                    scopeWholeRow: 'Matching rows will be formatted',
-                    scopeColumns: 'Cells in selected columns will be formatted',
-                    scopeDataTypes: 'Cells in columns with these Data Types will be formatted',
-                }) }), showRows && ((0, jsx_runtime_1.jsxs)(Flex_1.Box, { className: "twa:mt-3", children: ["Rows:", ' ', allKinds ? ((0, jsx_runtime_1.jsx)(Tag_1.Tag, { children: "All" })) : includedKinds.length === 0 ? ((0, jsx_runtime_1.jsx)(Tag_1.Tag, { children: "None" })) : (includedKinds.map((k) => ((0, jsx_runtime_1.jsx)(Tag_1.Tag, { className: "twa:mr-1", children: k }, k))))] }))] }));
+    return ((0, jsx_runtime_1.jsxs)(Flex_1.Box, { className: "twa:flex twa:flex-col twa:gap-3", children: [(0, jsx_runtime_1.jsx)(Flex_1.Box, { children: scopeApi.scopeIsAll(scope) ? ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: ["Columns ", (0, jsx_runtime_1.jsx)(Tag_1.Tag, { children: "All" })] })) : 'ColumnIds' in scope ? ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: ["Columns", ' ', columnsInScope.length ? (columnsInScope.map((column) => ((0, jsx_runtime_1.jsx)(Tag_1.Tag, { className: "twa:mr-1", children: column.friendlyName }, column.columnId)))) : ((0, jsx_runtime_1.jsx)(Tag_1.Tag, { children: "None" }))] })) : 'DataTypes' in scope ? ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: ["Data Types", ' ', scope.DataTypes.length ? (scope.DataTypes.map((dataType) => ((0, jsx_runtime_1.jsx)(Tag_1.Tag, { className: "twa:mr-1", children: (0, AdaptableColumn_1.getColumnTypeFriendlyName)(dataType) }, dataType)))) : ((0, jsx_runtime_1.jsx)(Tag_1.Tag, { children: "None" }))] })) : null }), showRows && ((0, jsx_runtime_1.jsxs)(Flex_1.Box, { children: ["Rows", ' ', allKinds ? ((0, jsx_runtime_1.jsx)(Tag_1.Tag, { children: "All" })) : includedKinds.length === 0 ? ((0, jsx_runtime_1.jsx)(Tag_1.Tag, { children: "None" })) : (includedKinds.map((k) => ((0, jsx_runtime_1.jsx)(Tag_1.Tag, { className: "twa:mr-1", children: k }, k))))] }))] }));
+};
+const renderFormatColumnScopeSummary = (data) => {
+    return (0, jsx_runtime_1.jsx)(FormatColumnScopeSummaryContent, { data: data });
 };
 exports.renderFormatColumnScopeSummary = renderFormatColumnScopeSummary;
 // ---------------------------------------------------------------------------

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

@@ -12,7 +12,7 @@ const Card_1 = require("../../../components/Card");
 const Input_1 = tslib_1.__importDefault(require("../../../components/Input"));
 const TypeRadio_1 = require("../../Wizard/TypeRadio");
 const renderFormatColumnSettingsSummary = (data) => {
-    return ((0, jsx_runtime_1.jsxs)(Flex_1.Box, { className: "twa:p-2", children: [(0, jsx_runtime_1.jsxs)(Flex_1.Box, { className: "twa:mt-3", children: ["Name ", (0, jsx_runtime_1.jsx)(Tag_1.Tag, { children: data.Name })] }), (0, jsx_runtime_1.jsxs)(Flex_1.Box, { className: "twa:mt-3", children: ["Target", ' ', (0, jsx_runtime_1.jsx)(Tag_1.Tag, { children: !data.Target || data.Target === 'cell' ? 'Column Cells' : 'Column Header' })] }), ' ', (0, jsx_runtime_1.jsxs)(Flex_1.Box, { className: "twa:mt-3", children: ["Apply on Column Groups:", ' ', (0, jsx_runtime_1.jsx)(Tag_1.Tag, { children: !data.ColumnGroupScope || data.ColumnGroupScope === 'Both'
+    return ((0, jsx_runtime_1.jsxs)(Flex_1.Flex, { flexWrap: "wrap", alignItems: "center", className: "twa:gap-x-4 twa:gap-y-2", children: [(0, jsx_runtime_1.jsxs)(Flex_1.Box, { children: ["Name ", (0, jsx_runtime_1.jsx)(Tag_1.Tag, { children: data.Name })] }), (0, jsx_runtime_1.jsxs)(Flex_1.Box, { children: ["Target", ' ', (0, jsx_runtime_1.jsx)(Tag_1.Tag, { children: !data.Target || data.Target === 'cell' ? 'Column Cells' : 'Column Header' })] }), (0, jsx_runtime_1.jsxs)(Flex_1.Box, { children: ["Column Groups", ' ', (0, jsx_runtime_1.jsx)(Tag_1.Tag, { children: !data.ColumnGroupScope || data.ColumnGroupScope === 'Both'
                             ? 'Always'
                             : data.ColumnGroupScope })] })] }));
 };

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

@@ -5,7 +5,9 @@ export declare const isFormatColumnStyleValid: (data: FormatColumn, api: Adaptab
 type FormatColumnStyleWizardSectionProps = {
     onChange: (data: FormatColumn) => void;
 };
+export declare const hasFormatColumnStyle: (formatColumn: FormatColumn) => boolean;
+export declare const getFormatColumnStyleViewValues: (formatColumn: FormatColumn) => string[];
 export declare const renderFormatColumnStyleWizardSummary: (data: FormatColumn) => React.JSX.Element;
-export declare const renderFormatColumnStyleSummary: (data: FormatColumn, api: AdaptableApi) => React.JSX.Element;
+export declare const renderFormatColumnStyleSummary: (data: FormatColumn, _api: AdaptableApi) => React.JSX.Element;
 export declare function FormatColumnStyleWizardSection(props: FormatColumnStyleWizardSectionProps): React.JSX.Element;
 export {};

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

@@ -1,14 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.renderFormatColumnStyleSummary = exports.renderFormatColumnStyleWizardSummary = exports.isFormatColumnStyleValid = void 0;
+exports.renderFormatColumnStyleSummary = exports.renderFormatColumnStyleWizardSummary = exports.getFormatColumnStyleViewValues = exports.hasFormatColumnStyle = exports.isFormatColumnStyleValid = void 0;
 exports.FormatColumnStyleWizardSection = FormatColumnStyleWizardSection;
 const tslib_1 = require("tslib");
 const jsx_runtime_1 = require("react/jsx-runtime");
-const StyleHelper_1 = require("../../../Utilities/Helpers/StyleHelper");
 const StyleComponent_1 = require("../../Components/StyleComponent");
 const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
 const UIHelper_1 = tslib_1.__importDefault(require("../../UIHelper"));
+const StringExtensions_1 = tslib_1.__importDefault(require("../../../Utilities/Extensions/StringExtensions"));
 const Flex_1 = require("../../../components/Flex");
+const Tag_1 = require("../../../components/Tag");
+const FormatColumnPreview_1 = require("./FormatColumnPreview");
 const isFormatColumnStyleValid = (data, api) => {
     if (data.Style &&
         UIHelper_1.default.IsEmptyStyle(data.Style) &&
@@ -19,27 +21,76 @@ const isFormatColumnStyleValid = (data, api) => {
     return true;
 };
 exports.isFormatColumnStyleValid = isFormatColumnStyleValid;
-const toStyle = (data) => {
-    return {
-        ...(0, StyleHelper_1.convertAdaptableStyleToCSS)(data.Style ?? {}),
-        borderWidth: data.Style?.BorderColor ? 2 : 0,
-        borderStyle: 'solid',
-        // ToDO abcdefg
-        textAlign: data.Style?.Alignment ? data.Style.Alignment.toLowerCase() : undefined,
-    };
+const getFormatColumnStyleSummaryItems = (formatColumn) => {
+    const style = formatColumn.Style;
+    if (!style) {
+        return [];
+    }
+    if (StringExtensions_1.default.IsNotNullOrEmpty(style.ClassName)) {
+        return [{ label: 'Class Name', value: style.ClassName }];
+    }
+    const items = [];
+    if (style.BackColor) {
+        items.push({ label: 'Back Colour', value: style.BackColor });
+    }
+    if (style.ForeColor) {
+        items.push({ label: 'Fore Colour', value: style.ForeColor });
+    }
+    if (style.BorderColor) {
+        items.push({ label: 'Border Colour', value: style.BorderColor });
+    }
+    if (style.BorderRadius != null) {
+        items.push({ label: 'Border Radius', value: String(style.BorderRadius) });
+    }
+    if (style.FontWeight === 'Bold') {
+        items.push({ label: 'Font Weight', value: 'Bold' });
+    }
+    if (style.FontStyle === 'Italic') {
+        items.push({ label: 'Font Style', value: 'Italic' });
+    }
+    if (style.TextDecoration && style.TextDecoration !== 'None') {
+        items.push({ label: 'Text Decoration', value: style.TextDecoration });
+    }
+    if (style.FontSize) {
+        items.push({ label: 'Font Size', value: style.FontSize });
+    }
+    if (style.Alignment && style.Alignment !== 'Default') {
+        items.push({ label: 'Alignment', value: style.Alignment });
+    }
+    return items;
+};
+const hasFormatColumnStyle = (formatColumn) => {
+    if (formatColumn.Style == null || UIHelper_1.default.IsEmptyStyle(formatColumn.Style)) {
+        return false;
+    }
+    return getFormatColumnStyleSummaryItems(formatColumn).length > 0;
+};
+exports.hasFormatColumnStyle = hasFormatColumnStyle;
+const getFormatColumnStyleViewValues = (formatColumn) => {
+    return getFormatColumnStyleSummaryItems(formatColumn).map(({ label, value }) => `${label}: ${value}`);
 };
+exports.getFormatColumnStyleViewValues = getFormatColumnStyleViewValues;
 const renderFormatColumnStyleWizardSummary = (data) => {
     const { api } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
     return (0, exports.renderFormatColumnStyleSummary)(data, api);
 };
 exports.renderFormatColumnStyleWizardSummary = renderFormatColumnStyleWizardSummary;
-const renderFormatColumnStyleSummary = (data, api) => {
-    return ((0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "ab-FormatPreview twa:p-2", style: toStyle(data), children: "Preview result" }));
+const renderFormatColumnStyleSummary = (data, _api) => {
+    const hasStyle = data.Style != null && UIHelper_1.default.IsNotEmptyStyle(data.Style);
+    if (!hasStyle) {
+        return (0, jsx_runtime_1.jsx)(Tag_1.Tag, { children: "No Style" });
+    }
+    const items = getFormatColumnStyleSummaryItems(data);
+    if (!items.length) {
+        return (0, jsx_runtime_1.jsx)(Tag_1.Tag, { children: "No Style" });
+    }
+    return ((0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:grid twa:grid-cols-2 twa:gap-2", children: items.map(({ label, value }) => ((0, jsx_runtime_1.jsxs)(Flex_1.Box, { children: [label, " ", (0, jsx_runtime_1.jsx)(Tag_1.Tag, { children: value })] }, label))) }));
 };
 exports.renderFormatColumnStyleSummary = renderFormatColumnStyleSummary;
 function FormatColumnStyleWizardSection(props) {
     const { data, api } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
-    return ((0, jsx_runtime_1.jsx)(StyleComponent_1.StyleComponent, { headless: true, api: api, Style: data.Style ?? {}, UpdateStyle: (Style) => {
+    const previewText = (0, FormatColumnPreview_1.getFormatColumnStylePreviewText)(data, api);
+    return ((0, jsx_runtime_1.jsx)(StyleComponent_1.StyleComponent, { headless: true, api: api, previewText: previewText, Style: data.Style ?? {}, UpdateStyle: (Style) => {
             props.onChange({ ...data, Style });
         } }));
 }

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

@@ -24,6 +24,7 @@ const constants_1 = require("./constants");
 const ObjectExtensions_1 = require("../../../Utilities/Extensions/ObjectExtensions");
 const AdaptableFormatPresets_1 = require("../../../AdaptableState/Common/AdaptableFormatPresets");
 const Flex_1 = require("../../../components/Flex");
+const FormatColumnPreview_1 = require("./FormatColumnPreview");
 const adjustDisplayFormat = (fc, api) => {
     const formatColumn = { ...fc };
     let formatDataType = (0, FormatColumnFormatWizardSection_1.getFormatDisplayTypeForScope)(formatColumn.Scope, api);
@@ -157,6 +158,7 @@ function FormatColumnWizard(props) {
                 },
                 title: 'Condition',
                 details: 'Build a Rule when the Format Column should be applied',
+                renderSummary: FormatColumnRuleWizardSection_1.renderFormatColumnConditionWizardSummary,
                 render: () => {
                     return ((0, jsx_runtime_1.jsx)(FormatColumnRuleWizardSection_1.FormatColumnRuleWizardSection, { onChange: setFormatColumn, defaultPredicateId: constants_1.DEFAULT_PREDICATE_ID_FOR_FORMAT_COLUMN }));
                 },
@@ -189,7 +191,7 @@ function FormatColumnWizard(props) {
             {
                 details: 'Review the Format Column',
                 render: () => {
-                    return ((0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:p-2", children: (0, jsx_runtime_1.jsx)(OnePageAdaptableWizard_1.OnePageWizardSummary, {}) }));
+                    return ((0, jsx_runtime_1.jsxs)(Flex_1.Box, { className: "twa:p-2 twa:flex twa:flex-col twa:gap-3", children: [(0, jsx_runtime_1.jsx)(OnePageAdaptableWizard_1.OnePageWizardSummary, {}), (0, jsx_runtime_1.jsx)(FormatColumnPreview_1.FormatColumnPreviewSummaryCard, {})] }));
                 },
                 title: 'Summary',
             },

package/src/View/FreeTextColumn/Utilities/getFreeTextColumnSettingsTags.d.ts

@@ -0,0 +1,2 @@
+import { FreeTextColumnSettings } from '../../../AdaptableState/FreeTextColumnState';
+export declare const getFreeTextColumnSettingsTags: (settings: FreeTextColumnSettings) => string[];

package/src/View/FreeTextColumn/Utilities/getFreeTextColumnSettingsTags.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getFreeTextColumnSettingsTags = void 0;
+const getFreeTextColumnSettingsTags = (settings) => {
+    const { DataType, Width, Filterable, Resizable, Groupable, Sortable, Pivotable, Aggregatable } = settings ?? {};
+    const colTypes = settings?.ColumnTypes ? settings.ColumnTypes.join(', ') : '';
+    return [
+        DataType ? `DataType: ${DataType}` : null,
+        Width ? `Width: ${Width}px` : null,
+        Pivotable ? 'Pivotable' : null,
+        Filterable ? 'Filterable' : null,
+        Resizable ? 'Resizable' : null,
+        Groupable ? 'Groupable' : null,
+        Sortable ? 'Sortable' : null,
+        Aggregatable ? 'Aggregatable' : null,
+        colTypes ? `Column Types: ${colTypes}` : null,
+    ].filter(Boolean);
+};
+exports.getFreeTextColumnSettingsTags = getFreeTextColumnSettingsTags;

package/src/View/FreeTextColumn/Wizard/FreeTextColumnDefinitionWizardSection.d.ts

@@ -0,0 +1,10 @@
+import * as React from 'react';
+import { FreeTextColumn } from '../../../AdaptableState/FreeTextColumnState';
+import { AdaptableApi } from '../../../Api/AdaptableApi';
+export type FreeTextColumnDefinitionWizardSectionProps = {
+    onChange: (data: FreeTextColumn) => void;
+    isEdit: boolean;
+};
+export declare const renderFreeTextColumnDefinitionSummary: (data: FreeTextColumn) => React.JSX.Element;
+export declare const isValidFreeTextColumnDefinition: (data: FreeTextColumn, api: AdaptableApi) => true | string;
+export declare const FreeTextColumnDefinitionWizardSection: (props: FreeTextColumnDefinitionWizardSectionProps) => React.JSX.Element;