@adaptabletools/adaptable-cjs 23.0.0-canary.0 → 23.0.0-canary.10

package/src/View/Layout/Wizard/sections/RowSummarySection.js

@@ -6,9 +6,9 @@ const jsx_runtime_1 = require("react/jsx-runtime");
 const React = tslib_1.__importStar(require("react"));
 const CheckBox_1 = require("../../../../components/CheckBox");
 const FormLayout_1 = tslib_1.__importStar(require("../../../../components/FormLayout"));
-const Panel_1 = tslib_1.__importDefault(require("../../../../components/Panel"));
 const SimpleButton_1 = tslib_1.__importDefault(require("../../../../components/SimpleButton"));
-const Tabs_1 = require("../../../../components/Tabs");
+const ButtonNew_1 = require("../../../Components/Buttons/ButtonNew");
+const Card_1 = require("../../../../components/Card");
 const Tag_1 = require("../../../../components/Tag");
 const RowSummary_1 = require("../../../../AdaptableState/Common/RowSummary");
 const adaptableQlUtils_1 = require("../../../../Utilities/adaptableQlUtils");
@@ -23,6 +23,9 @@ const ColumnGroupTag_1 = require("../../../Components/ColumnGroupTag");
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../../../../Utilities/Extensions/ArrayExtensions"));
 const Flex_1 = require("../../../../components/Flex");
 const NewSelect_1 = require("../../../../components/NewSelect");
+const CollapsibleWizardCard_1 = require("../../../Wizard/CollapsibleWizardCard");
+const utils_1 = require("../../../../lib/utils");
+const objectListActionButtonStyles_1 = require("../../../Components/AdaptableObjectList/objectListActionButtonStyles");
 const areSummaryRowsValid = (layout) => {
     if (!layout.RowSummaries)
         return true;
@@ -38,6 +41,7 @@ const areSummaryRowsValid = (layout) => {
     return valid;
 };
 exports.areSummaryRowsValid = areSummaryRowsValid;
+const rowSummaryCardId = (index) => `row-summary-${index}`;
 const availableExpressionsForColumnTypeCache = new Map();
 const getAvailableExpressionsForColumnType = (columnType, availableScalarExpressions) => {
     const key = columnType;
@@ -78,19 +82,53 @@ const getAvailableExpressionsForColumnType = (columnType, availableScalarExpress
     availableExpressionsForColumnTypeCache.set(key, expressions);
     return expressions;
 };
+const buildRowSummaryExpressionOptions = (column, availableScalarExpressions, layout) => {
+    const expressionOptions = getAvailableExpressionsForColumnType(column.dataType, availableScalarExpressions).map((expression) => ({
+        label: expression,
+        value: expression,
+    }));
+    const aggregation = layout.TableAggregationColumns?.find((agg) => agg.ColumnId === column.columnId)?.AggFunc;
+    if (aggregation && typeof aggregation === 'object' && aggregation.weightedColumnId) {
+        expressionOptions.push({
+            label: 'WEIGHTERD_AVG',
+            value: RowSummary_1.WEIGHTED_AVERAGE_AGGREGATED_FUNCTION,
+        });
+    }
+    return expressionOptions;
+};
+const getDefaultRowSummaryExpression = (column, availableScalarExpressions, layout) => {
+    const optionValues = buildRowSummaryExpressionOptions(column, availableScalarExpressions, layout).map((option) => option.value);
+    if (optionValues.includes('sum')) {
+        return 'sum';
+    }
+    const sumExpression = optionValues.find((value) => value.toLowerCase() === 'sum');
+    if (sumExpression) {
+        return sumExpression;
+    }
+    return optionValues[0] ?? null;
+};
+const RowSummaryPositionTag = ({ position }) => (0, jsx_runtime_1.jsx)(Tag_1.Tag, { className: "twa:shrink-0", children: position });
+const RowSummaryCardSummary = ({ rowSummary }) => {
+    const adaptable = (0, AdaptableContext_1.useAdaptable)();
+    const columnIds = Object.keys(rowSummary.ColumnsMap ?? {}).filter((colId) => colId !== 'Source' && colId !== 'Uuid');
+    if (!columnIds.length) {
+        return (0, jsx_runtime_1.jsx)(Tag_1.Tag, { children: "No columns" });
+    }
+    return ((0, jsx_runtime_1.jsx)(Flex_1.Flex, { flexWrap: "wrap", className: "twa:gap-1", children: columnIds.map((colId) => ((0, jsx_runtime_1.jsxs)(Tag_1.ColumnTag, { children: [rowSummary.ColumnsMap[colId], "(", adaptable.api.columnApi.getFriendlyNameForColumnId(colId), ")"] }, colId))) }));
+};
 const RowSummarySectionSummary = () => {
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
     const { data: layout } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
     return ((0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:flex twa:flex-col", children: layout.RowSummaries?.length ? (layout.RowSummaries.map((rowSummary, index) => {
-            return ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: (0, jsx_runtime_1.jsxs)(Flex_1.Box, { className: "twa:mr-1 twa:mb-1", children: [rowSummary.Position, ":", ' ', Object.keys(rowSummary.ColumnsMap).map((colId) => {
-                            if (colId === 'Source' || colId === 'Uuid')
-                                return null;
-                            return ((0, jsx_runtime_1.jsxs)(Tag_1.Tag, { className: "twa:mr-1", children: [rowSummary.ColumnsMap[colId], "(", adaptable.api.columnApi.getFriendlyNameForColumnId(colId), ")"] }, colId));
-                        })] }, index) }));
+            return ((0, jsx_runtime_1.jsxs)(Flex_1.Box, { className: "twa:mr-1 twa:mb-1", children: [rowSummary.Position, ":", ' ', Object.keys(rowSummary.ColumnsMap).map((colId) => {
+                        if (colId === 'Source' || colId === 'Uuid')
+                            return null;
+                        return ((0, jsx_runtime_1.jsxs)(Tag_1.ColumnTag, { className: "twa:mr-1", children: [rowSummary.ColumnsMap[colId], "(", adaptable.api.columnApi.getFriendlyNameForColumnId(colId), ")"] }, colId));
+                    })] }, index));
         })) : ((0, jsx_runtime_1.jsx)(Tag_1.Tag, { children: "No Row Summaries" })) }));
 };
 exports.RowSummarySectionSummary = RowSummarySectionSummary;
-const RowSummaryEditor = React.memo(({ rowSummary, onChange, availableScalarExpressions, onDelete, }) => {
+const RowSummaryEditorForm = React.memo(({ rowSummary, onChange, availableScalarExpressions, }) => {
     const { data: layout } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
     const columns = React.useMemo(() => {
@@ -106,19 +144,7 @@ const RowSummaryEditor = React.memo(({ rowSummary, onChange, availableScalarExpr
             sortUnorderedItems: false,
         }).map((colId) => adaptable.api.columnApi.getColumnWithColumnId(colId));
     }, [rowSummary.ColumnsMap]);
-    return ((0, jsx_runtime_1.jsxs)(Panel_1.default, { header: (0, jsx_runtime_1.jsxs)(Flex_1.Flex, { className: "twa:w-full", children: [(0, jsx_runtime_1.jsx)(Flex_1.Flex, { className: "twa:flex-1", alignItems: "center", children: "Row Summary" }), (0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:mr-2", children: (0, jsx_runtime_1.jsx)(SuspendToggleButton_1.SuspendToggleButton, { onSuspend: () => {
-                            onChange({
-                                ...rowSummary,
-                                IsSuspended: true,
-                            });
-                        }, onUnSuspend: () => {
-                            onChange({
-                                ...rowSummary,
-                                IsSuspended: false,
-                            });
-                        }, suspendableObject: rowSummary }) }), (0, jsx_runtime_1.jsx)(SimpleButton_1.default, { icon: "delete", onClick: () => {
-                        onDelete();
-                    } })] }), className: "twa:p-2", children: [(0, jsx_runtime_1.jsxs)(FormLayout_1.default, { children: [(0, jsx_runtime_1.jsx)(FormLayout_1.FormRow, { label: "Position", children: (0, jsx_runtime_1.jsx)(NewSelect_1.SingleSelect, { items: [
+    return ((0, jsx_runtime_1.jsxs)(Flex_1.Box, { className: "twa:flex twa:flex-col twa:gap-3 twa:h-full twa:min-h-0 twa:overflow-hidden", children: [(0, jsx_runtime_1.jsxs)(FormLayout_1.default, { children: [(0, jsx_runtime_1.jsx)(FormLayout_1.FormRow, { label: "Position", children: (0, jsx_runtime_1.jsx)(NewSelect_1.SingleSelect, { items: [
                                 {
                                     label: 'Top',
                                     value: 'Top',
@@ -137,25 +163,13 @@ const RowSummaryEditor = React.memo(({ rowSummary, onChange, availableScalarExpr
                                     ...rowSummary,
                                     IncludeOnlyFilteredRows,
                                 });
-                            }, children: "Include Only Filtered Rows" }) })] }), (0, jsx_runtime_1.jsxs)(Flex_1.Flex, { flexDirection: "column", className: "twa:mt-2 twa:mb-1", children: [(0, jsx_runtime_1.jsx)(Flex_1.Flex, { alignItems: "center", className: "twa:flex-1 twa:mb-2", children: "Column Aggregations" }), (0, jsx_runtime_1.jsx)(Panel_1.default, { bodyProps: { className: 'twa:max-h-full twa:bg-primarylight ' }, className: "twa:h-[360px]", children: (0, jsx_runtime_1.jsx)(ValueSelector_1.ValueSelector, { style: { maxHeight: '100%' }, showFilterInput: true, filter: Utilities_1.columnFilter, toIdentifier: (column) => column.columnId, toLabel: (option) => option.friendlyName ?? option.columnId, options: columns, toListLabel: (column) => {
+                            }, children: "Include Only Filtered Rows" }) })] }), (0, jsx_runtime_1.jsxs)(Card_1.Card, { shadow: false, className: "twa:flex-1 twa:min-h-0 twa:overflow-hidden twa:flex twa:flex-col", children: [(0, jsx_runtime_1.jsxs)(Card_1.Card.Title, { children: [(0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:font-medium", children: "Column Aggregations" }), (0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "Select columns and choose an aggregation function for each" })] }), (0, jsx_runtime_1.jsx)(Card_1.Card.Body, { className: "twa:flex-1 twa:min-h-0 twa:overflow-hidden twa:p-1", children: (0, jsx_runtime_1.jsx)(ValueSelector_1.ValueSelector, { style: { minHeight: 0, maxHeight: '100%' }, showFilterInput: true, toggleSelectionOnRowClick: false, filter: Utilities_1.columnFilter, toIdentifier: (column) => column.columnId, toLabel: (option) => option.friendlyName ?? option.columnId, options: columns, optionLayout: "label-beside-checkbox", toListLabel: (column) => {
                                 const label = column.friendlyName ?? column.columnId;
-                                if (!(column.columnId in (rowSummary.ColumnsMap ?? {}))) {
-                                    return ((0, jsx_runtime_1.jsxs)(Flex_1.Flex, { alignItems: "center", children: [label, (0, jsx_runtime_1.jsx)(ColumnGroupTag_1.ColumnGroupTag, { column: column })] }));
-                                }
-                                const expressionOptions = getAvailableExpressionsForColumnType(column.dataType, availableScalarExpressions).map((expression) => ({
-                                    label: expression,
-                                    value: expression,
-                                }));
-                                // check out if this layout has a aggregation with weighted column
-                                const aggregation = layout.TableAggregationColumns?.find((agg) => agg.ColumnId === column.columnId)?.AggFunc;
-                                if (aggregation &&
-                                    typeof aggregation === 'object' &&
-                                    aggregation.weightedColumnId) {
-                                    expressionOptions.push({
-                                        label: 'WEIGHTERD_AVG',
-                                        value: RowSummary_1.WEIGHTED_AVERAGE_AGGREGATED_FUNCTION,
-                                    });
+                                const disabled = !(column.columnId in (rowSummary.ColumnsMap ?? {}));
+                                if (disabled) {
+                                    return ((0, jsx_runtime_1.jsxs)(Flex_1.Flex, { alignItems: "center", className: "twa:gap-2", children: [label, (0, jsx_runtime_1.jsx)(ColumnGroupTag_1.ColumnGroupTag, { column: column }), (0, jsx_runtime_1.jsx)(NewSelect_1.SingleSelect, { disabled: true, items: [{ label: 'Select Aggregation', value: null }] })] }));
                                 }
+                                const expressionOptions = buildRowSummaryExpressionOptions(column, availableScalarExpressions, layout);
                                 const expression = rowSummary.ColumnsMap[column.columnId];
                                 return ((0, jsx_runtime_1.jsxs)(Flex_1.Flex, { children: [(0, jsx_runtime_1.jsxs)(Flex_1.Flex, { className: "twa:mr-2", alignItems: 'center', children: [label, (0, jsx_runtime_1.jsx)(ColumnGroupTag_1.ColumnGroupTag, { column: column })] }), (0, jsx_runtime_1.jsx)(NewSelect_1.SingleSelect, { value: expression, items: expressionOptions, onValueChange: (expression) => {
                                                 onChange({
@@ -169,7 +183,15 @@ const RowSummaryEditor = React.memo(({ rowSummary, onChange, availableScalarExpr
                             }, value: Object.keys(rowSummary.ColumnsMap), onChange: (colIds) => {
                                 const newColumnsMap = {};
                                 colIds.forEach((colId) => {
-                                    newColumnsMap[colId] = rowSummary.ColumnsMap[colId] ?? null;
+                                    const existing = rowSummary.ColumnsMap[colId];
+                                    if (existing) {
+                                        newColumnsMap[colId] = existing;
+                                        return;
+                                    }
+                                    const column = adaptable.api.columnApi.getColumnWithColumnId(colId);
+                                    newColumnsMap[colId] = column
+                                        ? getDefaultRowSummaryExpression(column, availableScalarExpressions, layout)
+                                        : null;
                                 });
                                 onChange({
                                     ...rowSummary,
@@ -180,40 +202,66 @@ const RowSummaryEditor = React.memo(({ rowSummary, onChange, availableScalarExpr
 const RowSummarySection = (props) => {
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
     const { data: layout } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
+    const rowSummaries = layout.RowSummaries ?? [];
     const availableScalarExpressions = React.useMemo(() => {
         const sytemExpressions = adaptable.api.internalApi
             .getQueryLanguageService()
             .getModuleExpressionFunctionsMap(ModuleConstants_1.LayoutModuleId).aggregatedScalarFunctions;
         return sytemExpressions;
     }, []);
-    return ((0, jsx_runtime_1.jsxs)(Tabs_1.Tabs, { style: { height: '100%' }, children: [(0, jsx_runtime_1.jsx)(Tabs_1.Tabs.Tab, { children: "Row Summaries" }), (0, jsx_runtime_1.jsx)(Tabs_1.Tabs.Content, { children: (0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsxs)(Flex_1.Flex, { className: "twa:mb-1", children: [(0, jsx_runtime_1.jsx)(Flex_1.Flex, { className: "twa:flex-1" }), (0, jsx_runtime_1.jsx)(SimpleButton_1.default, { onClick: () => {
-                                        props.onChange({
-                                            ...layout,
-                                            RowSummaries: [
-                                                ...(layout.RowSummaries ?? []),
-                                                {
-                                                    Position: 'Top',
-                                                    ColumnsMap: {},
-                                                    IncludeOnlyFilteredRows: true,
-                                                },
-                                            ],
-                                        });
-                                    }, icon: "plus", children: "Add Row Summary" })] }), (layout.RowSummaries ?? []).map((rowSummary, index) => {
-                            return ((0, jsx_runtime_1.jsx)(RowSummaryEditor, { onDelete: () => {
-                                    const newSummaries = [...layout.RowSummaries];
-                                    newSummaries.splice(index, 1);
-                                    props.onChange({
-                                        ...layout,
-                                        RowSummaries: newSummaries,
-                                    });
-                                }, availableScalarExpressions: availableScalarExpressions, rowSummary: rowSummary, onChange: (rowSummary) => {
-                                    const newSummaries = [...layout.RowSummaries];
-                                    newSummaries[index] = rowSummary;
-                                    props.onChange({
-                                        ...layout,
-                                        RowSummaries: newSummaries,
-                                    });
-                                } }, index));
-                        })] }) })] }));
+    const { bindCard, hasExpandedCard, expandedFillsSpace, expandedId, setExpandedId } = (0, CollapsibleWizardCard_1.useWizardCardAccordion)(null);
+    const handleAddRowSummary = () => {
+        const newIndex = rowSummaries.length;
+        props.onChange({
+            ...layout,
+            RowSummaries: [
+                ...rowSummaries,
+                {
+                    Position: 'Top',
+                    ColumnsMap: {},
+                    IncludeOnlyFilteredRows: true,
+                },
+            ],
+        });
+        setExpandedId(rowSummaryCardId(newIndex));
+    };
+    const handleDeleteRowSummary = (index) => {
+        const cardId = rowSummaryCardId(index);
+        const newSummaries = [...rowSummaries];
+        newSummaries.splice(index, 1);
+        props.onChange({
+            ...layout,
+            RowSummaries: newSummaries,
+        });
+        if (expandedId === cardId) {
+            setExpandedId(null);
+            return;
+        }
+        if (expandedId?.startsWith('row-summary-')) {
+            const expandedIndex = Number(expandedId.replace('row-summary-', ''));
+            if (!Number.isNaN(expandedIndex) && expandedIndex > index) {
+                setExpandedId(rowSummaryCardId(expandedIndex - 1));
+            }
+        }
+    };
+    return ((0, jsx_runtime_1.jsxs)(Flex_1.Box, { className: (0, utils_1.cn)((0, CollapsibleWizardCard_1.getWizardAccordionSectionClassName)(hasExpandedCard, expandedFillsSpace), 'twa:p-3'), children: [(0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:text-xs twa:opacity-70 twa:mb-2 twa:max-w-[520px] twa:shrink-0", children: "Add summary rows at the top or bottom of the grid with aggregated column values" }), (0, jsx_runtime_1.jsx)(Flex_1.Flex, { className: "twa:justify-end twa:mb-2 twa:shrink-0", children: (0, jsx_runtime_1.jsx)(ButtonNew_1.ButtonNew, { onClick: handleAddRowSummary, children: "Add Row Summary" }) }), (0, jsx_runtime_1.jsx)(Flex_1.Flex, { flexDirection: "column", className: "twa:gap-3 twa:min-h-0", children: rowSummaries.map((rowSummary, index) => {
+                    const cardBinding = bindCard(rowSummaryCardId(index), { fillAvailable: true });
+                    return ((0, jsx_runtime_1.jsx)(CollapsibleWizardCard_1.CollapsibleWizardCard, { ...cardBinding, surface: "panel", "data-name": `row-summary-${index}`, title: `Row Summary ${index + 1}`, help: "Configure position, filters, and column aggregations for this summary row", collapsedHelp: false, compactSummary: (0, jsx_runtime_1.jsx)(RowSummaryPositionTag, { position: rowSummary.Position }), headerVisual: !cardBinding.expanded ? ((0, jsx_runtime_1.jsx)(RowSummaryPositionTag, { position: rowSummary.Position })) : undefined, headerActions: (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [cardBinding.expanded ? ((0, jsx_runtime_1.jsx)(SuspendToggleButton_1.SuspendToggleButton, { iconSize: 26, className: (0, objectListActionButtonStyles_1.objectListActionButtonClassName)('suspend'), onSuspend: () => {
+                                        const newSummaries = [...rowSummaries];
+                                        newSummaries[index] = { ...rowSummary, IsSuspended: true };
+                                        props.onChange({ ...layout, RowSummaries: newSummaries });
+                                    }, onUnSuspend: () => {
+                                        const newSummaries = [...rowSummaries];
+                                        newSummaries[index] = { ...rowSummary, IsSuspended: false };
+                                        props.onChange({ ...layout, RowSummaries: newSummaries });
+                                    }, suspendableObject: rowSummary })) : null, (0, jsx_runtime_1.jsx)(SimpleButton_1.default, { icon: "delete", variant: "text", tooltip: "Delete row summary", className: (0, objectListActionButtonStyles_1.objectListActionButtonClassName)('delete'), onClick: () => handleDeleteRowSummary(index) })] }), summary: (0, jsx_runtime_1.jsx)(RowSummaryCardSummary, { rowSummary: rowSummary }), className: "twa:overflow-hidden twa:flex twa:flex-col", bodyClassName: "twa:min-h-[200px] twa:max-h-[420px] twa:overflow-hidden twa:flex twa:flex-col twa:!pt-0", children: (0, jsx_runtime_1.jsx)(RowSummaryEditorForm, { rowSummary: rowSummary, availableScalarExpressions: availableScalarExpressions, onChange: (nextRowSummary) => {
+                                const newSummaries = [...rowSummaries];
+                                newSummaries[index] = nextRowSummary;
+                                props.onChange({
+                                    ...layout,
+                                    RowSummaries: newSummaries,
+                                });
+                            } }) }, rowSummaryCardId(index)));
+                }) })] }));
 };
 exports.RowSummarySection = RowSummarySection;

package/src/View/Layout/Wizard/sections/SettingsSection.js

@@ -3,14 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SettingsSection = exports.SettingsSectionSummary = void 0;
 const tslib_1 = require("tslib");
 const jsx_runtime_1 = require("react/jsx-runtime");
-const FormLayout_1 = tslib_1.__importStar(require("../../../../components/FormLayout"));
 const Input_1 = tslib_1.__importDefault(require("../../../../components/Input"));
-const Radio_1 = tslib_1.__importDefault(require("../../../../components/Radio"));
-const Tabs_1 = require("../../../../components/Tabs");
 const Tag_1 = require("../../../../components/Tag");
+const TypeRadio_1 = require("../../../Wizard/TypeRadio");
 const OnePageAdaptableWizard_1 = require("../../../Wizard/OnePageAdaptableWizard");
 const isPivotLayout_1 = require("../../../../Utilities/isPivotLayout");
 const Flex_1 = require("../../../../components/Flex");
+const Card_1 = require("../../../../components/Card");
 const SettingsSectionSummary = () => {
     const { data: layout } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
     const isPivot = (0, isPivotLayout_1.isPivotLayout)(layout);
@@ -25,6 +24,6 @@ const SettingsSection = (props) => {
             Name: event.target.value,
         });
     };
-    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsxs)(Tabs_1.Tabs, { className: "twa:mb-3", children: [(0, jsx_runtime_1.jsx)(Tabs_1.Tabs.Tab, { children: "Settings" }), (0, jsx_runtime_1.jsx)(Tabs_1.Tabs.Content, { children: (0, jsx_runtime_1.jsx)(Flex_1.Flex, { flexDirection: "row", children: (0, jsx_runtime_1.jsx)(FormLayout_1.default, { className: "twa:max-w-[300px] twa:w-full", children: (0, jsx_runtime_1.jsx)(FormLayout_1.FormRow, { label: "Name", children: (0, jsx_runtime_1.jsx)(Input_1.default, { className: "twa:w-full", "data-name": "layout-name", onChange: onNameChange, value: layout?.Name ?? '' }) }) }) }) })] }), (0, jsx_runtime_1.jsxs)(Tabs_1.Tabs, { className: "twa:mb-2", children: [(0, jsx_runtime_1.jsx)(Tabs_1.Tabs.Tab, { children: "Grid Type" }), (0, jsx_runtime_1.jsx)(Tabs_1.Tabs.Content, { children: (0, jsx_runtime_1.jsxs)(Flex_1.Flex, { flexDirection: "column", children: [(0, jsx_runtime_1.jsx)(Radio_1.default, { "data-name": "layout-type-table", disabled: true, checked: !(0, isPivotLayout_1.isPivotLayout)(layout), children: "Table" }), (0, jsx_runtime_1.jsx)(Radio_1.default, { "data-name": "layout-type-pivot", disabled: true, checked: (0, isPivotLayout_1.isPivotLayout)(layout), children: "Pivot" })] }) })] })] }));
+    return ((0, jsx_runtime_1.jsxs)(Flex_1.Flex, { flexDirection: "column", className: "twa:gap-3 twa:p-3", children: [(0, jsx_runtime_1.jsxs)(Card_1.Card, { shadow: false, children: [(0, jsx_runtime_1.jsxs)(Card_1.Card.Title, { children: [(0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:font-medium", children: "Name" }), (0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "Provide a unique name for this Layout" })] }), (0, jsx_runtime_1.jsx)(Card_1.Card.Body, { className: "twa:p-1", children: (0, jsx_runtime_1.jsx)(Input_1.default, { className: "twa:max-w-[300px] twa:w-full", "data-name": "layout-name", onChange: onNameChange, value: layout?.Name ?? '' }) })] }), (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: "Grid Type" }) }), (0, jsx_runtime_1.jsx)(Card_1.Card.Body, { className: "twa:p-1", children: (0, jsx_runtime_1.jsxs)(Flex_1.Flex, { flexDirection: "column", className: "twa:gap-2", children: [(0, jsx_runtime_1.jsx)(Flex_1.Box, { "data-name": "layout-type-table", children: (0, jsx_runtime_1.jsx)(TypeRadio_1.TypeRadio, { disabled: true, checked: !(0, isPivotLayout_1.isPivotLayout)(layout), text: "Table", description: "A flat layout \u2014 data is shown in standard rows and columns, one row per record" }) }), (0, jsx_runtime_1.jsx)(Flex_1.Box, { "data-name": "layout-type-pivot", children: (0, jsx_runtime_1.jsx)(TypeRadio_1.TypeRadio, { disabled: true, checked: (0, isPivotLayout_1.isPivotLayout)(layout), text: "Pivot", description: "An aggregated layout \u2014 data is grouped and summarized by pivot columns" }) })] }) })] })] }));
 };
 exports.SettingsSection = SettingsSection;

package/src/View/Layout/Wizard/sections/SortSection.d.ts

@@ -1,8 +1,18 @@
 import * as React from 'react';
 import { Layout } from '../../../../../types';
+import { useAdaptable } from '../../../AdaptableContext';
+import { type WizardCardAccordionBindCard } from '../../../Wizard/CollapsibleWizardCard';
 export declare const SortSectionSummary: React.FunctionComponent;
-interface SortSectionProps {
+export declare const buildColumnSortingSummary: (layout: Layout, adaptable: ReturnType<typeof useAdaptable>) => React.ReactNode;
+interface ColumnSortingWizardCardProps {
+    layout: Layout;
     onChange: (data: Layout) => void;
+    bindCard: WizardCardAccordionBindCard;
+    title?: string;
+    cardId?: string;
+    'data-name'?: string;
+    /** When expanded, grow to fill remaining section height. */
+    fillWhenExpanded?: boolean;
 }
-export declare const SortSection: React.FunctionComponent<SortSectionProps>;
+export declare const ColumnSortingWizardCard: React.FunctionComponent<ColumnSortingWizardCardProps>;
 export {};

package/src/View/Layout/Wizard/sections/SortSection.js

@@ -1,55 +1,79 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SortSection = exports.SortSectionSummary = void 0;
+exports.ColumnSortingWizardCard = exports.buildColumnSortingSummary = exports.SortSectionSummary = void 0;
 const tslib_1 = require("tslib");
 const jsx_runtime_1 = require("react/jsx-runtime");
 const React = tslib_1.__importStar(require("react"));
 const SimpleButton_1 = tslib_1.__importDefault(require("../../../../components/SimpleButton"));
-const Tabs_1 = require("../../../../components/Tabs");
+const Card_1 = require("../../../../components/Card");
 const Tag_1 = require("../../../../components/Tag");
 const getLayoutSortViewItems_1 = require("../../../../Strategy/Utilities/Layout/getLayoutSortViewItems");
 const AdaptableContext_1 = require("../../../AdaptableContext");
 const ValueSelector_1 = require("../../../Components/ValueSelector");
 const OnePageAdaptableWizard_1 = require("../../../Wizard/OnePageAdaptableWizard");
 const Utilities_1 = require("./Utilities");
+const utils_1 = require("../../../../lib/utils");
+const layoutWizardColumns_1 = require("./layoutWizardColumns");
 const ColumnGroupTag_1 = require("../../../Components/ColumnGroupTag");
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../../../../Utilities/Extensions/ArrayExtensions"));
 const Flex_1 = require("../../../../components/Flex");
+const CollapsibleWizardCard_1 = require("../../../Wizard/CollapsibleWizardCard");
 const SortSectionSummary = () => {
     const { data: layout } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
     const sortViewItems = (0, getLayoutSortViewItems_1.getLayoutSortViewItems)(layout, adaptable.api);
-    return ((0, jsx_runtime_1.jsx)(Flex_1.Box, { children: sortViewItems.values.length ? (sortViewItems.values.map((value) => ((0, jsx_runtime_1.jsx)(Tag_1.Tag, { className: "twa:mb-1 twa:mr-1", children: value }, value)))) : ((0, jsx_runtime_1.jsx)(Tag_1.Tag, { children: "No Sorts" })) }));
+    return ((0, jsx_runtime_1.jsx)(Flex_1.Box, { children: sortViewItems.values.length ? (sortViewItems.values.map((value) => ((0, jsx_runtime_1.jsx)(Tag_1.ColumnTag, { className: "twa:mb-1 twa:mr-1", children: value }, value)))) : ((0, jsx_runtime_1.jsx)(Tag_1.Tag, { children: "No Sorts" })) }));
 };
 exports.SortSectionSummary = SortSectionSummary;
-const ColumnRow = (props) => {
-    const SortOrder = (props.layout?.ColumnSorts ?? []).find((sort) => sort.ColumnId === props.column.columnId)?.SortOrder;
-    const icon = SortOrder === 'Asc' ? 'sort-asc' : 'sort-desc';
-    return ((0, jsx_runtime_1.jsxs)(Flex_1.Flex, { alignItems: "center", children: [props.column.friendlyName, (0, jsx_runtime_1.jsx)(ColumnGroupTag_1.ColumnGroupTag, { column: props.column }), SortOrder && ((0, jsx_runtime_1.jsx)(SimpleButton_1.default, { className: "twa:ml-2", onClick: () => props.onSortChange(props.column.columnId, SortOrder === 'Asc' ? 'Desc' : 'Asc'), variant: "raised", icon: icon }))] }));
+const getColumnSortOrder = (layout, columnId) => (layout.ColumnSorts ?? []).find((sort) => sort.ColumnId === columnId)?.SortOrder;
+const SortDirectionButton = (props) => {
+    const icon = props.sortOrder === 'Asc' ? 'sort-asc' : 'sort-desc';
+    const sortTooltip = props.sortOrder === 'Asc' ? 'Ascending (A to Z)' : 'Descending (Z to A)';
+    return ((0, jsx_runtime_1.jsx)(SimpleButton_1.default, { className: (0, utils_1.cn)('twa:flex twa:items-center twa:justify-center twa:m-1 twa:p-1', props.compact ? 'twa:min-h-7 twa:min-w-7 twa:p-0' : 'twa:shrink-0'), tooltip: sortTooltip, onClick: (event) => {
+            event.stopPropagation();
+            props.onSortChange(props.columnId, props.sortOrder === 'Asc' ? 'Desc' : 'Asc');
+        }, variant: props.compact ? 'outlined' : 'raised', tone: props.compact ? 'none' : undefined, iconSize: props.compact ? 16 : undefined, icon: icon }));
 };
-const SortSection = (props) => {
+const SortColumnRow = (props) => {
+    const sortOrder = getColumnSortOrder(props.layout, props.column.columnId);
+    return ((0, jsx_runtime_1.jsxs)(Flex_1.Flex, { alignItems: "center", className: "twa:gap-2", children: [(0, jsx_runtime_1.jsx)(Flex_1.Box, { className: props.compact ? 'twa:truncate' : undefined, children: props.column.friendlyName ?? props.column.columnId }), sortOrder ? ((0, jsx_runtime_1.jsx)(SortDirectionButton, { compact: props.compact, columnId: props.column.columnId, sortOrder: sortOrder, onSortChange: props.onSortChange })) : null, (0, jsx_runtime_1.jsx)(ColumnGroupTag_1.ColumnGroupTag, { column: props.column })] }));
+};
+const SORT_VALUE_SELECTOR_OPTION_CLASS = 'twa:!py-1.5 twa:!px-2 twa:min-h-[2.5rem]';
+const buildColumnSortingSummary = (layout, adaptable) => {
+    const sortViewItems = (0, getLayoutSortViewItems_1.getLayoutSortViewItems)(layout, adaptable.api);
+    if (!sortViewItems.values.length) {
+        return (0, jsx_runtime_1.jsx)(Tag_1.Tag, { children: "No sorts" });
+    }
+    return ((0, jsx_runtime_1.jsx)(Flex_1.Flex, { flexWrap: "wrap", className: "twa:gap-1", children: sortViewItems.values.map((value) => ((0, jsx_runtime_1.jsx)(Tag_1.ColumnTag, { children: value }, value))) }));
+};
+exports.buildColumnSortingSummary = buildColumnSortingSummary;
+const ColumnSortingWizardCard = (props) => {
+    const title = props.title ?? 'Sorting';
+    const cardId = props.cardId ?? 'sorting';
+    const dataName = props['data-name'] ?? 'column-sorting';
+    const fillWhenExpanded = props.fillWhenExpanded ?? true;
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
-    const { data: layout } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
     const allSortableColumns = adaptable.api.columnApi.getSortableColumns();
     const sortedSortColumns = React.useMemo(() => {
-        return ArrayExtensions_1.default.sortArrayWithOrder(allSortableColumns.map((col) => col.columnId), (layout.ColumnSorts ?? []).map((sort) => sort.ColumnId), { sortUnorderedItems: false }).map((colId) => adaptable.api.columnApi.getColumnWithColumnId(colId));
-    }, [layout, allSortableColumns]);
+        return ArrayExtensions_1.default.sortArrayWithOrder(allSortableColumns.map((col) => col.columnId), (props.layout.ColumnSorts ?? []).map((sort) => sort.ColumnId), { sortUnorderedItems: false }).map((colId) => adaptable.api.columnApi.getColumnWithColumnId(colId));
+    }, [props.layout, allSortableColumns, adaptable]);
     const handleColumnsSelectionChange = React.useCallback((columnIds) => {
         props.onChange({
-            ...layout,
+            ...props.layout,
             ColumnSorts: (columnIds || []).map((columnId) => {
-                const SortOrder = layout.ColumnSorts?.find((sort) => sort.ColumnId === columnId)?.SortOrder ?? 'Asc';
+                const SortOrder = props.layout.ColumnSorts?.find((sort) => sort.ColumnId === columnId)?.SortOrder ??
+                    'Asc';
                 return {
                     ColumnId: columnId,
                     SortOrder: SortOrder,
                 };
             }),
         });
-    }, [layout]);
+    }, [props.layout, props.onChange]);
     const handleSortChange = React.useCallback((columnId, SortOrder) => {
         props.onChange({
-            ...layout,
-            ColumnSorts: layout.ColumnSorts?.map((sort) => {
+            ...props.layout,
+            ColumnSorts: props.layout.ColumnSorts?.map((sort) => {
                 if (sort.ColumnId === columnId) {
                     return {
                         ...sort,
@@ -59,7 +83,8 @@ const SortSection = (props) => {
                 return sort;
             }),
         });
-    }, [layout]);
-    return ((0, jsx_runtime_1.jsxs)(Tabs_1.Tabs, { className: "twa:h-full", children: [(0, jsx_runtime_1.jsx)(Tabs_1.Tabs.Tab, { children: "Column Sorts" }), (0, jsx_runtime_1.jsx)(Tabs_1.Tabs.Content, { children: (0, jsx_runtime_1.jsx)(ValueSelector_1.ValueSelector, { showFilterInput: true, filter: Utilities_1.columnFilter, toIdentifier: (option) => `${option.columnId}`, toLabel: (option) => option.friendlyName ?? option.columnId, toListLabel: (column) => ((0, jsx_runtime_1.jsx)(ColumnRow, { onSortChange: handleSortChange, layout: layout, column: column })), options: sortedSortColumns, value: (layout.ColumnSorts ?? []).map((sort) => sort.ColumnId), allowReorder: () => true, onChange: handleColumnsSelectionChange }) })] }));
+    }, [props.layout, props.onChange]);
+    const sortViewItems = (0, getLayoutSortViewItems_1.getLayoutSortViewItems)(props.layout, adaptable.api);
+    return ((0, jsx_runtime_1.jsx)(CollapsibleWizardCard_1.CollapsibleWizardCard, { ...props.bindCard(cardId, { fillAvailable: fillWhenExpanded }), surface: "panel", "data-name": dataName, title: title, help: "Select columns to sort and set their order. Drag to change sort priority.", collapsedHelp: "", compactSummary: sortViewItems.values.length ? ((0, jsx_runtime_1.jsxs)(Flex_1.Flex, { alignItems: "center", className: "twa:gap-1 twa:min-w-0 twa:overflow-hidden", children: [sortViewItems.values.slice(0, 2).map((value) => ((0, jsx_runtime_1.jsx)(Tag_1.ColumnTag, { className: "twa:shrink-0", children: value }, value))), sortViewItems.values.length > 2 ? ((0, jsx_runtime_1.jsxs)("span", { className: "twa:text-xs twa:opacity-70 twa:shrink-0", children: ["+", sortViewItems.values.length - 2] })) : null] })) : ('No sorts'), summary: (0, exports.buildColumnSortingSummary)(props.layout, adaptable), className: "twa:overflow-hidden twa:flex twa:flex-col", bodyClassName: "twa:min-h-[200px] twa:max-h-[420px] twa:overflow-hidden twa:flex twa:flex-col twa:!pt-0 twa:!pb-0 twa:px-1", children: (0, jsx_runtime_1.jsx)(Card_1.Card, { shadow: false, className: "twa:h-full twa:overflow-hidden twa:flex twa:flex-col", children: (0, jsx_runtime_1.jsx)(Card_1.Card.Body, { className: "twa:flex-1 twa:min-h-0 twa:overflow-hidden twa:px-1 twa:pt-0 twa:pb-0", children: (0, jsx_runtime_1.jsx)(Flex_1.Box, { className: "twa:flex twa:flex-col twa:gap-1.5 twa:h-full twa:overflow-hidden twa:flex-1 twa:min-h-0", "data-name": "sorting-columns-container", children: (0, jsx_runtime_1.jsx)(ValueSelector_1.ValueSelector, { compact: true, showFilterInput: true, filter: Utilities_1.columnFilter, filterPlaceholder: "Search Columns...", compactHeaderClassName: layoutWizardColumns_1.LAYOUT_WIZARD_COLUMN_LIST_HEADER_CLASS, compactFilterClassName: layoutWizardColumns_1.LAYOUT_WIZARD_COLUMN_LIST_SEARCH_CLASS, toggleSelectionOnRowClick: true, optionClassName: SORT_VALUE_SELECTOR_OPTION_CLASS, toIdentifier: (option) => `${option.columnId}`, toLabel: (option) => option.friendlyName ?? option.columnId, optionLayout: "label-beside-checkbox", toListLabel: (column) => ((0, jsx_runtime_1.jsx)(SortColumnRow, { compact: true, column: column, layout: props.layout, onSortChange: handleSortChange })), options: sortedSortColumns, value: (props.layout.ColumnSorts ?? []).map((sort) => sort.ColumnId), allowReorder: () => true, onChange: handleColumnsSelectionChange }) }) }) }) }));
 };
-exports.SortSection = SortSection;
+exports.ColumnSortingWizardCard = ColumnSortingWizardCard;

package/src/View/Layout/Wizard/sections/columnLayoutCards.d.ts

@@ -0,0 +1,20 @@
+import * as React from 'react';
+import { Layout, TableLayout } from '../../../../../types';
+import { type WizardCardAccordionBindCard } from '../../../Wizard/CollapsibleWizardCard';
+import type { IAdaptable } from '../../../../AdaptableInterfaces/IAdaptable';
+import { type ColumnDefaultWidthResolver } from './columnLayoutHelpers';
+export declare const buildColumnPinningSummary: (layout: Layout, adaptable: IAdaptable) => React.ReactNode;
+export declare const buildColumnSizingSummary: (layout: Layout, adaptable: IAdaptable, resolveDefaultWidth: ColumnDefaultWidthResolver) => React.ReactNode;
+interface ColumnPinningWizardCardProps {
+    layout: TableLayout;
+    onChange: (data: Layout) => void;
+    bindCard: WizardCardAccordionBindCard;
+}
+export declare const ColumnPinningWizardCard: React.FunctionComponent<ColumnPinningWizardCardProps>;
+interface ColumnSizingWizardCardProps {
+    layout: TableLayout;
+    onChange: (data: Layout) => void;
+    bindCard: WizardCardAccordionBindCard;
+}
+export declare const ColumnSizingWizardCard: React.FunctionComponent<ColumnSizingWizardCardProps>;
+export {};