@adaptabletools/adaptable 22.0.0-canary.12 → 22.0.0-canary.14

package/src/Api/Internal/ColumnInternalApi.d.ts

@@ -32,6 +32,6 @@ export declare class ColumnInternalApi extends ApiBase {
     private buildColumnHeaderContext;
     hasArrayDataType(column: AdaptableColumn): boolean;
     getQueryableColumnsForUIEditor(): AdaptableColumn[];
-    isAlwaysHiddenColumn(columnIdentifier: string | ColDef): boolean;
+    isColumnUIHidden(columnIdentifier: string | ColDef): boolean;
     getColumnDateTypes(): AdaptableColumnDataType[];
 }

package/src/Api/Internal/ColumnInternalApi.js

@@ -277,9 +277,11 @@ export class ColumnInternalApi extends ApiBase {
     getQueryableColumnsForUIEditor() {
         return this.getColumnApi()
             .getQueryableColumns()
-            .filter((column) => !column.isGeneratedPivotResultColumn && !column.isGeneratedRowGroupColumn && !column.isGeneratedSelectionColumn);
+            .filter((column) => !column.isGeneratedPivotResultColumn &&
+            !column.isGeneratedRowGroupColumn &&
+            !column.isGeneratedSelectionColumn);
     }
-    isAlwaysHiddenColumn(columnIdentifier) {
+    isColumnUIHidden(columnIdentifier) {
         return this.getColumnApi().hasColumnType(columnIdentifier, HIDDEN_COLUMN_TYPE);
     }
     getColumnDateTypes() {

package/src/Strategy/FormatColumnModule.js

@@ -9,7 +9,7 @@ import { MoveFormatColumn } from '../View/FormatColumn/MoveFormatColumn';
 import { getObjectTagsViewItems } from '../Utilities/getObjectTagsViewItems';
 import { getRuleViewItems } from '../Utilities/getRuleViewItems';
 import { getScopeViewItems } from '../Utilities/getScopeViewItems';
-import { getFormatColumnSettingsTargetItems } from './Utilities/FormatColumn/getFormatColumnSettingsTargetItems';
+import { getFormatColumnRowTargetItems } from './Utilities/FormatColumn/getFormatColumnRowTargetItems';
 import { renderFormatColumnStyleSummary } from '../View/FormatColumn/Wizard/FormatColumnStyleWizardSection';
 export class FormatColumnModule extends AdaptableModuleBase {
     constructor(api) {
@@ -87,7 +87,7 @@ export class FormatColumnModule extends AdaptableModuleBase {
                     values: [formatColumn.Name],
                 },
                 getScopeViewItems(formatColumn.Scope, this.api),
-                getFormatColumnSettingsTargetItems(formatColumn),
+                getFormatColumnRowTargetItems(formatColumn),
                 formatColumn.Rule && getRuleViewItems(formatColumn.Rule, this.api),
                 {
                     name: 'Style',

package/src/Strategy/StyledColumnModule.js

@@ -187,14 +187,22 @@ export class StyledColumnModule extends AdaptableModuleBase {
             });
         }
         if (styledColumn.BadgeStyle) {
+            let rowTypes = [];
+            if (!styledColumn.BadgeStyle?.RowScope?.ExcludeDataRows) {
+                rowTypes.push('Data');
+            }
+            if (!styledColumn.BadgeStyle?.RowScope?.ExcludeGroupRows) {
+                rowTypes.push('Group');
+            }
+            if (!styledColumn.BadgeStyle?.RowScope?.ExcludeSummaryRows) {
+                rowTypes.push('Summary');
+            }
+            if (!styledColumn.BadgeStyle?.RowScope?.ExcludeTotalRows) {
+                rowTypes.push('Total');
+            }
             specificTypeItems.push({
                 name: 'Rows',
-                values: [
-                    `Data Rows: ${styledColumn.BadgeStyle?.RowScope?.ExcludeDataRows ? 'No' : 'Yes'}`,
-                    `Group Rows: ${styledColumn.BadgeStyle?.RowScope?.ExcludeGroupRows ? 'No' : 'Yes'}`,
-                    `Summary Rows: ${styledColumn.BadgeStyle?.RowScope?.ExcludeSummaryRows ? 'No' : 'Yes'}`,
-                    `Total Rows: ${styledColumn.BadgeStyle?.RowScope?.ExcludeTotalRows ? 'No' : 'Yes'}`,
-                ],
+                values: rowTypes
             });
         }
         if (styledColumn.BadgeStyle) {

package/src/Strategy/Utilities/FormatColumn/{getFormatColumnSettingsTargetItems.d.ts → getFormatColumnRowTargetItems.d.ts}

@@ -1,5 +1,5 @@
 import { FormatColumn } from '../../../AdaptableState/FormatColumnState';
-export declare const getFormatColumnSettingsTargetItems: (formatColumn: FormatColumn) => {
+export declare const getFormatColumnRowTargetItems: (formatColumn: FormatColumn) => {
     name: string;
     values: string[];
 };

package/src/Strategy/Utilities/FormatColumn/getFormatColumnRowTargetItems.js

@@ -0,0 +1,22 @@
+export const getFormatColumnRowTargetItems = (formatColumn) => {
+    let values = [];
+    if (formatColumn.RowScope) {
+        if (!formatColumn.RowScope.ExcludeDataRows) {
+            values.push('Data');
+        }
+        if (!formatColumn.RowScope.ExcludeGroupRows) {
+            values.push('Group');
+        }
+        if (!formatColumn.RowScope.ExcludeSummaryRows) {
+            values.push('Summary');
+        }
+        if (!formatColumn.RowScope.ExcludeTotalRows) {
+            values.push('Total');
+        }
+    }
+    values = values.filter(Boolean);
+    return {
+        name: 'Rows',
+        values: values.length > 0 ? values : ['-'],
+    };
+};

package/src/Strategy/Utilities/FormatColumn/getFormatColumnSettingsViewItems.js

@@ -1,18 +1,10 @@
 export const getFormatColumnSettingsViewItems = (formatColumn) => {
     let values = [];
-    if (formatColumn.RowScope) {
-        if (formatColumn.RowScope.ExcludeDataRows) {
-            values.push('Exclude Data Rows');
-        }
-        if (formatColumn.RowScope.ExcludeGroupRows) {
-            values.push('Exclude Group Rows');
-        }
-        if (formatColumn.RowScope.ExcludeSummaryRows) {
-            values.push('Exclude Summary Rows');
-        }
-        if (formatColumn.RowScope.ExcludeTotalRows) {
-            values.push('Exclude Total Rows');
-        }
+    if (!formatColumn.Target || formatColumn.Target === 'cell') {
+        values.push('Target: Column Cells');
+    }
+    else {
+        values.push('Target: Column Header');
     }
     if (formatColumn.ColumnGroupScope) {
         values.push(`Column Groups: ${formatColumn.ColumnGroupScope === 'Both' ? 'Always' : formatColumn.ColumnGroupScope}`);

package/src/Utilities/ExpressionFunctions/aggregatedScalarExpressionFunctions.js

@@ -451,7 +451,7 @@ export const aggregatedScalarExpressionFunctions = {
         handler(args, context) {
             const distinctColumnParameter = extractColumnParameter('ONLY', args);
             const onlyColumnName = distinctColumnParameter.value;
-            const columnType = validateColumnType(onlyColumnName, ['number'], 'ONLY', context.adaptableApi);
+            const columnType = validateColumnType(onlyColumnName, ['number', 'text'], 'ONLY', context.adaptableApi);
             const groupByParameter = extractParameter('ONLY', 'operand', ['GROUP_BY'], args, {
                 isOptional: true,
             });

package/src/Utilities/getScopeViewItems.js

@@ -17,7 +17,7 @@ export const getScopeViewItems = (scope, api) => {
         values = scope.ColumnTypes;
     }
     return {
-        label: 'Scope',
+        label: 'Columns',
         name: 'Target',
         values,
     };

package/src/Utilities/only.d.ts

@@ -0,0 +1,15 @@
+import { IAggFuncParams } from 'ag-grid-enterprise';
+interface OnlyAggResult {
+    distinctValues: Set<number | string>;
+    value: number | string | null;
+    toString(): string;
+}
+/**
+ * AG Grid aggFunc that returns the column value only when all rows in the group
+ * share the same value. Returns null when values differ (or when there are no values).
+ *
+ * Supports multiple group levels: leaf groups aggregate raw cell values while
+ * parent groups merge the metadata objects returned by child groups.
+ */
+export declare const only: (params: IAggFuncParams, columnId: string) => OnlyAggResult;
+export {};

package/src/Utilities/only.js

@@ -0,0 +1,54 @@
+function createOnlyResult(distinctValues) {
+    const value = distinctValues.size === 1 ? distinctValues.values().next().value : null;
+    return {
+        distinctValues,
+        value,
+        toString() {
+            return value != null ? String(value) : '';
+        },
+    };
+}
+/**
+ * AG Grid aggFunc that returns the column value only when all rows in the group
+ * share the same value. Returns null when values differ (or when there are no values).
+ *
+ * Supports multiple group levels: leaf groups aggregate raw cell values while
+ * parent groups merge the metadata objects returned by child groups.
+ */
+export const only = (params, columnId) => {
+    const { api: gridApi, rowNode: groupRowNode, values } = params;
+    // Leaf group: the lowest-level group whose children are actual data rows.
+    // We read raw cell values and collect distinct ones, bailing out early
+    // as soon as we see a second distinct value (the result would be null anyway).
+    if (groupRowNode.leafGroup) {
+        const filteredOnly = !gridApi.getGridOption('suppressAggFilteredOnly');
+        const childNodes = (filteredOnly ? groupRowNode.childrenAfterFilter : groupRowNode.childrenAfterGroup) ?? [];
+        const distinctValues = new Set();
+        for (const rowNode of childNodes) {
+            const rawValue = gridApi.getCellValue({ colKey: columnId, rowNode });
+            if (typeof rawValue === 'number' || typeof rawValue === 'string') {
+                distinctValues.add(rawValue);
+                if (distinctValues.size > 1) {
+                    return createOnlyResult(distinctValues);
+                }
+            }
+        }
+        return createOnlyResult(distinctValues);
+    }
+    // Non-leaf group: children are other groups, not data rows.
+    // AG Grid has already called this aggFunc on each child group, so
+    // `params.values` contains the OnlyAggResult objects they returned.
+    // We merge their distinctValues sets instead of re-traversing leaf rows.
+    const mergedDistinctValues = new Set();
+    for (const childResult of values) {
+        if (childResult && typeof childResult === 'object' && 'distinctValues' in childResult) {
+            for (const val of childResult.distinctValues) {
+                mergedDistinctValues.add(val);
+                if (mergedDistinctValues.size > 1) {
+                    return createOnlyResult(mergedDistinctValues);
+                }
+            }
+        }
+    }
+    return createOnlyResult(mergedDistinctValues);
+};

package/src/View/Components/ValueSelector/index.js

@@ -159,7 +159,12 @@ export const renderSelectionSection = (props) => {
     const { value, options, disabled, singleSelect, toLabel, toIdentifier, } = props;
     const selectionBox = (React.createElement(Box, { className: "twa:flex twa:flex-col twa:gap-2 twa:py-2" },
         React.createElement(Box, { className: clsx('twa:flex twa:flex-row', 'twa:border-b twa:border-primarydark/30 twa:rounded-standard') },
-            React.createElement(CheckBox, { className: "twa:ml-0.5 twa:font-bold", checked: !value.length ? false : value.length === options.length ? true : null, onChange: (checked) => {
+            singleSelect ? (React.createElement(Box, { className: "twa:flex twa:flex-row twa:text-3 twa:font-normal" },
+                "(",
+                value.length,
+                " of ",
+                options.length,
+                " selected)")) : (React.createElement(CheckBox, { className: "twa:ml-0.5 twa:font-bold", checked: !value.length ? false : value.length === options.length ? true : null, onChange: (checked) => {
                     if (checked) {
                         props.onSelectAll();
                     }
@@ -174,7 +179,7 @@ export const renderSelectionSection = (props) => {
                         value.length,
                         " of ",
                         options.length,
-                        " selected)"))),
+                        " selected)")))),
             React.createElement("div", { className: "twa:flex-1" }),
             React.createElement(Box, { className: "twa:mr-2 twa:text-2 twa:font-normal" }, props.showOnlySelectedCheckbox))));
     return React.createElement(Box, { className: clsx(`${baseClassName}__header `) }, selectionBox);

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

@@ -35,6 +35,14 @@ export const NewReportWizard = (props) => {
         props.onFinishWizard(report);
     };
     return (React.createElement(OnePageAdaptableWizard, { defaultCurrentSectionName: props.defaultCurrentSectionName, moduleInfo: props.moduleInfo, data: report, onHide: props.onCloseWizard, onFinish: handleFinish, sections: [
+            {
+                title: 'Name',
+                details: 'Enter the name of the Report',
+                isValid: isValidReportName,
+                renderSummary: renderReportNameSummary,
+                render: () => (React.createElement(Box, { className: "twa:p-2" },
+                    React.createElement(ReportNameWizardSection, { onChange: setReport }))),
+            },
             {
                 title: 'Columns',
                 details: 'Choose the Columns you want to include in the Report',
@@ -48,14 +56,6 @@ export const NewReportWizard = (props) => {
                 renderSummary: renderReportRowsSummary,
                 render: () => React.createElement(ReportRowsWizardSection, { onChange: setReport }),
             },
-            {
-                title: 'Name',
-                details: 'Enter the name of the Report',
-                isValid: isValidReportName,
-                renderSummary: renderReportNameSummary,
-                render: () => (React.createElement(Box, { className: "twa:p-2" },
-                    React.createElement(ReportNameWizardSection, { onChange: setReport }))),
-            },
             {
                 details: 'Select Report Tags',
                 title: 'Tags',

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

@@ -80,15 +80,12 @@ export const FlashingAlertSettingsWizardSection = (props) => {
             React.createElement(Tabs.Content, null,
                 React.createElement(FormLayout, null,
                     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")),
-                    React.createElement(FormRow, { label: "Duration" },
+                        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(Tabs, { autoFocus: false, className: "twa:p-2" },
+            React.createElement(Tabs.Tab, null, "Flash Duration"),
+            React.createElement(Tabs.Content, null,
+                React.createElement(FormLayout, null,
+                    React.createElement(FormRow, { label: "" },
                         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,
@@ -96,5 +93,17 @@ export const FlashingAlertSettingsWizardSection = (props) => {
                                         const value = event.target.value;
                                         setDuration(isNaN(Number(value)) ? 500 : Number(value));
                                     } }),
-                                React.createElement(Box, { className: "twa:text-2" }, "ms"))))))))));
+                                React.createElement(Box, { className: "twa:text-2" }, "ms")))))))),
+        ' ',
+        React.createElement(Tabs, { autoFocus: false, className: "twa:p-2" },
+            React.createElement(Tabs.Tab, null, "Flash Target"),
+            React.createElement(Tabs.Content, null,
+                React.createElement(FormLayout, null,
+                    React.createElement(FormRow, { label: "" },
+                        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")))))));
 };

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

@@ -73,7 +73,7 @@ export const FlashingCellWizard = (props) => {
                 isValid: isScopeValid,
                 render: () => React.createElement(FlashingAlertScopeWizardSection, { onChange: setFlashingCell }),
                 renderSummary: renderScopeSummary,
-                title: 'Scope',
+                title: 'Columns',
             },
             {
                 details: 'Build the Rules for when Cells should Flash',

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

@@ -0,0 +1,8 @@
+import * as React from 'react';
+import { FormatColumn } from '../../../AdaptableState/FormatColumnState';
+type FormatColumnRowScopeWizardSectionProps = {
+    onChange: (data: FormatColumn) => void;
+};
+export declare const renderFormatColumnRowScopeSummary: (data: FormatColumn) => React.JSX.Element;
+export declare const FormatColumnRowScopeWizardSection: (props: FormatColumnRowScopeWizardSectionProps) => React.JSX.Element;
+export {};

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

@@ -0,0 +1,80 @@
+import * as React from 'react';
+import FormLayout, { FormRow } from '../../../components/FormLayout';
+import { CheckBox } from '../../../components/CheckBox';
+import { useOnePageAdaptableWizardContext } from '../../Wizard/OnePageAdaptableWizard';
+import { Tag } from '../../../components/Tag';
+import { Box, Flex } from '../../../components/Flex';
+import { Tabs } from '../../../components/Tabs';
+export const renderFormatColumnRowScopeSummary = (data) => {
+    return (React.createElement(Box, { className: "twa:p-2" },
+        React.createElement(Box, { className: "twa:mt-3" },
+            "Data Rows ",
+            React.createElement(Tag, null, data.RowScope?.ExcludeDataRows ? 'no' : 'yes')),
+        ' ',
+        React.createElement(Box, { className: "twa:mt-3" },
+            "Group Rows ",
+            React.createElement(Tag, null, data.RowScope?.ExcludeGroupRows ? 'no' : 'yes')),
+        React.createElement(Box, { className: "twa:mt-3" },
+            "Summary Rows ",
+            React.createElement(Tag, null, data.RowScope?.ExcludeSummaryRows ? 'no' : 'yes')),
+        React.createElement(Box, { className: "twa:mt-3" },
+            "Total Rows ",
+            React.createElement(Tag, null, data.RowScope?.ExcludeTotalRows ? 'no' : 'yes'))));
+};
+export const FormatColumnRowScopeWizardSection = (props) => {
+    const { data } = useOnePageAdaptableWizardContext();
+    const onExcludeDataRowsChanged = (includeDataRows) => {
+        props.onChange({
+            ...data,
+            RowScope: {
+                ...data.RowScope,
+                ExcludeDataRows: !includeDataRows,
+            },
+        });
+    };
+    const onExcludeGroupedRowsChanged = (includeGroupedRows) => {
+        props.onChange({
+            ...data,
+            RowScope: {
+                ...data.RowScope,
+                ExcludeGroupRows: !includeGroupedRows,
+            },
+        });
+    };
+    const onExcludeSummaryRowsChanged = (includeSummaryRows) => {
+        props.onChange({
+            ...data,
+            RowScope: {
+                ...data.RowScope,
+                ExcludeSummaryRows: !includeSummaryRows,
+            },
+        });
+    };
+    const onExcludeTotalRowsChanged = (includeTotalRows) => {
+        props.onChange({
+            ...data,
+            RowScope: {
+                ...data.RowScope,
+                ExcludeTotalRows: !includeTotalRows,
+            },
+        });
+    };
+    return (React.createElement(Flex, { flexDirection: "column", style: { height: '100%' } },
+        React.createElement(Tabs, { className: "twa:mb-3" },
+            React.createElement(Tabs.Tab, null, "Row Types"),
+            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: "Data (leaf) Rows:" },
+                            React.createElement(Flex, { alignItems: "center", className: "twa:ml-2" },
+                                React.createElement(CheckBox, { "data-name": "include-data-rows-checkbox", checked: !data.RowScope?.ExcludeDataRows, onChange: onExcludeDataRowsChanged, className: "twa:mr-2" }))),
+                        React.createElement(FormRow, { label: "Group Rows:" },
+                            React.createElement(Flex, { alignItems: "center", className: "twa:ml-2" },
+                                React.createElement(CheckBox, { "data-name": "include-grouped-rows-checkbox", checked: !data.RowScope?.ExcludeGroupRows, onChange: onExcludeGroupedRowsChanged, className: "twa:mr-2" }))),
+                        React.createElement(FormRow, { label: "Summary Rows:" },
+                            React.createElement(Flex, { alignItems: "center", className: "twa:ml-2" },
+                                React.createElement(CheckBox, { "data-name": "include-summary-rows-checkbox", checked: !data.RowScope?.ExcludeSummaryRows, onChange: onExcludeSummaryRowsChanged, className: "twa:mr-2" }))),
+                        React.createElement(FormRow, { label: "Total Rows:" },
+                            React.createElement(Flex, { alignItems: "center", className: "twa:ml-2" },
+                                React.createElement(CheckBox, { "data-name": "include-total-rows-checkbox", checked: !data.RowScope?.ExcludeTotalRows, onChange: onExcludeTotalRowsChanged, className: "twa:mr-2" })))))))))));
+};

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

@@ -1,30 +1,22 @@
 import * as React from 'react';
 import FormLayout, { FormRow } from '../../../components/FormLayout';
-import { CheckBox } from '../../../components/CheckBox';
 import { useOnePageAdaptableWizardContext } from '../../Wizard/OnePageAdaptableWizard';
 import { Tag } from '../../../components/Tag';
 import Radio, { RadioGroup } from '../../../components/Radio';
 import { Box, Flex } from '../../../components/Flex';
 import { Tabs } from '../../../components/Tabs';
 import Input from '../../../components/Input';
+import { TypeRadio } from '../../Wizard/TypeRadio';
 export const renderFormatColumnSettingsSummary = (data) => {
     return (React.createElement(Box, { className: "twa:p-2" },
         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')),
+            "Target",
+            ' ',
+            React.createElement(Tag, null, !data.Target || data.Target === 'cell' ? 'Column Cells' : 'Column Header')),
         ' ',
-        React.createElement(Box, { className: "twa:mt-3" },
-            "Group Rows ",
-            React.createElement(Tag, null, data.RowScope?.ExcludeGroupRows ? 'no' : 'yes')),
-        React.createElement(Box, { className: "twa:mt-3" },
-            "Summary Rows ",
-            React.createElement(Tag, null, data.RowScope?.ExcludeSummaryRows ? 'no' : 'yes')),
-        React.createElement(Box, { className: "twa:mt-3" },
-            "Total Rows ",
-            React.createElement(Tag, null, data.RowScope?.ExcludeTotalRows ? 'no' : 'yes')),
         React.createElement(Box, { className: "twa:mt-3" },
             "Apply on Column Groups:",
             ' ',
@@ -33,49 +25,22 @@ export const renderFormatColumnSettingsSummary = (data) => {
                 : data.ColumnGroupScope))));
 };
 export const FormatColumnSettingsWizardSection = (props) => {
-    const { data } = useOnePageAdaptableWizardContext();
-    const onNameChange = (event) => {
-        props.onChange({
-            ...data,
-            Name: event.target.value,
-        });
-    };
-    const onExcludeDataRowsChanged = (ExcludeDataRows) => {
-        props.onChange({
-            ...data,
-            RowScope: {
-                ...data.RowScope,
-                ExcludeDataRows,
-            },
-        });
-    };
-    const onExcludeGroupedRowsChanged = (ExcludeGroupedRows) => {
+    const { data, api } = useOnePageAdaptableWizardContext();
+    const currentTarget = data.Target ? data.Target : 'cell';
+    const handleTargetChange = (target) => {
+        // Update the formatColumn object
         props.onChange({
             ...data,
-            RowScope: {
-                ...data.RowScope,
-                ExcludeGroupRows: ExcludeGroupedRows,
-            },
+            Target: target,
         });
     };
-    const onExcludeSummaryRowsChanged = (ExcludeSummaryRows) => {
-        props.onChange({
-            ...data,
-            RowScope: {
-                ...data.RowScope,
-                ExcludeSummaryRows,
-            },
-        });
-    };
-    const onExcludeTotalRowsChanged = (ExcludeTotalRows) => {
+    const onNameChange = (event) => {
         props.onChange({
             ...data,
-            RowScope: {
-                ...data.RowScope,
-                ExcludeTotalRows,
-            },
+            Name: event.target.value,
         });
     };
+    const behaviourSpellingVariant = api.internalApi.getCorrectEnglishVariant('Behaviour');
     return (React.createElement(Flex, { flexDirection: "column", style: { height: '100%' } },
         React.createElement(Tabs, { className: "twa:mb-3" },
             React.createElement(Tabs.Tab, null, "Settings"),
@@ -84,24 +49,20 @@ export const FormatColumnSettingsWizardSection = (props) => {
                     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, { className: "twa:mb-3" },
+            React.createElement(Tabs.Tab, null, "Target"),
+            React.createElement(Tabs.Content, null,
+                React.createElement(Flex, { flexDirection: "column" },
+                    React.createElement(TypeRadio, { "data-name": "target-column-cell", text: 'Column Cells', description: "Column Cells are styled and formatted", checked: currentTarget === 'cell', onClick: () => handleTargetChange('cell') }),
+                    React.createElement(TypeRadio, { "data-name": "target-column-header", text: 'Column Header', description: "The Column Header is styled (Note: Conditions are not available for Column Headers)", checked: currentTarget === 'columnHeader', onClick: () => handleTargetChange('columnHeader') })))),
         React.createElement(Tabs, null,
-            React.createElement(Tabs.Tab, null, "Configuration"),
+            React.createElement(Tabs.Tab, null,
+                "Column Group ",
+                behaviourSpellingVariant,
+                " "),
             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({

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

@@ -2,7 +2,10 @@ import * as React from 'react';
 import { useState } from 'react';
 import { OnePageAdaptableWizard, OnePageWizardSummary } from '../../Wizard/OnePageAdaptableWizard';
 import { cloneObject } from '../../../Utilities/Helpers/Helper';
-import { FormatColumnScopeWizardSection, renderFormatColumnScopeSummary, } from './FormatColumnScopeWizardSection';
+import { FormatColumnScopeWizardSection, renderFormatColumnScopeSummary, } from './FormatColumnColumnScopeWizardSection';
+import { FormatColumnRowScopeWizardSection, renderFormatColumnRowScopeSummary,
+// renderFormatColumnRowScopeSummary,
+ } from './FormatColumnRowScopeWizardSection';
 import { FormatColumnStyleWizardSection, isFormatColumnStyleValid, renderFormatColumnStyleWizardSummary, } from './FormatColumnStyleWizardSection';
 import { FormatColumnFormatWizardSection, getFormatDisplayTypeForScope, renderFormatColumnFormatSummary, } from './FormatColumnFormatWizardSection';
 import { useAdaptable } from '../../AdaptableContext';
@@ -17,11 +20,22 @@ import { isAdaptableRuleValid } from '../../Components/EntityRulesEditor/Utiliti
 import { FormatColumnRuleWizardSection } from './FormatColumnRuleWizardSection';
 import { DEFAULT_PREDICATE_ID_FOR_FORMAT_COLUMN } from './constants';
 import { isObjectEmpty } from '../../../Utilities/Extensions/ObjectExtensions';
-import { FormatColumnTargetWizardSection, renderFormatColumnTargetSummary, } from './FormatColumnTargetWizardSection';
 import { Box, Flex } from '../../../components/Flex';
 const adjustDisplayFormat = (fc, api) => {
     const formatColumn = { ...fc };
     let formatDataType = getFormatDisplayTypeForScope(formatColumn.Scope, api);
+    // Add RowScope and Target defaults for Format Columns that have been created in Initial State
+    if (!formatColumn.RowScope) {
+        formatColumn.RowScope = {
+            ExcludeDataRows: false,
+            ExcludeGroupRows: false,
+            ExcludeSummaryRows: false,
+            ExcludeTotalRows: false,
+        };
+    }
+    if (!formatColumn.Target) {
+        formatColumn.Target = 'cell';
+    }
     if (formatColumn.Target === 'columnHeader') {
         // Column Headers are always text
         formatDataType = 'text';
@@ -96,7 +110,7 @@ export function FormatColumnWizard(props) {
     return (React.createElement(OnePageAdaptableWizard, { defaultCurrentSectionName: props.defaultCurrentSectionName, moduleInfo: props.moduleInfo, modal: props.modal, data: formatColumn, onHide: props.onCloseWizard, onFinish: handleFinish, sections: [
             {
                 title: 'Settings',
-                details: 'Enter Name and set Additional Properties',
+                details: 'Enter Name and other Properties',
                 isValid: (formatColumnData) => {
                     if (!formatColumnData.Name) {
                         return 'Format Column Name cannot be blank';
@@ -113,7 +127,7 @@ export function FormatColumnWizard(props) {
                 },
             },
             {
-                title: 'Scope',
+                title: 'Columns',
                 details: 'Select which Columns will be formatted',
                 isValid: isScopeValid,
                 renderSummary: renderFormatColumnScopeSummary,
@@ -123,12 +137,12 @@ export function FormatColumnWizard(props) {
                 },
             },
             {
-                title: 'Target',
-                details: 'Select which Columns Elements will be formatted',
-                renderSummary: renderFormatColumnTargetSummary,
+                title: 'Rows',
+                details: 'Select which Rows will be formatted',
+                renderSummary: renderFormatColumnRowScopeSummary,
                 render: () => {
                     return (React.createElement(Flex, { flexDirection: "column", className: "twa:p-2 twa:h-full" },
-                        React.createElement(FormatColumnTargetWizardSection, { onChange: setFormatColumn })));
+                        React.createElement(FormatColumnRowScopeWizardSection, { onChange: setFormatColumn })));
                 },
             },
             {

package/src/View/Layout/TransposedPopup.js

@@ -80,7 +80,6 @@ export const TransposedPopup = (props) => {
     const transposeConfig = {
         transposedColumnId: rawConfig.transposedColumnId ?? primaryKey,
         hideTransposedColumn: rawConfig.hideTransposedColumn ?? true,
-        autosize: rawConfig.autosize ?? true,
         columnsToTranspose: rawConfig.columnsToTranspose,
         rowsToTranspose: rawConfig.rowsToTranspose,
     };