The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Migrate chart settings dropdowns (#28545)
Raphaël Bosib2109c9a1839
diff --git a/packages/twenty-front/src/modules/command-menu/components/CommandMenuItemDropdownTrigger.tsx b/packages/twenty-front/src/modules/command-menu/components/CommandMenuItemDropdownTrigger.tsxnew file mode 100644index 00000000000..c5d482f9176--- /dev/null+++ b/packages/twenty-front/src/modules/command-menu/components/CommandMenuItemDropdownTrigger.tsx@@ -0,0 +1,74 @@+import { type CommandMenuItemProps } from '@/command-menu/types/CommandMenuItemProps';+import { getCommandMenuItemStartIcon } from '@/command-menu/utils/getCommandMenuItemStartIcon';+import { useSidePanelListItemFocus } from '@/side-panel/hooks/useSidePanelListItemFocus';+import { DropdownComponentInstanceContext } from '@/ui/layout/dropdown/contexts/DropdownComponentInstanceContext';+import { isDropdownOpenComponentState } from '@/ui/layout/dropdown/states/isDropdownOpenComponentState';+import { ListItemSubmenuIndicator } from '@/ui/navigation/list-item/components/ListItemSubmenuIndicator';+import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';+import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';+import { Dropdown, ListItemButton } from 'twenty-ui/components/navigation';+import { useTheme } from 'twenty-ui/theme';++type CommandMenuItemDropdownTriggerProps = Pick<+ CommandMenuItemProps,+ | 'id'+ | 'label'+ | 'Icon'+ | 'LeftComponent'+ | 'description'+ | 'contextualTextPosition'+ | 'disabled'+>;++export const CommandMenuItemDropdownTrigger = ({+ id,+ label,+ Icon,+ LeftComponent,+ description,+ contextualTextPosition = 'left',+ disabled = false,+}: CommandMenuItemDropdownTriggerProps) => {+ const theme = useTheme();+ const dropdownId = useAvailableComponentInstanceIdOrThrow(+ DropdownComponentInstanceContext,+ );+ const isDropdownOpen = useAtomComponentStateValue(+ isDropdownOpenComponentState,+ dropdownId,+ );+ const { nativeItemRef, isSelectedItemId, handleFocus } =+ useSidePanelListItemFocus(id);++ return (+ <Dropdown.Trigger+ ref={nativeItemRef}+ disabled={disabled}+ onFocus={handleFocus}+ onClick={handleFocus}+ render={+ <ListItemButton+ startIcon={getCommandMenuItemStartIcon({+ LeftComponent,+ Icon,+ iconSize: theme.icon.size.md,+ iconStroke: theme.icon.stroke.sm,+ })}+ description={description}+ descriptionPlacement={+ contextualTextPosition === 'right' ? 'end' : 'inline'+ }+ focused={!disabled && isSelectedItemId}+ endIcon={+ <ListItemSubmenuIndicator+ isOpen={isDropdownOpen}+ disabled={disabled}+ />+ }+ />+ }+ >+ {label}+ </Dropdown.Trigger>+ );+};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/__stories__/ChartSettings.navigation.stories.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/__stories__/ChartSettings.navigation.stories.tsxnew file mode 100644index 00000000000..82e2deae3f4--- /dev/null+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/__stories__/ChartSettings.navigation.stories.tsx@@ -0,0 +1,253 @@+import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';+import { ChartSettingsStory } from '@/side-panel/pages/page-layout/components/__stories__/ChartSettingsStory';+import { CHART_SETTINGS_STORY_DATA } from '@/side-panel/pages/page-layout/components/__stories__/chartSettingsStoryData';+import { initializeChartSettingsStory } from '@/side-panel/pages/page-layout/components/__stories__/initializeChartSettingsStory';+import { ChartFieldSelectionForAggregateOperationDropdownContent } from '@/side-panel/pages/page-layout/components/dropdown-content/ChartFieldSelectionForAggregateOperationDropdownContent';+import { ChartSortBySelectionDropdownContent } from '@/side-panel/pages/page-layout/components/dropdown-content/ChartSortBySelectionDropdownContent';+import { ChartXAxisFieldSelectionDropdownContent } from '@/side-panel/pages/page-layout/components/dropdown-content/ChartXAxisFieldSelectionDropdownContent';+import { CHART_CONFIGURATION_SETTING_IDS } from '@/side-panel/pages/page-layout/types/ChartConfigurationSettingIds';+import { type ChartSettingsItem } from '@/side-panel/pages/page-layout/types/ChartSettingsGroup';+import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';+import { msg } from '@lingui/core/macro';+import { type Meta, type StoryObj } from '@storybook/react-vite';+import { expect, userEvent, waitFor, within } from 'storybook/test';+import { IconChartBar, IconSortAscending } from 'twenty-ui/icon';+import { ComponentDecorator } from 'twenty-ui/testing';+import {+ AggregateOperations,+ GraphOrderBy,+} from '~/generated-metadata/graphql';+import { MemoryRouterDecorator } from '~/testing/decorators/MemoryRouterDecorator';+import { ObjectMetadataItemsDecorator } from '~/testing/decorators/ObjectMetadataItemsDecorator';+import { getMockFieldMetadataItemOrThrow } from '~/testing/utils/getMockFieldMetadataItemOrThrow';+import { getMockObjectMetadataItemOrThrow } from '~/testing/utils/getMockObjectMetadataItemOrThrow';++const GROUP_BY_ITEM: ChartSettingsItem = {+ id: CHART_CONFIGURATION_SETTING_IDS.DATA_ON_DISPLAY_X,+ label: msg`Group by`,+ Icon: IconChartBar,+ isBoolean: false,+ DropdownContent: ChartXAxisFieldSelectionDropdownContent,+};++const SORT_BY_ITEM: ChartSettingsItem = {+ id: CHART_CONFIGURATION_SETTING_IDS.PRIMARY_SORT_BY,+ label: msg`Sort by`,+ Icon: IconSortAscending,+ isBoolean: false,+ DropdownContent: ChartSortBySelectionDropdownContent,+};++const AGGREGATE_ITEM: ChartSettingsItem = {+ id: CHART_CONFIGURATION_SETTING_IDS.DATA_ON_DISPLAY_AGGREGATE,+ label: msg`Aggregate`,+ Icon: IconChartBar,+ isBoolean: false,+ DropdownContent: ChartFieldSelectionForAggregateOperationDropdownContent,+};++const getChartConfiguration = () =>+ jotaiStore.get(+ pageLayoutDraftComponentState.atomFamily({+ instanceId: CHART_SETTINGS_STORY_DATA.pageLayoutId,+ }),+ ).tabs[0].widgets[0].configuration;++const meta: Meta<typeof ChartSettingsStory> = {+ title: 'Modules/SidePanel/PageLayout/ChartSettings/Navigation',+ component: ChartSettingsStory,+ decorators: [+ ComponentDecorator,+ MemoryRouterDecorator,+ ObjectMetadataItemsDecorator,+ ],+ parameters: { container: { width: 640, height: 600 } },+ beforeEach: () => initializeChartSettingsStory(),+};++export default meta;+type Story = StoryObj<typeof meta>;++export const RelationAndCompositeNavigation: Story = {+ render: () => <ChartSettingsStory items={[GROUP_BY_ITEM]} />,+ play: async ({ canvasElement }) => {+ const canvas = within(canvasElement);+ const body = within(canvasElement.ownerDocument.body);+ const trigger = await canvas.findByRole('button', { name: /^Group by/ });+ const opportunity = getMockObjectMetadataItemOrThrow('opportunity');+ const pointOfContact = getMockFieldMetadataItemOrThrow({+ objectMetadataItem: opportunity,+ fieldName: 'pointOfContact',+ });++ await userEvent.click(trigger);+ const fieldSearch = await body.findByRole('searchbox', {+ name: 'Search fields',+ });+ await userEvent.type(fieldSearch, 'point of contact');+ const relationOpener = body.getByRole('button', {+ name: 'Point of Contact',+ });+ await userEvent.click(relationOpener);+ const relationSearch = await body.findByRole('searchbox', {+ name: 'Search fields',+ });+ await userEvent.type(relationSearch, 'name');+ const compositeOpener = body.getByRole('button', {+ name: 'Name',+ });+ await userEvent.click(compositeOpener);+ await userEvent.click(+ await body.findByRole('button', {+ name: 'Name',+ }),+ );+ await waitFor(() => expect(compositeOpener).toHaveFocus());+ expect(relationSearch).toHaveValue('name');+ await userEvent.click(+ body.getByRole('button', {+ name: 'Point of Contact',+ }),+ );+ await waitFor(() => expect(relationOpener).toHaveFocus());+ expect(fieldSearch).toHaveValue('point of contact');++ await userEvent.click(relationOpener);+ await userEvent.click(+ await body.findByRole('button', {+ name: 'Name',+ }),+ );+ await userEvent.click(+ await body.findByRole('button', {+ name: 'First Name',+ }),+ );+ await waitFor(() => {+ expect(getChartConfiguration()).toMatchObject({+ primaryAxisGroupByFieldMetadataId: pointOfContact.id,+ primaryAxisGroupBySubFieldName: 'name.firstName',+ });+ expect(trigger).toHaveAttribute('aria-expanded', 'false');+ expect(trigger).toHaveFocus();+ });+ },+};++export const AggregateRatioNavigation: Story = {+ beforeEach: () => initializeChartSettingsStory({ chartType: 'aggregate' }),+ render: () => <ChartSettingsStory items={[AGGREGATE_ITEM]} />,+ play: async ({ canvasElement }) => {+ const canvas = within(canvasElement);+ const body = within(canvasElement.ownerDocument.body);+ const trigger = await canvas.findByRole('button', { name: /^Aggregate/ });+ const opportunity = getMockObjectMetadataItemOrThrow('opportunity');+ const stage = getMockFieldMetadataItemOrThrow({+ objectMetadataItem: opportunity,+ fieldName: 'stage',+ });++ await userEvent.click(trigger);+ await userEvent.type(+ await body.findByRole('searchbox', {+ name: 'Search fields',+ }),+ 'stage',+ );+ await userEvent.click(+ body.getByRole('button', {+ name: 'Stage',+ }),+ );+ const ratioOpener = await body.findByRole('button', {+ name: 'Ratio',+ });+ await userEvent.click(ratioOpener);+ await userEvent.click(+ await body.findByRole('button', {+ name: 'Back to operations',+ }),+ );+ await waitFor(() => expect(ratioOpener).toHaveFocus());+ await userEvent.click(ratioOpener);+ const optionSearch = await body.findByRole('searchbox', {+ name: 'Search options',+ });+ await userEvent.type(optionSearch, 'customer');+ await userEvent.keyboard('{Enter}');+ await waitFor(() => {+ expect(getChartConfiguration()).toMatchObject({+ aggregateFieldMetadataId: stage.id,+ aggregateOperation: AggregateOperations.COUNT,+ ratioAggregateConfig: {+ fieldMetadataId: stage.id,+ optionValue: 'CUSTOMER',+ },+ });+ expect(trigger).toHaveAttribute('aria-expanded', 'false');+ expect(trigger).toHaveFocus();+ });+ },+};++export const ManualSortKeyboardReorder: Story = {+ render: () => <ChartSettingsStory items={[SORT_BY_ITEM]} />,+ play: async ({ canvasElement }) => {+ const canvas = within(canvasElement);+ const body = within(canvasElement.ownerDocument.body);+ const trigger = await canvas.findByRole('button', { name: /^Sort by/ });++ await userEvent.click(trigger);+ await userEvent.click(+ await body.findByRole('button', {+ name: 'Manual',+ }),+ );+ const firstOption = await body.findByRole('button', {+ name: 'New',+ });+ firstOption.focus();+ await userEvent.keyboard(' ');+ await userEvent.keyboard('{Shift>}{ArrowDown}{/Shift}');+ await userEvent.keyboard(' ');+ await waitFor(() =>+ expect(getChartConfiguration()).toMatchObject({+ primaryAxisOrderBy: GraphOrderBy.MANUAL,+ primaryAxisManualSortOrder: [+ 'SCREENING',+ 'NEW',+ 'MEETING',+ 'PROPOSAL',+ 'CUSTOMER',+ ],+ }),+ );+ expect(trigger).toHaveAttribute('aria-expanded', 'true');+ await userEvent.click(+ body.getByRole('button', { name: 'Reorder options' }),+ );+ await userEvent.keyboard('{Escape}');+ await waitFor(() => expect(trigger).toHaveFocus());+ await userEvent.click(trigger);+ await userEvent.click(+ await body.findByRole('button', {+ name: 'Manual',+ }),+ );+ expect(+ await body.findByRole('button', {+ name: 'Screening',+ }),+ ).toBeVisible();+ expect(getChartConfiguration()).toMatchObject({+ primaryAxisManualSortOrder: [+ 'SCREENING',+ 'NEW',+ 'MEETING',+ 'PROPOSAL',+ 'CUSTOMER',+ ],+ });+ await userEvent.keyboard('{Escape}');+ },+};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/__stories__/ChartSettings.stories.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/__stories__/ChartSettings.stories.tsxnew file mode 100644index 00000000000..ab6a0c8fc87--- /dev/null+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/__stories__/ChartSettings.stories.tsx@@ -0,0 +1,208 @@+import { CommandMenuItemDropdownTrigger } from '@/command-menu/components/CommandMenuItemDropdownTrigger';+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';+import { Dropdown } from 'twenty-ui/components/navigation';+import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';+import { SIDE_PANEL_SELECTABLE_LIST_ID } from '@/side-panel/constants/SidePanelSelectableListId';+import { ChartSettingsStory } from '@/side-panel/pages/page-layout/components/__stories__/ChartSettingsStory';+import { CHART_SETTINGS_STORY_DATA } from '@/side-panel/pages/page-layout/components/__stories__/chartSettingsStoryData';+import { initializeChartSettingsStory } from '@/side-panel/pages/page-layout/components/__stories__/initializeChartSettingsStory';+import { ChartColorSelectionDropdownContent } from '@/side-panel/pages/page-layout/components/dropdown-content/ChartColorSelectionDropdownContent';+import { ChartDataSourceDropdownContent } from '@/side-panel/pages/page-layout/components/dropdown-content/ChartDataSourceDropdownContent';+import { ChartNumberFormatSelectionDropdownContent } from '@/side-panel/pages/page-layout/components/dropdown-content/ChartNumberFormatSelectionDropdownContent';+import { CHART_CONFIGURATION_SETTING_IDS } from '@/side-panel/pages/page-layout/types/ChartConfigurationSettingIds';+import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';+import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';+import { msg } from '@lingui/core/macro';+import { type Meta, type StoryObj } from '@storybook/react-vite';+import { expect, fn, userEvent, waitFor, within } from 'storybook/test';+import {+ IconBuildingSkyscraper,+ IconNumber,+ IconColorSwatch,+} from 'twenty-ui/icon';+import { ComponentDecorator } from 'twenty-ui/testing';+import { MemoryRouterDecorator } from '~/testing/decorators/MemoryRouterDecorator';+import { ObjectMetadataItemsDecorator } from '~/testing/decorators/ObjectMetadataItemsDecorator';+import { getMockObjectMetadataItemOrThrow } from '~/testing/utils/getMockObjectMetadataItemOrThrow';++const onBackgroundClickOutside = fn();+const draftState = pageLayoutDraftComponentState.atomFamily({+ instanceId: CHART_SETTINGS_STORY_DATA.pageLayoutId,+});++const meta: Meta<typeof ChartSettingsStory> = {+ title: 'Modules/SidePanel/PageLayout/ChartSettings',+ component: ChartSettingsStory,+ decorators: [+ ComponentDecorator,+ MemoryRouterDecorator,+ ObjectMetadataItemsDecorator,+ ],+ parameters: { container: { width: 900, height: 600 } },+ args: {+ onBackgroundClickOutside,+ items: [+ {+ id: CHART_CONFIGURATION_SETTING_IDS.SOURCE,+ label: msg`Source`,+ Icon: IconBuildingSkyscraper,+ isBoolean: false,+ DropdownContent: ChartDataSourceDropdownContent,+ },+ {+ id: CHART_CONFIGURATION_SETTING_IDS.COLORS,+ label: msg`Colors`,+ Icon: IconColorSwatch,+ isBoolean: false,+ dropdownWidth: 320,+ DropdownContent: ChartColorSelectionDropdownContent,+ },+ {+ id: CHART_CONFIGURATION_SETTING_IDS.FORMAT,+ label: msg`Format`,+ Icon: IconNumber,+ isBoolean: false,+ DropdownContent: ChartNumberFormatSelectionDropdownContent,+ },+ ],+ },+ beforeEach: () => {+ initializeChartSettingsStory();+ onBackgroundClickOutside.mockClear();+ },+};++export default meta;+type Story = StoryObj<typeof meta>;++export const SearchAndCommitSourceWithKeyboard: Story = {+ play: async ({ canvasElement }) => {+ const body = within(canvasElement.ownerDocument.body);+ const trigger = await body.findByRole('button', { name: /^Source/ });+ trigger.focus();+ await userEvent.keyboard('{Enter}');+ const search = await body.findByRole('searchbox', {+ name: 'Search objects',+ });+ await waitFor(() => expect(search).toHaveFocus());+ expect(+ jotaiStore.get(+ selectedItemIdComponentState.atomFamily({+ instanceId: SIDE_PANEL_SELECTABLE_LIST_ID,+ }),+ ),+ ).toBe(CHART_CONFIGURATION_SETTING_IDS.SOURCE);+ await userEvent.type(search, 'compan');+ await userEvent.keyboard('{Enter}');+ await waitFor(() =>+ expect(trigger).toHaveAttribute('aria-expanded', 'false'),+ );+ expect(jotaiStore.get(draftState).tabs[0].widgets[0]).toEqual(+ expect.objectContaining({+ objectMetadataId: getMockObjectMetadataItemOrThrow('company').id,+ configuration: expect.objectContaining({+ aggregateFieldMetadataId: undefined,+ primaryAxisGroupByFieldMetadataId: undefined,+ filter: {},+ }),+ }),+ );+ await waitFor(() => expect(trigger).toHaveFocus());+ expect(onBackgroundClickOutside).not.toHaveBeenCalled();+ },+};++export const FilterColorsAndSwitchPickers: Story = {+ play: async ({ canvasElement }) => {+ const body = within(canvasElement.ownerDocument.body);+ const colorsTrigger = await body.findByRole('button', { name: /^Colors/ });+ await userEvent.click(colorsTrigger);+ const search = await body.findByRole('searchbox', {+ name: 'Search colors',+ });+ const popup = body.getByRole('dialog');+ await waitFor(() => {+ const popupBounds = popup.getBoundingClientRect();+ const triggerBounds = colorsTrigger.getBoundingClientRect();+ expect(popupBounds.width).toBeCloseTo(320);+ expect(+ Math.abs(popupBounds.right - triggerBounds.right),+ ).toBeLessThanOrEqual(1);+ expect(+ Math.abs(popupBounds.top - triggerBounds.bottom - 4),+ ).toBeLessThanOrEqual(1);+ });+ await userEvent.type(search, 'no matching palette');+ expect(await body.findByText('No results found')).toBeVisible();+ expect(+ body.queryByRole('option', { name: 'Default palette' }),+ ).not.toBeInTheDocument();+ await userEvent.clear(search);+ await userEvent.type(search, 'red');+ await userEvent.keyboard('{Enter}');+ await waitFor(() =>+ expect(colorsTrigger).toHaveAttribute('aria-expanded', 'false'),+ );+ expect(jotaiStore.get(draftState).tabs[0].widgets[0].configuration).toEqual(+ expect.objectContaining({ color: 'red' }),+ );+ await userEvent.click(colorsTrigger);+ await waitFor(() =>+ expect(+ body.getByRole('searchbox', { name: 'Search colors' }),+ ).toHaveValue(''),+ );+ const formatTrigger = body.getByRole('button', { name: /^Format/ });+ await userEvent.click(formatTrigger);+ await waitFor(() =>+ expect(colorsTrigger).toHaveAttribute('aria-expanded', 'false'),+ );+ expect(formatTrigger).toHaveAttribute('aria-expanded', 'false');+ await userEvent.click(formatTrigger);+ const fullOption = await body.findByRole('option', { name: 'Full' });+ await waitFor(() =>+ expect(colorsTrigger).toHaveAttribute('aria-expanded', 'false'),+ );+ expect(formatTrigger).toHaveAttribute('aria-expanded', 'true');+ await userEvent.click(fullOption);+ await waitFor(() =>+ expect(formatTrigger).toHaveAttribute('aria-expanded', 'false'),+ );+ expect(jotaiStore.get(draftState).tabs[0].widgets[0].configuration).toEqual(+ expect.objectContaining({ numberFormat: 'FULL' }),+ );+ expect(onBackgroundClickOutside).not.toHaveBeenCalled();+ },+};++export const DisabledTrigger: Story = {+ render: () => (+ <ChartSettingsStory items={[]}>+ <DropdownRoot dropdownId="disabled-chart-setting" type="picker">+ <CommandMenuItemDropdownTrigger+ id="disabled-setting"+ label="Disabled chart setting"+ disabled+ />+ <DropdownContent>+ <Dropdown.OptionItem selected={false}>+ Unavailable option+ </Dropdown.OptionItem>+ </DropdownContent>+ </DropdownRoot>+ </ChartSettingsStory>+ ),+ play: async ({ canvasElement }) => {+ const body = within(canvasElement.ownerDocument.body);+ const trigger = await body.findByRole('button', {+ name: 'Disabled chart setting',+ });+ expect(trigger).toBeDisabled();+ await userEvent.click(trigger);+ expect(trigger).toHaveAttribute('aria-expanded', 'false');+ expect(+ body.queryByRole('button', { name: 'Unavailable option' }),+ ).not.toBeInTheDocument();+ },+};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/__stories__/ChartSettingsStory.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/__stories__/ChartSettingsStory.tsxnew file mode 100644index 00000000000..4faf27d87f5--- /dev/null+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/__stories__/ChartSettingsStory.tsx@@ -0,0 +1,89 @@+import { SidePanelPageComponentInstanceContext } from '@/side-panel/states/contexts/SidePanelPageComponentInstanceContext';+import { SIDE_PANEL_CLICK_OUTSIDE_ID } from '@/side-panel/constants/SidePanelClickOutsideId';+import { SIDE_PANEL_FOCUS_ID } from '@/side-panel/constants/SidePanelFocusId';+import { SIDE_PANEL_SELECTABLE_LIST_ID } from '@/side-panel/constants/SidePanelSelectableListId';+import { ChartSettingItem } from '@/side-panel/pages/page-layout/components/chart-settings/ChartSettingItem';+import { CHART_SETTINGS_STORY_DATA } from '@/side-panel/pages/page-layout/components/__stories__/chartSettingsStoryData';+import { PageLayoutSidePanelTargetContext } from '@/side-panel/pages/page-layout/contexts/PageLayoutSidePanelTargetContext';+import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';+import { assertChartWidgetOrThrow } from '@/side-panel/pages/page-layout/utils/assertChartWidgetOrThrow';+import { type ChartSettingsItem } from '@/side-panel/pages/page-layout/types/ChartSettingsGroup';+import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList';+import { ParentClickOutsideIdContext } from '@/ui/utilities/pointer-event/contexts/ParentClickOutsideIdContext';+import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside';+import { styled } from '@linaria/react';+import { isDefined } from 'twenty-shared/utils';+import { type ReactNode } from 'react';++const StyledPanel = styled.div`+ margin-left: auto;+ margin-top: 32px;+ width: 320px;+`;++type ChartSettingsStoryProps = {+ items: ChartSettingsItem[];+ children?: ReactNode;+ onBackgroundClickOutside?: () => void;+};++const handleBackgroundClickOutside = () => {};++export const ChartSettingsStory = ({+ items,+ children,+ onBackgroundClickOutside = handleBackgroundClickOutside,+}: ChartSettingsStoryProps) => {+ const { pageLayoutId } = CHART_SETTINGS_STORY_DATA;+ const { widgetInEditMode } = useWidgetInEditMode(pageLayoutId);+ useListenClickOutside({+ listenerId: 'chart-settings-background',+ excludedClickOutsideIds: [SIDE_PANEL_CLICK_OUTSIDE_ID],+ refs: [],+ callback: onBackgroundClickOutside,+ });++ if (!isDefined(widgetInEditMode)) {+ return null;+ }++ assertChartWidgetOrThrow(widgetInEditMode);++ return (+ <SidePanelPageComponentInstanceContext.Provider+ value={{ instanceId: CHART_SETTINGS_STORY_DATA.pageLayoutId }}+ >+ <PageLayoutSidePanelTargetContext.Provider+ value={{+ pageLayoutId,+ targetRecordIdentifier: {+ targetObjectNameSingular: 'opportunity',+ id: 'chart-story-record',+ },+ }}+ >+ <ParentClickOutsideIdContext.Provider+ value={SIDE_PANEL_CLICK_OUTSIDE_ID}+ >+ <StyledPanel data-click-outside-id={SIDE_PANEL_CLICK_OUTSIDE_ID}>+ <SelectableList+ selectableListInstanceId={SIDE_PANEL_SELECTABLE_LIST_ID}+ focusId={SIDE_PANEL_FOCUS_ID}+ selectableItemIdArray={items.map((item) => item.id)}+ >+ {items.map((item) => (+ <ChartSettingItem+ key={item.id}+ item={item}+ objectMetadataId={widgetInEditMode.objectMetadataId}+ configuration={widgetInEditMode.configuration}+ />+ ))}+ {children}+ </SelectableList>+ </StyledPanel>+ </ParentClickOutsideIdContext.Provider>+ </PageLayoutSidePanelTargetContext.Provider>+ </SidePanelPageComponentInstanceContext.Provider>+ );+};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/__stories__/chartSettingsStoryData.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/__stories__/chartSettingsStoryData.tsnew file mode 100644index 00000000000..f81a8ab5d0a--- /dev/null+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/__stories__/chartSettingsStoryData.ts@@ -0,0 +1,5 @@+export const CHART_SETTINGS_STORY_DATA = {+ pageLayoutId: 'chart-settings-story',+ widgetId: 'chart',+ tabId: 'overview',+};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/__stories__/getChartSettingsStoryConfiguration.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/__stories__/getChartSettingsStoryConfiguration.tsnew file mode 100644index 00000000000..da145328029--- /dev/null+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/__stories__/getChartSettingsStoryConfiguration.ts@@ -0,0 +1,39 @@+import { type ChartConfiguration } from '@/side-panel/pages/page-layout/types/ChartConfiguration';+import {+ AggregateOperations,+ BarChartLayout,+ GraphOrderBy,+ WidgetConfigurationType,+} from '~/generated-metadata/graphql';++type GetChartSettingsStoryConfigurationOptions = {+ chartType: 'bar' | 'aggregate';+ groupFieldMetadataId: string;+ aggregateFieldMetadataId: string;+};++export const getChartSettingsStoryConfiguration = ({+ chartType,+ groupFieldMetadataId,+ aggregateFieldMetadataId,+}: GetChartSettingsStoryConfigurationOptions): ChartConfiguration => {+ if (chartType === 'aggregate') {+ return {+ __typename: 'AggregateChartConfiguration',+ configurationType: WidgetConfigurationType.AGGREGATE_CHART,+ aggregateFieldMetadataId: groupFieldMetadataId,+ aggregateOperation: AggregateOperations.COUNT,+ };+ }++ return {+ __typename: 'BarChartConfiguration',+ configurationType: WidgetConfigurationType.BAR_CHART,+ layout: BarChartLayout.VERTICAL,+ aggregateFieldMetadataId,+ aggregateOperation: AggregateOperations.SUM,+ primaryAxisGroupByFieldMetadataId: groupFieldMetadataId,+ primaryAxisOrderBy: GraphOrderBy.FIELD_POSITION_ASC,+ color: 'auto',+ };+};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/__stories__/initializeChartSettingsStory.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/__stories__/initializeChartSettingsStory.tsnew file mode 100644index 00000000000..b50564ed151--- /dev/null+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/__stories__/initializeChartSettingsStory.ts@@ -0,0 +1,72 @@+import { getChartSettingsStoryConfiguration } from '@/side-panel/pages/page-layout/components/__stories__/getChartSettingsStoryConfiguration';+import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';+import { pageLayoutEditingWidgetIdComponentState } from '@/page-layout/states/pageLayoutEditingWidgetIdComponentState';+import {+ makeDraft,+ makeTab,+ makeWidget,+} from '@/page-layout/testing/pageLayoutDraftFixtures';+import { SIDE_PANEL_FOCUS_ID } from '@/side-panel/constants/SidePanelFocusId';+import { CHART_SETTINGS_STORY_DATA } from '@/side-panel/pages/page-layout/components/__stories__/chartSettingsStoryData';+import { focusStackState } from '@/ui/utilities/focus/states/focusStackState';+import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentType';+import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';+import { WidgetType } from '~/generated-metadata/graphql';+import { getMockObjectMetadataItemOrThrow } from '~/testing/utils/getMockObjectMetadataItemOrThrow';+import { getMockFieldMetadataItemOrThrow } from '~/testing/utils/getMockFieldMetadataItemOrThrow';++export const initializeChartSettingsStory = ({+ chartType = 'bar',+ objectName = 'opportunity',+}: {+ chartType?: 'bar' | 'aggregate';+ objectName?: string;+} = {}) => {+ const { pageLayoutId, widgetId, tabId } = CHART_SETTINGS_STORY_DATA;+ const objectMetadataItem = getMockObjectMetadataItemOrThrow(objectName);+ const groupField = getMockFieldMetadataItemOrThrow({+ objectMetadataItem,+ fieldName: objectName === 'opportunity' ? 'stage' : 'name',+ });+ const aggregateField = getMockFieldMetadataItemOrThrow({+ objectMetadataItem,+ fieldName: objectName === 'opportunity' ? 'amount' : 'employees',+ });+ const configuration = getChartSettingsStoryConfiguration({+ chartType,+ groupFieldMetadataId: groupField.id,+ aggregateFieldMetadataId: aggregateField.id,+ });+ jotaiStore.set(+ pageLayoutDraftComponentState.atomFamily({ instanceId: pageLayoutId }),+ makeDraft([+ makeTab(tabId, [+ {+ ...makeWidget(widgetId, 0, tabId),+ type: WidgetType.GRAPH,+ objectMetadataId: objectMetadataItem.id,+ configuration,+ },+ ]),+ ]),+ );+ jotaiStore.set(+ pageLayoutEditingWidgetIdComponentState.atomFamily({+ instanceId: pageLayoutId,+ }),+ widgetId,+ );+ jotaiStore.set(focusStackState.atom, [+ {+ focusId: SIDE_PANEL_FOCUS_ID,+ componentInstance: {+ componentType: FocusComponentType.SIDE_PANEL,+ componentInstanceId: SIDE_PANEL_FOCUS_ID,+ },+ globalHotkeysConfig: {+ enableGlobalHotkeysWithModifiers: true,+ enableGlobalHotkeysConflictingWithKeyboard: true,+ },+ },+ ]);+};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/chart-settings/ChartSettingItem.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/chart-settings/ChartSettingItem.tsxindex d715e1f647f..d5df659fe62 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/chart-settings/ChartSettingItem.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/chart-settings/ChartSettingItem.tsx@@ -1,5 +1,5 @@import { CommandMenuItem } from '@/command-menu/components/CommandMenuItem';-import { CommandMenuItemDropdown } from '@/command-menu/components/CommandMenuItemDropdown';+import { CommandMenuItemDropdownTrigger } from '@/command-menu/components/CommandMenuItemDropdownTrigger';import { CommandMenuItemNumberInput } from '@/command-menu/components/CommandMenuItemNumberInput';import { CommandMenuItemTextInput } from '@/command-menu/components/CommandMenuItemTextInput';import { CommandMenuItemSwitch } from '@/command-menu/components/CommandMenuItemSwitch';@@ -15,8 +15,8 @@ import { CHART_CONFIGURATION_SETTING_IDS } from '@/side-panel/pages/page-layout/import { type ChartSettingsItem } from '@/side-panel/pages/page-layout/types/ChartSettingsGroup';import { isMinMaxRangeValid } from '@/side-panel/pages/page-layout/utils/isMinMaxRangeValid';import { SidePanelSubPages } from '@/side-panel/types/SidePanelSubPages';-import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';-import { useCloseAnyOpenDropdown } from '@/ui/layout/dropdown/hooks/useCloseAnyOpenDropdown';+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';import { useOpenDropdown } from '@/ui/layout/dropdown/hooks/useOpenDropdown';import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';import { useSelectableList } from '@/ui/layout/selectable-list/hooks/useSelectableList';@@ -24,6 +24,8 @@ import { t } from '@lingui/core/macro';import { isString } from '@sniptt/guards';import { isDefined } from 'twenty-shared/utils';+const CHART_SETTINGS_DROPDOWN_SIDE_OFFSET = 4;+type ChartSettingItemProps = {item: ChartSettingsItem;objectMetadataId: string;@@ -36,7 +38,6 @@ export const ChartSettingItem = ({configuration,}: ChartSettingItemProps) => {const { pageLayoutId } = usePageLayoutSidePanelTarget();- const { closeAnyOpenDropdown } = useCloseAnyOpenDropdown();const { openDropdown } = useOpenDropdown();const { setSelectedItemId } = useSelectableList(SIDE_PANEL_SELECTABLE_LIST_ID,@@ -73,7 +74,6 @@ export const ChartSettingItem = ({};const handleDropdownOpen = () => {- closeAnyOpenDropdown();openDropdown({dropdownComponentInstanceIdFromProps: item.id,});@@ -173,28 +173,33 @@ export const ChartSettingItem = ({);}+ const settingValue = getChartSettingsValues(item.id);+ const settingDescription = isString(settingValue) ? settingValue : undefined;+return (<SelectableListItemkey={item.id}itemId={item.id}onEnter={handleDropdownOpen}>- <CommandMenuItemDropdown- Icon={item.Icon}- label={t(item.label)}- id={item.id}- dropdownId={item.id}- dropdownComponents={- <LegacyDropdownContent widthInPixels={item.dropdownWidth}>- {item.DropdownContent && <item.DropdownContent />}- </LegacyDropdownContent>- }- dropdownPlacement="bottom-end"- dropdownOffset={{ y: 4 }}- description={getChartSettingsValues(item.id) as string}- contextualTextPosition={'right'}- hasSubMenu- />+ <DropdownRoot dropdownId={item.id} type="picker">+ <CommandMenuItemDropdownTrigger+ Icon={item.Icon}+ label={t(item.label)}+ id={item.id}+ description={settingDescription}+ contextualTextPosition="right"+ />+ <DropdownContent+ side="bottom"+ align="end"+ sideOffset={CHART_SETTINGS_DROPDOWN_SIDE_OFFSET}+ width={item.dropdownWidth}+ collisionPadding={{ left: 0, right: 0 }}+ >+ {item.DropdownContent && <item.DropdownContent />}+ </DropdownContent>+ </DropdownRoot></SelectableListItem>);};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/chart-settings/ChartSettingsDropdownSection.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/chart-settings/ChartSettingsDropdownSection.tsxnew file mode 100644index 00000000000..890c383d86d--- /dev/null+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/chart-settings/ChartSettingsDropdownSection.tsx@@ -0,0 +1,18 @@+import { PAGE_LAYOUT_DROPDOWN_CONTENT_MAX_HEIGHT } from '@/side-panel/pages/page-layout/constants/PageLayoutDropdownContentMaxHeight';+import { type ReactNode } from 'react';+import { Dropdown } from 'twenty-ui/components/navigation';++type ChartSettingsDropdownSectionProps = {+ children: ReactNode;+};++export const ChartSettingsDropdownSection = ({+ children,+}: ChartSettingsDropdownSectionProps) => (+ <Dropdown.Section+ scrollable+ style={{ maxHeight: PAGE_LAYOUT_DROPDOWN_CONTENT_MAX_HEIGHT }}+ >+ {children}+ </Dropdown.Section>+);diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartAggregateOperationSelectableListItem.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartAggregateOperationSelectableListItem.tsxindex 9afd3cf4396..2ee5cce8077 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartAggregateOperationSelectableListItem.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartAggregateOperationSelectableListItem.tsx@@ -6,14 +6,8 @@ import { type ExtendedAggregateOperations } from '@/object-record/record-table/timport { convertExtendedAggregateOperationToAggregateOperation } from '@/object-record/utils/convertExtendedAggregateOperationToAggregateOperation';import { DASHBOARD_AGGREGATE_OPERATION_RATIO } from '@/page-layout/widgets/graph/constants/DashboardAggregateOperationRatio';import { type AggregateChartOperation } from '@/page-layout/widgets/graph/graph-widget-aggregate-chart/types/AggregateChartOperation';-import { DropdownComponentInstanceContext } from '@/ui/layout/dropdown/contexts/DropdownComponentInstanceContext';-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';-import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';-import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';-import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { isDefined } from 'twenty-shared/utils';-import { ListItemButton } from 'twenty-ui/components/navigation';+import { Dropdown } from 'twenty-ui/components/navigation';const isExtendedAggregateOperation = (operation: AggregateChartOperation,@@ -21,34 +15,25 @@ const isExtendedAggregateOperation = (return operation !== DASHBOARD_AGGREGATE_OPERATION_RATIO;};+type ChartAggregateOperationSelectableListItemProps = {+ operation: AggregateChartOperation;+ label: string;+ currentFieldMetadataId: string;+};+export const ChartAggregateOperationSelectableListItem = ({operation,label,currentFieldMetadataId,-}: {- operation: AggregateChartOperation;- label: string;- currentFieldMetadataId: string;-}) => {+}: ChartAggregateOperationSelectableListItemProps) => {const { pageLayoutId } = usePageLayoutSidePanelTarget();const { widgetInEditMode } = useWidgetInEditMode(pageLayoutId);const { updateCurrentWidgetConfig } =useUpdateCurrentWidgetConfig(pageLayoutId);- const { closeDropdown } = useCloseDropdown();-- const dropdownId = useAvailableComponentInstanceIdOrThrow(- DropdownComponentInstanceContext,- );-- const selectedItemId = useAtomComponentStateValue(- selectedItemIdComponentState,- dropdownId,- );-const configuration = widgetInEditMode?.configuration;const currentAggregateOperation =- configuration &&+ isDefined(configuration) &&'aggregateOperation' in configuration &&configuration.aggregateOperation;@@ -66,8 +51,6 @@ export const ChartAggregateOperationSelectableListItem = ({const isSelected =currentAggregateOperation === aggregateOperation && !isCurrentlyRatio;- const isFocused = selectedItemId === operation;-const handleClick = () => {updateCurrentWidgetConfig({configToUpdate: {@@ -76,21 +59,11 @@ export const ChartAggregateOperationSelectableListItem = ({ratioAggregateConfig: null,},});- closeDropdown();};return (- <SelectableListItem itemId={operation} onEnter={handleClick}>- <ListItemButton- focused={isFocused}- onClick={handleClick}- role="option"- aria-selected={isSelected}- selected={isSelected}- indicator="check"- >- {label}- </ListItemButton>- </SelectableListItem>+ <Dropdown.OptionItem onSelect={handleClick} selected={isSelected}>+ {label}+ </Dropdown.OptionItem>);};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartAggregateOperationSelectionDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartAggregateOperationSelectionDropdownContent.tsxindex afc1c59af95..add1b95c1ad 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartAggregateOperationSelectionDropdownContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartAggregateOperationSelectionDropdownContent.tsx@@ -1,6 +1,6 @@import { ChartAggregateOperationSelectableListItem } from '@/side-panel/pages/page-layout/components/dropdown-content/ChartAggregateOperationSelectableListItem';import { ChartRatioAggregateOperationSelectableListItem } from '@/side-panel/pages/page-layout/components/dropdown-content/ChartRatioAggregateOperationSelectableListItem';-import { ChartRatioOptionValueSelectionDropdownContent } from '@/side-panel/pages/page-layout/components/dropdown-content/ChartRatioOptionValueSelectionDropdownContent';+import { ChartSettingsDropdownSection } from '@/side-panel/pages/page-layout/components/chart-settings/ChartSettingsDropdownSection';import { usePageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/hooks/usePageLayoutSidePanelTarget';import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';import { isWidgetConfigurationOfType } from '@/side-panel/pages/page-layout/utils/isWidgetConfigurationOfType';@@ -11,30 +11,21 @@ import { DASHBOARD_AGGREGATE_OPERATION_RATIO } from '@/page-layout/widgets/graphimport { type AggregateChartOperation } from '@/page-layout/widgets/graph/graph-widget-aggregate-chart/types/AggregateChartOperation';import { getAggregateChartOperationLabel } from '@/page-layout/widgets/graph/graph-widget-aggregate-chart/utils/getAggregateChartOperationLabel';import { getAvailableAggregateOperationsForAggregateChart } from '@/page-layout/widgets/graph/graph-widget-aggregate-chart/utils/getAvailableAggregateOperationsForAggregateChart';-import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';-import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';-import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';-import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';-import { DropdownComponentInstanceContext } from '@/ui/layout/dropdown/contexts/DropdownComponentInstanceContext';-import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList';-import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';import { t } from '@lingui/core/macro';import { useState } from 'react';-import { isDefined } from 'twenty-shared/utils';+import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';+import { Dropdown } from 'twenty-ui/components/navigation';import { doNotTranslate } from 'twenty-shared/i18n';-import { IconChevronLeft } from 'twenty-ui/icon';import { filterBySearchQuery } from '~/utils/filterBySearchQuery';+type ChartAggregateOperationSelectionDropdownContentProps = {+ currentFieldMetadataId: string;+};+export const ChartAggregateOperationSelectionDropdownContent = ({currentFieldMetadataId,- setIsSubMenuOpen,-}: {- currentFieldMetadataId: string;- setIsSubMenuOpen: (isSubMenuOpen: boolean) => void;-}) => {+}: ChartAggregateOperationSelectionDropdownContentProps) => {const [searchQuery, setSearchQuery] = useState('');- const [isOptionValueMenuOpen, setIsOptionValueMenuOpen] = useState(false);const { objectMetadataItems } = useObjectMetadataItems();const { pageLayoutId } = usePageLayoutSidePanelTarget();const { widgetInEditMode } = useWidgetInEditMode(pageLayoutId);@@ -65,11 +56,9 @@ export const ChartAggregateOperationSelectionDropdownContent = ({(field) => field.id === currentFieldMetadataId,);- const dropdownId = useAvailableComponentInstanceIdOrThrow(- DropdownComponentInstanceContext,- );-- const availableAggregateOperations: AggregateChartOperation[] = selectedField+ const availableAggregateOperations: AggregateChartOperation[] = isDefined(+ selectedField,+ )? isAggregateChart? getAvailableAggregateOperationsForAggregateChart({fieldMetadataType: selectedField.type,@@ -106,65 +95,39 @@ export const ChartAggregateOperationSelectionDropdownContent = ({return null;}- const handleSelectRatio = () => {- setIsOptionValueMenuOpen(true);- };-- if (isOptionValueMenuOpen) {- return (- <ChartRatioOptionValueSelectionDropdownContent- currentFieldMetadataId={currentFieldMetadataId}- setIsOptionValueMenuOpen={setIsOptionValueMenuOpen}- />- );- }-return (<>- <DropdownMenuHeader- StartComponent={- <DropdownMenuHeaderLeftComponent- onClick={() => setIsSubMenuOpen(false)}- Icon={IconChevronLeft}- />- }- >- {`${selectedField.label}`}- </DropdownMenuHeader>- <DropdownMenuSearchInput- autoFocus- type="text"+ <Dropdown.Back aria-label={t`${selectedField.label}, back to fields`}>+ {selectedField.label}+ </Dropdown.Back>+ <Dropdown.Searchplaceholder={t`Search operations`}- onChange={(event) => setSearchQuery(event.target.value)}+ aria-label={t`Search operations`}+ onValueChange={setSearchQuery}value={searchQuery}/>- <DropdownMenuSeparator />- <DropdownMenuItemsContainer>- <SelectableList- selectableListInstanceId={dropdownId}- focusId={dropdownId}- selectableItemIdArray={filteredAggregateOperationsWithLabels.map(- (item) => item.operation,- )}- >- {filteredAggregateOperationsWithLabels.map((item) =>- item.operation === DASHBOARD_AGGREGATE_OPERATION_RATIO ? (- <ChartRatioAggregateOperationSelectableListItem- key={item.operation}- label={item.label}- onSelect={handleSelectRatio}- />- ) : (- <ChartAggregateOperationSelectableListItem- key={item.operation}- operation={item.operation}- label={item.label}- currentFieldMetadataId={currentFieldMetadataId}- />- ),- )}- </SelectableList>- </DropdownMenuItemsContainer>+ <Dropdown.Separator />+ <ChartSettingsDropdownSection>+ {filteredAggregateOperationsWithLabels.map((item) =>+ item.operation === DASHBOARD_AGGREGATE_OPERATION_RATIO ? (+ <ChartRatioAggregateOperationSelectableListItem+ key={item.operation}+ label={item.label}+ currentFieldMetadataId={currentFieldMetadataId}+ />+ ) : (+ <ChartAggregateOperationSelectableListItem+ key={item.operation}+ operation={item.operation}+ label={item.label}+ currentFieldMetadataId={currentFieldMetadataId}+ />+ ),+ )}+ {!isNonEmptyArray(filteredAggregateOperationsWithLabels) && (+ <Dropdown.Empty>{t`No operations found`}</Dropdown.Empty>+ )}+ </ChartSettingsDropdownSection></>);};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartAxisNameSelectionDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartAxisNameSelectionDropdownContent.tsxindex ebad395ea39..f6ef3274fc8 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartAxisNameSelectionDropdownContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartAxisNameSelectionDropdownContent.tsx@@ -1,17 +1,11 @@+import { ChartSettingsDropdownSection } from '@/side-panel/pages/page-layout/components/chart-settings/ChartSettingsDropdownSection';+import { t } from '@lingui/core/macro';+import { Dropdown } from 'twenty-ui/components/navigation';import { usePageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/hooks/usePageLayoutSidePanelTarget';import { useUpdateCurrentWidgetConfig } from '@/side-panel/pages/page-layout/hooks/useUpdateCurrentWidgetConfig';import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';import { getChartAxisNameDisplayOptions } from '@/side-panel/pages/page-layout/utils/getChartAxisNameDisplayOptions';import { isWidgetConfigurationOfType } from '@/side-panel/pages/page-layout/utils/isWidgetConfigurationOfType';-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';-import { DropdownComponentInstanceContext } from '@/ui/layout/dropdown/contexts/DropdownComponentInstanceContext';-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';-import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList';-import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';-import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';-import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { ListItemButton } from 'twenty-ui/components/navigation';import { AxisNameDisplay } from '~/generated-metadata/graphql';import { doNotTranslate } from 'twenty-shared/i18n';@@ -31,15 +25,6 @@ export const ChartAxisNameSelectionDropdownContent = () => {const currentAxisNameDisplay = configuration.axisNameDisplay;- const dropdownId = useAvailableComponentInstanceIdOrThrow(- DropdownComponentInstanceContext,- );-- const selectedItemId = useAtomComponentStateValue(- selectedItemIdComponentState,- dropdownId,- );-const axisOptions: AxisNameDisplay[] = [AxisNameDisplay.NONE,AxisNameDisplay.X,@@ -50,49 +35,30 @@ export const ChartAxisNameSelectionDropdownContent = () => {const { updateCurrentWidgetConfig } =useUpdateCurrentWidgetConfig(pageLayoutId);- const { closeDropdown } = useCloseDropdown();-const handleSelectAxisNameOption = (axisNameOption: AxisNameDisplay) => {updateCurrentWidgetConfig({configToUpdate: {axisNameDisplay: axisNameOption,},});- closeDropdown();};return (- <>- <DropdownMenuItemsContainer>- <SelectableList- selectableListInstanceId={dropdownId}- focusId={dropdownId}- selectableItemIdArray={axisOptions}- >- {axisOptions.map((option) => (- <SelectableListItem- key={option}- itemId={option}- onEnter={() => {- handleSelectAxisNameOption(option);- }}- >- <ListItemButton- focused={selectedItemId === option}- onClick={() => {- handleSelectAxisNameOption(option);- }}- role="option"- aria-selected={currentAxisNameDisplay?.toUpperCase() === option}- selected={currentAxisNameDisplay?.toUpperCase() === option}- indicator="check"- >- {getChartAxisNameDisplayOptions(option)}- </ListItemButton>- </SelectableListItem>- ))}- </SelectableList>- </DropdownMenuItemsContainer>- </>+ <ChartSettingsDropdownSection>+ <Dropdown.SelectionGroup+ aria-label={t`Axis name`}+ value={currentAxisNameDisplay?.toUpperCase() ?? null}+ >+ {axisOptions.map((option) => (+ <Dropdown.OptionItem+ key={option}+ value={option}+ onSelect={() => handleSelectAxisNameOption(option)}+ >+ {getChartAxisNameDisplayOptions(option)}+ </Dropdown.OptionItem>+ ))}+ </Dropdown.SelectionGroup>+ </ChartSettingsDropdownSection>);};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartColorGradientOption.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartColorGradientOption.tsxindex dd31c8231fc..17d1cf9017e 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartColorGradientOption.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartColorGradientOption.tsx@@ -1,21 +1,17 @@import { CHART_SETTINGS_PALETTE_COLOR_GROUP_COUNT } from '@/side-panel/pages/page-layout/constants/ChartSettingsPaletteColorGroupCount';import { createGraphColorRegistry } from '@/page-layout/widgets/graph/utils/createGraphColorRegistry';import { generateGroupColor } from '@/page-layout/widgets/graph/utils/generateGroupColor';-import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';import { styled } from '@linaria/react';import { ColorSample } from 'twenty-ui/primitives/data-display';-import { ListItemButton } from 'twenty-ui/components/navigation';+import { Dropdown } from 'twenty-ui/components/navigation';import { useTheme, themeCssVariables, type ThemeColor } from 'twenty-ui/theme';type ChartColorGradientOptionProps = {colorOption: {id: string;name: string;- colorName: ThemeColor | 'auto';+ colorName: ThemeColor;};- selectedItemId: string | null;- currentColor: string | null | undefined;- onSelectColor: (colorName: ThemeColor | 'auto') => void;};const StyledColorSamplesContainer = styled.div`@@ -26,11 +22,8 @@ const StyledColorSamplesContainer = styled.div`export const ChartColorGradientOption = ({colorOption,- selectedItemId,- currentColor,- onSelectColor,}: ChartColorGradientOptionProps) => {- const colorName = colorOption.colorName as ThemeColor;+ const { colorName } = colorOption;const theme = useTheme();const colorRegistry = createGraphColorRegistry(theme.color);@@ -56,29 +49,12 @@ export const ChartColorGradientOption = ({);return (- <SelectableListItem- key={colorOption.id}- itemId={colorOption.id}- onEnter={() => {- onSelectColor(colorOption.colorName);- }}+ <Dropdown.OptionItem+ value={colorOption.id}+ description={colorSamples}+ descriptionPlacement="end">- <ListItemButton- focused={- selectedItemId === colorOption.id || currentColor === colorOption.id- }- onClick={() => {- onSelectColor(colorOption.colorName);- }}- role="option"- aria-selected={false}- selected={false}- indicator="check"- description={colorSamples}- descriptionPlacement={'end'}- >- {colorOption.name}- </ListItemButton>- </SelectableListItem>+ {colorOption.name}+ </Dropdown.OptionItem>);};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartColorPaletteOption.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartColorPaletteOption.tsxindex 7d8fad3d5f8..d3c9ca09dfa 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartColorPaletteOption.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartColorPaletteOption.tsx@@ -1,19 +1,12 @@import { CHART_SETTINGS_PALETTE_COLOR_GROUP_COUNT } from '@/side-panel/pages/page-layout/constants/ChartSettingsPaletteColorGroupCount';import { createGraphColorRegistry } from '@/page-layout/widgets/graph/utils/createGraphColorRegistry';import { getColorSchemeByIndex } from '@/page-layout/widgets/graph/utils/getColorSchemeByIndex';-import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';import { styled } from '@linaria/react';import { t } from '@lingui/core/macro';import { ColorSample } from 'twenty-ui/primitives/data-display';-import { ListItemButton } from 'twenty-ui/components/navigation';+import { Dropdown } from 'twenty-ui/components/navigation';import { getMainColorNameFromPaletteColorName } from 'twenty-ui/utilities';-import { useTheme, themeCssVariables, type ThemeColor } from 'twenty-ui/theme';--type ChartColorPaletteOptionProps = {- selectedItemId: string | null;- currentColor: string | null | undefined;- onSelectColor: (colorName: ThemeColor | 'auto') => void;-};+import { useTheme, themeCssVariables } from 'twenty-ui/theme';const StyledColorSamplesContainer = styled.div`align-items: center;@@ -21,11 +14,7 @@ const StyledColorSamplesContainer = styled.div`gap: ${themeCssVariables.spacing[0.5]};`;-export const ChartColorPaletteOption = ({- selectedItemId,- currentColor,- onSelectColor,-}: ChartColorPaletteOptionProps) => {+export const ChartColorPaletteOption = () => {const theme = useTheme();const colorRegistry = createGraphColorRegistry(theme.color);@@ -56,25 +45,10 @@ export const ChartColorPaletteOption = ({);return (- <SelectableListItem- key={'auto'}- itemId={'auto'}- onEnter={() => {- onSelectColor('auto');- }}- >- <ListItemButton- focused={selectedItemId === 'auto' || currentColor === 'auto'}- onClick={() => {- onSelectColor('auto');- }}- role="option"- aria-selected={false}- selected={false}- indicator="check"- description={colorSamples}- descriptionPlacement={'end'}- >{t`Default palette`}</ListItemButton>- </SelectableListItem>+ <Dropdown.OptionItem+ value="auto"+ description={colorSamples}+ descriptionPlacement="end"+ >{t`Default palette`}</Dropdown.OptionItem>);};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartColorSelectionDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartColorSelectionDropdownContent.tsxindex 8873a698189..d7789743812 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartColorSelectionDropdownContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartColorSelectionDropdownContent.tsx@@ -5,20 +5,13 @@ import { useUpdateCurrentWidgetConfig } from '@/side-panel/pages/page-layout/hooimport { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';import { type ChartConfiguration } from '@/side-panel/pages/page-layout/types/ChartConfiguration';import { isWidgetConfigurationOfType } from '@/side-panel/pages/page-layout/utils/isWidgetConfigurationOfType';-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';-import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';-import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';-import { DropdownComponentInstanceContext } from '@/ui/layout/dropdown/contexts/DropdownComponentInstanceContext';-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';-import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList';-import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';-import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';+import { ChartSettingsDropdownSection } from '@/side-panel/pages/page-layout/components/chart-settings/ChartSettingsDropdownSection';import { t } from '@lingui/core/macro';import { useState } from 'react';-import { capitalize, isDefined } from 'twenty-shared/utils';+import { capitalize, isDefined, isNonEmptyArray } from 'twenty-shared/utils';import { doNotTranslate } from 'twenty-shared/i18n';-import { type ThemeColor, MAIN_COLOR_NAMES } from 'twenty-ui/theme';+import { Dropdown } from 'twenty-ui/components/navigation';+import { MAIN_COLOR_NAMES, type ThemeColor } from 'twenty-ui/theme';import { filterBySearchQuery } from '~/utils/filterBySearchQuery';type ColorOption = {@@ -32,20 +25,9 @@ export const ChartColorSelectionDropdownContent = () => {const { pageLayoutId } = usePageLayoutSidePanelTarget();const { widgetInEditMode } = useWidgetInEditMode(pageLayoutId);- const dropdownId = useAvailableComponentInstanceIdOrThrow(- DropdownComponentInstanceContext,- );-- const selectedItemId = useAtomComponentStateValue(- selectedItemIdComponentState,- dropdownId,- );-const { updateCurrentWidgetConfig } =useUpdateCurrentWidgetConfig(pageLayoutId);- const { closeDropdown } = useCloseDropdown();-if (!isDefined(widgetInEditMode)) {return null;}@@ -100,54 +82,52 @@ export const ChartColorSelectionDropdownContent = () => {color: colorName,},});- closeDropdown();};const regularColorOptions = filteredColorOptions.filter(- (option) => option.colorName !== 'auto',+ (option): option is ColorOption & { colorName: ThemeColor } =>+ option.colorName !== 'auto',+ );+ const hasDefaultPalette = filteredColorOptions.some(+ (option) => option.colorName === 'auto',);return (<>- <DropdownMenuSearchInput- autoFocus- type="text"+ <Dropdown.Searchplaceholder={t`Search colors`}- onChange={(event) => setSearchQuery(event.target.value)}+ aria-label={t`Search colors`}+ onValueChange={setSearchQuery}value={searchQuery}/>- <DropdownMenuSeparator />- <DropdownMenuItemsContainer>- <SelectableList- selectableListInstanceId={dropdownId}- focusId={dropdownId}- selectableItemIdArray={filteredColorOptions.map(- (colorOption) => colorOption.id,- )}+ <ChartSettingsDropdownSection>+ <Dropdown.SelectionGroup+ aria-label={t`Colors`}+ value={currentColor ?? 'auto'}+ onValueChange={(value) => {+ const selectedColor = colorOptions.find(+ (option) => option.id === value,+ );+ if (isDefined(selectedColor)) {+ handleSelectColor(selectedColor.colorName);+ }+ }}>- <ChartColorPaletteOption- selectedItemId={selectedItemId}- currentColor={currentColor}- onSelectColor={handleSelectColor}- />-- {regularColorOptions.length > 0 && (- <>- <DropdownMenuSeparator />-- {regularColorOptions.map((colorOption) => (- <ChartColorGradientOption- key={colorOption.id}- colorOption={colorOption}- selectedItemId={selectedItemId}- currentColor={currentColor}- onSelectColor={handleSelectColor}- />- ))}- </>+ {hasDefaultPalette && <ChartColorPaletteOption />}+ {hasDefaultPalette && isNonEmptyArray(regularColorOptions) && (+ <Dropdown.Separator />)}- </SelectableList>- </DropdownMenuItemsContainer>+ {regularColorOptions.map((colorOption) => (+ <ChartColorGradientOption+ key={colorOption.id}+ colorOption={colorOption}+ />+ ))}+ </Dropdown.SelectionGroup>+ {!isNonEmptyArray(filteredColorOptions) && (+ <Dropdown.Empty>{t`No results found`}</Dropdown.Empty>+ )}+ </ChartSettingsDropdownSection></>);};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartDataSourceDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartDataSourceDropdownContent.tsxindex 5cf14a05704..d3fb71015af 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartDataSourceDropdownContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartDataSourceDropdownContent.tsx@@ -7,23 +7,11 @@ import { usePageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/hooimport { useResetChartDraftFiltersSettings } from '@/side-panel/pages/page-layout/hooks/useResetChartDraftFiltersSettings';import { useUpdateCurrentWidgetConfig } from '@/side-panel/pages/page-layout/hooks/useUpdateCurrentWidgetConfig';import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';-import {- StyledPageLayoutDropdownContentContainer,- StyledPageLayoutDropdownMenuItemsContainer,-} from '@/side-panel/pages/page-layout/components/dropdown-content/PageLayoutDropdownContentContainer';-import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';-import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';-import { DropdownComponentInstanceContext } from '@/ui/layout/dropdown/contexts/DropdownComponentInstanceContext';-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';-import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList';-import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';-import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';-import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';+import { ChartSettingsDropdownSection } from '@/side-panel/pages/page-layout/components/chart-settings/ChartSettingsDropdownSection';import { t } from '@lingui/core/macro';-import { useMemo, useState } from 'react';-import { isDefined } from 'twenty-shared/utils';-import { ListItemButton } from 'twenty-ui/components/navigation';+import { useState } from 'react';+import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';+import { Dropdown } from 'twenty-ui/components/navigation';import { filterBySearchQuery } from '~/utils/filterBySearchQuery';export const ChartDataSourceDropdownContent = () => {@@ -38,31 +26,21 @@ export const ChartDataSourceDropdownContent = () => {| string| undefined;- const dropdownId = useAvailableComponentInstanceIdOrThrow(- DropdownComponentInstanceContext,+ const objectsWithReadAccess = filterReadableActiveObjectMetadataItems(+ objectMetadataItems,+ objectPermissionsByObjectMetadataId,);-- const selectedItemId = useAtomComponentStateValue(- selectedItemIdComponentState,- dropdownId,- );-- const searchableObjects = useMemo(() => {- const objectsWithReadAccess = filterReadableActiveObjectMetadataItems(- objectMetadataItems,- objectPermissionsByObjectMetadataId,+ const regularObjects = objectsWithReadAccess+ .filter((item) => !item.isSystem)+ .sort((firstObject, secondObject) =>+ firstObject.labelPlural.localeCompare(secondObject.labelPlural),);-- const regularObjects = objectsWithReadAccess- .filter((item) => item.isSystem === false)- .sort((a, b) => a.labelPlural.localeCompare(b.labelPlural));-- const systemObjects = objectsWithReadAccess- .filter((item) => item.isSystem === true)- .sort((a, b) => a.labelPlural.localeCompare(b.labelPlural));-- return [...regularObjects, ...systemObjects];- }, [objectMetadataItems, objectPermissionsByObjectMetadataId]);+ const systemObjects = objectsWithReadAccess+ .filter((item) => item.isSystem)+ .sort((firstObject, secondObject) =>+ firstObject.labelPlural.localeCompare(secondObject.labelPlural),+ );+ const searchableObjects = [...regularObjects, ...systemObjects];const availableObjectMetadataItems = filterBySearchQuery({items: searchableObjects,@@ -73,8 +51,6 @@ export const ChartDataSourceDropdownContent = () => {const { updateCurrentWidgetConfig } =useUpdateCurrentWidgetConfig(pageLayoutId);- const { closeDropdown } = useCloseDropdown();-const { resetChartDraftFiltersSettings } =useResetChartDraftFiltersSettings();@@ -101,62 +77,48 @@ export const ChartDataSourceDropdownContent = () => {resetChartDraftFiltersSettings(currentObjectMetadataItemId);}}- closeDropdown();};return (- <StyledPageLayoutDropdownContentContainer>- <DropdownMenuSearchInput- autoFocus- type="text"+ <>+ <Dropdown.Searchplaceholder={t`Search objects`}- onChange={(event) => setSearchQuery(event.target.value)}+ aria-label={t`Search objects`}+ onValueChange={setSearchQuery}value={searchQuery}/>- <DropdownMenuSeparator />- <StyledPageLayoutDropdownMenuItemsContainer>- <SelectableList- selectableListInstanceId={dropdownId}- focusId={dropdownId}- selectableItemIdArray={availableObjectMetadataItems.map(- (objectMetadataItem) => objectMetadataItem.id,- )}+ <ChartSettingsDropdownSection>+ <Dropdown.SelectionGroup+ aria-label={t`Source`}+ value={currentObjectMetadataItemId ?? null}+ onValueChange={(value) => {+ if (isDefined(value)) {+ handleSelectSource(value);+ }+ }}>{availableObjectMetadataItems.map((objectMetadataItem) => (- <SelectableListItem+ <Dropdown.OptionItemkey={objectMetadataItem.id}- itemId={objectMetadataItem.id}- onEnter={() => {- handleSelectSource(objectMetadataItem.id);- }}+ value={objectMetadataItem.id}+ startIcon={+ <SelectOptionIcon+ Icon={() => (+ <ObjectMetadataIcon+ objectMetadataItem={objectMetadataItem}+ />+ )}+ />+ }>- <ListItemButton- focused={selectedItemId === objectMetadataItem.id}- onClick={() => {- handleSelectSource(objectMetadataItem.id);- }}- role="option"- aria-selected={- currentObjectMetadataItemId === objectMetadataItem.id- }- selected={currentObjectMetadataItemId === objectMetadataItem.id}- indicator="check"- startIcon={- <SelectOptionIcon- Icon={() => (- <ObjectMetadataIcon- objectMetadataItem={objectMetadataItem}- />- )}- />- }- >- {objectMetadataItem.labelPlural}- </ListItemButton>- </SelectableListItem>+ {objectMetadataItem.labelPlural}+ </Dropdown.OptionItem>))}- </SelectableList>- </StyledPageLayoutDropdownMenuItemsContainer>- </StyledPageLayoutDropdownContentContainer>+ </Dropdown.SelectionGroup>+ {!isNonEmptyArray(availableObjectMetadataItems) && (+ <Dropdown.Empty>{t`No results found`}</Dropdown.Empty>+ )}+ </ChartSettingsDropdownSection>+ </>);};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartDateGranularitySelectionDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartDateGranularitySelectionDropdownContent.tsxindex 310b3d9270f..1a98c7261f0 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartDateGranularitySelectionDropdownContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartDateGranularitySelectionDropdownContent.tsx@@ -1,3 +1,6 @@+import { ChartSettingsDropdownSection } from '@/side-panel/pages/page-layout/components/chart-settings/ChartSettingsDropdownSection';+import { t } from '@lingui/core/macro';+import { Dropdown } from 'twenty-ui/components/navigation';import { usePageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/hooks/usePageLayoutSidePanelTarget';import { useUpdateCurrentWidgetConfig } from '@/side-panel/pages/page-layout/hooks/useUpdateCurrentWidgetConfig';import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';@@ -5,18 +8,9 @@ import { type ChartConfiguration } from '@/side-panel/pages/page-layout/types/Chimport { getDateGranularityLabel } from '@/side-panel/pages/page-layout/utils/getDateGranularityLabel';import { isWidgetConfigurationOfType } from '@/side-panel/pages/page-layout/utils/isWidgetConfigurationOfType';import { type FieldConfiguration } from '@/page-layout/types/FieldConfiguration';-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';-import { DropdownComponentInstanceContext } from '@/ui/layout/dropdown/contexts/DropdownComponentInstanceContext';-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';-import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList';-import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';-import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';-import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { ObjectRecordGroupByDateGranularity } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';import { doNotTranslate } from 'twenty-shared/i18n';-import { ListItemButton } from 'twenty-ui/components/navigation';import {type FieldsConfiguration,type WidgetConfiguration,@@ -102,18 +96,9 @@ export const ChartDateGranularitySelectionDropdownContent = ({const currentDateGranularity = getCurrentDateGranularity({configuration,- axis: axis as 'primary' | 'secondary',+ axis,});- const dropdownId = useAvailableComponentInstanceIdOrThrow(- DropdownComponentInstanceContext,- );-- const selectedItemId = useAtomComponentStateValue(- selectedItemIdComponentState,- dropdownId,- );-const dateGranularityOptions: ObjectRecordGroupByDateGranularity[] = [ObjectRecordGroupByDateGranularity.DAY,ObjectRecordGroupByDateGranularity.WEEK,@@ -128,55 +113,40 @@ export const ChartDateGranularitySelectionDropdownContent = ({const { updateCurrentWidgetConfig } =useUpdateCurrentWidgetConfig(pageLayoutId);- const { closeDropdown } = useCloseDropdown();-const handleSelectDateGranularityOption = (dateGranularityOption: ObjectRecordGroupByDateGranularity,) => {- const configToUpdate = axis- ? axis === 'primary'+ if (!isDefined(axis)) {+ updateCurrentWidgetConfig({+ configToUpdate: { dateGranularity: dateGranularityOption },+ });+ return;+ }++ const configToUpdate =+ axis === 'primary'? { primaryAxisDateGranularity: dateGranularityOption }- : { secondaryAxisGroupByDateGranularity: dateGranularityOption }- : { dateGranularity: dateGranularityOption };+ : { secondaryAxisGroupByDateGranularity: dateGranularityOption };- updateCurrentWidgetConfig({- configToUpdate,- });- closeDropdown();+ updateCurrentWidgetConfig({ configToUpdate });};return (- <>- <DropdownMenuItemsContainer>- <SelectableList- selectableListInstanceId={dropdownId}- focusId={dropdownId}- selectableItemIdArray={dateGranularityOptions}- >- {dateGranularityOptions.map((option) => (- <SelectableListItem- key={option}- itemId={option}- onEnter={() => {- handleSelectDateGranularityOption(option);- }}- >- <ListItemButton- focused={selectedItemId === option}- onClick={() => {- handleSelectDateGranularityOption(option);- }}- role="option"- aria-selected={currentDateGranularity === option}- selected={currentDateGranularity === option}- indicator="check"- >- {getDateGranularityLabel(option)}- </ListItemButton>- </SelectableListItem>- ))}- </SelectableList>- </DropdownMenuItemsContainer>- </>+ <ChartSettingsDropdownSection>+ <Dropdown.SelectionGroup+ aria-label={t`Date granularity`}+ value={currentDateGranularity}+ >+ {dateGranularityOptions.map((option) => (+ <Dropdown.OptionItem+ key={option}+ value={option}+ onSelect={() => handleSelectDateGranularityOption(option)}+ >+ {getDateGranularityLabel(option)}+ </Dropdown.OptionItem>+ ))}+ </Dropdown.SelectionGroup>+ </ChartSettingsDropdownSection>);};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartFieldSelectionForAggregateOperationDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartFieldSelectionForAggregateOperationDropdownContent.tsxindex 072f74a5610..00876b1633c 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartFieldSelectionForAggregateOperationDropdownContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartFieldSelectionForAggregateOperationDropdownContent.tsx@@ -1,30 +1,23 @@import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';import { ChartAggregateOperationSelectionDropdownContent } from '@/side-panel/pages/page-layout/components/dropdown-content/ChartAggregateOperationSelectionDropdownContent';+import { ChartRatioOptionValueSelectionDropdownContent } from '@/side-panel/pages/page-layout/components/dropdown-content/ChartRatioOptionValueSelectionDropdownContent';+import { ChartSettingsDropdownSection } from '@/side-panel/pages/page-layout/components/chart-settings/ChartSettingsDropdownSection';import { usePageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/hooks/usePageLayoutSidePanelTarget';import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';import { isWidgetConfigurationOfType } from '@/side-panel/pages/page-layout/utils/isWidgetConfigurationOfType';import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';import { isHiddenSystemField } from '@/object-metadata/utils/isHiddenSystemField';import { isFieldRelation } from '@/object-record/record-field/ui/types/guards/isFieldRelation';-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';-import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';-import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';-import { DropdownComponentInstanceContext } from '@/ui/layout/dropdown/contexts/DropdownComponentInstanceContext';-import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList';-import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';-import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';-import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';+import { getChartAggregateDropdownPageId } from '@/side-panel/pages/page-layout/utils/getChartAggregateDropdownPageId';import { t } from '@lingui/core/macro';-import { useState } from 'react';-import { useIcons } from 'twenty-ui/icon';-import { ListItemButton } from 'twenty-ui/components/navigation';+import { Fragment, useState } from 'react';+import { IconCheck, useIcons } from 'twenty-ui/icon';+import { Dropdown } from 'twenty-ui/components/navigation';+import { isNonEmptyArray } from 'twenty-shared/utils';import { filterBySearchQuery } from '~/utils/filterBySearchQuery';import { doNotTranslate } from 'twenty-shared/i18n';export const ChartFieldSelectionForAggregateOperationDropdownContent = () => {- const [isSubMenuOpen, setIsSubMenuOpen] = useState(false);-const [searchQuery, setSearchQuery] = useState('');const { objectMetadataItems } = useObjectMetadataItems();const { pageLayoutId } = usePageLayoutSidePanelTarget();@@ -50,89 +43,85 @@ export const ChartFieldSelectionForAggregateOperationDropdownContent = () => {const currentFieldMetadataId = configuration.aggregateFieldMetadataId;- const [selectedFieldMetadataId, setSelectedFieldMetadataId] = useState(- currentFieldMetadataId,- );-const sourceObjectMetadataItem = objectMetadataItems.find((item) => item.id === widgetInEditMode?.objectMetadataId,);- const dropdownId = useAvailableComponentInstanceIdOrThrow(- DropdownComponentInstanceContext,- );-- const selectedItemId = useAtomComponentStateValue(- selectedItemIdComponentState,- dropdownId,- );-- const availableFieldMetadataItems = filterBySearchQuery({- items: sourceObjectMetadataItem?.fields || [],+ const availableFieldMetadataItems = (+ sourceObjectMetadataItem?.fields ?? []+ ).filter((field) => !isFieldRelation(field) && !isHiddenSystemField(field));+ const filteredFieldMetadataItems = filterBySearchQuery({+ items: availableFieldMetadataItems,searchQuery,getSearchableValues: (item) => [item.label, item.name],- // TODO: remove the relation filter once group by is supported for relation fields- }).filter((field) => !isFieldRelation(field) && !isHiddenSystemField(field));+ });const { getIcon } = useIcons();- if (isSubMenuOpen) {- return (- <ChartAggregateOperationSelectionDropdownContent- currentFieldMetadataId={selectedFieldMetadataId}- setIsSubMenuOpen={setIsSubMenuOpen}- />- );- }-return (<>- <DropdownMenuSearchInput- autoFocus- type="text"- placeholder={t`Search fields`}- onChange={(event) => setSearchQuery(event.target.value)}- value={searchQuery}- />- <DropdownMenuSeparator />- <DropdownMenuItemsContainer>- <SelectableList- selectableListInstanceId={dropdownId}- focusId={dropdownId}- selectableItemIdArray={availableFieldMetadataItems.map(- (item) => item.id,- )}- >- {availableFieldMetadataItems.map((fieldMetadataItem) => (- <SelectableListItem+ <Dropdown.Page id="root">+ <Dropdown.Search+ placeholder={t`Search fields`}+ aria-label={t`Search fields`}+ onValueChange={setSearchQuery}+ value={searchQuery}+ />+ <Dropdown.Separator />+ <ChartSettingsDropdownSection>+ {filteredFieldMetadataItems.map((fieldMetadataItem) => (+ <Dropdown.ActionItemkey={fieldMetadataItem.id}- itemId={fieldMetadataItem.id}- onEnter={() => {- setIsSubMenuOpen(true);- setSelectedFieldMetadataId(fieldMetadataItem.id);- }}+ page={getChartAggregateDropdownPageId({+ fieldMetadataId: fieldMetadataItem.id,+ page: 'operations',+ })}+ aria-current={+ currentFieldMetadataId === fieldMetadataItem.id+ ? 'true'+ : undefined+ }+ startIcon={+ <SelectOptionIcon Icon={getIcon(fieldMetadataItem.icon)} />+ }+ endIcon={+ currentFieldMetadataId === fieldMetadataItem.id ? (+ <SelectOptionIcon Icon={IconCheck} />+ ) : undefined+ }>- <ListItemButton- focused={selectedItemId === fieldMetadataItem.id}- onClick={() => {- setIsSubMenuOpen(true);- setSelectedFieldMetadataId(fieldMetadataItem.id);- }}- role="option"- aria-selected={selectedFieldMetadataId === fieldMetadataItem.id}- selected={selectedFieldMetadataId === fieldMetadataItem.id}- indicator="check"- hasSubmenu={true}- startIcon={- <SelectOptionIcon Icon={getIcon(fieldMetadataItem.icon)} />- }- >- {fieldMetadataItem.label}- </ListItemButton>- </SelectableListItem>+ {fieldMetadataItem.label}+ </Dropdown.ActionItem>))}- </SelectableList>- </DropdownMenuItemsContainer>+ {!isNonEmptyArray(filteredFieldMetadataItems) && (+ <Dropdown.Empty>{t`No fields found`}</Dropdown.Empty>+ )}+ </ChartSettingsDropdownSection>+ </Dropdown.Page>+ {availableFieldMetadataItems.map((fieldMetadataItem) => (+ <Fragment key={fieldMetadataItem.id}>+ <Dropdown.Page+ id={getChartAggregateDropdownPageId({+ fieldMetadataId: fieldMetadataItem.id,+ page: 'operations',+ })}+ >+ <ChartAggregateOperationSelectionDropdownContent+ currentFieldMetadataId={fieldMetadataItem.id}+ />+ </Dropdown.Page>+ <Dropdown.Page+ id={getChartAggregateDropdownPageId({+ fieldMetadataId: fieldMetadataItem.id,+ page: 'ratio',+ })}+ >+ <ChartRatioOptionValueSelectionDropdownContent+ currentFieldMetadataId={fieldMetadataItem.id}+ />+ </Dropdown.Page>+ </Fragment>+ ))}</>);};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionCompositeFieldView.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionCompositeFieldView.tsxindex 8d15f73507e..ac0de653ecb 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionCompositeFieldView.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionCompositeFieldView.tsx@@ -1,56 +1,51 @@-import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';import { getCompositeSubFieldLabel } from '@/object-record/object-filter-dropdown/utils/getCompositeSubFieldLabel';import { ICON_NAME_BY_SUB_FIELD } from '@/object-record/record-filter/constants/IconNameBySubField';import { SETTINGS_COMPOSITE_FIELD_TYPE_CONFIGS } from '@/settings/data-model/constants/SettingsCompositeFieldTypeConfigs';-import { type CompositeFieldType } from '@/settings/data-model/types/CompositeFieldType';-import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';-import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';-import { DropdownComponentInstanceContext } from '@/ui/layout/dropdown/contexts/DropdownComponentInstanceContext';-import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList';-import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';-import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';-import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { IconChevronLeft, useIcons } from 'twenty-ui/icon';-import { ListItemButton } from 'twenty-ui/components/navigation';+import { isCompositeFieldType } from '@/object-record/object-filter-dropdown/utils/isCompositeFieldType';+import { ChartSettingsDropdownSection } from '@/side-panel/pages/page-layout/components/chart-settings/ChartSettingsDropdownSection';+import { useChartGroupByFieldSelectionContextOrThrow } from '@/side-panel/pages/page-layout/hooks/useChartGroupByFieldSelectionContextOrThrow';+import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';import { compositeTypeDefinitions } from 'twenty-shared/types';-import { isCompositePropertySupportedInGroupBy } from 'twenty-shared/utils';+import {+ isCompositePropertySupportedInGroupBy,+ isDefined,+} from 'twenty-shared/utils';+import { Dropdown } from 'twenty-ui/components/navigation';+import { useIcons } from 'twenty-ui/icon';type ChartGroupByFieldSelectionCompositeFieldViewProps = {+ pageId: string;compositeField: FieldMetadataItem;- currentSubFieldName: string | undefined;- onBack: () => void;- onSelectSubField: (subFieldName: string) => void;+ fieldMetadataId: string;+ subFieldNamePrefix?: string;};export const ChartGroupByFieldSelectionCompositeFieldView = ({+ pageId,compositeField,- currentSubFieldName,- onBack,- onSelectSubField,+ fieldMetadataId,+ subFieldNamePrefix,}: ChartGroupByFieldSelectionCompositeFieldViewProps) => {const { getIcon } = useIcons();+ const { currentGroupByFieldMetadataId, currentSubFieldName, selectField } =+ useChartGroupByFieldSelectionContextOrThrow();+ const compositeFieldType = compositeField.type;- const dropdownId = useAvailableComponentInstanceIdOrThrow(- DropdownComponentInstanceContext,- );-- const selectedItemId = useAtomComponentStateValue(- selectedItemIdComponentState,- dropdownId,- );-- const compositeFieldType = compositeField.type as CompositeFieldType;+ if (!isCompositeFieldType(compositeFieldType)) {+ return null;+ }+ const getSubFieldName = (subFieldName: string) =>+ isDefined(subFieldNamePrefix)+ ? `${subFieldNamePrefix}.${subFieldName}`+ : subFieldName;const groupableSubFieldNames = new Set(compositeTypeDefinitions.get(compositeField.type)?.properties.filter(isCompositePropertySupportedInGroupBy).map((property) => property.name),);-const subFieldNames = SETTINGS_COMPOSITE_FIELD_TYPE_CONFIGS[compositeFieldType].subFields@@ -58,55 +53,34 @@ export const ChartGroupByFieldSelectionCompositeFieldView = ({.filter((subFieldName) => groupableSubFieldNames.has(subFieldName));return (- <>- <DropdownMenuHeader- StartComponent={- <DropdownMenuHeaderLeftComponent- onClick={onBack}- Icon={IconChevronLeft}- />- }- >- {compositeField.label}- </DropdownMenuHeader>- <DropdownMenuItemsContainer>- <SelectableList- selectableListInstanceId={dropdownId}- focusId={dropdownId}- selectableItemIdArray={subFieldNames}- >- {subFieldNames.map((subFieldName) => (- <SelectableListItem- key={subFieldName}- itemId={subFieldName}- onEnter={() => {- onSelectSubField(subFieldName);- }}- >- <ListItemButton- focused={selectedItemId === subFieldName}- onClick={() => {- onSelectSubField(subFieldName);- }}- role="option"- aria-selected={currentSubFieldName === subFieldName}- selected={currentSubFieldName === subFieldName}- indicator="check"- startIcon={- <SelectOptionIcon- Icon={getIcon(- ICON_NAME_BY_SUB_FIELD[subFieldName] ??- compositeField.icon,- )}- />- }- >- {getCompositeSubFieldLabel(compositeFieldType, subFieldName)}- </ListItemButton>- </SelectableListItem>- ))}- </SelectableList>- </DropdownMenuItemsContainer>- </>+ <Dropdown.Page id={pageId}>+ <Dropdown.Back>{compositeField.label}</Dropdown.Back>+ <ChartSettingsDropdownSection>+ {subFieldNames.map((subFieldName) => (+ <Dropdown.OptionItem+ key={subFieldName}+ onSelect={() =>+ selectField({+ fieldId: fieldMetadataId,+ subFieldName: getSubFieldName(subFieldName),+ })+ }+ selected={+ currentGroupByFieldMetadataId === fieldMetadataId &&+ currentSubFieldName === getSubFieldName(subFieldName)+ }+ startIcon={+ <SelectOptionIcon+ Icon={getIcon(+ ICON_NAME_BY_SUB_FIELD[subFieldName] ?? compositeField.icon,+ )}+ />+ }+ >+ {getCompositeSubFieldLabel(compositeFieldType, subFieldName)}+ </Dropdown.OptionItem>+ ))}+ </ChartSettingsDropdownSection>+ </Dropdown.Page>);};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionDropdownContent.tsxindex 43af03f6f4c..f3d67132a97 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionDropdownContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionDropdownContent.tsx@@ -1,14 +1,5 @@import { ChartGroupByFieldSelectionDropdownContentBase } from '@/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionDropdownContentBase';-import { type TypedBarChartConfiguration } from '@/side-panel/pages/page-layout/types/TypedBarChartConfiguration';-import { type TypedLineChartConfiguration } from '@/side-panel/pages/page-layout/types/TypedLineChartConfiguration';-export const ChartGroupByFieldSelectionDropdownContent = () => {- return (- <ChartGroupByFieldSelectionDropdownContentBase<- TypedBarChartConfiguration | TypedLineChartConfiguration- >- fieldMetadataIdKey="secondaryAxisGroupByFieldMetadataId"- subFieldNameKey="secondaryAxisGroupBySubFieldName"- />- );-};+export const ChartGroupByFieldSelectionDropdownContent = () => (+ <ChartGroupByFieldSelectionDropdownContentBase axis="secondary" />+);diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionDropdownContentBase.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionDropdownContentBase.tsxindex 04697af5e26..f7501050e08 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionDropdownContentBase.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionDropdownContentBase.tsx@@ -1,6 +1,3 @@-import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';-import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';-import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';import { isHiddenSystemField } from '@/object-metadata/utils/isHiddenSystemField';import { isCompositeFieldType } from '@/object-record/object-filter-dropdown/utils/isCompositeFieldType';import { isFieldMorphRelation } from '@/object-record/record-field/ui/types/guards/isFieldMorphRelation';@@ -8,97 +5,47 @@ import { isFieldRelation } from '@/object-record/record-field/ui/types/guards/isimport { ChartGroupByFieldSelectionCompositeFieldView } from '@/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionCompositeFieldView';import { ChartGroupByFieldSelectionMorphRelationFieldView } from '@/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionMorphRelationFieldView';import { ChartGroupByFieldSelectionRelationFieldView } from '@/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionRelationFieldView';-import { usePageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/hooks/usePageLayoutSidePanelTarget';-import { useUpdateCurrentWidgetConfig } from '@/side-panel/pages/page-layout/hooks/useUpdateCurrentWidgetConfig';-import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';-import { type ChartConfiguration } from '@/side-panel/pages/page-layout/types/ChartConfiguration';-import { buildChartGroupByFieldConfigUpdate } from '@/side-panel/pages/page-layout/utils/buildChartGroupByFieldConfigUpdate';-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';-import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';-import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';-import { DropdownComponentInstanceContext } from '@/ui/layout/dropdown/contexts/DropdownComponentInstanceContext';-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';-import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList';-import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';-import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';-import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';+import { ChartSettingsDropdownSection } from '@/side-panel/pages/page-layout/components/chart-settings/ChartSettingsDropdownSection';+import { ChartGroupByFieldSelectionContext } from '@/side-panel/pages/page-layout/contexts/ChartGroupByFieldSelectionContext';+import { useChartGroupByFieldSelection } from '@/side-panel/pages/page-layout/hooks/useChartGroupByFieldSelection';+import { type ChartGroupByFieldSelectionAxis } from '@/side-panel/pages/page-layout/types/ChartGroupByFieldSelectionAxis';+import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';import { t } from '@lingui/core/macro';import { useMemo, useState } from 'react';import {isDefined,isFieldMetadataSupportedInGroupBy,+ isNonEmptyArray,} from 'twenty-shared/utils';+import { Dropdown } from 'twenty-ui/components/navigation';import { useIcons } from 'twenty-ui/icon';-import { ListItemButton } from 'twenty-ui/components/navigation';+import { normalizeSearchText } from 'twenty-ui/utilities';import { RelationType } from '~/generated-metadata/graphql';import { filterBySearchQuery } from '~/utils/filterBySearchQuery';-type ChartGroupByFieldSelectionDropdownContentBaseProps<- T extends ChartConfiguration,-> = {- fieldMetadataIdKey: keyof T;- subFieldNameKey: keyof T;+type ChartGroupByFieldSelectionDropdownContentBaseProps = {+ axis: ChartGroupByFieldSelectionAxis;};-export const ChartGroupByFieldSelectionDropdownContentBase = <- T extends ChartConfiguration,->({- fieldMetadataIdKey,- subFieldNameKey,-}: ChartGroupByFieldSelectionDropdownContentBaseProps<T>) => {+export const ChartGroupByFieldSelectionDropdownContentBase = ({+ axis,+}: ChartGroupByFieldSelectionDropdownContentBaseProps) => {const [searchQuery, setSearchQuery] = useState('');+ const selection = useChartGroupByFieldSelection({ axis });+ const { getIcon } = useIcons();+ const sourceObjectMetadataItem = selection?.sourceObjectMetadataItem;- const [selectedCompositeField, setSelectedCompositeField] =- useState<FieldMetadataItem | null>(null);-- const [selectedRelationField, setSelectedRelationField] =- useState<FieldMetadataItem | null>(null);-- const [selectedMorphField, setSelectedMorphField] =- useState<FieldMetadataItem | null>(null);-- const { objectMetadataItems } = useObjectMetadataItems();-- const { pageLayoutId } = usePageLayoutSidePanelTarget();-- const { widgetInEditMode } = useWidgetInEditMode(pageLayoutId);-- const configuration = widgetInEditMode?.configuration as T;-- const currentGroupByFieldMetadataId = configuration?.[fieldMetadataIdKey] as- | string- | undefined;- const currentSubFieldName = configuration?.[subFieldNameKey] as- | string- | undefined;-- const sourceObjectMetadataItem = objectMetadataItems.find(- (item) => item.id === widgetInEditMode?.objectMetadataId,- );-- const dropdownId = useAvailableComponentInstanceIdOrThrow(- DropdownComponentInstanceContext,- );-- const selectedItemId = useAtomComponentStateValue(- selectedItemIdComponentState,- dropdownId,- );-- const availableFieldMetadataItems = useMemo(+ const groupableFields = useMemo(() =>- filterBySearchQuery({- items: sourceObjectMetadataItem?.fields || [],- searchQuery,- getSearchableValues: (item) => [item.label, item.name],- }).filter((field) => {+ (sourceObjectMetadataItem?.fields ?? []).filter((field) => {if (isHiddenSystemField(field)) {return false;}+if (isFieldRelation(field)) {return field.relation?.type === RelationType.MANY_TO_ONE;}+return isFieldMetadataSupportedInGroupBy({type: field.type,name: field.name,@@ -106,295 +53,118 @@ export const ChartGroupByFieldSelectionDropdownContentBase = <relationType: field.settings?.relationType ?? null,});}),- [sourceObjectMetadataItem?.fields, searchQuery],+ [sourceObjectMetadataItem?.fields],);- const { updateCurrentWidgetConfig } =- useUpdateCurrentWidgetConfig(pageLayoutId);-- const { closeDropdown } = useCloseDropdown();-- const { getIcon } = useIcons();-- const isSecondaryAxisGroupBy =- fieldMetadataIdKey === 'secondaryAxisGroupByFieldMetadataId';-- const selectableItemIdArray = isSecondaryAxisGroupBy- ? ['none', ...availableFieldMetadataItems.map((item) => item.id)]- : availableFieldMetadataItems.map((item) => item.id);-- if (!isDefined(sourceObjectMetadataItem)) {- return null;- }-- const handleSelectField = (fieldMetadataItem: FieldMetadataItem) => {- if (isFieldMorphRelation(fieldMetadataItem)) {- setSelectedMorphField(fieldMetadataItem);- return;- }-- if (isFieldRelation(fieldMetadataItem)) {- setSelectedRelationField(fieldMetadataItem);- return;- }-- if (isCompositeFieldType(fieldMetadataItem.type)) {- setSelectedCompositeField(fieldMetadataItem);- return;- }-- updateCurrentWidgetConfig({- configToUpdate: buildChartGroupByFieldConfigUpdate({- configuration,- fieldMetadataIdKey,- subFieldNameKey,- fieldId: fieldMetadataItem.id,- subFieldName: null,- objectMetadataItem: sourceObjectMetadataItem,- objectMetadataItems,- }),- });- closeDropdown();- };-- const handleSelectNone = () => {- updateCurrentWidgetConfig({- configToUpdate: buildChartGroupByFieldConfigUpdate({- configuration,- fieldMetadataIdKey,- subFieldNameKey,- fieldId: null,- subFieldName: null,- objectMetadataItem: sourceObjectMetadataItem,- objectMetadataItems,- }),- });- closeDropdown();- };-- const handleBackFromComposite = () => {- setSelectedCompositeField(null);- };-- const handleBackFromRelation = () => {- setSelectedRelationField(null);- };-- const handleBackFromMorph = () => {- setSelectedMorphField(null);- };-- const handleSelectMorphTargetSubField = ({- perTargetFieldId,- subFieldName,- }: {- perTargetFieldId: string;- subFieldName: string;- }) => {- updateCurrentWidgetConfig({- configToUpdate: buildChartGroupByFieldConfigUpdate({- configuration,- fieldMetadataIdKey,- subFieldNameKey,- fieldId: perTargetFieldId,- subFieldName,- objectMetadataItem: sourceObjectMetadataItem,- objectMetadataItems,- }),- });- closeDropdown();- };-- const handleSelectCompositeSubField = (subFieldName: string) => {- if (!isDefined(selectedCompositeField)) {- return;- }-- updateCurrentWidgetConfig({- configToUpdate: buildChartGroupByFieldConfigUpdate({- configuration,- fieldMetadataIdKey,- subFieldNameKey,- fieldId: selectedCompositeField.id,- subFieldName,- objectMetadataItem: sourceObjectMetadataItem,- objectMetadataItems,- }),- });- closeDropdown();- };-- const handleSelectRelationSubField = (subFieldName: string) => {- if (!isDefined(selectedRelationField)) {- return;- }-- updateCurrentWidgetConfig({- configToUpdate: buildChartGroupByFieldConfigUpdate({- configuration,- fieldMetadataIdKey,- subFieldNameKey,- fieldId: selectedRelationField.id,- subFieldName,- objectMetadataItem: sourceObjectMetadataItem,- objectMetadataItems,- }),- });- closeDropdown();- };-- const handleSelectRelationRecord = () => {- if (!isDefined(selectedRelationField)) {- return;- }-- updateCurrentWidgetConfig({- configToUpdate: buildChartGroupByFieldConfigUpdate({- configuration,- fieldMetadataIdKey,- subFieldNameKey,- fieldId: selectedRelationField.id,- subFieldName: null,- objectMetadataItem: sourceObjectMetadataItem,- objectMetadataItems,- }),- });- closeDropdown();- };-- const handleSelectMorphTargetRecord = ({- perTargetFieldId,- }: {- perTargetFieldId: string;- }) => {- updateCurrentWidgetConfig({- configToUpdate: buildChartGroupByFieldConfigUpdate({- configuration,- fieldMetadataIdKey,- subFieldNameKey,- fieldId: perTargetFieldId,- subFieldName: null,- objectMetadataItem: sourceObjectMetadataItem,- objectMetadataItems,- }),- });- closeDropdown();- };-- if (isDefined(selectedMorphField)) {- return (- <ChartGroupByFieldSelectionMorphRelationFieldView- morphField={selectedMorphField}- currentFieldMetadataId={currentGroupByFieldMetadataId}- currentSubFieldName={currentSubFieldName}- onBack={handleBackFromMorph}- onSelectTargetSubField={handleSelectMorphTargetSubField}- onSelectTargetRecord={handleSelectMorphTargetRecord}- />+ const availableFields = filterBySearchQuery({+ items: groupableFields,+ searchQuery,+ getSearchableValues: (field) => [field.label, field.name],+ });+ const noneOptionLabel = t`None`;+ const isNoneOptionVisible =+ axis === 'secondary' &&+ normalizeSearchText(noneOptionLabel).includes(+ normalizeSearchText(searchQuery),);- }- if (isDefined(selectedRelationField)) {- return (- <ChartGroupByFieldSelectionRelationFieldView- relationField={selectedRelationField}- currentSubFieldName={- selectedRelationField.id === currentGroupByFieldMetadataId- ? currentSubFieldName- : undefined- }- isCurrentGroupByField={- selectedRelationField.id === currentGroupByFieldMetadataId- }- onBack={handleBackFromRelation}- onSelectSubField={handleSelectRelationSubField}- onSelectRecord={handleSelectRelationRecord}- />- );+ if (!isDefined(selection)) {+ return null;}- if (isDefined(selectedCompositeField)) {- return (- <ChartGroupByFieldSelectionCompositeFieldView- compositeField={selectedCompositeField}- currentSubFieldName={currentSubFieldName}- onBack={handleBackFromComposite}- onSelectSubField={handleSelectCompositeSubField}- />- );- }+ const { currentGroupByFieldMetadataId, selectField } = selection;return (- <>- <DropdownMenuSearchInput- autoFocus- type="text"- placeholder={t`Search fields`}- onChange={(event) => setSearchQuery(event.target.value)}- value={searchQuery}- />- <DropdownMenuSeparator />- <DropdownMenuItemsContainer>- <SelectableList- selectableListInstanceId={dropdownId}- focusId={dropdownId}- selectableItemIdArray={selectableItemIdArray}- >- {isSecondaryAxisGroupBy && (- <SelectableListItem itemId="none" onEnter={handleSelectNone}>- <ListItemButton- focused={selectedItemId === 'none'}- onClick={handleSelectNone}- role="option"- aria-selected={!isDefined(currentGroupByFieldMetadataId)}- selected={!isDefined(currentGroupByFieldMetadataId)}- indicator="check"- >{t`None`}</ListItemButton>- </SelectableListItem>- )}-- {availableFieldMetadataItems.map((fieldMetadataItem) => (- <SelectableListItem- key={fieldMetadataItem.id}- itemId={fieldMetadataItem.id}- onEnter={() => {- handleSelectField(fieldMetadataItem);- }}+ <ChartGroupByFieldSelectionContext.Provider value={selection}>+ <Dropdown.Page id="root">+ <Dropdown.Search+ placeholder={t`Search fields`}+ aria-label={t`Search fields`}+ onValueChange={setSearchQuery}+ value={searchQuery}+ />+ <ChartSettingsDropdownSection>+ {isNoneOptionVisible && (+ <Dropdown.OptionItem+ onSelect={() => selectField({ fieldId: null })}+ selected={!isDefined(currentGroupByFieldMetadataId)}>- <ListItemButton- focused={selectedItemId === fieldMetadataItem.id}- onClick={() => {- handleSelectField(fieldMetadataItem);- }}- role="option"- aria-selected={- !isCompositeFieldType(fieldMetadataItem.type) &&- !isFieldRelation(fieldMetadataItem) &&- !isFieldMorphRelation(fieldMetadataItem) &&- currentGroupByFieldMetadataId === fieldMetadataItem.id- }+ {noneOptionLabel}+ </Dropdown.OptionItem>+ )}+ {availableFields.map((fieldMetadataItem) => {+ const hasFieldPage =+ isCompositeFieldType(fieldMetadataItem.type) ||+ isFieldRelation(fieldMetadataItem) ||+ isFieldMorphRelation(fieldMetadataItem);+ const fieldIcon = (+ <SelectOptionIcon Icon={getIcon(fieldMetadataItem.icon)} />+ );++ if (hasFieldPage) {+ return (+ <Dropdown.ActionItem+ key={fieldMetadataItem.id}+ page={fieldMetadataItem.id}+ startIcon={fieldIcon}+ >+ {fieldMetadataItem.label}+ </Dropdown.ActionItem>+ );+ }++ return (+ <Dropdown.OptionItem+ key={fieldMetadataItem.id}+ onSelect={() => selectField({ fieldId: fieldMetadataItem.id })}selected={- !isCompositeFieldType(fieldMetadataItem.type) &&- !isFieldRelation(fieldMetadataItem) &&- !isFieldMorphRelation(fieldMetadataItem) &¤tGroupByFieldMetadataId === fieldMetadataItem.id}- indicator="check"- hasSubmenu={- isCompositeFieldType(fieldMetadataItem.type) ||- isFieldRelation(fieldMetadataItem) ||- isFieldMorphRelation(fieldMetadataItem)- }- startIcon={- <SelectOptionIcon Icon={getIcon(fieldMetadataItem.icon)} />- }+ startIcon={fieldIcon}>{fieldMetadataItem.label}- </ListItemButton>- </SelectableListItem>- ))}- </SelectableList>- </DropdownMenuItemsContainer>- </>+ </Dropdown.OptionItem>+ );+ })}+ {!isNonEmptyArray(availableFields) && !isNoneOptionVisible && (+ <Dropdown.Empty>{t`No fields available`}</Dropdown.Empty>+ )}+ </ChartSettingsDropdownSection>+ </Dropdown.Page>+ {groupableFields.map((fieldMetadataItem) => {+ if (isFieldMorphRelation(fieldMetadataItem)) {+ return (+ <ChartGroupByFieldSelectionMorphRelationFieldView+ key={fieldMetadataItem.id}+ pageId={fieldMetadataItem.id}+ morphField={fieldMetadataItem}+ />+ );+ }++ if (isFieldRelation(fieldMetadataItem)) {+ return (+ <ChartGroupByFieldSelectionRelationFieldView+ key={fieldMetadataItem.id}+ pageId={fieldMetadataItem.id}+ relationField={fieldMetadataItem}+ />+ );+ }++ if (!isCompositeFieldType(fieldMetadataItem.type)) {+ return null;+ }++ return (+ <ChartGroupByFieldSelectionCompositeFieldView+ key={fieldMetadataItem.id}+ pageId={fieldMetadataItem.id}+ compositeField={fieldMetadataItem}+ fieldMetadataId={fieldMetadataItem.id}+ />+ );+ })}+ </ChartGroupByFieldSelectionContext.Provider>);};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionMorphRelationFieldView.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionMorphRelationFieldView.tsxindex e2b1f0481db..76770f3c6ff 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionMorphRelationFieldView.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionMorphRelationFieldView.tsx@@ -1,175 +1,86 @@-import { ListItemButton } from 'twenty-ui/components/navigation';-import { ListItem } from 'twenty-ui/primitives/navigation';-import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';import { ChartGroupByFieldSelectionTargetObjectFieldsView } from '@/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionTargetObjectFieldsView';-import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';-import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';-import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';-import { DropdownComponentInstanceContext } from '@/ui/layout/dropdown/contexts/DropdownComponentInstanceContext';-import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList';-import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';-import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';-import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';+import { ChartSettingsDropdownSection } from '@/side-panel/pages/page-layout/components/chart-settings/ChartSettingsDropdownSection';+import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';import { t } from '@lingui/core/macro';-import { useMemo, useState } from 'react';-import { isDefined } from 'twenty-shared/utils';-import { IconChevronLeft, useIcons } from 'twenty-ui/icon';+import { useMemo } from 'react';+import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';+import { Dropdown } from 'twenty-ui/components/navigation';+import { useIcons } from 'twenty-ui/icon';import { RelationType } from '~/generated-metadata/graphql';-type MorphRelationTarget = {- perTargetFieldId: string;- targetObjectNameSingular: string;- label: string;- icon?: string | null;-};-type ChartGroupByFieldSelectionMorphRelationFieldViewProps = {+ pageId: string;morphField: FieldMetadataItem;- currentFieldMetadataId: string | undefined;- currentSubFieldName: string | undefined;- onBack: () => void;- onSelectTargetSubField: (params: {- perTargetFieldId: string;- subFieldName: string;- }) => void;- onSelectTargetRecord: (params: { perTargetFieldId: string }) => void;};export const ChartGroupByFieldSelectionMorphRelationFieldView = ({+ pageId,morphField,- currentFieldMetadataId,- currentSubFieldName,- onBack,- onSelectTargetSubField,- onSelectTargetRecord,}: ChartGroupByFieldSelectionMorphRelationFieldViewProps) => {const { getIcon } = useIcons();-const { objectMetadataItems } = useObjectMetadataItems();+ const availableTargets = useMemo(+ () =>+ (morphField.morphRelations ?? [])+ .filter(+ (morphRelation) => morphRelation.type === RelationType.MANY_TO_ONE,+ )+ .map((morphRelation) => {+ const targetObjectMetadataItem = objectMetadataItems.find(+ (item) =>+ item.nameSingular ===+ morphRelation.targetObjectMetadata.nameSingular,+ );- const [selectedTarget, setSelectedTarget] =- useState<MorphRelationTarget | null>(null);-- const dropdownId = useAvailableComponentInstanceIdOrThrow(- DropdownComponentInstanceContext,- );-- const selectedItemId = useAtomComponentStateValue(- selectedItemIdComponentState,- dropdownId,+ return {+ perTargetFieldId: morphRelation.sourceFieldMetadata.id,+ targetObjectNameSingular:+ morphRelation.targetObjectMetadata.nameSingular,+ label:+ targetObjectMetadataItem?.labelSingular ??+ morphRelation.targetObjectMetadata.nameSingular,+ icon: targetObjectMetadataItem?.icon,+ };+ }),+ [morphField.morphRelations, objectMetadataItems],);- const availableTargets = useMemo<MorphRelationTarget[]>(() => {- return (morphField.morphRelations ?? [])- .filter(- (morphRelation) => morphRelation.type === RelationType.MANY_TO_ONE,- )- .map((morphRelation) => {- const targetObjectMetadataItem = objectMetadataItems.find(- (item) =>- item.nameSingular ===- morphRelation.targetObjectMetadata.nameSingular,- );-- return {- perTargetFieldId: morphRelation.sourceFieldMetadata.id,- targetObjectNameSingular:- morphRelation.targetObjectMetadata.nameSingular,- label:- targetObjectMetadataItem?.labelSingular ??- morphRelation.targetObjectMetadata.nameSingular,- icon: targetObjectMetadataItem?.icon,- };- });- }, [morphField.morphRelations, objectMetadataItems]);-- if (isDefined(selectedTarget)) {- return (- <ChartGroupByFieldSelectionTargetObjectFieldsView- targetObjectNameSingular={selectedTarget.targetObjectNameSingular}- headerLabel={`${morphField.label} · ${selectedTarget.label}`}- currentSubFieldName={- selectedTarget.perTargetFieldId === currentFieldMetadataId- ? currentSubFieldName- : undefined- }- isCurrentGroupByField={- selectedTarget.perTargetFieldId === currentFieldMetadataId- }- onBack={() => setSelectedTarget(null)}- onSelectSubField={(subFieldName) =>- onSelectTargetSubField({- perTargetFieldId: selectedTarget.perTargetFieldId,- subFieldName,- })- }- onSelectRecord={() =>- onSelectTargetRecord({- perTargetFieldId: selectedTarget.perTargetFieldId,- })- }- />- );- }return (<>- <DropdownMenuHeader- StartComponent={- <DropdownMenuHeaderLeftComponent- onClick={onBack}- Icon={IconChevronLeft}- />- }- >- {morphField.label}- </DropdownMenuHeader>- <DropdownMenuSeparator />- <DropdownMenuItemsContainer>- {availableTargets.length === 0 ? (- <ListItem disabled>{t`No targets available`}</ListItem>- ) : (- <SelectableList- selectableListInstanceId={dropdownId}- focusId={dropdownId}- selectableItemIdArray={availableTargets.map(- (target) => target.perTargetFieldId,- )}- >- {availableTargets.map((target) => (- <SelectableListItem- key={target.perTargetFieldId}- itemId={target.perTargetFieldId}- onEnter={() => {- setSelectedTarget(target);- }}- >- <ListItemButton- focused={selectedItemId === target.perTargetFieldId}- startIcon={- <SelectOptionIcon- Icon={- isDefined(target.icon)- ? getIcon(target.icon)- : undefined- }- />+ <Dropdown.Page id={pageId}>+ <Dropdown.Back>{morphField.label}</Dropdown.Back>+ <ChartSettingsDropdownSection>+ {availableTargets.map((target) => (+ <Dropdown.ActionItem+ key={target.perTargetFieldId}+ page={`${pageId}:${target.perTargetFieldId}`}+ startIcon={+ <SelectOptionIcon+ Icon={+ isDefined(target.icon) ? getIcon(target.icon) : undefined}- hasSubmenu- onClick={() => {- setSelectedTarget(target);- }}- >- {target.label}- </ListItemButton>- </SelectableListItem>- ))}- </SelectableList>- )}- </DropdownMenuItemsContainer>+ />+ }+ >+ {target.label}+ </Dropdown.ActionItem>+ ))}+ {!isNonEmptyArray(availableTargets) && (+ <Dropdown.Empty>{t`No targets available`}</Dropdown.Empty>+ )}+ </ChartSettingsDropdownSection>+ </Dropdown.Page>+ {availableTargets.map((target) => (+ <ChartGroupByFieldSelectionTargetObjectFieldsView+ key={target.perTargetFieldId}+ pageId={`${pageId}:${target.perTargetFieldId}`}+ targetObjectNameSingular={target.targetObjectNameSingular}+ headerLabel={`${morphField.label} · ${target.label}`}+ fieldMetadataId={target.perTargetFieldId}+ />+ ))}</>);};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionRelationFieldView.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionRelationFieldView.tsxindex a7fc92643d4..cc80f90547d 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionRelationFieldView.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionRelationFieldView.tsx@@ -2,33 +2,22 @@ import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataIteimport { ChartGroupByFieldSelectionTargetObjectFieldsView } from '@/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionTargetObjectFieldsView';type ChartGroupByFieldSelectionRelationFieldViewProps = {+ pageId: string;relationField: FieldMetadataItem;- currentSubFieldName: string | undefined;- isCurrentGroupByField: boolean;- onBack: () => void;- onSelectSubField: (subFieldName: string) => void;- onSelectRecord: () => void;};export const ChartGroupByFieldSelectionRelationFieldView = ({+ pageId,relationField,- currentSubFieldName,- isCurrentGroupByField,- onBack,- onSelectSubField,- onSelectRecord,}: ChartGroupByFieldSelectionRelationFieldViewProps) => {return (<ChartGroupByFieldSelectionTargetObjectFieldsView+ pageId={pageId}targetObjectNameSingular={relationField.relation?.targetObjectMetadata?.nameSingular}headerLabel={relationField.label}- currentSubFieldName={currentSubFieldName}- isCurrentGroupByField={isCurrentGroupByField}- onBack={onBack}- onSelectSubField={onSelectSubField}- onSelectRecord={onSelectRecord}+ fieldMetadataId={relationField.id}/>);};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionTargetObjectFieldsView.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionTargetObjectFieldsView.tsxindex f62daa6908a..495ee3fd7f5 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionTargetObjectFieldsView.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionTargetObjectFieldsView.tsx@@ -1,222 +1,135 @@-import { ListItemButton } from 'twenty-ui/components/navigation';-import { ListItem } from 'twenty-ui/primitives/navigation';-import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';-import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';import { isCompositeFieldType } from '@/object-record/object-filter-dropdown/utils/isCompositeFieldType';import { ChartGroupByFieldSelectionCompositeFieldView } from '@/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionCompositeFieldView';+import { ChartSettingsDropdownSection } from '@/side-panel/pages/page-layout/components/chart-settings/ChartSettingsDropdownSection';+import { useChartGroupByFieldSelectionContextOrThrow } from '@/side-panel/pages/page-layout/hooks/useChartGroupByFieldSelectionContextOrThrow';import { isFieldSupportedAsChartGroupBySubField } from '@/side-panel/pages/page-layout/utils/isFieldSupportedAsChartGroupBySubField';-import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';-import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';-import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';-import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';-import { DropdownComponentInstanceContext } from '@/ui/layout/dropdown/contexts/DropdownComponentInstanceContext';-import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList';-import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';-import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';-import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';+import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';import { t } from '@lingui/core/macro';-import { useMemo, useState } from 'react';-import { isDefined } from 'twenty-shared/utils';-import { IconChevronLeft, useIcons } from 'twenty-ui/icon';-import { filterBySearchQuery } from '~/utils/filterBySearchQuery';+import { useState } from 'react';+import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';+import { Dropdown } from 'twenty-ui/components/navigation';+import { useIcons } from 'twenty-ui/icon';import { normalizeSearchText } from 'twenty-ui/utilities';--const RECORD_ITEM_ID = 'record';+import { filterBySearchQuery } from '~/utils/filterBySearchQuery';type ChartGroupByFieldSelectionTargetObjectFieldsViewProps = {+ pageId: string;targetObjectNameSingular?: string;headerLabel: string;- currentSubFieldName: string | undefined;- isCurrentGroupByField: boolean;- onBack: () => void;- onSelectSubField: (subFieldName: string) => void;- onSelectRecord: () => void;+ fieldMetadataId: string;};export const ChartGroupByFieldSelectionTargetObjectFieldsView = ({+ pageId,targetObjectNameSingular,headerLabel,- currentSubFieldName,- isCurrentGroupByField,- onBack,- onSelectSubField,- onSelectRecord,+ fieldMetadataId,}: ChartGroupByFieldSelectionTargetObjectFieldsViewProps) => {const { getIcon } = useIcons();-+ const { currentGroupByFieldMetadataId, currentSubFieldName, selectField } =+ useChartGroupByFieldSelectionContextOrThrow();+ const isCurrentGroupByField =+ currentGroupByFieldMetadataId === fieldMetadataId;const [searchQuery, setSearchQuery] = useState('');-- const [selectedCompositeField, setSelectedCompositeField] =- useState<FieldMetadataItem | null>(null);-- const dropdownId = useAvailableComponentInstanceIdOrThrow(- DropdownComponentInstanceContext,- );-- const selectedItemId = useAtomComponentStateValue(- selectedItemIdComponentState,- dropdownId,- );-const { objectMetadataItems } = useObjectMetadataItems();-- const targetObjectMetadataItem = useMemo(- () =>- objectMetadataItems.find(- (item) => item.nameSingular === targetObjectNameSingular,- ),- [objectMetadataItems, targetObjectNameSingular],+ const targetObjectMetadataItem = objectMetadataItems.find(+ (item) => item.nameSingular === targetObjectNameSingular,);-- const availableFields = useMemo(() => {- if (!isDefined(targetObjectMetadataItem)) {- return [];- }-- return filterBySearchQuery({- items: targetObjectMetadataItem.fields.filter(- isFieldSupportedAsChartGroupBySubField,- ),- searchQuery,- getSearchableValues: (field) => [field.label, field.name],- });- }, [targetObjectMetadataItem, searchQuery]);-- const handleSelectField = (fieldMetadataItem: FieldMetadataItem) => {- if (isCompositeFieldType(fieldMetadataItem.type)) {- setSelectedCompositeField(fieldMetadataItem);- } else {- onSelectSubField(fieldMetadataItem.name);- }- };-- const handleSelectCompositeSubField = (compositeSubFieldName: string) => {- if (!isDefined(selectedCompositeField)) {- return;- }- onSelectSubField(`${selectedCompositeField.name}.${compositeSubFieldName}`);- };-- const handleBackFromComposite = () => {- setSelectedCompositeField(null);- };-- const [currentNestedFieldName, currentNestedSubFieldName] =- currentSubFieldName?.split('.') ?? [];-+ const groupableFields = (targetObjectMetadataItem?.fields ?? []).filter(+ isFieldSupportedAsChartGroupBySubField,+ );+ const availableFields = filterBySearchQuery({+ items: groupableFields,+ searchQuery,+ getSearchableValues: (field) => [field.label, field.name],+ });+ const [currentNestedFieldName] = currentSubFieldName?.split('.') ?? [];const recordOptionLabel = t`Record`;-const isRecordOptionVisible = normalizeSearchText(recordOptionLabel).includes(normalizeSearchText(searchQuery),);- if (isDefined(selectedCompositeField)) {- return (- <ChartGroupByFieldSelectionCompositeFieldView- compositeField={selectedCompositeField}- currentSubFieldName={currentNestedSubFieldName}- onBack={handleBackFromComposite}- onSelectSubField={handleSelectCompositeSubField}- />- );- }-return (<>- <DropdownMenuHeader- StartComponent={- <DropdownMenuHeaderLeftComponent- onClick={onBack}- Icon={IconChevronLeft}- />- }- >- {headerLabel}- </DropdownMenuHeader>- <DropdownMenuSearchInput- autoFocus- type="text"- placeholder={t`Search fields`}- onChange={(event) => setSearchQuery(event.target.value)}- value={searchQuery}- />- <DropdownMenuSeparator />- <DropdownMenuItemsContainer>- <SelectableList- selectableListInstanceId={dropdownId}- focusId={dropdownId}- selectableItemIdArray={[- ...(isRecordOptionVisible ? [RECORD_ITEM_ID] : []),- ...availableFields.map((field) => field.id),- ]}- >+ <Dropdown.Page id={pageId}>+ <Dropdown.Back>{headerLabel}</Dropdown.Back>+ <Dropdown.Search+ placeholder={t`Search fields`}+ aria-label={t`Search fields`}+ onValueChange={setSearchQuery}+ value={searchQuery}+ />+ <ChartSettingsDropdownSection>{isRecordOptionVisible && (- <SelectableListItem- itemId={RECORD_ITEM_ID}- onEnter={onSelectRecord}+ <Dropdown.OptionItem+ onSelect={() => selectField({ fieldId: fieldMetadataId })}+ selected={+ isCurrentGroupByField && !isDefined(currentSubFieldName)+ }+ startIcon={+ <SelectOptionIcon+ Icon={getIcon(targetObjectMetadataItem?.icon)}+ />+ }>- <ListItemButton- focused={selectedItemId === RECORD_ITEM_ID}- onClick={onSelectRecord}- role="option"- aria-selected={- isCurrentGroupByField && !isDefined(currentSubFieldName)+ {recordOptionLabel}+ </Dropdown.OptionItem>+ )}+ {availableFields.map((fieldMetadataItem) => {+ const fieldIcon = (+ <SelectOptionIcon Icon={getIcon(fieldMetadataItem.icon)} />+ );++ if (isCompositeFieldType(fieldMetadataItem.type)) {+ return (+ <Dropdown.ActionItem+ key={fieldMetadataItem.id}+ page={`${pageId}:${fieldMetadataItem.id}`}+ startIcon={fieldIcon}+ >+ {fieldMetadataItem.label}+ </Dropdown.ActionItem>+ );+ }++ return (+ <Dropdown.OptionItem+ key={fieldMetadataItem.id}+ onSelect={() =>+ selectField({+ fieldId: fieldMetadataId,+ subFieldName: fieldMetadataItem.name,+ })}selected={- isCurrentGroupByField && !isDefined(currentSubFieldName)- }- indicator="check"- startIcon={- <SelectOptionIcon- Icon={getIcon(targetObjectMetadataItem?.icon)}- />+ isCurrentGroupByField &&+ currentNestedFieldName === fieldMetadataItem.name}+ startIcon={fieldIcon}>- {recordOptionLabel}- </ListItemButton>- </SelectableListItem>+ {fieldMetadataItem.label}+ </Dropdown.OptionItem>+ );+ })}+ {!isNonEmptyArray(availableFields) && !isRecordOptionVisible && (+ <Dropdown.Empty>{t`No fields available`}</Dropdown.Empty>)}- {availableFields.length === 0 && !isRecordOptionVisible ? (- <ListItem disabled>{t`No fields available`}</ListItem>- ) : (- availableFields.map((fieldMetadataItem) => (- <SelectableListItem- key={fieldMetadataItem.id}- itemId={fieldMetadataItem.id}- onEnter={() => {- handleSelectField(fieldMetadataItem);- }}- >- <ListItemButton- focused={selectedItemId === fieldMetadataItem.id}- onClick={() => {- handleSelectField(fieldMetadataItem);- }}- role="option"- aria-selected={- !isCompositeFieldType(fieldMetadataItem.type) &&- currentNestedFieldName === fieldMetadataItem.name- }- selected={- !isCompositeFieldType(fieldMetadataItem.type) &&- currentNestedFieldName === fieldMetadataItem.name- }- indicator="check"- hasSubmenu={isCompositeFieldType(fieldMetadataItem.type)}- startIcon={- <SelectOptionIcon Icon={getIcon(fieldMetadataItem.icon)} />- }- >- {fieldMetadataItem.label}- </ListItemButton>- </SelectableListItem>- ))- )}- </SelectableList>- </DropdownMenuItemsContainer>+ </ChartSettingsDropdownSection>+ </Dropdown.Page>+ {groupableFields+ .filter((fieldMetadataItem) =>+ isCompositeFieldType(fieldMetadataItem.type),+ )+ .map((fieldMetadataItem) => (+ <ChartGroupByFieldSelectionCompositeFieldView+ key={fieldMetadataItem.id}+ pageId={`${pageId}:${fieldMetadataItem.id}`}+ compositeField={fieldMetadataItem}+ fieldMetadataId={fieldMetadataId}+ subFieldNamePrefix={fieldMetadataItem.name}+ />+ ))}</>);};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartManualSortSubMenuContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartManualSortSubMenuContent.tsxindex 6d622eb2e32..5327177e4e4 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartManualSortSubMenuContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartManualSortSubMenuContent.tsx@@ -1,3 +1,5 @@+import { ChartSettingsDropdownSection } from '@/side-panel/pages/page-layout/components/chart-settings/ChartSettingsDropdownSection';+import { Dropdown } from 'twenty-ui/components/navigation';import { DraggableListRow } from '@/ui/layout/draggable-list/components/DraggableListRow';import { type DraggableListDropResult } from '@/ui/layout/draggable-list/types/DraggableListDropResult';@@ -11,12 +13,8 @@ import { getManualSortOrderFromConfig } from '@/side-panel/pages/page-layout/utiimport { isWidgetConfigurationOfType } from '@/side-panel/pages/page-layout/utils/isWidgetConfigurationOfType';import { DraggableItem } from '@/ui/layout/draggable-list/components/DraggableItem';import { DraggableList } from '@/ui/layout/draggable-list/components/DraggableList';-import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';-import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';import { t } from '@lingui/core/macro';import { isDefined } from 'twenty-shared/utils';-import { IconChevronLeft } from 'twenty-ui/icon';import { Tag } from 'twenty-ui/primitives/data-display';import { type WidgetConfiguration } from '~/generated-metadata/graphql';import { moveArrayItem } from '~/utils/array/moveArrayItem';@@ -24,13 +22,11 @@ import { moveArrayItem } from '~/utils/array/moveArrayItem';type ChartManualSortSubMenuContentProps = {fieldMetadataItem: FieldMetadataItem;axis: 'primary' | 'secondary';- onBack: () => void;};export const ChartManualSortSubMenuContent = ({fieldMetadataItem,axis,- onBack,}: ChartManualSortSubMenuContentProps) => {const { pageLayoutId } = usePageLayoutSidePanelTarget();const { widgetInEditMode } = useWidgetInEditMode(pageLayoutId);@@ -78,17 +74,8 @@ export const ChartManualSortSubMenuContent = ({return (<>- <DropdownMenuHeader- StartComponent={- <DropdownMenuHeaderLeftComponent- onClick={onBack}- Icon={IconChevronLeft}- />- }- >- {t`Reorder options`}- </DropdownMenuHeader>- <DropdownMenuItemsContainer>+ <Dropdown.Back>{t`Reorder options`}</Dropdown.Back>+ <ChartSettingsDropdownSection><DraggableListonDragEnd={handleDragEnd}draggableItems={@@ -114,7 +101,7 @@ export const ChartManualSortSubMenuContent = ({</>}/>- </DropdownMenuItemsContainer>+ </ChartSettingsDropdownSection></>);};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartNumberFormatSelectionDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartNumberFormatSelectionDropdownContent.tsxindex 675cf9054fe..509f8016ec3 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartNumberFormatSelectionDropdownContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartNumberFormatSelectionDropdownContent.tsx@@ -1,18 +1,12 @@+import { ChartSettingsDropdownSection } from '@/side-panel/pages/page-layout/components/chart-settings/ChartSettingsDropdownSection';+import { t } from '@lingui/core/macro';+import { Dropdown } from 'twenty-ui/components/navigation';import { CHART_NUMBER_FORMAT_DEFAULT } from '@/page-layout/widgets/graph/constants/ChartNumberFormatDefault';import { usePageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/hooks/usePageLayoutSidePanelTarget';import { useUpdateCurrentWidgetConfig } from '@/side-panel/pages/page-layout/hooks/useUpdateCurrentWidgetConfig';import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';import { getChartNumberFormatLabel } from '@/side-panel/pages/page-layout/utils/getChartNumberFormatLabel';import { isWidgetConfigurationOfType } from '@/side-panel/pages/page-layout/utils/isWidgetConfigurationOfType';-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';-import { DropdownComponentInstanceContext } from '@/ui/layout/dropdown/contexts/DropdownComponentInstanceContext';-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';-import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList';-import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';-import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';-import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { ListItemButton } from 'twenty-ui/components/navigation';import { ChartNumberFormat } from '~/generated-metadata/graphql';import { doNotTranslate } from 'twenty-shared/i18n';@@ -38,15 +32,6 @@ export const ChartNumberFormatSelectionDropdownContent = () => {? undefined: CHART_NUMBER_FORMAT_DEFAULT);- const dropdownId = useAvailableComponentInstanceIdOrThrow(- DropdownComponentInstanceContext,- );-- const selectedItemId = useAtomComponentStateValue(- selectedItemIdComponentState,- dropdownId,- );-const numberFormatOptions: ChartNumberFormat[] = [ChartNumberFormat.SHORT,ChartNumberFormat.FULL,@@ -55,8 +40,6 @@ export const ChartNumberFormatSelectionDropdownContent = () => {const { updateCurrentWidgetConfig } =useUpdateCurrentWidgetConfig(pageLayoutId);- const { closeDropdown } = useCloseDropdown();-const handleSelectNumberFormatOption = (numberFormatOption: ChartNumberFormat,) => {@@ -65,39 +48,24 @@ export const ChartNumberFormatSelectionDropdownContent = () => {numberFormat: numberFormatOption,},});- closeDropdown();};return (- <DropdownMenuItemsContainer>- <SelectableList- selectableListInstanceId={dropdownId}- focusId={dropdownId}- selectableItemIdArray={numberFormatOptions}+ <ChartSettingsDropdownSection>+ <Dropdown.SelectionGroup+ aria-label={t`Number format`}+ value={currentNumberFormat ?? null}>{numberFormatOptions.map((option) => (- <SelectableListItem+ <Dropdown.OptionItemkey={option}- itemId={option}- onEnter={() => {- handleSelectNumberFormatOption(option);- }}+ value={option}+ onSelect={() => handleSelectNumberFormatOption(option)}>- <ListItemButton- focused={selectedItemId === option}- onClick={() => {- handleSelectNumberFormatOption(option);- }}- role="option"- aria-selected={currentNumberFormat === option}- selected={currentNumberFormat === option}- indicator="check"- >- {getChartNumberFormatLabel(option)}- </ListItemButton>- </SelectableListItem>+ {getChartNumberFormatLabel(option)}+ </Dropdown.OptionItem>))}- </SelectableList>- </DropdownMenuItemsContainer>+ </Dropdown.SelectionGroup>+ </ChartSettingsDropdownSection>);};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartPieFieldSelectionDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartPieFieldSelectionDropdownContent.tsxindex 0ee39b6e2cb..08f7691b2a7 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartPieFieldSelectionDropdownContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartPieFieldSelectionDropdownContent.tsx@@ -1,11 +1,5 @@import { ChartGroupByFieldSelectionDropdownContentBase } from '@/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionDropdownContentBase';-import { type TypedPieChartConfiguration } from '@/side-panel/pages/page-layout/types/TypedPieChartConfiguration';-export const ChartPieFieldSelectionDropdownContent = () => {- return (- <ChartGroupByFieldSelectionDropdownContentBase<TypedPieChartConfiguration>- fieldMetadataIdKey="groupByFieldMetadataId"- subFieldNameKey="groupBySubFieldName"- />- );-};+export const ChartPieFieldSelectionDropdownContent = () => (+ <ChartGroupByFieldSelectionDropdownContentBase axis="pie" />+);diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioAggregateOperationSelectableListItem.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioAggregateOperationSelectableListItem.tsxindex e32584bdb8d..76159be7bb4 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioAggregateOperationSelectableListItem.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioAggregateOperationSelectableListItem.tsx@@ -1,58 +1,42 @@import { usePageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/hooks/usePageLayoutSidePanelTarget';import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';import { isWidgetConfigurationOfType } from '@/side-panel/pages/page-layout/utils/isWidgetConfigurationOfType';-import { DASHBOARD_AGGREGATE_OPERATION_RATIO } from '@/page-layout/widgets/graph/constants/DashboardAggregateOperationRatio';-import { DropdownComponentInstanceContext } from '@/ui/layout/dropdown/contexts/DropdownComponentInstanceContext';-import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';-import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';-import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { isDefined } from 'twenty-shared/utils';-import { ListItemButton } from 'twenty-ui/components/navigation';+import { Dropdown } from 'twenty-ui/components/navigation';+import { IconCheck } from 'twenty-ui/icon';+import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';+import { getChartAggregateDropdownPageId } from '@/side-panel/pages/page-layout/utils/getChartAggregateDropdownPageId';++type ChartRatioAggregateOperationSelectableListItemProps = {+ label: string;+ currentFieldMetadataId: string;+};export const ChartRatioAggregateOperationSelectableListItem = ({label,- onSelect,-}: {- label: string;- onSelect: () => void;-}) => {+ currentFieldMetadataId,+}: ChartRatioAggregateOperationSelectableListItemProps) => {const { pageLayoutId } = usePageLayoutSidePanelTarget();const { widgetInEditMode } = useWidgetInEditMode(pageLayoutId);- const dropdownId = useAvailableComponentInstanceIdOrThrow(- DropdownComponentInstanceContext,- );-- const selectedItemId = useAtomComponentStateValue(- selectedItemIdComponentState,- dropdownId,- );-const isCurrentlyRatio =isWidgetConfigurationOfType(widgetInEditMode?.configuration,'AggregateChartConfiguration',) && isDefined(widgetInEditMode.configuration.ratioAggregateConfig);- const isFocused = selectedItemId === DASHBOARD_AGGREGATE_OPERATION_RATIO;-return (- <SelectableListItem- itemId={DASHBOARD_AGGREGATE_OPERATION_RATIO}- onEnter={onSelect}+ <Dropdown.ActionItem+ page={getChartAggregateDropdownPageId({+ fieldMetadataId: currentFieldMetadataId,+ page: 'ratio',+ })}+ aria-current={isCurrentlyRatio ? 'true' : undefined}+ endIcon={+ isCurrentlyRatio ? <SelectOptionIcon Icon={IconCheck} /> : undefined+ }>- <ListItemButton- focused={isFocused}- onClick={onSelect}- role="option"- aria-selected={isCurrentlyRatio}- selected={isCurrentlyRatio}- indicator="check"- hasSubmenu={true}- >- {label}- </ListItemButton>- </SelectableListItem>+ {label}+ </Dropdown.ActionItem>);};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioOptionBooleanSelectableListItem.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioOptionBooleanSelectableListItem.tsxindex 913b9b946ce..22e7c639c10 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioOptionBooleanSelectableListItem.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioOptionBooleanSelectableListItem.tsx@@ -3,40 +3,25 @@ import { usePageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/hooimport { useUpdateCurrentWidgetConfig } from '@/side-panel/pages/page-layout/hooks/useUpdateCurrentWidgetConfig';import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';import { isWidgetConfigurationOfType } from '@/side-panel/pages/page-layout/utils/isWidgetConfigurationOfType';-import { DropdownComponentInstanceContext } from '@/ui/layout/dropdown/contexts/DropdownComponentInstanceContext';-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';-import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';-import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';-import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { IconCheck, IconX } from 'twenty-ui/icon';-import { ListItemButton } from 'twenty-ui/components/navigation';+import { Dropdown } from 'twenty-ui/components/navigation';import { AggregateOperations } from '~/generated-metadata/graphql';+type ChartRatioOptionBooleanSelectableListItemProps = {+ optionValue: string;+ label: string;+ currentFieldMetadataId: string;+};+export const ChartRatioOptionBooleanSelectableListItem = ({optionValue,label,currentFieldMetadataId,-}: {- optionValue: string;- label: string;- currentFieldMetadataId: string;-}) => {+}: ChartRatioOptionBooleanSelectableListItemProps) => {const { pageLayoutId } = usePageLayoutSidePanelTarget();const { widgetInEditMode } = useWidgetInEditMode(pageLayoutId);const { updateCurrentWidgetConfig } =useUpdateCurrentWidgetConfig(pageLayoutId);- const { closeDropdown } = useCloseDropdown();-- const dropdownId = useAvailableComponentInstanceIdOrThrow(- DropdownComponentInstanceContext,- );-- const selectedItemId = useAtomComponentStateValue(- selectedItemIdComponentState,- dropdownId,- );-const currentRatioConfig = isWidgetConfigurationOfType(widgetInEditMode?.configuration,'AggregateChartConfiguration',@@ -45,7 +30,6 @@ export const ChartRatioOptionBooleanSelectableListItem = ({: undefined;const isSelected = currentRatioConfig?.optionValue === optionValue;- const isFocused = selectedItemId === optionValue;const handleClick = () => {updateCurrentWidgetConfig({@@ -58,24 +42,17 @@ export const ChartRatioOptionBooleanSelectableListItem = ({},},});- closeDropdown();};return (- <SelectableListItem itemId={optionValue} onEnter={handleClick}>- <ListItemButton- focused={isFocused}- onClick={handleClick}- role="option"- aria-selected={isSelected}- selected={isSelected}- indicator="check"- startIcon={- <SelectOptionIcon Icon={optionValue === 'true' ? IconCheck : IconX} />- }- >- {label}- </ListItemButton>- </SelectableListItem>+ <Dropdown.OptionItem+ onSelect={handleClick}+ selected={isSelected}+ startIcon={+ <SelectOptionIcon Icon={optionValue === 'true' ? IconCheck : IconX} />+ }+ >+ {label}+ </Dropdown.OptionItem>);};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioOptionSelectSelectableListItem.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioOptionSelectSelectableListItem.tsxindex f4e03c96718..e310d72d230 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioOptionSelectSelectableListItem.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioOptionSelectSelectableListItem.tsx@@ -2,43 +2,28 @@ import { usePageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/hooimport { useUpdateCurrentWidgetConfig } from '@/side-panel/pages/page-layout/hooks/useUpdateCurrentWidgetConfig';import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';import { isWidgetConfigurationOfType } from '@/side-panel/pages/page-layout/utils/isWidgetConfigurationOfType';-import { DropdownComponentInstanceContext } from '@/ui/layout/dropdown/contexts/DropdownComponentInstanceContext';-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';-import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';-import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';-import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { Tag } from 'twenty-ui/primitives/data-display';-import { ListItemButton } from 'twenty-ui/components/navigation';+import { Dropdown } from 'twenty-ui/components/navigation';import { type ThemeColor } from 'twenty-ui/theme';import { AggregateOperations } from '~/generated-metadata/graphql';+type ChartRatioOptionSelectSelectableListItemProps = {+ optionValue: string;+ label: string;+ color: ThemeColor | undefined;+ currentFieldMetadataId: string;+};+export const ChartRatioOptionSelectSelectableListItem = ({optionValue,label,color,currentFieldMetadataId,-}: {- optionValue: string;- label: string;- color: ThemeColor | undefined;- currentFieldMetadataId: string;-}) => {+}: ChartRatioOptionSelectSelectableListItemProps) => {const { pageLayoutId } = usePageLayoutSidePanelTarget();const { widgetInEditMode } = useWidgetInEditMode(pageLayoutId);const { updateCurrentWidgetConfig } =useUpdateCurrentWidgetConfig(pageLayoutId);- const { closeDropdown } = useCloseDropdown();-- const dropdownId = useAvailableComponentInstanceIdOrThrow(- DropdownComponentInstanceContext,- );-- const selectedItemId = useAtomComponentStateValue(- selectedItemIdComponentState,- dropdownId,- );-const currentRatioConfig = isWidgetConfigurationOfType(widgetInEditMode?.configuration,'AggregateChartConfiguration',@@ -47,7 +32,6 @@ export const ChartRatioOptionSelectSelectableListItem = ({: undefined;const isSelected = currentRatioConfig?.optionValue === optionValue;- const isFocused = selectedItemId === optionValue;const handleClick = () => {updateCurrentWidgetConfig({@@ -60,21 +44,11 @@ export const ChartRatioOptionSelectSelectableListItem = ({},},});- closeDropdown();};return (- <SelectableListItem itemId={optionValue} onEnter={handleClick}>- <ListItemButton- focused={isFocused}- onClick={handleClick}- role="option"- aria-selected={isSelected}- selected={isSelected}- indicator="check"- >- <Tag color={color ?? 'transparent'}>{label}</Tag>- </ListItemButton>- </SelectableListItem>+ <Dropdown.OptionItem onSelect={handleClick} selected={isSelected}>+ <Tag color={color ?? 'transparent'}>{label}</Tag>+ </Dropdown.OptionItem>);};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioOptionValueSelectionDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioOptionValueSelectionDropdownContent.tsxindex 0814d19b659..2220bf2775d 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioOptionValueSelectionDropdownContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioOptionValueSelectionDropdownContent.tsx@@ -4,18 +4,11 @@ import { usePageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/hooimport { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';import { isWidgetConfigurationOfType } from '@/side-panel/pages/page-layout/utils/isWidgetConfigurationOfType';import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';-import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';-import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';-import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';-import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';-import { DropdownComponentInstanceContext } from '@/ui/layout/dropdown/contexts/DropdownComponentInstanceContext';-import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList';-import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';import { t } from '@lingui/core/macro';import { useState } from 'react';-import { isDefined } from 'twenty-shared/utils';-import { IconChevronLeft } from 'twenty-ui/icon';+import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';+import { Dropdown } from 'twenty-ui/components/navigation';+import { ChartSettingsDropdownSection } from '@/side-panel/pages/page-layout/components/chart-settings/ChartSettingsDropdownSection';import { type ThemeColor } from 'twenty-ui/theme';import { FieldMetadataType } from '~/generated-metadata/graphql';import { filterBySearchQuery } from '~/utils/filterBySearchQuery';@@ -26,22 +19,18 @@ type RatioOption = {color?: ThemeColor;};+type ChartRatioOptionValueSelectionDropdownContentProps = {+ currentFieldMetadataId: string;+};+export const ChartRatioOptionValueSelectionDropdownContent = ({currentFieldMetadataId,- setIsOptionValueMenuOpen,-}: {- currentFieldMetadataId: string;- setIsOptionValueMenuOpen: (isOpen: boolean) => void;-}) => {+}: ChartRatioOptionValueSelectionDropdownContentProps) => {const [searchQuery, setSearchQuery] = useState('');const { objectMetadataItems } = useObjectMetadataItems();const { pageLayoutId } = usePageLayoutSidePanelTarget();const { widgetInEditMode } = useWidgetInEditMode(pageLayoutId);- const dropdownId = useAvailableComponentInstanceIdOrThrow(- DropdownComponentInstanceContext,- );-if (!isWidgetConfigurationOfType(widgetInEditMode?.configuration,@@ -97,50 +86,39 @@ export const ChartRatioOptionValueSelectionDropdownContent = ({return (<>- <DropdownMenuHeader- StartComponent={- <DropdownMenuHeaderLeftComponent- onClick={() => setIsOptionValueMenuOpen(false)}- Icon={IconChevronLeft}- />- }- >+ <Dropdown.Back aria-label={t`Back to operations`}>{t`Select value`}- </DropdownMenuHeader>- <DropdownMenuSearchInput- autoFocus- type="text"+ </Dropdown.Back>+ <Dropdown.Searchplaceholder={t`Search options`}- onChange={(event) => setSearchQuery(event.target.value)}+ aria-label={t`Search options`}+ onValueChange={setSearchQuery}value={searchQuery}/>- <DropdownMenuSeparator />- <DropdownMenuItemsContainer>- <SelectableList- selectableListInstanceId={dropdownId}- focusId={dropdownId}- selectableItemIdArray={filteredOptions.map((item) => item.value)}- >- {filteredOptions.map((option) =>- isBoolean ? (- <ChartRatioOptionBooleanSelectableListItem- key={option.value}- optionValue={option.value}- label={option.label}- currentFieldMetadataId={currentFieldMetadataId}- />- ) : (- <ChartRatioOptionSelectSelectableListItem- key={option.value}- optionValue={option.value}- label={option.label}- color={option.color}- currentFieldMetadataId={currentFieldMetadataId}- />- ),- )}- </SelectableList>- </DropdownMenuItemsContainer>+ <Dropdown.Separator />+ <ChartSettingsDropdownSection>+ {filteredOptions.map((option) =>+ isBoolean ? (+ <ChartRatioOptionBooleanSelectableListItem+ key={option.value}+ optionValue={option.value}+ label={option.label}+ currentFieldMetadataId={currentFieldMetadataId}+ />+ ) : (+ <ChartRatioOptionSelectSelectableListItem+ key={option.value}+ optionValue={option.value}+ label={option.label}+ color={option.color}+ currentFieldMetadataId={currentFieldMetadataId}+ />+ ),+ )}+ {!isNonEmptyArray(filteredOptions) && (+ <Dropdown.Empty>{t`No options found`}</Dropdown.Empty>+ )}+ </ChartSettingsDropdownSection></>);};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartSortByGroupByFieldDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartSortByGroupByFieldDropdownContent.tsxindex fb32705a331..e72c62a5fec 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartSortByGroupByFieldDropdownContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartSortByGroupByFieldDropdownContent.tsx@@ -1,6 +1,9 @@+import { ChartSettingsDropdownSection } from '@/side-panel/pages/page-layout/components/chart-settings/ChartSettingsDropdownSection';+import { CHART_SORT_DROPDOWN_PAGE } from '@/side-panel/pages/page-layout/constants/ChartSortDropdownPage';+import { Dropdown } from 'twenty-ui/components/navigation';+import { IconCheck } from 'twenty-ui/icon';import { findFieldMetadataItemByFieldMetadataId } from '@/object-metadata/utils/findFieldMetadataItemByFieldMetadataId';import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';-import { useState } from 'react';import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';@@ -14,30 +17,19 @@ import { filterSortOptionsByFieldType } from '@/side-panel/pages/page-layout/utiimport { getDefaultManualSortOrder } from '@/side-panel/pages/page-layout/utils/getDefaultManualSortOrder';import { getSortIconForFieldType } from '@/side-panel/pages/page-layout/utils/getSortIconForFieldType';import { isWidgetConfigurationOfType } from '@/side-panel/pages/page-layout/utils/isWidgetConfigurationOfType';-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';-import { DropdownComponentInstanceContext } from '@/ui/layout/dropdown/contexts/DropdownComponentInstanceContext';-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';-import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList';-import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';-import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';-import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { isDefined } from 'twenty-shared/utils';import { doNotTranslate } from 'twenty-shared/i18n';-import { ListItemButton } from 'twenty-ui/components/navigation';import {GraphOrderBy,type GraphOrderBy as GraphOrderByType,} from '~/generated-metadata/graphql';export const ChartSortByGroupByFieldDropdownContent = () => {- const [isSubMenuOpen, setIsSubMenuOpen] = useState(false);const { pageLayoutId } = usePageLayoutSidePanelTarget();const { widgetInEditMode } = useWidgetInEditMode(pageLayoutId);const { objectMetadataItems } = useObjectMetadataItems();const { updateCurrentWidgetConfig } =useUpdateCurrentWidgetConfig(pageLayoutId);- const { closeDropdown } = useCloseDropdown();const configuration = widgetInEditMode?.configuration;@@ -53,15 +45,6 @@ export const ChartSortByGroupByFieldDropdownContent = () => {throw new Error(doNotTranslate('No data source in chart'));}- const dropdownId = useAvailableComponentInstanceIdOrThrow(- DropdownComponentInstanceContext,- );-- const selectedItemId = useAtomComponentStateValue(- selectedItemIdComponentState,- dropdownId,- );-const objectMetadataItem = objectMetadataItems.find((item) => item.id === widgetInEditMode.objectMetadataId,);@@ -87,101 +70,94 @@ export const ChartSortByGroupByFieldDropdownContent = () => {const configToUpdate: Record<string, unknown> = {secondaryAxisOrderBy: orderBy,};-- if (orderBy === GraphOrderBy.MANUAL) {- const existingManualSortOrder =- configuration.secondaryAxisManualSortOrder;-- if (!isDefined(existingManualSortOrder)) {- configToUpdate.secondaryAxisManualSortOrder = getDefaultManualSortOrder(- secondaryAxisField?.options,- );- }-- updateCurrentWidgetConfig({ configToUpdate });- setIsSubMenuOpen(true);- return;+ const shouldInitializeManualSortOrder =+ orderBy === GraphOrderBy.MANUAL &&+ !isDefined(configuration.secondaryAxisManualSortOrder);+ const shouldClearManualSortOrder =+ configuration.secondaryAxisOrderBy === GraphOrderBy.MANUAL &&+ orderBy !== GraphOrderBy.MANUAL;++ if (shouldInitializeManualSortOrder) {+ configToUpdate.secondaryAxisManualSortOrder = getDefaultManualSortOrder(+ secondaryAxisField.options,+ );}- if (configuration.secondaryAxisOrderBy === GraphOrderBy.MANUAL) {+ if (shouldClearManualSortOrder) {configToUpdate.secondaryAxisManualSortOrder = null;}updateCurrentWidgetConfig({ configToUpdate });- closeDropdown();};const availableOptions = filterSortOptionsByFieldType({options: AGGREGATE_SORT_BY_OPTIONS,- fieldType: secondaryAxisField?.type,+ fieldType: secondaryAxisField.type,});- if (isSubMenuOpen && isDefined(secondaryAxisField)) {- return (- <ChartManualSortSubMenuContent- fieldMetadataItem={secondaryAxisField}- axis="secondary"- onBack={() => setIsSubMenuOpen(false)}- />- );- }-return (- <DropdownMenuItemsContainer>- <SelectableList- selectableListInstanceId={dropdownId}- focusId={dropdownId}- selectableItemIdArray={availableOptions.map((option) => option.value)}- >- {availableOptions.map((sortOption) => {- const isManualOption = sortOption.value === GraphOrderBy.MANUAL;-- return (- <SelectableListItem- key={sortOption.value}- itemId={sortOption.value}- onEnter={() => {- handleSelectSortOption(sortOption.value);- }}- >- <ListItemButton- focused={selectedItemId === sortOption.value}- onClick={() => {- handleSelectSortOption(sortOption.value);- }}- role="option"- aria-selected={- configuration.secondaryAxisOrderBy === sortOption.value- }- selected={- configuration.secondaryAxisOrderBy === sortOption.value- }- indicator="check"- hasSubmenu={isManualOption}- startIcon={- <SelectOptionIcon- Icon={- sortOption.icon ??- getSortIconForFieldType({- fieldType: secondaryAxisField?.type,- orderBy: sortOption.value,- })- }- />+ <>+ <Dropdown.Page id={CHART_SORT_DROPDOWN_PAGE.ROOT}>+ <ChartSettingsDropdownSection>+ {availableOptions.map((sortOption) => {+ const isManualOption = sortOption.value === GraphOrderBy.MANUAL;+ const isSelected =+ configuration.secondaryAxisOrderBy === sortOption.value;+ const startIcon = (+ <SelectOptionIcon+ Icon={+ sortOption.icon ??+ getSortIconForFieldType({+ fieldType: secondaryAxisField.type,+ orderBy: sortOption.value,+ })}+ />+ );+ const label = (+ <OverflowingTextWithTooltip+ text={getGroupBySortOptionLabel({+ graphOrderBy: sortOption.value,+ groupByFieldMetadataId:+ configuration.secondaryAxisGroupByFieldMetadataId ?? '',+ })}+ />+ );++ if (isManualOption) {+ return (+ <Dropdown.ActionItem+ key={sortOption.value}+ page={CHART_SORT_DROPDOWN_PAGE.MANUAL}+ onClick={() => handleSelectSortOption(sortOption.value)}+ aria-current={isSelected ? 'true' : undefined}+ startIcon={startIcon}+ endIcon={isSelected ? <IconCheck /> : undefined}+ >+ {label}+ </Dropdown.ActionItem>+ );+ }++ return (+ <Dropdown.OptionItem+ key={sortOption.value}+ selected={isSelected}+ onSelect={() => handleSelectSortOption(sortOption.value)}+ startIcon={startIcon}>- <OverflowingTextWithTooltip- text={getGroupBySortOptionLabel({- graphOrderBy: sortOption.value,- groupByFieldMetadataId:- configuration.secondaryAxisGroupByFieldMetadataId ?? '',- })}- />- </ListItemButton>- </SelectableListItem>- );- })}- </SelectableList>- </DropdownMenuItemsContainer>+ {label}+ </Dropdown.OptionItem>+ );+ })}+ </ChartSettingsDropdownSection>+ </Dropdown.Page>+ <Dropdown.Page id={CHART_SORT_DROPDOWN_PAGE.MANUAL} type="panel">+ <ChartManualSortSubMenuContent+ fieldMetadataItem={secondaryAxisField}+ axis="secondary"+ />+ </Dropdown.Page>+ </>);};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartSortBySelectionDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartSortBySelectionDropdownContent.tsxindex e0050fe10e5..6c8cc554ea4 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartSortBySelectionDropdownContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartSortBySelectionDropdownContent.tsx@@ -1,6 +1,9 @@+import { ChartSettingsDropdownSection } from '@/side-panel/pages/page-layout/components/chart-settings/ChartSettingsDropdownSection';+import { CHART_SORT_DROPDOWN_PAGE } from '@/side-panel/pages/page-layout/constants/ChartSortDropdownPage';+import { Dropdown } from 'twenty-ui/components/navigation';+import { IconCheck } from 'twenty-ui/icon';import { findFieldMetadataItemByFieldMetadataId } from '@/object-metadata/utils/findFieldMetadataItemByFieldMetadataId';import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';-import { useState } from 'react';import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';@@ -14,41 +17,16 @@ import { filterSortOptionsByFieldType } from '@/side-panel/pages/page-layout/utiimport { getDefaultManualSortOrder } from '@/side-panel/pages/page-layout/utils/getDefaultManualSortOrder';import { getSortIconForFieldType } from '@/side-panel/pages/page-layout/utils/getSortIconForFieldType';import { isWidgetConfigurationOfType } from '@/side-panel/pages/page-layout/utils/isWidgetConfigurationOfType';-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';-import { DropdownComponentInstanceContext } from '@/ui/layout/dropdown/contexts/DropdownComponentInstanceContext';-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';-import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList';-import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';-import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';-import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { type CompositeFieldSubFieldName } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';import { doNotTranslate } from 'twenty-shared/i18n';-import { ListItemButton } from 'twenty-ui/components/navigation';-import {- type BarChartConfiguration,- GraphOrderBy,- type LineChartConfiguration,-} from '~/generated-metadata/graphql';+import { GraphOrderBy } from '~/generated-metadata/graphql';export const ChartSortBySelectionDropdownContent = () => {- const [isSubMenuOpen, setIsSubMenuOpen] = useState(false);const { pageLayoutId } = usePageLayoutSidePanelTarget();const { widgetInEditMode } = useWidgetInEditMode(pageLayoutId);const { objectMetadataItems } = useObjectMetadataItems();const { updateCurrentWidgetConfig } =useUpdateCurrentWidgetConfig(pageLayoutId);- const { closeDropdown } = useCloseDropdown();-- const dropdownId = useAvailableComponentInstanceIdOrThrow(- DropdownComponentInstanceContext,- );-- const selectedItemId = useAtomComponentStateValue(- selectedItemIdComponentState,- dropdownId,- );const configuration = widgetInEditMode?.configuration;@@ -81,25 +59,15 @@ export const ChartSortBySelectionDropdownContent = () => {(item) => item.id === widgetInEditMode.objectMetadataId,);- let currentOrderBy: GraphOrderBy | undefined;- let groupByFieldMetadataId: string | undefined;- let groupBySubFieldName: string | null | undefined;-- if (isPieChart) {- currentOrderBy = configuration.orderBy ?? undefined;- groupByFieldMetadataId = configuration.groupByFieldMetadataId;- groupBySubFieldName = configuration.groupBySubFieldName;- } else {- const barOrLineChartConfiguration = configuration as- | BarChartConfiguration- | LineChartConfiguration;- currentOrderBy =- barOrLineChartConfiguration.primaryAxisOrderBy ?? undefined;- groupByFieldMetadataId =- barOrLineChartConfiguration.primaryAxisGroupByFieldMetadataId;- groupBySubFieldName =- barOrLineChartConfiguration.primaryAxisGroupBySubFieldName;- }+ const currentOrderBy = isPieChart+ ? configuration.orderBy+ : configuration.primaryAxisOrderBy;+ const groupByFieldMetadataId = isPieChart+ ? configuration.groupByFieldMetadataId+ : configuration.primaryAxisGroupByFieldMetadataId;+ const groupBySubFieldName = isPieChart+ ? configuration.groupBySubFieldName+ : configuration.primaryAxisGroupBySubFieldName;const primaryAxisField = findFieldMetadataItemByFieldMetadataId({fieldMetadataItems: objectMetadataItem?.fields,@@ -112,121 +80,103 @@ export const ChartSortBySelectionDropdownContent = () => {const existingManualSortOrder = isPieChart? configuration.manualSortOrder- : (configuration as BarChartConfiguration | LineChartConfiguration)- .primaryAxisManualSortOrder;+ : configuration.primaryAxisManualSortOrder;const handleSelect = (orderBy: GraphOrderBy) => {- const configToUpdate: Record<string, unknown> = {};-- if (orderBy === GraphOrderBy.MANUAL) {- const orderByKey = isPieChart ? 'orderBy' : 'primaryAxisOrderBy';- const manualSortOrderKey = isPieChart- ? 'manualSortOrder'- : 'primaryAxisManualSortOrder';-- configToUpdate[orderByKey] = orderBy;-- if (!isDefined(existingManualSortOrder)) {- configToUpdate[manualSortOrderKey] = getDefaultManualSortOrder(- primaryAxisField?.options,- );- }-- updateCurrentWidgetConfig({ configToUpdate });- setIsSubMenuOpen(true);- return;+ const orderByKey = isPieChart ? 'orderBy' : 'primaryAxisOrderBy';+ const manualSortOrderKey = isPieChart+ ? 'manualSortOrder'+ : 'primaryAxisManualSortOrder';+ const configToUpdate: Record<string, unknown> = { [orderByKey]: orderBy };+ const shouldInitializeManualSortOrder =+ orderBy === GraphOrderBy.MANUAL && !isDefined(existingManualSortOrder);+ const shouldClearManualSortOrder =+ currentOrderBy === GraphOrderBy.MANUAL && orderBy !== GraphOrderBy.MANUAL;++ if (shouldInitializeManualSortOrder) {+ configToUpdate[manualSortOrderKey] = getDefaultManualSortOrder(+ primaryAxisField.options,+ );}- if (currentOrderBy === GraphOrderBy.MANUAL) {- const manualSortOrderKey = isPieChart- ? 'manualSortOrder'- : 'primaryAxisManualSortOrder';+ if (shouldClearManualSortOrder) {configToUpdate[manualSortOrderKey] = null;}- if (isPieChart) {- configToUpdate.orderBy = orderBy;- } else {- configToUpdate.primaryAxisOrderBy = orderBy;- }-updateCurrentWidgetConfig({ configToUpdate });- closeDropdown();};const availableOptions = filterSortOptionsByFieldType({options: X_SORT_BY_OPTIONS,- fieldType: primaryAxisField?.type,+ fieldType: primaryAxisField.type,});- if (isSubMenuOpen && isDefined(primaryAxisField)) {- return (- <ChartManualSortSubMenuContent- fieldMetadataItem={primaryAxisField}- axis={'primary'}- onBack={() => setIsSubMenuOpen(false)}- />- );- }-return (- <DropdownMenuItemsContainer>- <SelectableList- selectableListInstanceId={dropdownId}- focusId={dropdownId}- selectableItemIdArray={availableOptions.map((option) => option.value)}- >- {availableOptions.map((sortOption) => {- const isManualOption = sortOption.value === GraphOrderBy.MANUAL;-- return (- <SelectableListItem- key={sortOption.value}- itemId={sortOption.value}- onEnter={() => {- handleSelect(sortOption.value);- }}- >- <ListItemButton- focused={selectedItemId === sortOption.value}- onClick={() => {- handleSelect(sortOption.value);- }}- role="option"- aria-selected={currentOrderBy === sortOption.value}- selected={currentOrderBy === sortOption.value}- indicator="check"- hasSubmenu={isManualOption}- startIcon={- <SelectOptionIcon- Icon={- sortOption.icon ??- getSortIconForFieldType({- fieldType: primaryAxisField?.type,- orderBy: sortOption.value,- })- }- />+ <>+ <Dropdown.Page id={CHART_SORT_DROPDOWN_PAGE.ROOT}>+ <ChartSettingsDropdownSection>+ {availableOptions.map((sortOption) => {+ const isManualOption = sortOption.value === GraphOrderBy.MANUAL;+ const isSelected = currentOrderBy === sortOption.value;+ const startIcon = (+ <SelectOptionIcon+ Icon={+ sortOption.icon ??+ getSortIconForFieldType({+ fieldType: primaryAxisField.type,+ orderBy: sortOption.value,+ })}+ />+ );+ const label = (+ <OverflowingTextWithTooltip+ text={getXSortOptionLabel({+ graphOrderBy: sortOption.value,+ groupByFieldMetadataIdX: groupByFieldMetadataId ?? '',+ groupBySubFieldNameX: groupBySubFieldName ?? undefined,+ aggregateFieldMetadataId:+ configuration.aggregateFieldMetadataId ?? undefined,+ aggregateOperation:+ configuration.aggregateOperation ?? undefined,+ })}+ />+ );++ if (isManualOption) {+ return (+ <Dropdown.ActionItem+ key={sortOption.value}+ page={CHART_SORT_DROPDOWN_PAGE.MANUAL}+ onClick={() => handleSelect(sortOption.value)}+ aria-current={isSelected ? 'true' : undefined}+ startIcon={startIcon}+ endIcon={isSelected ? <IconCheck /> : undefined}+ >+ {label}+ </Dropdown.ActionItem>+ );+ }++ return (+ <Dropdown.OptionItem+ key={sortOption.value}+ selected={isSelected}+ onSelect={() => handleSelect(sortOption.value)}+ startIcon={startIcon}>- <OverflowingTextWithTooltip- text={getXSortOptionLabel({- graphOrderBy: sortOption.value,- groupByFieldMetadataIdX: groupByFieldMetadataId ?? '',- groupBySubFieldNameX: groupBySubFieldName as- | CompositeFieldSubFieldName- | undefined,- aggregateFieldMetadataId:- configuration.aggregateFieldMetadataId ?? undefined,- aggregateOperation:- configuration.aggregateOperation ?? undefined,- })}- />- </ListItemButton>- </SelectableListItem>- );- })}- </SelectableList>- </DropdownMenuItemsContainer>+ {label}+ </Dropdown.OptionItem>+ );+ })}+ </ChartSettingsDropdownSection>+ </Dropdown.Page>+ <Dropdown.Page id={CHART_SORT_DROPDOWN_PAGE.MANUAL} type="panel">+ <ChartManualSortSubMenuContent+ fieldMetadataItem={primaryAxisField}+ axis="primary"+ />+ </Dropdown.Page>+ </>);};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartXAxisFieldSelectionDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartXAxisFieldSelectionDropdownContent.tsxindex 331fe321279..df0d99e226e 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartXAxisFieldSelectionDropdownContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartXAxisFieldSelectionDropdownContent.tsx@@ -1,14 +1,5 @@import { ChartGroupByFieldSelectionDropdownContentBase } from '@/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionDropdownContentBase';-import { type TypedBarChartConfiguration } from '@/side-panel/pages/page-layout/types/TypedBarChartConfiguration';-import { type TypedLineChartConfiguration } from '@/side-panel/pages/page-layout/types/TypedLineChartConfiguration';-export const ChartXAxisFieldSelectionDropdownContent = () => {- return (- <ChartGroupByFieldSelectionDropdownContentBase<- TypedBarChartConfiguration | TypedLineChartConfiguration- >- fieldMetadataIdKey="primaryAxisGroupByFieldMetadataId"- subFieldNameKey="primaryAxisGroupBySubFieldName"- />- );-};+export const ChartXAxisFieldSelectionDropdownContent = () => (+ <ChartGroupByFieldSelectionDropdownContentBase axis="primary" />+);diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/PageLayoutDropdownContentContainer.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/PageLayoutDropdownContentContainer.tsxindex 17320e283ce..a5bc34ac9b5 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/PageLayoutDropdownContentContainer.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/PageLayoutDropdownContentContainer.tsx@@ -1,8 +1,7 @@+import { PAGE_LAYOUT_DROPDOWN_CONTENT_MAX_HEIGHT } from '@/side-panel/pages/page-layout/constants/PageLayoutDropdownContentMaxHeight';import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';import { styled } from '@linaria/react';-const PAGE_LAYOUT_DROPDOWN_CONTENT_MAX_HEIGHT = 340;-export const StyledPageLayoutDropdownContentContainer = styled.div`display: flex;flex-direction: column;diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/ChartSortDropdownPage.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/ChartSortDropdownPage.tsnew file mode 100644index 00000000000..54c71dfb098--- /dev/null+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/ChartSortDropdownPage.ts@@ -0,0 +1,4 @@+export const CHART_SORT_DROPDOWN_PAGE = {+ ROOT: 'root',+ MANUAL: 'manual-sort',+};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/PageLayoutDropdownContentMaxHeight.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/PageLayoutDropdownContentMaxHeight.tsnew file mode 100644index 00000000000..574dadb1c0b--- /dev/null+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/constants/PageLayoutDropdownContentMaxHeight.ts@@ -0,0 +1 @@+export const PAGE_LAYOUT_DROPDOWN_CONTENT_MAX_HEIGHT = 340;diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/contexts/ChartGroupByFieldSelectionContext.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/contexts/ChartGroupByFieldSelectionContext.tsnew file mode 100644index 00000000000..5e5d3ba7711--- /dev/null+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/contexts/ChartGroupByFieldSelectionContext.ts@@ -0,0 +1,5 @@+import { type useChartGroupByFieldSelection } from '@/side-panel/pages/page-layout/hooks/useChartGroupByFieldSelection';+import { createContext } from 'react';++export const ChartGroupByFieldSelectionContext =+ createContext<ReturnType<typeof useChartGroupByFieldSelection>>(null);diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/useChartGroupByFieldSelection.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/useChartGroupByFieldSelection.tsnew file mode 100644index 00000000000..494f0e64e50--- /dev/null+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/useChartGroupByFieldSelection.ts@@ -0,0 +1,104 @@+import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';+import { usePageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/hooks/usePageLayoutSidePanelTarget';+import { useUpdateCurrentWidgetConfig } from '@/side-panel/pages/page-layout/hooks/useUpdateCurrentWidgetConfig';+import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';+import { type ChartGroupByFieldSelectionAxis } from '@/side-panel/pages/page-layout/types/ChartGroupByFieldSelectionAxis';+import { buildChartGroupByFieldConfigUpdate } from '@/side-panel/pages/page-layout/utils/buildChartGroupByFieldConfigUpdate';+import { isWidgetConfigurationOfType } from '@/side-panel/pages/page-layout/utils/isWidgetConfigurationOfType';+import { isDefined } from 'twenty-shared/utils';++export const useChartGroupByFieldSelection = ({+ axis,+}: {+ axis: ChartGroupByFieldSelectionAxis;+}) => {+ const { objectMetadataItems } = useObjectMetadataItems();+ const { pageLayoutId } = usePageLayoutSidePanelTarget();+ const { widgetInEditMode } = useWidgetInEditMode(pageLayoutId);+ const { updateCurrentWidgetConfig } =+ useUpdateCurrentWidgetConfig(pageLayoutId);+ const configuration = widgetInEditMode?.configuration;+ const sourceObjectMetadataItem = objectMetadataItems.find(+ (item) => item.id === widgetInEditMode?.objectMetadataId,+ );++ if (!isDefined(sourceObjectMetadataItem)) {+ return null;+ }++ if (+ axis === 'pie' &&+ isWidgetConfigurationOfType(configuration, 'PieChartConfiguration')+ ) {+ const selectField = ({+ fieldId,+ subFieldName = null,+ }: {+ fieldId: string | null;+ subFieldName?: string | null;+ }) => {+ updateCurrentWidgetConfig({+ configToUpdate: buildChartGroupByFieldConfigUpdate({+ configuration,+ fieldMetadataIdKey: 'groupByFieldMetadataId',+ subFieldNameKey: 'groupBySubFieldName',+ fieldId,+ subFieldName,+ objectMetadataItem: sourceObjectMetadataItem,+ objectMetadataItems,+ }),+ });+ };++ return {+ currentGroupByFieldMetadataId: configuration.groupByFieldMetadataId,+ currentSubFieldName: configuration.groupBySubFieldName,+ sourceObjectMetadataItem,+ selectField,+ };+ }++ const isCartesianChart =+ isWidgetConfigurationOfType(configuration, 'BarChartConfiguration') ||+ isWidgetConfigurationOfType(configuration, 'LineChartConfiguration');++ if (axis === 'pie' || !isCartesianChart) {+ return null;+ }++ const fieldMetadataIdKey =+ axis === 'primary'+ ? 'primaryAxisGroupByFieldMetadataId'+ : 'secondaryAxisGroupByFieldMetadataId';+ const subFieldNameKey =+ axis === 'primary'+ ? 'primaryAxisGroupBySubFieldName'+ : 'secondaryAxisGroupBySubFieldName';++ const selectField = ({+ fieldId,+ subFieldName = null,+ }: {+ fieldId: string | null;+ subFieldName?: string | null;+ }) => {+ updateCurrentWidgetConfig({+ configToUpdate: buildChartGroupByFieldConfigUpdate({+ configuration,+ fieldMetadataIdKey,+ subFieldNameKey,+ fieldId,+ subFieldName,+ objectMetadataItem: sourceObjectMetadataItem,+ objectMetadataItems,+ }),+ });+ };++ return {+ currentGroupByFieldMetadataId: configuration[fieldMetadataIdKey],+ currentSubFieldName: configuration[subFieldNameKey],+ sourceObjectMetadataItem,+ selectField,+ };+};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/useChartGroupByFieldSelectionContextOrThrow.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/useChartGroupByFieldSelectionContextOrThrow.tsnew file mode 100644index 00000000000..2820d9c2f56--- /dev/null+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/useChartGroupByFieldSelectionContextOrThrow.ts@@ -0,0 +1,18 @@+import { ChartGroupByFieldSelectionContext } from '@/side-panel/pages/page-layout/contexts/ChartGroupByFieldSelectionContext';+import { useContext } from 'react';+import { doNotTranslate } from 'twenty-shared/i18n';+import { isDefined } from 'twenty-shared/utils';++export const useChartGroupByFieldSelectionContextOrThrow = () => {+ const context = useContext(ChartGroupByFieldSelectionContext);++ if (!isDefined(context)) {+ throw new Error(+ doNotTranslate(+ 'useChartGroupByFieldSelectionContextOrThrow must be used within a chart group-by field selection',+ ),+ );+ }++ return context;+};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/useGraphXSortOptionLabels.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/useGraphXSortOptionLabels.tsindex 1454148e2e7..5937d366a4d 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/useGraphXSortOptionLabels.ts+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/useGraphXSortOptionLabels.ts@@ -6,7 +6,6 @@ import { getAggregateOperationLabel } from '@/object-record/record-board/record-import { type ExtendedAggregateOperations } from '@/object-record/record-table/types/ExtendedAggregateOperations';import { t } from '@lingui/core/macro';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';-import { type CompositeFieldSubFieldName } from 'twenty-shared/types';import { assertUnreachable, isDefined } from 'twenty-shared/utils';import { GraphOrderBy } from '~/generated-metadata/graphql';@@ -30,7 +29,7 @@ export const useGraphXSortOptionLabels = ({}: {graphOrderBy: GraphOrderBy;groupByFieldMetadataIdX: string;- groupBySubFieldNameX?: CompositeFieldSubFieldName;+ groupBySubFieldNameX?: string;aggregateFieldMetadataId?: string;aggregateOperation?: ExtendedAggregateOperations;}): string => {diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/types/ChartGroupByFieldSelectionAxis.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/types/ChartGroupByFieldSelectionAxis.tsnew file mode 100644index 00000000000..220e363deb4--- /dev/null+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/types/ChartGroupByFieldSelectionAxis.ts@@ -0,0 +1 @@+export type ChartGroupByFieldSelectionAxis = 'primary' | 'secondary' | 'pie';diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/getChartAggregateDropdownPageId.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/getChartAggregateDropdownPageId.tsnew file mode 100644index 00000000000..e54cf608ac2--- /dev/null+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/getChartAggregateDropdownPageId.ts@@ -0,0 +1,12 @@+const CHART_AGGREGATE_DROPDOWN_PAGE_PREFIX = {+ operations: 'aggregate-operations',+ ratio: 'aggregate-ratio',+};++export const getChartAggregateDropdownPageId = ({+ fieldMetadataId,+ page,+}: {+ fieldMetadataId: string;+ page: keyof typeof CHART_AGGREGATE_DROPDOWN_PAGE_PREFIX;+}) => `${CHART_AGGREGATE_DROPDOWN_PAGE_PREFIX[page]}-${fieldMetadataId}`;diff --git a/packages/twenty-oxlint-rules/rules/no-twenty-ui-override.exemptions.ts b/packages/twenty-oxlint-rules/rules/no-twenty-ui-override.exemptions.tsindex a32eee5ccf3..4762a54390f 100644--- a/packages/twenty-oxlint-rules/rules/no-twenty-ui-override.exemptions.ts+++ b/packages/twenty-oxlint-rules/rules/no-twenty-ui-override.exemptions.ts@@ -167,6 +167,12 @@ export const TWENTY_UI_OVERRIDE_EXEMPTIONS = ['packages/twenty-front/src/modules/spreadsheet-import/components/StepNavigationButton.tsx',reason: 'Dialog.Footer laid out as the import step navigation bar',},+ {+ filePath:+ 'packages/twenty-front/src/modules/side-panel/pages/page-layout/components/chart-settings/ChartSettingsDropdownSection.tsx',+ reason:+ 'Dropdown.Section preserves the chart settings list height inside the side panel',+ },{filePath:'packages/twenty-front/src/modules/ui/feedback/skeleton/components/SkeletonLine.tsx',