@adaptabletools/adaptable 23.0.0-canary.1 → 23.0.0-canary.10

package/src/View/CalculatedColumn/Wizard/CalculatedColumnExpressionWizardSection.d.ts

@@ -6,6 +6,6 @@ export type CalculatedColumnExpressionWizardSectionProps = {
     onChange: (data: CalculatedColumn) => void;
     expressionType: ExpressionType;
 };
-export declare const renderCalculatedColumnExpressionSummary: (data: CalculatedColumn) => React.JSX.Element;
+export declare const renderCalculatedColumnExpressionSummary: (data: CalculatedColumn, api: AdaptableApi) => React.JSX.Element;
 export declare const isValidCalculatedColumnExpression: (data: CalculatedColumn, api: AdaptableApi) => true | string;
 export declare const CalculatedColumnExpressionWizardSection: (props: CalculatedColumnExpressionWizardSectionProps) => React.JSX.Element;

package/src/View/CalculatedColumn/Wizard/CalculatedColumnExpressionWizardSection.js

@@ -1,13 +1,26 @@
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useMemo } from 'react';
 import { useOnePageAdaptableWizardContext } from '../../Wizard/OnePageAdaptableWizard';
 import { ExpressionEditor } from '../../../components/ExpressionEditor';
-import { Tabs } from '../../../components/Tabs';
 import { CodeBlock } from '../../../components/CodeBlock';
 import { Humanize } from '../../../Utilities/Extensions/StringExtensions';
-import { Box } from '../../../components/Flex';
-export const renderCalculatedColumnExpressionSummary = (data) => {
-    const { api } = useOnePageAdaptableWizardContext();
+import { Box, Flex } from '../../../components/Flex';
+import { Card } from '../../../components/Card';
+const getExpressionTypeDescription = (expressionType) => {
+    switch (expressionType) {
+        case 'ScalarExpression':
+            return 'Define an expression using values from other cells in each row';
+        case 'AggregatedScalarExpression':
+            return 'Define an expression using aggregated values from other rows';
+        case 'CumulativeAggregatedExpression':
+            return 'Define a cumulative expression using values from other rows';
+        case 'QuantileAggregatedExpression':
+            return 'Define a quantile expression using values from other rows';
+        default:
+            return '';
+    }
+};
+export const renderCalculatedColumnExpressionSummary = (data, api) => {
     return (_jsxs(Box, { className: "twa:text-2", children: ["Column scalar expression:", ' ', _jsx(CodeBlock, { children: api.internalApi.getAdaptableQueryExpressionText(data.Query) })] }));
 };
 export const isValidCalculatedColumnExpression = (data, api) => {
@@ -34,8 +47,6 @@ export const CalculatedColumnExpressionWizardSection = (props) => {
             CalculatedColumnSettings: {
                 ...data.CalculatedColumnSettings,
                 DataType: dataType,
-                //  Pivotable,
-                //  Aggregatable,
             },
         });
     };
@@ -50,16 +61,17 @@ export const CalculatedColumnExpressionWizardSection = (props) => {
         }
     };
     const columns = api.columnApi.internalApi.getQueryableColumnsForUIEditor();
-    return (_jsxs(Tabs, { autoFocus: false, height: "100%", children: [_jsx(Tabs.Tab, { children: Humanize(props.expressionType) }), _jsx(Tabs.Content, { children: (() => {
-                    switch (props.expressionType) {
-                        case 'ScalarExpression':
-                            return (_jsx(ExpressionEditor, { type: 'scalar', module: moduleInfo.ModuleName, className: "twa:pl-0", value: data.Query.ScalarExpression, onChange: (ScalarExpression) => setCalculatedColumnExpression({ ScalarExpression }), initialData: initialData, columns: columns, fields: api.expressionApi.internalApi.getAvailableFields(), namedQueries: api.namedQueryApi.getNamedQueries(), isFullExpression: true, api: api }));
-                        case 'AggregatedScalarExpression':
-                        case 'CumulativeAggregatedExpression':
-                        case 'QuantileAggregatedExpression':
-                            return (_jsx(ExpressionEditor, { type: getEditorType(props.expressionType), module: moduleInfo.ModuleName, className: "twa:pl-0", value: data.Query.AggregatedScalarExpression, onChange: (AggregatedScalarExpression) => setCalculatedColumnExpression({ AggregatedScalarExpression }), initialData: initialData, columns: columns, namedQueries: api.namedQueryApi.getNamedQueries(), isFullExpression: true, api: api }));
-                        default:
-                            return _jsx(_Fragment, {});
-                    }
-                })() })] }));
+    const expressionEditor = (() => {
+        switch (props.expressionType) {
+            case 'ScalarExpression':
+                return (_jsx(ExpressionEditor, { type: 'scalar', module: moduleInfo.ModuleName, className: "twa:pl-0", value: data.Query.ScalarExpression, onChange: (ScalarExpression) => setCalculatedColumnExpression({ ScalarExpression }), initialData: initialData, columns: columns, fields: api.expressionApi.internalApi.getAvailableFields(), namedQueries: api.namedQueryApi.getNamedQueries(), isFullExpression: true, api: api }));
+            case 'AggregatedScalarExpression':
+            case 'CumulativeAggregatedExpression':
+            case 'QuantileAggregatedExpression':
+                return (_jsx(ExpressionEditor, { type: getEditorType(props.expressionType), module: moduleInfo.ModuleName, className: "twa:pl-0", value: data.Query.AggregatedScalarExpression, onChange: (AggregatedScalarExpression) => setCalculatedColumnExpression({ AggregatedScalarExpression }), initialData: initialData, columns: columns, namedQueries: api.namedQueryApi.getNamedQueries(), isFullExpression: true, api: api }));
+            default:
+                return null;
+        }
+    })();
+    return (_jsx(Flex, { flexDirection: "column", className: "twa:h-full twa:gap-3 twa:p-3", children: _jsxs(Card, { shadow: false, className: "twa:flex-1 twa:min-h-0", children: [_jsxs(Card.Title, { children: [_jsx(Box, { className: "twa:font-medium", children: Humanize(props.expressionType) }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: getExpressionTypeDescription(props.expressionType) })] }), _jsx(Card.Body, { className: "twa:flex-1 twa:min-h-0", children: expressionEditor })] }) }));
 };

package/src/View/CalculatedColumn/Wizard/CalculatedColumnSettingsWizardSection.js

@@ -2,22 +2,20 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
 import { useMemo } from 'react';
 import { useOnePageAdaptableWizardContext } from '../../Wizard/OnePageAdaptableWizard';
-import FormLayout, { FormRow } from '../../../components/FormLayout';
 import Input from '../../../components/Input';
-import ErrorBox from '../../../components/ErrorBox';
-import { Tabs } from '../../../components/Tabs';
 import { SpecialColumnSettingsWizardStep } from '../../SpecialColumnSettingsWizardStep';
 import { getCalculatedColumnSettingsTags } from '../Utilities/getCalculatedColumnSettingsTags';
 import { Box, Flex } from '../../../components/Flex';
 import { TagList } from '../../../components/Tag/Tag';
 import { SingleSelect } from '../../../components/NewSelect';
+import { Card } from '../../../components/Card';
 export const renderCalculatedColumnSettingsSummary = (data) => {
     const options = getCalculatedColumnSettingsTags(data.CalculatedColumnSettings);
     return _jsx(TagList, { tags: options });
 };
 export const isValidCalculatedColumnSettings = (data) => {
     if (!data.CalculatedColumnSettings?.DataType) {
-        return 'A data type is required. It could not be inferred from the expression.';
+        return 'Please select a data type (could not be inferred from the expression)';
     }
     return true;
 };
@@ -64,9 +62,9 @@ export const CalculatedColumnSettingsWizardSection = (props) => {
         { value: 'boolean', label: 'Boolean' },
         { value: 'numberArray', label: 'NumberArray' },
     ];
-    return (_jsxs(Box, { "data-name": 'calculated-column-settings', children: [_jsxs(Tabs, { autoFocus: false, children: [_jsx(Tabs.Tab, { children: "Column Settings" }), _jsx(Tabs.Content, { children: _jsx(Flex, { flexDirection: "row", children: _jsxs(FormLayout, { children: [_jsx(FormRow, { label: "Data Type", children: _jsx(SingleSelect, { "data-name": "column-type", placeholder: "Select Data Type", items: options, value: dataType, onValueChange: (value) => handleDataTypeChange(value) }) }), _jsx(FormRow, { label: "Width", children: _jsx(Input, { "data-name": "column-width", type: "number", width: 300, value: Width || '', onChange: (e) => handleSpecialColumnSettingsChange({
-                                                Width: Number(e.target.value),
-                                            }) }) })] }) }) })] }), ErrorMessage ? _jsx(ErrorBox, { className: "twa:mt-2", children: ErrorMessage }) : null, _jsx(SpecialColumnSettingsWizardStep, { isEditable: false, 
-                // @ts-ignore CalculatedColumn has a broader DataType
-                settings: data.CalculatedColumnSettings, onChange: handleSpecialColumnSettingsChange })] }));
+    return (_jsx(Box, { "data-name": 'calculated-column-settings', children: _jsxs(Flex, { flexDirection: "column", className: "twa:gap-3 twa:p-3", children: [_jsxs(Card, { shadow: false, children: [_jsxs(Card.Title, { children: [_jsx(Box, { className: "twa:font-medium", children: "Data Type" }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "Choose the data type for the Calculated Column values" })] }), _jsxs(Card.Body, { className: "twa:p-1 twa:gap-1", children: [_jsx(SingleSelect, { "data-name": "column-type", placeholder: "Select Data Type", items: options, value: dataType, onValueChange: (value) => handleDataTypeChange(value), className: "twa:max-w-[300px]" }), ErrorMessage ? (_jsx(Box, { className: "twa:text-2 twa:text-destructive", children: ErrorMessage })) : null] })] }), _jsxs(Card, { shadow: false, children: [_jsxs(Card.Title, { children: [_jsx(Box, { className: "twa:font-medium", children: "Width" }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "Optional Column Width in pixels" })] }), _jsx(Card.Body, { className: "twa:p-1", children: _jsx(Input, { "data-name": "column-width", type: "number", className: "twa:max-w-[300px]", value: Width || '', onChange: (e) => handleSpecialColumnSettingsChange({
+                                    Width: Number(e.target.value),
+                                }) }) })] }), _jsx(SpecialColumnSettingsWizardStep, { isEditable: false, 
+                    // @ts-ignore CalculatedColumn has a broader DataType
+                    settings: data.CalculatedColumnSettings, onChange: handleSpecialColumnSettingsChange })] }) }));
 };

package/src/View/CalculatedColumn/Wizard/CalculatedColumnTypeSection.js

@@ -1,7 +1,33 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { Tabs } from '../../../components/Tabs';
-import { TypeRadio } from '../../Wizard/TypeRadio';
-import { Flex } from '../../../components/Flex';
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+import { Box, Flex } from '../../../components/Flex';
+import { getWizardTypeSelectionGridColumns, WizardTypeSelectionCard, WizardTypeSelectionPreviewFrame, WizardTypeSelectionSection, } from '../../Wizard/WizardTypeSelection';
+const CALCULATED_COLUMN_TYPE_OPTIONS = [
+    {
+        type: 'ScalarExpression',
+        label: 'Standard',
+        description: 'The calculated value is derived from other cells in the row',
+        expressionExample: '[price] * [quantity]',
+    },
+    {
+        type: 'AggregatedScalarExpression',
+        label: 'Aggregated',
+        description: 'The calculated value is derived from other rows',
+        expressionExample: 'SUM([pnl], GROUP_BY([desk]))',
+    },
+    {
+        type: 'CumulativeAggregatedExpression',
+        label: 'Cumulative',
+        description: 'The calculated value is derived cumulatively from other rows',
+        expressionExample: 'CUMUL(SUM([pnl]), OVER([tradeDate]))',
+    },
+    {
+        type: 'QuantileAggregatedExpression',
+        label: 'Quantile',
+        description: 'The calculated value is derived from other rows using quantile aggregations',
+        expressionExample: 'QUANT([pnl], 4)',
+    },
+];
+const CALCULATED_COLUMN_TYPE_COUNT = CALCULATED_COLUMN_TYPE_OPTIONS.length;
 export const CalculatedColumnTypeWizardSection = (props) => {
-    return (_jsxs(Tabs, { children: [_jsx(Tabs.Tab, { children: "Calculated Column Type" }), _jsx(Tabs.Content, { children: _jsxs(Flex, { flexDirection: "column", children: [_jsx(TypeRadio, { text: 'Standard', description: "The calculated value is derived from other cells in the row", checked: props.type === 'ScalarExpression', onClick: () => props.onTypeChange('ScalarExpression') }), _jsx(TypeRadio, { text: 'Aggregated', description: "The calculated value is derived from other rows", checked: props.type === 'AggregatedScalarExpression', onClick: () => props.onTypeChange('AggregatedScalarExpression') }), _jsx(TypeRadio, { text: 'Cumulative', description: "The calculated value is derived cumulatively from other rows", checked: props.type === 'CumulativeAggregatedExpression', onClick: () => props.onTypeChange('CumulativeAggregatedExpression') }), _jsx(TypeRadio, { text: 'Quantile', description: "The calculated value is derived from other rows using quantile aggregations", checked: props.type === 'QuantileAggregatedExpression', onClick: () => props.onTypeChange('QuantileAggregatedExpression') })] }) })] }));
+    return (_jsx(Flex, { flexDirection: "column", "data-name": "calculated-column-type", className: "twa:h-full twa:min-h-0 twa:p-2", children: _jsx(WizardTypeSelectionSection, { headingId: "calculated-column-type-heading", title: "Calculated Column Type", dataName: "calculated-column-type-grid", columns: getWizardTypeSelectionGridColumns(CALCULATED_COLUMN_TYPE_COUNT), intro: _jsxs(_Fragment, { children: ["Click a card to choose one of ", CALCULATED_COLUMN_TYPE_COUNT, " calculated column types"] }), children: CALCULATED_COLUMN_TYPE_OPTIONS.map((option) => (_jsx(WizardTypeSelectionCard, { label: option.label, description: option.description, selected: props.type === option.type, dataName: `calculated-column-type-${option.type}`, minHeightClassName: "twa:min-h-[148px]", onSelect: () => props.onTypeChange(option.type), footer: _jsx(WizardTypeSelectionPreviewFrame, { children: _jsx(Box, { as: "code", className: "ab-CodeBlock twa:block twa:w-full twa:truncate twa:bg-transparent twa:p-0 twa:font-mono twa:text-2 twa:leading-snug twa:text-foreground twa:opacity-90", children: option.expressionExample }) }) }, option.type))) }) }));
 };

package/src/View/CellSummary/CellSummaryViewPanel.js

@@ -3,13 +3,13 @@ import * as React from 'react';
 import { EnumExtensions } from '../../Utilities/Extensions/EnumExtensions';
 import { SummaryOperation } from '../../AdaptableState/Common/Enums';
 import ArrayExtensions from '../../Utilities/Extensions/ArrayExtensions';
+import { cn } from '../../lib/utils';
 import { CellSummaryPopover } from './CellSummaryPopover';
 import * as GeneralConstants from '../../Utilities/Constants/GeneralConstants';
 import { AdaptablePopover } from '../AdaptablePopover';
 import * as InternalRedux from '../../Redux/ActionsReducers/InternalRedux';
 import { connect } from 'react-redux';
 import { Flex } from '../../components/Flex';
-import clsx from 'clsx';
 import { SingleSelect } from '../../components/NewSelect';
 class CellSummaryViewPanelComponent extends React.Component {
     cleanupEvent;
@@ -50,12 +50,12 @@ class CellSummaryViewPanelComponent extends React.Component {
         const isToolbar = this.props.viewType === 'Toolbar';
         const elementType = isToolbar ? 'DashboardToolbar' : 'ToolPanel';
         const operationValue = this.getOperationValue() ?? 'N/A';
-        return (_jsxs(Flex, { className: clsx(shouldDisable ? GeneralConstants.READ_ONLY_STYLE : '', `ab-${elementType}__CellSummary__wrap twa:gap-2 twa:flex-row`, {
+        return (_jsxs(Flex, { className: cn(shouldDisable ? GeneralConstants.READ_ONLY_STYLE : '', `ab-${elementType}__CellSummary__wrap twa:gap-2 twa:flex-row`, {
                 'twa:min-w-[215px] twa:max-w-[215px] twa:w-[215px] twa:flex-nowrap': isToolbar,
                 'twa:flex-1 twa:flex-wrap': !isToolbar,
-            }), children: [_jsx(Flex, { className: "twa:flex-1", children: _jsx(SingleSelect, { ariaLabel: "Cell Summary Operation Selector", className: `ab-${elementType}__CellSummary__select twa:w-full`, disabled: shouldDisable, items: [...operationMenuItems, ...operationDefinitions], onValueChange: (x) => this.props.onCellSummaryOperationChange(x), value: this.props.CellSummaryOperation }) }), _jsx(Flex, { className: "twa:items-center twa:gap-1", children: _jsxs(_Fragment, { children: [_jsx(Flex, { className: clsx(`ab-${elementType}__CellSummary__value twa:min-w-[50px]`, {
-                                    'twa:rounded-standard twa:text-color-text-on-info twa:bg-color-info twa:text-2': !isToolbar,
-                                    'twa:flex-1 twa:text-color-text-on-primary twa:justify-center': isToolbar,
+            }), children: [_jsx(Flex, { className: "twa:flex-1", children: _jsx(SingleSelect, { ariaLabel: "Cell Summary Operation Selector", className: `ab-${elementType}__CellSummary__select twa:w-full`, disabled: shouldDisable, items: [...operationMenuItems, ...operationDefinitions], onValueChange: (x) => this.props.onCellSummaryOperationChange(x), value: this.props.CellSummaryOperation }) }), _jsx(Flex, { className: "twa:items-center twa:gap-1", children: _jsxs(_Fragment, { children: [_jsx(Flex, { className: cn(`ab-${elementType}__CellSummary__value twa:min-w-[50px]`, {
+                                    'twa:rounded-standard twa:text-info-foreground twa:bg-info twa:text-2': !isToolbar,
+                                    'twa:flex-1 twa:text-primary-foreground twa:justify-center': isToolbar,
                                 }), children: operationValue }), _jsx(AdaptablePopover, { popoverMaxWidth: 360, className: "ab-ToolPanel__CellSummary__info", bodyText: [cellSummaryPopover], useButton: true, showEvent: 'focus', hideEvent: "blur", tooltipText: 'Show Cell Summaries', disabled: !this.props.CellSummary?.Count })] }) })] }));
     }
     checkSelectedCells() {

package/src/View/Charting/ChartingWizard/AgChargingWizard/AgChargingWizard.js

@@ -2,7 +2,6 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
 import { useAdaptable } from '../../../AdaptableContext';
 import { OnePageAdaptableWizard } from '../../../Wizard/OnePageAdaptableWizard';
-import { PreviewChartSection } from './PreviewChartSection';
 import { isSettingsValid, SettingsSection } from './SettingsSection';
 import { ObjectTagsWizardSection, renderObjectTagsSummary, } from '../../../Wizard/ObjectTagsWizardSection';
 import { Box } from '../../../../components/Flex';
@@ -17,10 +16,10 @@ export const AgChargingWizard = (props) => {
     }, [chartDefinition]);
     return (_jsx(OnePageAdaptableWizard, { defaultCurrentSectionName: props.defaultCurrentSectionName, moduleInfo: props.moduleInfo, data: chartDefinition, onHide: props.onCloseWizard, onFinish: handleFinish, sections: [
             {
-                title: 'Settings',
-                details: 'Chart Settings',
+                title: 'Chart',
+                details: 'Configure chart properties and preview the result',
                 isValid: isSettingsValid,
-                render: () => (_jsx(Box, { className: "twa:p-2", children: _jsx(SettingsSection, { chartDefinition: chartDefinition, onChange: setChartDefinition }) })),
+                render: () => (_jsx(SettingsSection, { chartDefinition: chartDefinition, onChange: setChartDefinition })),
             },
             {
                 details: 'Select Chart Tags',
@@ -29,11 +28,5 @@ export const AgChargingWizard = (props) => {
                 render: () => (_jsx(Box, { className: "twa:p-2", children: _jsx(ObjectTagsWizardSection, { onChange: setChartDefinition }) })),
                 renderSummary: renderObjectTagsSummary,
             },
-            '-',
-            {
-                title: 'Preview Chart',
-                details: 'Chart Preview',
-                render: () => (_jsx(Box, { className: "twa:p-2", children: _jsx(PreviewChartSection, { chartDefinition: chartDefinition, onChange: setChartDefinition }) })),
-            },
         ] }));
 };

package/src/View/Charting/ChartingWizard/AgChargingWizard/PreviewChartSection.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
 import { useSelector } from 'react-redux';
-import isEqual from '../../../../Utilities/utils/isEqual';
+import { isEqual } from '../../../../Utilities/Extensions/ObjectExtensions';
 import * as InternalRedux from '../../../../Redux/ActionsReducers/InternalRedux';
 import { useAdaptable } from '../../../AdaptableContext';
 export const PreviewChartSection = (props) => {
@@ -29,5 +29,5 @@ export const PreviewChartSection = (props) => {
             });
         }
     }, [currentChartModels]);
-    return _jsx("div", { ref: divRef });
+    return _jsx("div", { ref: divRef, className: "twa:min-h-[280px] twa:h-full twa:w-full" });
 };

package/src/View/Charting/ChartingWizard/AgChargingWizard/SettingsSection.js

@@ -1,61 +1,44 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import * as React from 'react';
 import { CheckBox } from '../../../../components/CheckBox';
-import DropdownButton from '../../../../components/DropdownButton';
-import FormLayout, { FormRow } from '../../../../components/FormLayout';
-import { validateChartName } from '../../../../Utilities/Helpers/chartingHelper';
-import AdaptableInput from '../../../Components/AdaptableInput';
+import { SingleSelect } from '../../../../components/NewSelect';
+import { validateChartName } from '../../../../Utilities/Helpers/ChartHelper';
+import { Box, Flex } from '../../../../components/Flex';
+import { Card } from '../../../../components/Card';
+import Input from '../../../../components/Input';
+import { PreviewChartSection } from './PreviewChartSection';
 export const isSettingsValid = (chartDefinition, api) => {
     return validateChartName(api, chartDefinition.Name, chartDefinition.Uuid);
 };
+const AGG_FUNCS = ['sum', 'min', 'max', 'count', 'avg', 'first', 'last'];
 export const SettingsSection = (props) => {
-    const handleNameChange = React.useCallback((event) => {
-        props.onChange({
-            ...props.chartDefinition,
-            Name: event.target.value,
-            Model: props.chartDefinition.Model,
-        });
-    }, [props.chartDefinition]);
-    const handleUnLinkChange = React.useCallback(() => {
-        props.onChange({
-            ...props.chartDefinition,
-            Model: {
-                ...props.chartDefinition.Model,
-                unlinkChart: !props.chartDefinition.Model.unlinkChart,
-            },
-        });
-    }, [props.chartDefinition]);
-    const handleSuppressChartRanges = React.useCallback(() => {
-        props.onChange({
-            ...props.chartDefinition,
-            Model: {
-                ...props.chartDefinition.Model,
-                suppressChartRanges: !props.chartDefinition.Model.suppressChartRanges,
-            },
-        });
-    }, [props.chartDefinition]);
-    const aggFuncs = ['sum', 'min', 'max', 'count', 'avg', 'first', 'last'];
-    const aggFuncsOptions = aggFuncs.map((aggFunc) => ({
-        label: aggFunc,
-        onClick: () => {
-            props.onChange({
-                ...props.chartDefinition,
-                Model: {
-                    ...props.chartDefinition.Model,
-                    aggFunc,
-                },
-            });
-        },
+    const { chartDefinition, onChange } = props;
+    const aggFunc = chartDefinition.Model.aggFunc;
+    const showAggFunc = chartDefinition.Model.modelType === 'range' && typeof aggFunc !== 'function';
+    const aggFuncsOptions = AGG_FUNCS.map((option) => ({
+        label: option,
+        value: option,
     }));
-    const aggFunc = props.chartDefinition.Model.aggFunc;
-    const handleAggFuncClear = React.useCallback(() => {
-        props.onChange({
-            ...props.chartDefinition,
-            Model: {
-                ...props.chartDefinition.Model,
-                aggFunc: '',
-            },
-        });
-    }, [props.chartDefinition]);
-    return (_jsxs(FormLayout, { children: [_jsx(FormRow, { label: "Name", children: _jsx(AdaptableInput, { onChange: handleNameChange, value: props.chartDefinition.Name }) }), _jsx(FormRow, { label: "Unlink Chart", children: _jsx(CheckBox, { onClick: handleUnLinkChange, checked: props.chartDefinition.Model.unlinkChart }) }), _jsx(FormRow, { label: "Suppress Chart Ranges", children: _jsx(CheckBox, { onClick: handleSuppressChartRanges, checked: props.chartDefinition.Model.suppressChartRanges }) }), props.chartDefinition.Model.modelType === 'range' && typeof aggFunc !== 'function' && (_jsx(FormRow, { label: "Agg Func", children: _jsx(DropdownButton, { columns: ['label'], items: aggFuncsOptions, onClear: handleAggFuncClear, children: aggFunc ? aggFunc : 'Select ' }) }))] }));
+    return (_jsxs(Flex, { flexDirection: "column", className: "twa:gap-3 twa:p-3 twa:h-full twa:min-h-0", children: [_jsxs(Card, { shadow: false, children: [_jsxs(Card.Title, { children: [_jsx(Box, { className: "twa:font-medium", children: "Name" }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "Provide a unique name for the chart" })] }), _jsx(Card.Body, { className: "twa:p-1", children: _jsx(Input, { "data-name": "chart-name", className: "twa:max-w-[300px] twa:w-full", onChange: (event) => onChange({
+                                ...chartDefinition,
+                                Name: event.target.value,
+                                Model: chartDefinition.Model,
+                            }), value: chartDefinition.Name ?? '', placeholder: "Enter chart name" }) })] }), _jsxs(Card, { shadow: false, children: [_jsxs(Card.Title, { children: [_jsx(Box, { className: "twa:font-medium", children: "Unlink Chart" }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "When enabled, the chart is not linked to the grid data range" })] }), _jsx(Card.Body, { children: _jsx(CheckBox, { "data-name": "unlink-chart", checked: chartDefinition.Model.unlinkChart, onChange: (checked) => onChange({
+                                ...chartDefinition,
+                                Model: {
+                                    ...chartDefinition.Model,
+                                    unlinkChart: checked,
+                                },
+                            }), children: "Unlink from data" }) })] }), _jsxs(Card, { shadow: false, children: [_jsxs(Card.Title, { children: [_jsx(Box, { className: "twa:font-medium", children: "Suppress Chart Ranges" }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "Hide chart range highlights on the grid while the chart is open" })] }), _jsx(Card.Body, { children: _jsx(CheckBox, { "data-name": "suppress-chart-ranges", checked: chartDefinition.Model.suppressChartRanges, onChange: (checked) => onChange({
+                                ...chartDefinition,
+                                Model: {
+                                    ...chartDefinition.Model,
+                                    suppressChartRanges: checked,
+                                },
+                            }), children: "Suppress chart ranges" }) })] }), showAggFunc ? (_jsxs(Card, { shadow: false, children: [_jsxs(Card.Title, { children: [_jsx(Box, { className: "twa:font-medium", children: "Aggregation" }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "Aggregation function used for range charts" })] }), _jsx(Card.Body, { className: "twa:p-1", children: _jsx(SingleSelect, { "data-name": "chart-agg-func", placeholder: "Select", className: "twa:max-w-[300px]", items: aggFuncsOptions, value: aggFunc || undefined, onValueChange: (value) => onChange({
+                                ...chartDefinition,
+                                Model: {
+                                    ...chartDefinition.Model,
+                                    aggFunc: value,
+                                },
+                            }) }) })] })) : null, _jsxs(Card, { shadow: false, className: "twa:flex-1 twa:min-h-0", children: [_jsxs(Card.Title, { children: [_jsx(Box, { className: "twa:font-medium", children: "Preview" }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "Live preview of the chart \u2014 changes here are reflected in the chart model" })] }), _jsx(Card.Body, { className: "twa:flex-1 twa:min-h-[280px]", children: _jsx(PreviewChartSection, { chartDefinition: chartDefinition, onChange: onChange }) })] })] }));
 };

package/src/View/Charting/ChartingWizard/ExternalChartingWizard/ExternalChartingWizard.js

@@ -3,25 +3,6 @@ import * as React from 'react';
 import { useAdaptable } from '../../../AdaptableContext';
 import { OnePageAdaptableWizard } from '../../../Wizard/OnePageAdaptableWizard';
 import { isSettingsValid, SettingsSection } from './SettingsSection';
-import { Box } from '../../../../components/Flex';
-const PreviewChartSection = ({ chartDefinition }) => {
-    const adaptable = useAdaptable();
-    const divRef = React.useRef(null);
-    React.useEffect(() => {
-        if (!divRef.current) {
-            return;
-        }
-        const container = {
-            name: 'Preview Chart',
-            element: divRef.current,
-        };
-        const transientChartDefinition = adaptable.api.chartingApi.internalApi.onPreviewExternalChart(chartDefinition, container);
-        return () => {
-            adaptable.api.chartingApi.internalApi.onHideExternalChart(transientChartDefinition);
-        };
-    }, [divRef]);
-    return _jsx("div", { ref: divRef });
-};
 export const ExternalChartingWizard = (props) => {
     const adaptable = useAdaptable();
     const onPreviewChart = adaptable.api.optionsApi.getChartingOptions().externalChartingOptions?.onPreviewChart;
@@ -34,18 +15,10 @@ export const ExternalChartingWizard = (props) => {
     };
     return (_jsx(OnePageAdaptableWizard, { defaultCurrentSectionName: props.defaultCurrentSectionName, moduleInfo: props.moduleInfo, data: chartDefinition, onHide: props.onCloseWizard, onFinish: handleFinish, sections: [
             {
-                title: 'Settings',
-                details: 'Chart Settings',
+                title: 'Chart',
+                details: 'Configure chart properties and preview the result',
                 isValid: isSettingsValid,
-                render: () => (_jsx(Box, { className: "twa:p-2", children: _jsx(SettingsSection, { chartDefinition: chartDefinition, onChange: setChartDefinition }) })),
+                render: () => (_jsx(SettingsSection, { chartDefinition: chartDefinition, onChange: setChartDefinition, showPreview: Boolean(onPreviewChart) })),
             },
-            onPreviewChart
-                ? {
-                    title: 'Preview Chart',
-                    render: () => {
-                        return (_jsx(Box, { className: "twa:p-2", children: _jsx(PreviewChartSection, { chartDefinition: chartDefinition }) }));
-                    },
-                }
-                : null,
-        ].filter(Boolean) }));
+        ] }));
 };

package/src/View/Charting/ChartingWizard/ExternalChartingWizard/PreviewChartSection.d.ts

@@ -0,0 +1,5 @@
+import * as React from 'react';
+import { ExternalChartDefinition } from '../../../../AdaptableState/ChartingState';
+export declare const PreviewChartSection: React.FunctionComponent<{
+    chartDefinition: ExternalChartDefinition;
+}>;

package/src/View/Charting/ChartingWizard/ExternalChartingWizard/PreviewChartSection.js

@@ -0,0 +1,21 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import * as React from 'react';
+import { useAdaptable } from '../../../AdaptableContext';
+export const PreviewChartSection = (props) => {
+    const adaptable = useAdaptable();
+    const divRef = React.useRef(null);
+    React.useEffect(() => {
+        if (!divRef.current) {
+            return;
+        }
+        const container = {
+            name: 'Preview Chart',
+            element: divRef.current,
+        };
+        const transientChartDefinition = adaptable.api.chartingApi.internalApi.onPreviewExternalChart(props.chartDefinition, container);
+        return () => {
+            adaptable.api.chartingApi.internalApi.onHideExternalChart(transientChartDefinition);
+        };
+    }, [divRef]);
+    return _jsx("div", { ref: divRef, className: "twa:min-h-[280px] twa:h-full twa:w-full" });
+};

package/src/View/Charting/ChartingWizard/ExternalChartingWizard/SettingsSection.d.ts

@@ -5,5 +5,6 @@ export declare const isSettingsValid: (chartDefinition: ExternalChartDefinition,
 export interface SettingsSectionProps {
     chartDefinition: ExternalChartDefinition;
     onChange: (chartDefinition: ExternalChartDefinition) => void;
+    showPreview?: boolean;
 }
 export declare const SettingsSection: React.FunctionComponent<SettingsSectionProps>;

package/src/View/Charting/ChartingWizard/ExternalChartingWizard/SettingsSection.js

@@ -1,13 +1,16 @@
-import { jsx as _jsx } from "react/jsx-runtime";
-import FormLayout, { FormRow } from '../../../../components/FormLayout';
-import { validateChartName } from '../../../../Utilities/Helpers/chartingHelper';
-import AdaptableInput from '../../../Components/AdaptableInput';
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { validateChartName } from '../../../../Utilities/Helpers/ChartHelper';
+import { Box, Flex } from '../../../../components/Flex';
+import { Card } from '../../../../components/Card';
+import Input from '../../../../components/Input';
+import { PreviewChartSection } from './PreviewChartSection';
 export const isSettingsValid = (chartDefinition, api) => {
     return validateChartName(api, chartDefinition.Name, chartDefinition.Uuid);
 };
 export const SettingsSection = (props) => {
-    return (_jsx(FormLayout, { children: _jsx(FormRow, { label: "Name", children: _jsx(AdaptableInput, { value: props.chartDefinition.Name, onChange: (e) => props.onChange({
-                    ...props.chartDefinition,
-                    Name: e.target.value,
-                }) }) }) }));
+    const { chartDefinition, onChange, showPreview } = props;
+    return (_jsxs(Flex, { flexDirection: "column", className: "twa:gap-3 twa:p-3 twa:h-full twa:min-h-0", children: [_jsxs(Card, { shadow: false, children: [_jsxs(Card.Title, { children: [_jsx(Box, { className: "twa:font-medium", children: "Name" }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "Provide a unique name for the chart" })] }), _jsx(Card.Body, { className: "twa:p-1", children: _jsx(Input, { "data-name": "chart-name", className: "twa:max-w-[300px] twa:w-full", value: chartDefinition.Name ?? '', placeholder: "Enter chart name", onChange: (event) => onChange({
+                                ...chartDefinition,
+                                Name: event.target.value,
+                            }) }) })] }), showPreview ? (_jsxs(Card, { shadow: false, className: "twa:flex-1 twa:min-h-0", children: [_jsxs(Card.Title, { children: [_jsx(Box, { className: "twa:font-medium", children: "Preview" }), _jsx(Box, { className: "twa:text-xs twa:opacity-70 twa:font-normal twa:max-w-[520px]", children: "Live preview of the external chart" })] }), _jsx(Card.Body, { className: "twa:flex-1 twa:min-h-[280px]", children: _jsx(PreviewChartSection, { chartDefinition: chartDefinition }) })] })) : null] }));
 };

package/src/View/Charting/ShowChartButton.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import SimpleButton from '../../components/SimpleButton';
 import { useAdaptable } from '../AdaptableContext';
-import DropdownButton from '../../components/DropdownButton';
+import { NewDropdownButton } from '../../components/DropdownButton';
 import { AG_GRID_CHART_WINDOW } from '../../Utilities/Constants/GeneralConstants';
 import { isAgChartDefinition, isExternalChartDefinition, } from '../../AdaptableState/ChartingState';
 import { useAgChartState } from './useAgChartState';
@@ -16,7 +16,7 @@ const BaseShowChartButton = (props) => {
     if (!chartContainers?.length) {
         return (_jsx(SimpleButton, { "data-name": "show-chart-button", onClick: () => props.onShowChart(), variant: "text", tone: "success", icon: "visibility-on", tooltip: "Show Chart" }));
     }
-    return (_jsx(DropdownButton, { "data-name": "show-chart-dropdown", variant: "text", columns: ['label'], items: props.containerOptions, children: _jsx(SimpleButton, { variant: "raised", tone: "success", children: "Open" }) }));
+    return (_jsx(NewDropdownButton, { "data-name": "show-chart-dropdown", items: props.containerOptions, children: "Open In..." }));
 };
 const ShowAgChartButton = (props) => {
     const adaptableApi = useAdaptable().api;
@@ -29,13 +29,13 @@ const ShowAgChartButton = (props) => {
             onClick: () => {
                 showChart(null);
             },
-            ...(chartContainers
-                ? chartContainers?.map((contianerDef) => ({
-                    label: contianerDef.name,
-                    onClick: () => showChart(contianerDef),
-                }))
-                : []),
         },
+        ...(chartContainers
+            ? chartContainers.map((contianerDef) => ({
+                label: contianerDef.name,
+                onClick: () => showChart(contianerDef),
+            }))
+            : []),
     ];
     return (_jsx(BaseShowChartButton, { chartOpened: isOpen, onShowChart: showChart, onCloseChart: closeChart, containerOptions: containerOptions }));
 };

package/src/View/ColumnInfo/ColumnInfo.js

@@ -10,6 +10,7 @@ import { ButtonNew } from '../Components/Buttons/ButtonNew';
 import { ColumnSelector } from '../Components/Selectors/ColumnSelector';
 import ArrayExtensions from '../../Utilities/Extensions/ArrayExtensions';
 import { Box, Flex } from '../../components/Flex';
+import { formatColumnInspectorPinning, formatColumnInspectorSizing, formatColumnInspectorSorting, } from '../Layout/Wizard/sections/columnLayoutHelpers';
 const BASE_CLASS_NAME = 'ab-AdaptableColumns';
 const domProps = {
     className: 'twa:flex-1 twa:min-h-0 twa:w-full',
@@ -35,11 +36,22 @@ const MODULES_WITH_SCOPE = [
     'Shortcut',
     'StyledColumn',
 ];
+/** Column Info summary only — shows the resolved default width when layout has no explicit sizing. */
+const formatColumnInfoSummaryWidth = (columnId, sizing, resolveDefaultWidth) => {
+    const explicit = formatColumnInspectorSizing(columnId, sizing, resolveDefaultWidth);
+    if (explicit !== 'Default') {
+        return explicit;
+    }
+    return String(resolveDefaultWidth(columnId));
+};
 const ColumnDefPreview = (props) => {
     const adaptable = useAdaptable();
     if (props.column) {
         const api = adaptable.api;
         const summary = api.columnApi.getColumnSummaryForColumnId(props.column.columnId);
+        const layout = api.layoutApi.getCurrentLayout();
+        const resolveDefaultWidth = (columnId) => adaptable.getDefaultColumnWidthForCol(columnId);
+        const columnSizing = layout.ColumnSizing?.[props.column.columnId];
         const keyValuePairs = [
             {
                 Key: 'Column Id',
@@ -85,9 +97,17 @@ const ColumnDefPreview = (props) => {
                 Key: 'Visible',
                 Value: props.column.visible ? 'Yes' : 'No',
             },
+            {
+                Key: 'Pinning',
+                Value: formatColumnInspectorPinning(layout, props.column.columnId),
+            },
             {
                 Key: 'Width',
-                Value: props.column.width,
+                Value: formatColumnInfoSummaryWidth(props.column.columnId, columnSizing, resolveDefaultWidth),
+            },
+            {
+                Key: 'Sorting',
+                Value: formatColumnInspectorSorting(layout, props.column.columnId),
             },
             {
                 Key: 'Row Grouped',

package/src/View/Comments/CommentsEditor.js

@@ -8,7 +8,7 @@ import * as CommentsRedux from '../../Redux/ActionsReducers/CommentsRedux';
 import { CommentsAndNotesSelector } from '../../Redux/ActionsReducers/InternalRedux';
 import { useAdaptable } from '../AdaptableContext';
 import AdaptableInput from '../Components/AdaptableInput';
-import FormatHelper from '../../Utilities/Helpers/FormatHelper';
+import FormatHelper from '../../Utilities/Helpers/DisplayFormatHelper';
 import { Box, Flex } from '../../components/Flex';
 import { ACCESS_LEVEL_READ_ONLY } from '../../Utilities/Constants/GeneralConstants';
 // Edit Mode
@@ -53,7 +53,7 @@ export const CommentsEditor = (props) => {
     const formatDate = (date, format) => {
         return FormatHelper.DateFormatter(date, { Pattern: format });
     };
-    return (_jsxs(Panel, { color: "var(--ab-color-text-on-primary)", onClick: () => props.enableEditMode(), className: "ab-CommentPopup twa:min-w-[250px]", onKeyDown: (event) => {
+    return (_jsxs(Panel, { color: "var(--ab-color-primary-foreground)", onClick: () => props.enableEditMode(), className: "ab-CommentPopup twa:min-w-[250px]", onKeyDown: (event) => {
             if (event.key === 'Escape') {
                 api.commentApi.hideCommentsPopup();
             }

package/src/View/Comments/CommentsPopup.js

@@ -6,7 +6,7 @@ import Panel from '../../components/Panel';
 import { useAdaptable } from '../AdaptableContext';
 import { PopupPanel } from '../Components/Popups/AdaptablePopup/PopupPanel';
 import { AdaptableButtonComponent } from '../Components/AdaptableButton';
-import FormatHelper from '../../Utilities/Helpers/FormatHelper';
+import FormatHelper from '../../Utilities/Helpers/DisplayFormatHelper';
 import { ACCESS_LEVEL_READ_ONLY } from '../../Utilities/Constants/GeneralConstants';
 import { Box, Flex } from '../../components/Flex';
 const tableDOMProps = {

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

@@ -1,10 +1,10 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { PanelWithRow } from '../Panels/PanelWithRow';
+import { cn } from '../../../lib/utils';
 import { Box } from '../../../components/Flex';
-import clsx from 'clsx';
 import { twMerge } from '../../../twMerge';
 export const AdaptableObjectCollection = (props) => {
-    return (_jsxs(Box, { style: props.style, className: twMerge('ab-ObjectCollection twa:flex twa:flex-col', props.className), children: [_jsx(PanelWithRow, { border: "none", colItems: props.colItems }), _jsx("div", { className: clsx('ab-ObjectCollection__items twa:shadow-none twa:flex-1', {
+    return (_jsxs(Box, { style: props.style, className: twMerge('ab-ObjectCollection twa:flex twa:flex-col', props.className), children: [_jsx(PanelWithRow, { border: "none", colItems: props.colItems }), _jsx("div", { className: cn('ab-ObjectCollection__items twa:shadow-none twa:flex-1', {
                     'twa:overflow-y-visible': props.allowOverflow,
                     'twa:overflow-y-auto': !props.allowOverflow,
                 }), children: props.items })] }));