The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Migrate widget settings dropdowns (#28617)
Raphaël Bosif54986194b62
diff --git a/packages/twenty-front/src/modules/command-menu/components/CommandMenuItemDropdown.tsx b/packages/twenty-front/src/modules/command-menu/components/CommandMenuItemDropdown.tsxdeleted file mode 100644index 86d9c76cf57..00000000000--- a/packages/twenty-front/src/modules/command-menu/components/CommandMenuItemDropdown.tsx+++ /dev/null@@ -1,80 +0,0 @@-import { CommandMenuItem } from '@/command-menu/components/CommandMenuItem';-import { type CommandMenuItemProps } from '@/command-menu/types/CommandMenuItemProps';-import { SIDE_PANEL_SELECTABLE_LIST_ID } from '@/side-panel/constants/SidePanelSelectableListId';-import { hasUserSelectedSidePanelListItemState } from '@/side-panel/states/hasUserSelectedSidePanelListItemState';-import {- Dropdown,- type DropdownProps,-} from '@/ui/layout/dropdown/components/Dropdown';-import { isDropdownOpenComponentState } from '@/ui/layout/dropdown/states/isDropdownOpenComponentState';-import { useSelectableList } from '@/ui/layout/selectable-list/hooks/useSelectableList';-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';--export type CommandMenuItemDropdownProps = CommandMenuItemProps &- Pick<- DropdownProps,- 'dropdownPlacement' | 'dropdownOffset' | 'dropdownId' | 'dropdownComponents'- >;--export const CommandMenuItemDropdown = ({- id,- label,- Icon,- hotKeys,- RightComponent,- description,- contextualTextPosition,- dropdownComponents,- dropdownPlacement,- dropdownOffset,- dropdownId,- disabled = false,-}: CommandMenuItemDropdownProps) => {- const isDropdownOpen = useAtomComponentStateValue(- isDropdownOpenComponentState,- dropdownId,- );-- const { setSelectedItemId } = useSelectableList(- SIDE_PANEL_SELECTABLE_LIST_ID,- );- const setHasUserSelectedSidePanelListItem = useSetAtomState(- hasUserSelectedSidePanelListItemState,- );-- return (- <Dropdown- clickableComponentRole="presentation"- clickableComponent={- <CommandMenuItem- id={id}- label={label}- description={description}- contextualTextPosition={contextualTextPosition}- Icon={Icon}- hotKeys={hotKeys}- RightComponent={RightComponent}- hasSubMenu- isSubMenuOpened={isDropdownOpen}- aria-controls={`${dropdownId}-options`}- disabled={disabled}- />- }- dropdownComponents={dropdownComponents}- dropdownId={dropdownId}- dropdownPlacement={dropdownPlacement}- dropdownOffset={dropdownOffset}- disableClickForClickableComponent={disabled}- // Otherwise the default selection moves back to the first item- onOpen={() => {- setSelectedItemId(id);- setHasUserSelectedSidePanelListItem(true);- }}- middlewareBoundaryPadding={{- right: 0,- left: 0,- }}- />- );-};diff --git a/packages/twenty-front/src/modules/command-menu/components/__stories__/CommandMenuItem.stories.tsx b/packages/twenty-front/src/modules/command-menu/components/__stories__/CommandMenuItem.stories.tsxindex cf2af92f832..39176bfa4b1 100644--- a/packages/twenty-front/src/modules/command-menu/components/__stories__/CommandMenuItem.stories.tsx+++ b/packages/twenty-front/src/modules/command-menu/components/__stories__/CommandMenuItem.stories.tsx@@ -1,4 +1,6 @@-import { CommandMenuItemDropdown } from '@/command-menu/components/CommandMenuItemDropdown';+import { CommandMenuItemDropdownTrigger } from '@/command-menu/components/CommandMenuItemDropdownTrigger';+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';import { usePushFocusItemToFocusStack } from '@/ui/utilities/focus/hooks/usePushFocusItemToFocusStack';import { useRemoveFocusItemFromFocusStackById } from '@/ui/utilities/focus/hooks/useRemoveFocusItemFromFocusStackById';import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentType';@@ -6,7 +8,8 @@ import { useEffect } from 'react';import { CommandMenuItem } from '@/command-menu/components/CommandMenuItem';import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList';import { type Meta, type StoryObj } from '@storybook/react-vite';-import { expect, fn, userEvent, within } from 'storybook/test';+import { Dropdown } from 'twenty-ui/components/navigation';+import { expect, fn, userEvent, waitFor, within } from 'storybook/test';import { IconPlus } from 'twenty-ui/icon';import { Button } from 'twenty-ui/primitives/input';import { ComponentDecorator } from 'twenty-ui/testing';@@ -137,12 +140,15 @@ export const MixedNativeCommandOwners: Story = {label="First command"onClick={onFirstCommand}/>- <CommandMenuItemDropdown- id="dropdown"- label="Choose destination"- dropdownId="command-menu-item-destination"- dropdownComponents={<div>Available destinations</div>}- />+ <DropdownRoot dropdownId="command-menu-item-destination" type="menu">+ <CommandMenuItemDropdownTrigger+ id="dropdown"+ label="Choose destination"+ />+ <DropdownContent>+ <Dropdown.ActionItem>Available destinations</Dropdown.ActionItem>+ </DropdownContent>+ </DropdownRoot><CommandMenuItemid="disabled"label="Unavailable command"@@ -167,22 +173,27 @@ export const MixedNativeCommandOwners: Story = {});expect(destination.parentElement?.closest('[role="button"]')).toBeNull();- expect(destination).toHaveAttribute(- 'aria-controls',- 'command-menu-item-destination-options',- );expect(destination).toHaveFocus();await userEvent.keyboard('{Enter}');- expect(await body.findByText('Available destinations')).toBeVisible();+ const menu = await body.findByRole('menu', {+ name: 'Choose destination',+ });++ expect(menu).toBeVisible();+ expect(destination).toHaveAttribute('aria-controls', menu.id);expect(onFirstCommand).toHaveBeenCalledTimes(1);- await userEvent.keyboard('{Escape}{ArrowDown}');+ await userEvent.keyboard('{Escape}');- expect(- canvas.getByRole('button', { name: 'Unavailable command' }),- ).toHaveFocus();+ await waitFor(() => expect(destination).toHaveFocus());++ const disabledCommand = canvas.getByRole('button', {+ name: 'Unavailable command',+ });++ disabledCommand.focus();await userEvent.keyboard('{Enter}');diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SingleWidgetTabSettingsContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SingleWidgetTabSettingsContent.tsxindex deae5509b0e..fe6a926a59a 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SingleWidgetTabSettingsContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SingleWidgetTabSettingsContent.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 { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';import { SidePanelGroup } from '@/side-panel/components/SidePanelGroup';import { SidePanelList } from '@/side-panel/components/SidePanelList';@@ -8,7 +8,9 @@ import { SingleWidgetTabVisibilityDropdownContent } from '@/side-panel/pages/pagimport { TAB_SETTINGS_SELECTABLE_ITEM_IDS } from '@/side-panel/pages/page-layout/constants/settings/TabSettingsSelectableItemIds';import { useTranslatedVisibilityLabel } from '@/side-panel/pages/page-layout/hooks/useTranslatedVisibilityLabel';import { getTabSettingsPlacementItems } from '@/side-panel/pages/page-layout/utils/getTabSettingsPlacementItems';-import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';+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 { ConfirmationDialog } from '@/ui/layout/dialog/components/ConfirmationDialog';import { useDialog } from '@/ui/layout/dialog/hooks/useDialog';import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';@@ -57,6 +59,7 @@ export const SingleWidgetTabSettingsContent = ({}: SingleWidgetTabSettingsContentProps) => {const { t } = useLingui();const { openDialog } = useDialog();+ const { openDropdown } = useOpenDropdown();const visibilityLabel = useTranslatedVisibilityLabel(singleWidget.conditionalAvailabilityExpression,@@ -94,29 +97,40 @@ export const SingleWidgetTabSettingsContent = ({<SidePanelGroup heading={t`Manage`}><SelectableListItemitemId={TAB_SETTINGS_SELECTABLE_ITEM_IDS.VISIBILITY_RESTRICTION}+ onEnter={() =>+ openDropdown({+ dropdownComponentInstanceIdFromProps:+ TAB_SETTINGS_SELECTABLE_ITEM_IDS.VISIBILITY_RESTRICTION,+ })+ }>- <CommandMenuItemDropdown- id={TAB_SETTINGS_SELECTABLE_ITEM_IDS.VISIBILITY_RESTRICTION}- label={t`Visibility restriction`}- Icon={IconEyeX}+ <DropdownRootdropdownId={TAB_SETTINGS_SELECTABLE_ITEM_IDS.VISIBILITY_RESTRICTION}- dropdownComponents={- <LegacyDropdownContent>- <SingleWidgetTabVisibilityDropdownContent- widgetId={singleWidget.id}- currentExpression={- singleWidget.conditionalAvailabilityExpression- }- pageLayoutId={pageLayoutId}- />- </LegacyDropdownContent>- }- dropdownPlacement="bottom-end"- description={visibilityLabel}- contextualTextPosition="right"- />+ type="picker"+ >+ <CommandMenuItemDropdownTrigger+ id={TAB_SETTINGS_SELECTABLE_ITEM_IDS.VISIBILITY_RESTRICTION}+ label={t`Visibility restriction`}+ Icon={IconEyeX}+ description={visibilityLabel}+ contextualTextPosition="right"+ />+ <DropdownContent+ side="bottom"+ align="end"+ collisionPadding={{ left: 0, right: 0 }}+ >+ <SingleWidgetTabVisibilityDropdownContent+ widgetId={singleWidget.id}+ currentExpression={+ singleWidget.conditionalAvailabilityExpression+ }+ pageLayoutId={pageLayoutId}+ />+ </DropdownContent>+ </DropdownRoot></SelectableListItem><Tooltipdelay={TooltipDelay.mediumDelay}diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsManageSection.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsManageSection.tsxindex 5bb6c39c244..de3ed2216f1 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsManageSection.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsManageSection.tsx@@ -1,6 +1,6 @@import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';import { CommandMenuItem } from '@/command-menu/components/CommandMenuItem';-import { CommandMenuItemDropdown } from '@/command-menu/components/CommandMenuItemDropdown';+import { CommandMenuItemDropdownTrigger } from '@/command-menu/components/CommandMenuItemDropdownTrigger';import { useDeletePageLayoutWidget } from '@/page-layout/hooks/useDeletePageLayoutWidget';import { useResetPageLayoutWidgetToDefault } from '@/page-layout/hooks/useResetPageLayoutWidgetToDefault';import { pageLayoutEditingWidgetIdComponentState } from '@/page-layout/states/pageLayoutEditingWidgetIdComponentState';@@ -10,7 +10,9 @@ import { WIDGET_SETTINGS_SELECTABLE_ITEM_IDS } from '@/side-panel/pages/page-layimport { useOpenReplaceWidgetPicker } from '@/side-panel/pages/page-layout/hooks/useOpenReplaceWidgetPicker';import { useTranslatedVisibilityLabel } from '@/side-panel/pages/page-layout/hooks/useTranslatedVisibilityLabel';import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';-import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';+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 { ConfirmationDialog } from '@/ui/layout/dialog/components/ConfirmationDialog';import { useDialog } from '@/ui/layout/dialog/hooks/useDialog';import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';@@ -58,6 +60,7 @@ export const WidgetSettingsManageSection = ({const { openReplaceWidgetPicker } = useOpenReplaceWidgetPicker(pageLayoutId);const { openDialog } = useDialog();+ const { openDropdown } = useOpenDropdown();const visibilityLabel = useTranslatedVisibilityLabel(widgetInEditMode?.conditionalAvailabilityExpression,@@ -92,23 +95,34 @@ export const WidgetSettingsManageSection = ({<SidePanelGroup heading={t`Manage`}><SelectableListItemitemId={WIDGET_SETTINGS_SELECTABLE_ITEM_IDS.VISIBILITY_RESTRICTION}+ onEnter={() =>+ openDropdown({+ dropdownComponentInstanceIdFromProps:+ WIDGET_SETTINGS_SELECTABLE_ITEM_IDS.VISIBILITY_RESTRICTION,+ })+ }>- <CommandMenuItemDropdown- id={WIDGET_SETTINGS_SELECTABLE_ITEM_IDS.VISIBILITY_RESTRICTION}- label={t`Visibility Restriction`}- Icon={IconEyeX}+ <DropdownRootdropdownId={WIDGET_SETTINGS_SELECTABLE_ITEM_IDS.VISIBILITY_RESTRICTION}- dropdownComponents={- <LegacyDropdownContent>- <WidgetVisibilityDropdownContent />- </LegacyDropdownContent>- }- dropdownPlacement="bottom-end"- description={visibilityLabel}- contextualTextPosition="right"- />+ type="picker"+ >+ <CommandMenuItemDropdownTrigger+ id={WIDGET_SETTINGS_SELECTABLE_ITEM_IDS.VISIBILITY_RESTRICTION}+ label={t`Visibility Restriction`}+ Icon={IconEyeX}+ description={visibilityLabel}+ contextualTextPosition="right"+ />+ <DropdownContent+ side="bottom"+ align="end"+ collisionPadding={{ left: 0, right: 0 }}+ >+ <WidgetVisibilityDropdownContent />+ </DropdownContent>+ </DropdownRoot></SelectableListItem><Tooltipdelay={TooltipDelay.mediumDelay}diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsPlacementSection.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsPlacementSection.tsxindex 32dbf9be5c5..b7a933d0a73 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsPlacementSection.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsPlacementSection.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 { useMovePageLayoutWidget } from '@/page-layout/hooks/useMovePageLayoutWidget';import { widgetInsertionContextComponentState } from '@/page-layout/states/widgetInsertionContextComponentState';import { SidePanelGroup } from '@/side-panel/components/SidePanelGroup';@@ -7,7 +7,9 @@ import { MoveToTabDropdownContent } from '@/side-panel/pages/page-layout/componeimport { WIDGET_SETTINGS_SELECTABLE_ITEM_IDS } from '@/side-panel/pages/page-layout/constants/settings/WidgetSettingsSelectableItemIds';import { useNavigatePageLayoutSidePanel } from '@/side-panel/pages/page-layout/hooks/useNavigatePageLayoutSidePanel';import { type WidgetSettingsPlacement } from '@/side-panel/pages/page-layout/hooks/useWidgetSettingsPlacement';-import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';+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 { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';import { useLingui } from '@lingui/react/macro';@@ -45,6 +47,7 @@ export const WidgetSettingsPlacementSection = ({const { movePageLayoutWidget } = useMovePageLayoutWidget(pageLayoutId);const { navigatePageLayoutSidePanel } = useNavigatePageLayoutSidePanel();+ const { openDropdown } = useOpenDropdown();if (!isPlacementSectionVisible || !isDefined(pageLayoutEditingWidgetId)) {return null;@@ -110,19 +113,30 @@ export const WidgetSettingsPlacementSection = ({)}<SelectableListItemitemId={WIDGET_SETTINGS_SELECTABLE_ITEM_IDS.MOVE_TO_TAB}+ onEnter={() =>+ openDropdown({+ dropdownComponentInstanceIdFromProps:+ WIDGET_SETTINGS_SELECTABLE_ITEM_IDS.MOVE_TO_TAB,+ })+ }>- <CommandMenuItemDropdown- id={WIDGET_SETTINGS_SELECTABLE_ITEM_IDS.MOVE_TO_TAB}- label={t`Move to another tab`}- Icon={IconArrowsVertical}+ <DropdownRootdropdownId={WIDGET_SETTINGS_SELECTABLE_ITEM_IDS.MOVE_TO_TAB}- dropdownComponents={- <LegacyDropdownContent>- <MoveToTabDropdownContent />- </LegacyDropdownContent>- }- dropdownPlacement="bottom-end"- />+ type="menu"+ >+ <CommandMenuItemDropdownTrigger+ id={WIDGET_SETTINGS_SELECTABLE_ITEM_IDS.MOVE_TO_TAB}+ label={t`Move to another tab`}+ Icon={IconArrowsVertical}+ />+ <DropdownContent+ side="bottom"+ align="end"+ collisionPadding={{ left: 0, right: 0 }}+ >+ <MoveToTabDropdownContent />+ </DropdownContent>+ </DropdownRoot></SelectableListItem><SelectableListItemitemId={WIDGET_SETTINGS_SELECTABLE_ITEM_IDS.ADD_WIDGET_ABOVE}diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/__stories__/SidePanelPageLayoutTabSettingsContent.stories.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/__stories__/SidePanelPageLayoutTabSettingsContent.stories.tsxindex e2496a9538e..a2d0aabd3bb 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/__stories__/SidePanelPageLayoutTabSettingsContent.stories.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/__stories__/SidePanelPageLayoutTabSettingsContent.stories.tsx@@ -14,7 +14,11 @@ import { getIsFirstTabPinned } from '@/page-layout/utils/getIsFirstTabPinned';import { getTabListInstanceIdFromPageLayoutAndRecord } from '@/page-layout/utils/getTabListInstanceIdFromPageLayoutAndRecord';import { getTabsByDisplayMode } from '@/page-layout/utils/getTabsByDisplayMode';import { SIDE_PANEL_FOCUS_ID } from '@/side-panel/constants/SidePanelFocusId';+import { SIDE_PANEL_SELECTABLE_LIST_ID } from '@/side-panel/constants/SidePanelSelectableListId';import { SidePanelPageLayoutTabSettingsContent } from '@/side-panel/pages/page-layout/components/SidePanelPageLayoutTabSettingsContent';+import { EXPRESSION_DEVICE_MOBILE } from '@/side-panel/pages/page-layout/constants/ExpressionDeviceMobile';+import { TAB_SETTINGS_SELECTABLE_ITEM_IDS } from '@/side-panel/pages/page-layout/constants/settings/TabSettingsSelectableItemIds';+import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';import { LayoutRenderingProvider } from '@/ui/layout/contexts/LayoutRenderingContext';import { activeTabIdComponentState } from '@/ui/layout/tab-list/states/activeTabIdComponentState';import { TabListComponentInstanceContext } from '@/ui/layout/tab-list/states/contexts/TabListComponentInstanceContext';@@ -240,3 +244,43 @@ export const SingleWidgetUnpinThenCancel: Story = {initialHash: '#timeline',},};++export const SingleWidgetVisibility: Story = {+ parameters: { singleWidget: true },+ play: async ({ canvasElement }) => {+ const body = within(canvasElement.ownerDocument.body);+ const trigger = await body.findByRole('button', {+ name: /^Visibility restriction/,+ });+ trigger.focus();+ await userEvent.keyboard('{Enter}');+ expect(+ await body.findByRole('option', { name: 'Any device' }),+ ).toHaveAttribute('aria-selected', 'true');+ expect(+ jotaiStore.get(+ selectedItemIdComponentState.atomFamily({+ instanceId: SIDE_PANEL_SELECTABLE_LIST_ID,+ }),+ ),+ ).toBe(TAB_SETTINGS_SELECTABLE_ITEM_IDS.VISIBILITY_RESTRICTION);+ await userEvent.click(body.getByRole('option', { name: 'Mobile' }));+ await waitFor(() => {+ expect(trigger).toHaveAttribute('aria-expanded', 'false');+ expect(trigger).toHaveFocus();+ });+ expect(+ jotaiStore.get(+ pageLayoutDraftComponentState.atomFamily({+ instanceId: PAGE_LAYOUT_ID,+ }),+ ).tabs[0].widgets[0].conditionalAvailabilityExpression,+ ).toBe(EXPRESSION_DEVICE_MOBILE);+ await userEvent.click(trigger);+ expect(await body.findByRole('option', { name: 'Mobile' })).toHaveAttribute(+ 'aria-selected',+ 'true',+ );+ await userEvent.keyboard('{Escape}');+ },+};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/__stories__/TabSettingsPlacementSection.stories.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/__stories__/TabSettingsPlacementSection.stories.tsxindex 7bcf0bd55e3..5ac57646978 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/__stories__/TabSettingsPlacementSection.stories.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/__stories__/TabSettingsPlacementSection.stories.tsx@@ -1,19 +1,39 @@-import { makeWidget } from '@/page-layout/testing/pageLayoutDraftFixtures';+import {+ makeDraft,+ makeTab,+ makeWidget,+} from '@/page-layout/testing/pageLayoutDraftFixtures';+import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';+import { pageLayoutEditingWidgetIdComponentState } from '@/page-layout/states/pageLayoutEditingWidgetIdComponentState';+import { SidePanelList } from '@/side-panel/components/SidePanelList';import { SIDE_PANEL_FOCUS_ID } from '@/side-panel/constants/SidePanelFocusId';+import { SIDE_PANEL_SELECTABLE_LIST_ID } from '@/side-panel/constants/SidePanelSelectableListId';+import { PageLayoutSidePanelTargetProvider } from '@/side-panel/pages/page-layout/components/PageLayoutSidePanelTargetProvider';import { RegularTabSettingsContent } from '@/side-panel/pages/page-layout/components/RegularTabSettingsContent';import { SingleWidgetTabSettingsContent } from '@/side-panel/pages/page-layout/components/SingleWidgetTabSettingsContent';+import { WidgetSettingsManageSection } from '@/side-panel/pages/page-layout/components/WidgetSettingsManageSection';+import { WidgetSettingsPlacementSection } from '@/side-panel/pages/page-layout/components/WidgetSettingsPlacementSection';+import { EXPRESSION_DEVICE_DESKTOP } from '@/side-panel/pages/page-layout/constants/ExpressionDeviceDesktop';+import { WIDGET_SETTINGS_SELECTABLE_ITEM_IDS } from '@/side-panel/pages/page-layout/constants/settings/WidgetSettingsSelectableItemIds';+import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';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 { type Meta, type StoryObj } from '@storybook/react-vite';-import { expect, fn, userEvent, within } from 'storybook/test';+import { expect, fn, userEvent, waitFor, within } from 'storybook/test';import { ComponentDecorator } from 'twenty-ui/testing';import { MemoryRouterDecorator } from '~/testing/decorators/MemoryRouterDecorator';+import { ToastDecorator } from '~/testing/decorators/ToastDecorator';++const WIDGET_SETTINGS_STORY_LAYOUT_ID = 'widget-placement-story';+const WIDGET_SETTINGS_STORY_WIDGET_ID = 'placement-widget';+const WIDGET_SETTINGS_STORY_SOURCE_TAB_ID = 'source-tab';+const WIDGET_SETTINGS_STORY_DESTINATION_TAB_ID = 'destination-tab';const meta: Meta<typeof RegularTabSettingsContent> = {title: 'Modules/SidePanel/PageLayout/TabSettingsPlacementSection',component: RegularTabSettingsContent,- decorators: [ComponentDecorator, MemoryRouterDecorator],+ decorators: [ComponentDecorator, MemoryRouterDecorator, ToastDecorator],args: {canSetAsPinned: true,canUnpin: false,@@ -29,7 +49,31 @@ const meta: Meta<typeof RegularTabSettingsContent> = {onResetToDefault: fn(),onDelete: fn(),},- beforeEach: () => {+ beforeEach: ({ parameters }) => {+ const draft = makeDraft([+ makeTab(WIDGET_SETTINGS_STORY_SOURCE_TAB_ID, [+ makeWidget(+ WIDGET_SETTINGS_STORY_WIDGET_ID,+ 0,+ WIDGET_SETTINGS_STORY_SOURCE_TAB_ID,+ ),+ ]),+ ...(parameters.noOtherTabs+ ? []+ : [makeTab(WIDGET_SETTINGS_STORY_DESTINATION_TAB_ID, [], 1)]),+ ]);+ jotaiStore.set(+ pageLayoutDraftComponentState.atomFamily({+ instanceId: WIDGET_SETTINGS_STORY_LAYOUT_ID,+ }),+ { ...draft, id: WIDGET_SETTINGS_STORY_LAYOUT_ID },+ );+ jotaiStore.set(+ pageLayoutEditingWidgetIdComponentState.atomFamily({+ instanceId: WIDGET_SETTINGS_STORY_LAYOUT_ID,+ }),+ WIDGET_SETTINGS_STORY_WIDGET_ID,+ );jotaiStore.set(focusStackState.atom, [{focusId: SIDE_PANEL_FOCUS_ID,@@ -105,3 +149,141 @@ export const PinnedSingleWidget: Story = {render: SingleWidget.render,play: Pinned.play,};++export const MoveWidgetToTab: Story = {+ render: () => (+ <PageLayoutSidePanelTargetProvider+ pageLayoutId={WIDGET_SETTINGS_STORY_LAYOUT_ID}+ targetRecordIdentifier={{+ id: 'placement-record',+ targetObjectNameSingular: 'company',+ }}+ >+ <SidePanelList+ selectableItemIds={[+ WIDGET_SETTINGS_SELECTABLE_ITEM_IDS.MOVE_TO_TAB,+ WIDGET_SETTINGS_SELECTABLE_ITEM_IDS.ADD_WIDGET_ABOVE,+ ]}+ >+ <WidgetSettingsPlacementSection+ pageLayoutId={WIDGET_SETTINGS_STORY_LAYOUT_ID}+ isPlacementSectionVisible+ pageLayoutEditingWidgetId={WIDGET_SETTINGS_STORY_WIDGET_ID}+ showAddWidgetBelow={false}+ showMoveDown={false}+ showMoveUp={false}+ />+ </SidePanelList>+ </PageLayoutSidePanelTargetProvider>+ ),+ play: async ({ canvasElement }) => {+ const body = within(canvasElement.ownerDocument.body);+ const trigger = await body.findByRole('button', {+ name: 'Move to another tab',+ });+ trigger.focus();+ await userEvent.keyboard('{Enter}');+ const destination = await body.findByRole('menuitem', {+ name: WIDGET_SETTINGS_STORY_DESTINATION_TAB_ID,+ });+ expect(body.getByRole('menu')).toBeVisible();+ expect(+ jotaiStore.get(+ selectedItemIdComponentState.atomFamily({+ instanceId: SIDE_PANEL_SELECTABLE_LIST_ID,+ }),+ ),+ ).toBe(WIDGET_SETTINGS_SELECTABLE_ITEM_IDS.MOVE_TO_TAB);+ expect(+ body.queryByRole('menuitem', {+ name: WIDGET_SETTINGS_STORY_SOURCE_TAB_ID,+ }),+ ).not.toBeInTheDocument();+ await userEvent.click(destination);+ await waitFor(() => {+ expect(trigger).toHaveAttribute('aria-expanded', 'false');+ expect(trigger).toHaveFocus();+ });+ const draft = jotaiStore.get(+ pageLayoutDraftComponentState.atomFamily({+ instanceId: WIDGET_SETTINGS_STORY_LAYOUT_ID,+ }),+ );+ expect(draft.tabs[0].widgets).toHaveLength(0);+ expect(draft.tabs[1].widgets).toEqual([+ expect.objectContaining({+ id: WIDGET_SETTINGS_STORY_WIDGET_ID,+ pageLayoutTabId: WIDGET_SETTINGS_STORY_DESTINATION_TAB_ID,+ }),+ ]);+ },+};++export const NoEligibleTabs: Story = {+ parameters: { noOtherTabs: true },+ render: MoveWidgetToTab.render,+ play: async ({ canvasElement }) => {+ const body = within(canvasElement.ownerDocument.body);+ const trigger = await body.findByRole('button', {+ name: 'Move to another tab',+ });+ await userEvent.click(trigger);+ expect(+ await body.findByRole('menuitem', { name: 'No available tabs' }),+ ).toBeDisabled();+ await userEvent.keyboard('{Escape}');+ await waitFor(() => expect(trigger).toHaveFocus());+ },+};++export const WidgetVisibility: Story = {+ render: () => (+ <PageLayoutSidePanelTargetProvider+ pageLayoutId={WIDGET_SETTINGS_STORY_LAYOUT_ID}+ targetRecordIdentifier={{+ id: 'placement-record',+ targetObjectNameSingular: 'company',+ }}+ >+ <SidePanelList+ selectableItemIds={[+ WIDGET_SETTINGS_SELECTABLE_ITEM_IDS.VISIBILITY_RESTRICTION,+ WIDGET_SETTINGS_SELECTABLE_ITEM_IDS.RESET_TO_DEFAULT,+ WIDGET_SETTINGS_SELECTABLE_ITEM_IDS.REPLACE_WIDGET,+ WIDGET_SETTINGS_SELECTABLE_ITEM_IDS.DELETE_WIDGET,+ ]}+ >+ <WidgetSettingsManageSection+ pageLayoutId={WIDGET_SETTINGS_STORY_LAYOUT_ID}+ />+ </SidePanelList>+ </PageLayoutSidePanelTargetProvider>+ ),+ play: async ({ canvasElement }) => {+ const body = within(canvasElement.ownerDocument.body);+ const trigger = await body.findByRole('button', {+ name: /^Visibility Restriction/,+ });+ await userEvent.click(trigger);+ expect(+ await body.findByRole('option', { name: 'Any device' }),+ ).toHaveAttribute('aria-selected', 'true');+ await userEvent.click(body.getByRole('option', { name: 'Desktop' }));+ await waitFor(() => {+ expect(trigger).toHaveAttribute('aria-expanded', 'false');+ expect(trigger).toHaveFocus();+ });+ expect(+ jotaiStore.get(+ pageLayoutDraftComponentState.atomFamily({+ instanceId: WIDGET_SETTINGS_STORY_LAYOUT_ID,+ }),+ ).tabs[0].widgets[0].conditionalAvailabilityExpression,+ ).toBe(EXPRESSION_DEVICE_DESKTOP);+ await userEvent.click(trigger);+ expect(+ await body.findByRole('option', { name: 'Desktop' }),+ ).toHaveAttribute('aria-selected', 'true');+ await userEvent.keyboard('{Escape}');+ },+};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dashboard/SidePanelDashboardRecordTableSettings.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dashboard/SidePanelDashboardRecordTableSettings.tsxindex 7f30ebc4e4d..8553db0cd3e 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dashboard/SidePanelDashboardRecordTableSettings.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dashboard/SidePanelDashboardRecordTableSettings.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 { CommandMenuItemSwitch } from '@/command-menu/components/CommandMenuItemSwitch';import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';@@ -29,7 +29,9 @@ import { useRecordTableSettingsDescriptions } from '@/side-panel/pages/page-layoimport { useUpdateCurrentWidgetConfig } from '@/side-panel/pages/page-layout/hooks/useUpdateCurrentWidgetConfig';import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';import { SidePanelSubPages } from '@/side-panel/types/SidePanelSubPages';-import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';+import { useOpenDropdown } from '@/ui/layout/dropdown/hooks/useOpenDropdown';import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { styled } from '@linaria/react';@@ -68,6 +70,7 @@ const StyledSettingsContainer = styled.div`export const SidePanelDashboardRecordTableSettings = () => {const { t } = useLingui();+ const { openDropdown } = useOpenDropdown();const { pageLayoutId } = usePageLayoutSidePanelTarget();const pageLayoutDraft = useAtomComponentStateValue(@@ -208,6 +211,7 @@ export const SidePanelDashboardRecordTableSettings = () => {'record-table-source',...(hasViewId? [+ 'object-view-layout','record-table-fields','record-table-filter','record-table-sort',@@ -241,71 +245,100 @@ export const SidePanelDashboardRecordTableSettings = () => {<StyledSettingsContainer><SidePanelList selectableItemIds={selectableItemIds}><SidePanelGroup heading={t`Settings`}>- <SelectableListItem itemId="record-table-source">- <CommandMenuItemDropdown- Icon={IconBox}- label={t`Source`}- id="record-table-source"- dropdownId="record-table-source"- dropdownComponents={- <LegacyDropdownContent>- <RecordTableDataSourceDropdownContent />- </LegacyDropdownContent>- }- dropdownPlacement="bottom-end"- hasSubMenu- description={sourceDescription}- contextualTextPosition="right"- />+ <SelectableListItem+ itemId="record-table-source"+ onEnter={() =>+ openDropdown({+ dropdownComponentInstanceIdFromProps: 'record-table-source',+ })+ }+ >+ <DropdownRoot dropdownId="record-table-source" type="picker">+ <CommandMenuItemDropdownTrigger+ Icon={IconBox}+ label={t`Source`}+ id="record-table-source"+ description={sourceDescription}+ contextualTextPosition="right"+ />+ <DropdownContent+ side="bottom"+ align="end"+ collisionPadding={{ left: 0, right: 0 }}+ >+ <RecordTableDataSourceDropdownContent />+ </DropdownContent>+ </DropdownRoot></SelectableListItem>- <SelectableListItem itemId="object-view-layout">- <CommandMenuItemDropdown- Icon={CurrentLayoutIcon}- label={t`Layout`}- id="object-view-layout"- dropdownId="object-view-layout"- dropdownComponents={- hasViewId ? (- <LegacyDropdownContent>- <RecordTableLayoutDropdownContent- pageLayoutId={pageLayoutId}- widgetId={widgetInEditMode.id}- objectMetadataId={widgetInEditMode.objectMetadataId!}- currentLayoutViewType={currentLayoutViewType}- />- </LegacyDropdownContent>- ) : (- <></>- )- }- dropdownPlacement="bottom-end"- hasSubMenu={hasViewId}- description={t(currentLayoutLabel)}- disabled={!hasViewId}- contextualTextPosition="right"- />+ <SelectableListItem+ itemId="object-view-layout"+ onEnter={+ hasViewId+ ? () =>+ openDropdown({+ dropdownComponentInstanceIdFromProps:+ 'object-view-layout',+ })+ : undefined+ }+ >+ <DropdownRoot dropdownId="object-view-layout" type="picker">+ <CommandMenuItemDropdownTrigger+ Icon={CurrentLayoutIcon}+ label={t`Layout`}+ id="object-view-layout"+ description={t(currentLayoutLabel)}+ disabled={!hasViewId}+ contextualTextPosition="right"+ />+ <DropdownContent+ side="bottom"+ align="end"+ collisionPadding={{ left: 0, right: 0 }}+ >+ {hasViewId && (+ <RecordTableLayoutDropdownContent+ pageLayoutId={pageLayoutId}+ widgetId={widgetInEditMode.id}+ objectMetadataId={widgetInEditMode.objectMetadataId!}+ currentLayoutViewType={currentLayoutViewType}+ />+ )}+ </DropdownContent>+ </DropdownRoot></SelectableListItem>{hasViewId && (<>- <SelectableListItem itemId="record-table-fields">- <CommandMenuItemDropdown- Icon={IconListDetails}- label={t`Fields`}- id="record-table-fields"- dropdownId="record-table-fields"- dropdownComponents={+ <SelectableListItem+ itemId="record-table-fields"+ onEnter={() =>+ openDropdown({+ dropdownComponentInstanceIdFromProps:+ 'record-table-fields',+ })+ }+ >+ <DropdownRoot dropdownId="record-table-fields" type="panel">+ <CommandMenuItemDropdownTrigger+ Icon={IconListDetails}+ label={t`Fields`}+ id="record-table-fields"+ description={fieldsDescription}+ contextualTextPosition="right"+ />+ <DropdownContent+ side="bottom"+ align="end"+ collisionPadding={{ left: 0, right: 0 }}+ ><RecordTableFieldsDropdownContentviewId={viewId}objectMetadataId={widgetInEditMode.objectMetadataId!}onFieldUpdated={handleFieldUpdated}onFieldCreated={handleFieldCreated}/>- }- dropdownPlacement="bottom-end"- hasSubMenu- description={fieldsDescription}- contextualTextPosition="right"- />+ </DropdownContent>+ </DropdownRoot></SelectableListItem><SelectableListItemitemId="record-table-filter"@@ -336,83 +369,119 @@ export const SidePanelDashboardRecordTableSettings = () => {/></SelectableListItem>{isCalendarLayout && (- <SelectableListItem itemId="record-table-calendar-field">- <CommandMenuItemDropdown- Icon={IconCalendarEvent}- label={t`Date field`}- id="record-table-calendar-field"+ <SelectableListItem+ itemId="record-table-calendar-field"+ onEnter={() =>+ openDropdown({+ dropdownComponentInstanceIdFromProps:+ 'record-table-calendar-field',+ })+ }+ >+ <DropdownRootdropdownId="record-table-calendar-field"- dropdownComponents={- <LegacyDropdownContent>- <RecordTableCalendarFieldDropdownContent- pageLayoutId={pageLayoutId}- widgetId={widgetInEditMode.id}- objectMetadataId={- widgetInEditMode.objectMetadataId!- }- currentCalendarFieldMetadataId={- calendarFieldMetadataId- }- />- </LegacyDropdownContent>- }- dropdownPlacement="bottom-end"- hasSubMenu- description={calendarFieldLabel}- contextualTextPosition="right"- />+ type="picker"+ >+ <CommandMenuItemDropdownTrigger+ Icon={IconCalendarEvent}+ label={t`Date field`}+ id="record-table-calendar-field"+ description={calendarFieldLabel}+ contextualTextPosition="right"+ />+ <DropdownContent+ side="bottom"+ align="end"+ collisionPadding={{ left: 0, right: 0 }}+ >+ <RecordTableCalendarFieldDropdownContent+ pageLayoutId={pageLayoutId}+ widgetId={widgetInEditMode.id}+ objectMetadataId={+ widgetInEditMode.objectMetadataId!+ }+ currentCalendarFieldMetadataId={+ calendarFieldMetadataId+ }+ />+ </DropdownContent>+ </DropdownRoot></SelectableListItem>)}{isCalendarLayout && (- <SelectableListItem itemId="record-table-calendar-layout">- <CommandMenuItemDropdown- Icon={IconCalendar}- label={t`Calendar view`}- id="record-table-calendar-layout"+ <SelectableListItem+ itemId="record-table-calendar-layout"+ onEnter={() =>+ openDropdown({+ dropdownComponentInstanceIdFromProps:+ 'record-table-calendar-layout',+ })+ }+ >+ <DropdownRootdropdownId="record-table-calendar-layout"- dropdownComponents={- <LegacyDropdownContent>- <RecordTableCalendarLayoutDropdownContent- pageLayoutId={pageLayoutId}- widgetId={widgetInEditMode.id}- currentCalendarLayout={currentCalendarLayout}- />- </LegacyDropdownContent>- }- dropdownPlacement="bottom-end"- hasSubMenu- description={calendarLayoutLabel}- contextualTextPosition="right"- />+ type="picker"+ >+ <CommandMenuItemDropdownTrigger+ Icon={IconCalendar}+ label={t`Calendar view`}+ id="record-table-calendar-layout"+ description={calendarLayoutLabel}+ contextualTextPosition="right"+ />+ <DropdownContent+ side="bottom"+ align="end"+ collisionPadding={{ left: 0, right: 0 }}+ >+ <RecordTableCalendarLayoutDropdownContent+ pageLayoutId={pageLayoutId}+ widgetId={widgetInEditMode.id}+ currentCalendarLayout={currentCalendarLayout}+ />+ </DropdownContent>+ </DropdownRoot></SelectableListItem>)}{!isCalendarLayout && (- <SelectableListItem itemId="record-table-group-by">- <CommandMenuItemDropdown- Icon={IconLayoutList}- label={t`Group by`}- id="record-table-group-by"+ <SelectableListItem+ itemId="record-table-group-by"+ onEnter={() =>+ openDropdown({+ dropdownComponentInstanceIdFromProps:+ 'record-table-group-by',+ })+ }+ >+ <DropdownRootdropdownId="record-table-group-by"- dropdownComponents={- <LegacyDropdownContent>- <RecordTableGroupByDropdownContent- pageLayoutId={pageLayoutId}- widgetId={widgetInEditMode.id}- objectMetadataId={- widgetInEditMode.objectMetadataId!- }- currentMainGroupByFieldMetadataId={- mainGroupByFieldMetadataId- }- isClearable={!isKanbanLayout}- />- </LegacyDropdownContent>- }- dropdownPlacement="bottom-end"- hasSubMenu- description={mainGroupByFieldLabel}- contextualTextPosition="right"- />+ type="picker"+ >+ <CommandMenuItemDropdownTrigger+ Icon={IconLayoutList}+ label={t`Group by`}+ id="record-table-group-by"+ description={mainGroupByFieldLabel}+ contextualTextPosition="right"+ />+ <DropdownContent+ side="bottom"+ align="end"+ collisionPadding={{ left: 0, right: 0 }}+ >+ <RecordTableGroupByDropdownContent+ pageLayoutId={pageLayoutId}+ widgetId={widgetInEditMode.id}+ objectMetadataId={+ widgetInEditMode.objectMetadataId!+ }+ currentMainGroupByFieldMetadataId={+ mainGroupByFieldMetadataId+ }+ isClearable={!isKanbanLayout}+ />+ </DropdownContent>+ </DropdownRoot></SelectableListItem>)}{!isCalendarLayout && hasGroupBy && (diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dashboard/__stories__/RecordTableWidgetSettingsStory.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dashboard/__stories__/RecordTableWidgetSettingsStory.tsxnew file mode 100644index 00000000000..4effe9e7458--- /dev/null+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dashboard/__stories__/RecordTableWidgetSettingsStory.tsx@@ -0,0 +1,87 @@+import { SidePanelDashboardRecordTableSettings } from '@/side-panel/pages/page-layout/components/dashboard/SidePanelDashboardRecordTableSettings';+import { WidgetViewLayoutSettingsRows } from '@/side-panel/pages/page-layout/components/record-table-settings/WidgetViewLayoutSettingsRows';+import { RECORD_TABLE_WIDGET_SETTINGS_STORY_DATA } from '@/side-panel/pages/page-layout/components/dashboard/__stories__/recordTableWidgetSettingsStoryData';+import { PageLayoutSidePanelTargetContext } from '@/side-panel/pages/page-layout/contexts/PageLayoutSidePanelTargetContext';+import { SidePanelPageComponentInstanceContext } from '@/side-panel/states/contexts/SidePanelPageComponentInstanceContext';+import { SIDE_PANEL_CLICK_OUTSIDE_ID } from '@/side-panel/constants/SidePanelClickOutsideId';+import { SIDE_PANEL_CONSTRAINTS } from '@/side-panel/constants/SidePanelConstraints';+import { SIDE_PANEL_FOCUS_ID } from '@/side-panel/constants/SidePanelFocusId';+import { SIDE_PANEL_SELECTABLE_LIST_ID } from '@/side-panel/constants/SidePanelSelectableListId';+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 { themeCssVariables } from 'twenty-ui/theme';+import { getMockObjectMetadataItemOrThrow } from '~/testing/utils/getMockObjectMetadataItemOrThrow';++const StyledPanel = styled.div`+ align-self: stretch;+ margin-left: auto;+ margin-top: ${themeCssVariables.spacing[6]};+ width: ${SIDE_PANEL_CONSTRAINTS.min}px;+`;++type RecordTableWidgetSettingsStoryProps = {+ shouldShowLayoutRowsOnly?: boolean;+ onBackgroundClickOutside: () => void;+};++export const RecordTableWidgetSettingsStory = ({+ shouldShowLayoutRowsOnly = false,+ onBackgroundClickOutside,+}: RecordTableWidgetSettingsStoryProps) => {+ const { pageLayoutId, widgetId, viewId } =+ RECORD_TABLE_WIDGET_SETTINGS_STORY_DATA;+ const objectMetadataItem = getMockObjectMetadataItemOrThrow('opportunity');+ useListenClickOutside({+ listenerId: 'table-widget-settings-background',+ excludedClickOutsideIds: [SIDE_PANEL_CLICK_OUTSIDE_ID],+ refs: [],+ callback: onBackgroundClickOutside,+ });++ return (+ <SidePanelPageComponentInstanceContext.Provider+ value={{ instanceId: pageLayoutId }}+ >+ <PageLayoutSidePanelTargetContext.Provider+ value={{+ pageLayoutId,+ targetRecordIdentifier: {+ targetObjectNameSingular: 'opportunity',+ id: 'record-table-widget-story-record',+ },+ }}+ >+ <ParentClickOutsideIdContext.Provider+ value={SIDE_PANEL_CLICK_OUTSIDE_ID}+ >+ <StyledPanel data-click-outside-id={SIDE_PANEL_CLICK_OUTSIDE_ID}>+ {shouldShowLayoutRowsOnly ? (+ <SelectableList+ selectableListInstanceId={SIDE_PANEL_SELECTABLE_LIST_ID}+ focusId={SIDE_PANEL_FOCUS_ID}+ selectableItemIdArray={[+ 'object-view-layout',+ 'record-table-calendar-field',+ 'record-table-calendar-layout',+ 'record-table-group-by',+ 'record-table-hide-empty-groups',+ ]}+ >+ <WidgetViewLayoutSettingsRows+ pageLayoutId={pageLayoutId}+ widgetId={widgetId}+ viewId={viewId}+ objectMetadataId={objectMetadataItem.id}+ />+ </SelectableList>+ ) : (+ <SidePanelDashboardRecordTableSettings />+ )}+ </StyledPanel>+ </ParentClickOutsideIdContext.Provider>+ </PageLayoutSidePanelTargetContext.Provider>+ </SidePanelPageComponentInstanceContext.Provider>+ );+};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dashboard/__stories__/SidePanelDashboardRecordTableSettings.stories.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dashboard/__stories__/SidePanelDashboardRecordTableSettings.stories.tsxnew file mode 100644index 00000000000..6b264094f2c--- /dev/null+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dashboard/__stories__/SidePanelDashboardRecordTableSettings.stories.tsx@@ -0,0 +1,265 @@+import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';+import { recordTableWidgetViewDraftComponentState } from '@/page-layout/states/recordTableWidgetViewDraftComponentState';+import { SIDE_PANEL_SELECTABLE_LIST_ID } from '@/side-panel/constants/SidePanelSelectableListId';+import { RecordTableWidgetSettingsStory } from '@/side-panel/pages/page-layout/components/dashboard/__stories__/RecordTableWidgetSettingsStory';+import { initializeRecordTableWidgetSettingsStory } from '@/side-panel/pages/page-layout/components/dashboard/__stories__/initializeRecordTableWidgetSettingsStory';+import { RECORD_TABLE_WIDGET_SETTINGS_STORY_DATA } from '@/side-panel/pages/page-layout/components/dashboard/__stories__/recordTableWidgetSettingsStoryData';+import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';+import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';+import { type Meta, type StoryObj } from '@storybook/react-vite';+import { expect, fn, userEvent, waitFor, within } from 'storybook/test';+import { ComponentDecorator } from 'twenty-ui/testing';+import { ViewCalendarLayout, ViewType } 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 onBackgroundClickOutside = fn();+const { pageLayoutId, widgetId } = RECORD_TABLE_WIDGET_SETTINGS_STORY_DATA;+const getWidgetViewSnapshot = () =>+ jotaiStore.get(+ recordTableWidgetViewDraftComponentState.atomFamily({+ instanceId: pageLayoutId,+ }),+ )[widgetId];++const meta: Meta<typeof RecordTableWidgetSettingsStory> = {+ title: 'Modules/SidePanel/PageLayout/SidePanelDashboardRecordTableSettings',+ component: RecordTableWidgetSettingsStory,+ decorators: [+ ComponentDecorator,+ MemoryRouterDecorator,+ ObjectMetadataItemsDecorator,+ ],+ parameters: { container: { width: 900, height: 620 } },+ args: { onBackgroundClickOutside },+ beforeEach: () => {+ initializeRecordTableWidgetSettingsStory();+ onBackgroundClickOutside.mockClear();+ },+};++export default meta;+type Story = StoryObj<typeof meta>;++export const LayoutAndCalendarSelection: Story = {+ play: async ({ canvasElement }) => {+ const body = within(canvasElement.ownerDocument.body);+ const trigger = await body.findByRole('button', { name: /^Layout/ });+ trigger.focus();+ await userEvent.keyboard('{Enter}');+ expect(await body.findByRole('option', { name: 'Table' })).toHaveAttribute(+ 'aria-selected',+ 'true',+ );+ expect(+ body.getAllByRole('option').map((option) => option.textContent),+ ).toEqual(['Table', 'Kanban', 'List', 'Calendar']);+ await waitFor(() => {+ const popupBounds = body.getByRole('dialog').getBoundingClientRect();+ const triggerBounds = trigger.getBoundingClientRect();+ expect(popupBounds.width).toBeCloseTo(200);+ expect(+ Math.abs(popupBounds.right - triggerBounds.right),+ ).toBeLessThanOrEqual(1);+ expect(+ Math.abs(popupBounds.top - triggerBounds.bottom),+ ).toBeLessThanOrEqual(1);+ });+ expect(+ jotaiStore.get(+ selectedItemIdComponentState.atomFamily({+ instanceId: SIDE_PANEL_SELECTABLE_LIST_ID,+ }),+ ),+ ).toBe('object-view-layout');+ await userEvent.click(body.getByRole('option', { name: 'Calendar' }));+ await waitFor(() => {+ expect(trigger).toHaveAttribute('aria-expanded', 'false');+ expect(trigger).toHaveFocus();+ expect(getWidgetViewSnapshot().view.type).toBe(ViewType.CALENDAR_WIDGET);+ });+ const dateFieldTrigger = body.getByRole('button', { name: /^Date field/ });+ await userEvent.click(dateFieldTrigger);+ await userEvent.click(+ await body.findByRole('option', { name: 'Close date' }),+ );+ await waitFor(() =>+ expect(dateFieldTrigger).toHaveAttribute('aria-expanded', 'false'),+ );+ const opportunity = getMockObjectMetadataItemOrThrow('opportunity');+ const closeDate = getMockFieldMetadataItemOrThrow({+ objectMetadataItem: opportunity,+ fieldName: 'closeDate',+ });+ expect(getWidgetViewSnapshot().view.calendarFieldMetadataId).toBe(+ closeDate.id,+ );+ const calendarTrigger = body.getByRole('button', {+ name: /^Calendar view/,+ });+ await userEvent.click(calendarTrigger);+ await userEvent.click(await body.findByRole('option', { name: 'Week' }));+ await waitFor(() =>+ expect(calendarTrigger).toHaveAttribute('aria-expanded', 'false'),+ );+ expect(getWidgetViewSnapshot().view.calendarLayout).toBe(+ ViewCalendarLayout.WEEK,+ );+ expect(onBackgroundClickOutside).not.toHaveBeenCalled();+ },+};++export const SearchGroupWithKeyboard: Story = {+ play: async ({ canvasElement }) => {+ const body = within(canvasElement.ownerDocument.body);+ const trigger = await body.findByRole('button', { name: /^Group by/ });+ await userEvent.click(trigger);+ const search = await body.findByRole('searchbox', {+ name: 'Search fields',+ });+ await userEvent.type(search, 'stage');+ expect(+ body.queryByRole('option', { name: 'None' }),+ ).not.toBeInTheDocument();+ await userEvent.keyboard('{Enter}');+ await waitFor(() =>+ expect(trigger).toHaveAttribute('aria-expanded', 'false'),+ );+ const opportunity = getMockObjectMetadataItemOrThrow('opportunity');+ const stage = getMockFieldMetadataItemOrThrow({+ objectMetadataItem: opportunity,+ fieldName: 'stage',+ });+ expect(getWidgetViewSnapshot().view.mainGroupByFieldMetadataId).toBe(+ stage.id,+ );+ await userEvent.click(trigger);+ expect(+ await body.findByRole('searchbox', { name: 'Search fields' }),+ ).toHaveValue('');+ expect(body.getByRole('option', { name: 'Stage' })).toHaveAttribute(+ 'aria-selected',+ 'true',+ );+ await userEvent.click(body.getByRole('option', { name: 'None' }));+ expect(getWidgetViewSnapshot().view.mainGroupByFieldMetadataId).toBeNull();+ expect(onBackgroundClickOutside).not.toHaveBeenCalled();+ },+};++export const SearchSourceAndResetView: Story = {+ play: async ({ canvasElement }) => {+ const body = within(canvasElement.ownerDocument.body);+ const trigger = await body.findByRole('button', { name: /^Source/ });+ await userEvent.click(trigger);+ const search = await body.findByRole('searchbox', {+ name: 'Search objects',+ });+ await userEvent.type(search, 'compan');+ await userEvent.keyboard('{Enter}');+ await waitFor(() =>+ expect(trigger).toHaveAttribute('aria-expanded', 'false'),+ );+ const company = getMockObjectMetadataItemOrThrow('company');+ await waitFor(() => {+ const widget = jotaiStore.get(+ pageLayoutDraftComponentState.atomFamily({ instanceId: pageLayoutId }),+ ).tabs[0].widgets[0];+ expect(widget.objectMetadataId).toBe(company.id);+ expect(widget.title).toBe(company.labelPlural);+ expect(getWidgetViewSnapshot().view.objectMetadataId).toBe(company.id);+ });+ await userEvent.click(trigger);+ expect(+ await body.findByRole('searchbox', { name: 'Search objects' }),+ ).toHaveValue('');+ await userEvent.keyboard('{Escape}');+ expect(onBackgroundClickOutside).not.toHaveBeenCalled();+ },+};++export const ReorderHideAndShowFields: Story = {+ play: async ({ canvasElement }) => {+ const body = within(canvasElement.ownerDocument.body);+ const trigger = await body.findByRole('button', { name: /^Fields/ });+ await userEvent.click(trigger);+ const stageRow = await body.findByRole('button', { name: /^Stage/ });+ stageRow.focus();+ await userEvent.keyboard(' ');+ await userEvent.keyboard('{Shift>}{ArrowDown}{/Shift}');+ await userEvent.keyboard(' ');+ await waitFor(() => {+ const stageField = getWidgetViewSnapshot().viewFields.find(+ (field) => field.id === 'table-story-stage',+ );+ expect(stageField?.position).not.toBe(1);+ });+ await userEvent.click(body.getByRole('button', { name: 'Hide Amount' }));+ expect(+ getWidgetViewSnapshot().viewFields.find(+ (field) => field.id === 'table-story-amount',+ )?.isVisible,+ ).toBe(false);+ const hiddenFieldsOpener = body.getByRole('button', {+ name: 'Hidden Fields',+ });+ await userEvent.click(hiddenFieldsOpener);+ await userEvent.click(+ await body.findByRole('button', { name: 'Show Amount' }),+ );+ expect(+ getWidgetViewSnapshot().viewFields.find(+ (field) => field.id === 'table-story-amount',+ )?.isVisible,+ ).toBe(true);+ await userEvent.click(body.getByRole('button', { name: 'Hidden Fields' }));+ await waitFor(() => expect(hiddenFieldsOpener).toHaveFocus());+ expect(body.getByText('Amount')).toBeVisible();+ expect(trigger).toHaveAttribute('aria-expanded', 'true');+ await userEvent.keyboard('{Escape}');+ await waitFor(() => expect(trigger).toHaveFocus());+ await userEvent.click(trigger);+ expect(+ await body.findByRole('button', { name: 'Hidden Fields' }),+ ).toBeVisible();+ expect(body.getByText('Amount')).toBeVisible();+ expect(onBackgroundClickOutside).not.toHaveBeenCalled();+ },+};++export const LayoutWithoutViewIsDisabled: Story = {+ beforeEach: () =>+ initializeRecordTableWidgetSettingsStory({ hasView: false }),+ play: async ({ canvasElement }) => {+ const body = within(canvasElement.ownerDocument.body);+ const trigger = await body.findByRole('button', { name: /^Layout/ });+ expect(trigger).toBeDisabled();+ await userEvent.click(trigger);+ expect(trigger).toHaveAttribute('aria-expanded', 'false');+ expect(+ body.queryByRole('option', { name: 'Table' }),+ ).not.toBeInTheDocument();+ },+};++export const EmbeddedViewLayoutRows: Story = {+ args: { shouldShowLayoutRowsOnly: true },+ play: async ({ canvasElement }) => {+ const body = within(canvasElement.ownerDocument.body);+ const trigger = await body.findByRole('button', { name: /^Layout/ });+ await userEvent.click(trigger);+ await userEvent.click(await body.findByRole('option', { name: 'List' }));+ await waitFor(() => expect(trigger).toHaveTextContent('List'));+ expect(getWidgetViewSnapshot().view.type).toBe(ViewType.LIST_WIDGET);+ await userEvent.click(trigger);+ await userEvent.click(+ await body.findByRole('option', { name: 'Calendar' }),+ );+ expect(+ await body.findByRole('button', { name: /^Calendar view/ }),+ ).toHaveTextContent('Month');+ expect(onBackgroundClickOutside).not.toHaveBeenCalled();+ },+};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dashboard/__stories__/initializeRecordTableWidgetSettingsStory.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dashboard/__stories__/initializeRecordTableWidgetSettingsStory.tsnew file mode 100644index 00000000000..56670a09296--- /dev/null+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dashboard/__stories__/initializeRecordTableWidgetSettingsStory.ts@@ -0,0 +1,116 @@+import { currentRecordFieldsComponentState } from '@/object-record/record-field/states/currentRecordFieldsComponentState';+import { getRecordIndexIdFromObjectNamePluralAndViewId } from '@/object-record/utils/getRecordIndexIdFromObjectNamePluralAndViewId';+import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';+import { pageLayoutEditingWidgetIdComponentState } from '@/page-layout/states/pageLayoutEditingWidgetIdComponentState';+import { recordTableWidgetViewDraftComponentState } from '@/page-layout/states/recordTableWidgetViewDraftComponentState';+import {+ makeDraft,+ makeTab,+ makeWidget,+} from '@/page-layout/testing/pageLayoutDraftFixtures';+import { buildRecordTableWidgetViewSnapshot } from '@/page-layout/widgets/record-table/utils/buildRecordTableWidgetViewSnapshot';+import { type RecordTableWidgetLayoutViewType } from '@/page-layout/widgets/record-table/types/RecordTableWidgetLayoutViewType';+import { RECORD_TABLE_WIDGET_SETTINGS_STORY_DATA } from '@/side-panel/pages/page-layout/components/dashboard/__stories__/recordTableWidgetSettingsStoryData';+import { SIDE_PANEL_FOCUS_ID } from '@/side-panel/constants/SidePanelFocusId';+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 {+ PageLayoutType,+ ViewType,+ WidgetConfigurationType,+ WidgetType,+} from '~/generated-metadata/graphql';+import { getMockObjectMetadataItemOrThrow } from '~/testing/utils/getMockObjectMetadataItemOrThrow';+import { getMockFieldMetadataItemOrThrow } from '~/testing/utils/getMockFieldMetadataItemOrThrow';++export const initializeRecordTableWidgetSettingsStory = ({+ viewType = ViewType.TABLE_WIDGET,+ hasView = true,+}: {+ viewType?: RecordTableWidgetLayoutViewType;+ hasView?: boolean;+} = {}) => {+ const { pageLayoutId, widgetId, tabId, viewId } =+ RECORD_TABLE_WIDGET_SETTINGS_STORY_DATA;+ const objectMetadataItem = getMockObjectMetadataItemOrThrow('opportunity');+ const snapshot = buildRecordTableWidgetViewSnapshot(objectMetadataItem);+ snapshot.view = { ...snapshot.view, id: viewId, type: viewType };+ const fieldNames = ['name', 'stage', 'amount', 'closeDate'];+ const fields = fieldNames.map((fieldName, position) => {+ const fieldMetadataItem = getMockFieldMetadataItemOrThrow({+ objectMetadataItem,+ fieldName,+ });+ return {+ id: `table-story-${fieldName}`,+ fieldMetadataId: fieldMetadataItem.id,+ viewId,+ position,+ isVisible: position < 3,+ isActive: true,+ size: 180,+ };+ });+ snapshot.viewFields = fields;+ jotaiStore.set(+ recordTableWidgetViewDraftComponentState.atomFamily({+ instanceId: pageLayoutId,+ }),+ hasView ? { [widgetId]: snapshot } : {},+ );+ jotaiStore.set(+ pageLayoutDraftComponentState.atomFamily({ instanceId: pageLayoutId }),+ {+ ...makeDraft([+ makeTab(tabId, [+ {+ ...makeWidget(widgetId, 0, tabId),+ type: WidgetType.RECORD_TABLE,+ objectMetadataId: objectMetadataItem.id,+ configuration: {+ __typename: 'RecordTableConfiguration',+ configurationType: WidgetConfigurationType.RECORD_TABLE,+ viewId: hasView ? viewId : undefined,+ },+ },+ ]),+ ]),+ type: PageLayoutType.DASHBOARD,+ },+ );+ jotaiStore.set(+ pageLayoutEditingWidgetIdComponentState.atomFamily({+ instanceId: pageLayoutId,+ }),+ widgetId,+ );+ jotaiStore.set(+ currentRecordFieldsComponentState.atomFamily({+ instanceId: getRecordIndexIdFromObjectNamePluralAndViewId(+ objectMetadataItem.namePlural,+ viewId,+ ),+ }),+ fields.map((field) => ({+ id: field.id,+ fieldMetadataItemId: field.fieldMetadataId,+ position: field.position,+ size: field.size,+ isVisible: field.isVisible,+ })),+ );+ 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/dashboard/__stories__/recordTableWidgetSettingsStoryData.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dashboard/__stories__/recordTableWidgetSettingsStoryData.tsnew file mode 100644index 00000000000..a2e5da844bc--- /dev/null+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dashboard/__stories__/recordTableWidgetSettingsStoryData.ts@@ -0,0 +1,6 @@+export const RECORD_TABLE_WIDGET_SETTINGS_STORY_DATA = {+ pageLayoutId: 'record-table-widget-settings-story',+ widgetId: 'record-table',+ tabId: 'overview',+ viewId: 'record-table-widget-settings-view',+};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dashboard/__tests__/SidePanelDashboardRecordTableSettings.test.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dashboard/__tests__/SidePanelDashboardRecordTableSettings.test.tsxdeleted file mode 100644index 33689692425..00000000000--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dashboard/__tests__/SidePanelDashboardRecordTableSettings.test.tsx+++ /dev/null@@ -1,110 +0,0 @@-import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';-import { SidePanelDashboardRecordTableSettings } from '@/side-panel/pages/page-layout/components/dashboard/SidePanelDashboardRecordTableSettings';-import { PageLayoutSidePanelTargetContext } from '@/side-panel/pages/page-layout/contexts/PageLayoutSidePanelTargetContext';-import { i18n } from '@lingui/core';-import { I18nProvider } from '@lingui/react';-import { render } from '@testing-library/react';-import { createStore, Provider as JotaiProvider } from 'jotai';-import { PageLayoutType } from '~/generated-metadata/graphql';--const PAGE_LAYOUT_ID = 'dashboard-page-layout-id';--jest.mock('@/object-metadata/hooks/useObjectMetadataItems', () => ({- useObjectMetadataItems: () => ({ objectMetadataItems: [] }),-}));--jest.mock(- '@/page-layout/widgets/record-table/hooks/useRecordTableWidgetFieldCallbacks',- () => ({- useRecordTableWidgetFieldCallbacks: () => ({- handleFieldUpdated: jest.fn(),- handleFieldCreated: jest.fn(),- }),- }),-);--jest.mock(- '@/page-layout/widgets/record-table/hooks/useRecordTableWidgetLayoutCallbacks',- () => ({- useRecordTableWidgetLayoutCallbacks: () => ({- handleShouldHideEmptyGroupsChange: jest.fn(),- }),- }),-);--jest.mock(- '@/page-layout/widgets/record-table/hooks/useRecordTableWidgetViewForDisplay',- () => ({- useRecordTableWidgetViewForDisplay: () => ({ view: undefined }),- }),-);--jest.mock('@/side-panel/hooks/useSidePanelSubPageHistory', () => ({- useSidePanelSubPageHistory: () => ({- navigateToSidePanelSubPage: jest.fn(),- }),-}));--jest.mock(- '@/side-panel/pages/page-layout/hooks/useRecordTableSettingsDescriptions',- () => ({- useRecordTableSettingsDescriptions: () => ({- sourceDescription: '',- fieldsDescription: '',- filterDescription: '',- sortDescription: '',- }),- }),-);--jest.mock(- '@/side-panel/pages/page-layout/hooks/useUpdateCurrentWidgetConfig',- () => ({- useUpdateCurrentWidgetConfig: () => ({- updateCurrentWidgetConfig: jest.fn(),- }),- }),-);--jest.mock('@/side-panel/pages/page-layout/hooks/useWidgetInEditMode', () => ({- useWidgetInEditMode: () => ({ widgetInEditMode: undefined }),-}));--describe('SidePanelDashboardRecordTableSettings', () => {- it('reads the dashboard draft without a page layout component context', () => {- const store = createStore();-- store.set(- pageLayoutDraftComponentState.atomFamily({ instanceId: PAGE_LAYOUT_ID }),- {- id: PAGE_LAYOUT_ID,- name: 'Dashboard layout',- type: PageLayoutType.DASHBOARD,- objectMetadataId: null,- tabs: [],- defaultTabToFocusOnMobileAndSidePanelId: null,- isFirstTabPinned: true,- },- );-- const { container } = render(- <JotaiProvider store={store}>- <I18nProvider i18n={i18n}>- <PageLayoutSidePanelTargetContext.Provider- value={{- pageLayoutId: PAGE_LAYOUT_ID,- targetRecordIdentifier: {- id: 'dashboard-record-id',- targetObjectNameSingular: 'dashboard',- },- }}- >- <SidePanelDashboardRecordTableSettings />- </PageLayoutSidePanelTargetContext.Provider>- </I18nProvider>- </JotaiProvider>,- );-- expect(container).toBeEmptyDOMElement();- });-});diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/FieldWidgetFieldDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/FieldWidgetFieldDropdownContent.tsxindex 4fdb9dc03f7..b0e41fe1fbf 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/FieldWidgetFieldDropdownContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/FieldWidgetFieldDropdownContent.tsx@@ -17,32 +17,21 @@ 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 { FieldWidgetNestedFieldDropdownContent } from '@/side-panel/pages/page-layout/components/dropdown-content/FieldWidgetNestedFieldDropdownContent';-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 { useSelectableList } from '@/ui/layout/selectable-list/hooks/useSelectableList';-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 { isDefined, isNonEmptyArray } from 'twenty-shared/utils';import { useIcons } from 'twenty-ui/icon';-import { ListItemButton } from 'twenty-ui/components/navigation';+import { Dropdown } from 'twenty-ui/components/navigation';import { FieldDisplayMode } from '~/generated-metadata/graphql';import { filterBySearchQuery } from '~/utils/filterBySearchQuery';+type FieldWidgetFieldSelectionRow =+ | { type: 'navigation'; fieldMetadataItem: FieldMetadataItem }+ | { type: 'options'; fieldMetadataItems: FieldMetadataItem[] };+export const FieldWidgetFieldDropdownContent = () => {const [searchQuery, setSearchQuery] = useState('');- const [drillInFieldMetadataItem, setDrillInFieldMetadataItem] =- useState<FieldMetadataItem | null>(null);const { pageLayoutId, targetRecordIdentifier } =usePageLayoutSidePanelTarget();@@ -63,42 +52,22 @@ export const FieldWidgetFieldDropdownContent = () => {const { objectMetadataItems } = useObjectMetadataItems();- const { advancedFieldMetadataItems, regularFieldMetadataItems } = useMemo(- () =>- allFieldWidgetFieldMetadataItems.reduce<{- advancedFieldMetadataItems: typeof allFieldWidgetFieldMetadataItems;- regularFieldMetadataItems: typeof allFieldWidgetFieldMetadataItems;- }>(- (accumulator, fieldMetadataItem) => {- const isAdvancedField = isAdvancedRelationFieldMetadataItem(- fieldMetadataItem,- objectMetadataItems,- );-- if (isAdvancedField) {- accumulator.advancedFieldMetadataItems.push(fieldMetadataItem);- } else {- accumulator.regularFieldMetadataItems.push(fieldMetadataItem);- }-- return accumulator;- },- {- advancedFieldMetadataItems: [],- regularFieldMetadataItems: [],- },- ),- [allFieldWidgetFieldMetadataItems, objectMetadataItems],- );+ const regularFieldMetadataItems: FieldMetadataItem[] = [];+ const advancedFieldMetadataItems: FieldMetadataItem[] = [];- const dropdownId = useAvailableComponentInstanceIdOrThrow(- DropdownComponentInstanceContext,- );+ for (const fieldMetadataItem of allFieldWidgetFieldMetadataItems) {+ const isAdvancedField = isAdvancedRelationFieldMetadataItem(+ fieldMetadataItem,+ objectMetadataItems,+ );- const selectedItemId = useAtomComponentStateValue(- selectedItemIdComponentState,- dropdownId,- );+ if (isAdvancedField) {+ advancedFieldMetadataItems.push(fieldMetadataItem);+ continue;+ }++ regularFieldMetadataItems.push(fieldMetadataItem);+ }const { updateCurrentWidgetConfig } =useUpdateCurrentWidgetConfig(pageLayoutId);@@ -108,11 +77,6 @@ export const FieldWidgetFieldDropdownContent = () => {const { resolveFieldWidgetRelationTableViewIdChange } =useResolveFieldWidgetRelationTableViewIdChange(pageLayoutId);- const { closeDropdown } = useCloseDropdown();-- const { setSelectedItemId, resetSelectedItem } =- useSelectableList(dropdownId);-const { getIcon } = useIcons();const searchableFieldMetadataItems = [@@ -151,7 +115,7 @@ export const FieldWidgetFieldDropdownContent = () => {relationTargetObjectMetadataItem,);- if (nestedFieldCandidates.length > 0) {+ if (isNonEmptyArray(nestedFieldCandidates)) {candidatesByFieldId.set(fieldMetadataItem.id, nestedFieldCandidates);}}@@ -159,34 +123,13 @@ export const FieldWidgetFieldDropdownContent = () => {return candidatesByFieldId;}, [allFieldWidgetFieldMetadataItems, objectMetadataItems]);- // The browse list and submenu share one selectable list, so realign focus on enter and leave or Enter hits a stale row- const handleDrillIn = (fieldMetadataItem: FieldMetadataItem) => {- setDrillInFieldMetadataItem(fieldMetadataItem);-- const isCheckedNestedFieldInCandidates =- currentFieldMetadataId === fieldMetadataItem.id &&- isDefined(currentNestedRelationFieldMetadataId) &&- (nestedFieldCandidatesByFieldId.get(fieldMetadataItem.id) ?? []).some(- (nestedFieldMetadataItem) =>- nestedFieldMetadataItem.id === currentNestedRelationFieldMetadataId,- );-- if (isCheckedNestedFieldInCandidates) {- setSelectedItemId(currentNestedRelationFieldMetadataId);- } else {- resetSelectedItem();- }- };-- const handleDrillOut = (fieldMetadataItem: FieldMetadataItem) => {- setDrillInFieldMetadataItem(null);- setSelectedItemId(fieldMetadataItem.id);- };-- const isSelectingDifferentChain = (- fieldMetadataId: string,- nestedRelationFieldMetadataId: string | null,- ) =>+ const isSelectingDifferentChain = ({+ fieldMetadataId,+ nestedRelationFieldMetadataId,+ }: {+ fieldMetadataId: string;+ nestedRelationFieldMetadataId: string | null;+ }) =>currentFieldMetadataId !== fieldMetadataId ||(currentNestedRelationFieldMetadataId ?? null) !==nestedRelationFieldMetadataId;@@ -210,10 +153,10 @@ export const FieldWidgetFieldDropdownContent = () => {resolveFieldWidgetRelationTableViewIdChange({selectedField,nextDisplayMode,- isSelectingDifferentChain: isSelectingDifferentChain(- selectedField.id,- null,- ),+ isSelectingDifferentChain: isSelectingDifferentChain({+ fieldMetadataId: selectedField.id,+ nestedRelationFieldMetadataId: null,+ }),widgetId: widgetInEditMode?.id,currentViewId: fieldConfiguration?.viewId,});@@ -234,24 +177,24 @@ export const FieldWidgetFieldDropdownContent = () => {title: selectedField.label,});}-- closeDropdown();};- const handleSelectNestedField = (- parentFieldMetadataItem: FieldMetadataItem,- nestedFieldMetadataItem: FieldMetadataItem,- ) => {- // A nested relation widget always renders as an embedded view, so TABLE is the effective display mode+ const handleSelectNestedField = ({+ parentFieldMetadataItem,+ nestedFieldMetadataItem,+ }: {+ parentFieldMetadataItem: FieldMetadataItem;+ nestedFieldMetadataItem: FieldMetadataItem;+ }) => {const relationTableViewIdChange =resolveFieldWidgetRelationTableViewIdChange({selectedField: parentFieldMetadataItem,selectedNestedField: nestedFieldMetadataItem,nextDisplayMode: FieldDisplayMode.TABLE,- isSelectingDifferentChain: isSelectingDifferentChain(- parentFieldMetadataItem.id,- nestedFieldMetadataItem.id,- ),+ isSelectingDifferentChain: isSelectingDifferentChain({+ fieldMetadataId: parentFieldMetadataItem.id,+ nestedRelationFieldMetadataId: nestedFieldMetadataItem.id,+ }),widgetId: widgetInEditMode?.id,currentViewId: fieldConfiguration?.viewId,});@@ -270,93 +213,112 @@ export const FieldWidgetFieldDropdownContent = () => {title: `${parentFieldMetadataItem.label} → ${nestedFieldMetadataItem.label}`,});}-- closeDropdown();};- if (isDefined(drillInFieldMetadataItem)) {- return (- <FieldWidgetNestedFieldDropdownContent- drillInFieldMetadataItem={drillInFieldMetadataItem}- nestedFieldCandidates={- nestedFieldCandidatesByFieldId.get(drillInFieldMetadataItem.id) ?? []- }- checkedItemId={- currentFieldMetadataId === drillInFieldMetadataItem.id- ? (currentNestedRelationFieldMetadataId ??- drillInFieldMetadataItem.id)- : undefined- }- onBack={() => handleDrillOut(drillInFieldMetadataItem)}- onSelectField={handleSelectField}- onSelectNestedField={handleSelectNestedField}- />- );+ const fieldSelectionRows: FieldWidgetFieldSelectionRow[] = [];++ for (const fieldMetadataItem of availableFields) {+ if (nestedFieldCandidatesByFieldId.has(fieldMetadataItem.id)) {+ fieldSelectionRows.push({ type: 'navigation', fieldMetadataItem });+ continue;+ }++ const previousRow = fieldSelectionRows.at(-1);++ if (previousRow?.type === 'options') {+ previousRow.fieldMetadataItems.push(fieldMetadataItem);+ continue;+ }++ fieldSelectionRows.push({+ type: 'options',+ fieldMetadataItems: [fieldMetadataItem],+ });}- return (- <StyledPageLayoutDropdownContentContainer>- <DropdownMenuSearchInput- autoFocus- type="text"- placeholder={t`Search fields`}- onChange={(event) => setSearchQuery(event.target.value)}- value={searchQuery}- />- <DropdownMenuSeparator />- <StyledPageLayoutDropdownMenuItemsContainer>- <SelectableList- selectableListInstanceId={dropdownId}- focusId={dropdownId}- selectableItemIdArray={availableFields.map((field) => field.id)}- >- {availableFields.map((fieldMetadataItem) => {- const hasNestedFieldCandidates = nestedFieldCandidatesByFieldId.has(- fieldMetadataItem.id,- );+ const renderFieldIcon = (fieldMetadataItem: FieldMetadataItem) => (+ <ApplicationStackIcon+ Icon={getIcon(+ currentFieldMetadataId === fieldMetadataItem.id+ ? currentFieldMetadataItem?.icon+ : fieldMetadataItem.icon,+ )}+ applicationId={fieldMetadataItem.applicationId}+ />+ );- const handleClick = hasNestedFieldCandidates- ? () => handleDrillIn(fieldMetadataItem)- : () => handleSelectField(fieldMetadataItem);+ return (+ <>+ <Dropdown.Page id="root">+ <Dropdown.Search+ placeholder={t`Search fields`}+ aria-label={t`Search fields`}+ onValueChange={setSearchQuery}+ value={searchQuery}+ />+ <Dropdown.Separator />+ <ChartSettingsDropdownSection>+ {fieldSelectionRows.map((row) => {+ if (row.type === 'navigation') {+ return (+ <Dropdown.ActionItem+ key={row.fieldMetadataItem.id}+ page={row.fieldMetadataItem.id}+ startIcon={renderFieldIcon(row.fieldMetadataItem)}+ >+ {row.fieldMetadataItem.label}+ </Dropdown.ActionItem>+ );+ }return (- <SelectableListItem- key={fieldMetadataItem.id}- itemId={fieldMetadataItem.id}- onEnter={handleClick}+ <Dropdown.SelectionGroup+ key={row.fieldMetadataItems[0].id}+ value={currentFieldMetadataId ?? null}+ aria-label={t`Fields`}>- <ListItemButton- focused={selectedItemId === fieldMetadataItem.id}- onClick={handleClick}- role="option"- aria-selected={- !hasNestedFieldCandidates &&- currentFieldMetadataId === fieldMetadataItem.id- }- selected={- !hasNestedFieldCandidates &&- currentFieldMetadataId === fieldMetadataItem.id- }- indicator="check"- hasSubmenu={hasNestedFieldCandidates}- startIcon={- <ApplicationStackIcon- Icon={getIcon(- currentFieldMetadataId === fieldMetadataItem.id- ? currentFieldMetadataItem?.icon- : fieldMetadataItem.icon,- )}- applicationId={fieldMetadataItem.applicationId}- />- }- >- {fieldMetadataItem.label}- </ListItemButton>- </SelectableListItem>+ {row.fieldMetadataItems.map((fieldMetadataItem) => (+ <Dropdown.OptionItem+ key={fieldMetadataItem.id}+ value={fieldMetadataItem.id}+ onSelect={() => handleSelectField(fieldMetadataItem)}+ startIcon={renderFieldIcon(fieldMetadataItem)}+ >+ {fieldMetadataItem.label}+ </Dropdown.OptionItem>+ ))}+ </Dropdown.SelectionGroup>);})}- </SelectableList>- </StyledPageLayoutDropdownMenuItemsContainer>- </StyledPageLayoutDropdownContentContainer>+ {!isNonEmptyArray(availableFields) && (+ <Dropdown.Empty>{t`No fields available`}</Dropdown.Empty>+ )}+ </ChartSettingsDropdownSection>+ </Dropdown.Page>+ {allFieldWidgetFieldMetadataItems.map((fieldMetadataItem) => {+ const nestedFieldCandidates = nestedFieldCandidatesByFieldId.get(+ fieldMetadataItem.id,+ );++ if (!isDefined(nestedFieldCandidates)) {+ return null;+ }++ return (+ <FieldWidgetNestedFieldDropdownContent+ key={fieldMetadataItem.id}+ drillInFieldMetadataItem={fieldMetadataItem}+ nestedFieldCandidates={nestedFieldCandidates}+ checkedItemId={+ currentFieldMetadataId === fieldMetadataItem.id+ ? (currentNestedRelationFieldMetadataId ?? fieldMetadataItem.id)+ : undefined+ }+ onSelectField={handleSelectField}+ onSelectNestedField={handleSelectNestedField}+ />+ );+ })}+ </>);};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/FieldWidgetLayoutDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/FieldWidgetLayoutDropdownContent.tsxindex c0c8c454292..f0fef663e1a 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/FieldWidgetLayoutDropdownContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/FieldWidgetLayoutDropdownContent.tsx@@ -15,22 +15,12 @@ import {getRecordTableWidgetLayoutViewType,type RecordTableWidgetLayoutViewType,} from '@/page-layout/widgets/record-table/types/RecordTableWidgetLayoutViewType';-import {- getSelectableLayoutViewTypes,- isSelectableLayout,-} from '@/page-layout/widgets/record-table/utils/getRecordTableWidgetLayoutPickerOptions';+import { isSelectableLayout } from '@/page-layout/widgets/record-table/utils/getRecordTableWidgetLayoutPickerOptions';import { RecordTableWidgetLayoutMenuItems } from '@/side-panel/pages/page-layout/components/record-table-settings/RecordTableWidgetLayoutMenuItems';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 { 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 { ChartSettingsDropdownSection } from '@/side-panel/pages/page-layout/components/chart-settings/ChartSettingsDropdownSection';import { useLingui } from '@lingui/react/macro';import { isDefined } from 'twenty-shared/utils';import {@@ -40,7 +30,7 @@ import {IconListDetails,IconTable,} from 'twenty-ui/icon';-import { ListItemButton } from 'twenty-ui/components/navigation';+import { Dropdown } from 'twenty-ui/components/navigation';import { FieldDisplayMode } from '~/generated-metadata/graphql';const DISPLAY_MODE_ICONS: Record<FieldDisplayMode, IconComponent> = {@@ -91,7 +81,7 @@ export const FieldWidgetLayoutDropdownContent = () => {currentNestedRelationFieldMetadataId,);- const availableDisplayModes = fieldMetadataItem+ const availableDisplayModes = isDefined(fieldMetadataItem)? getFieldWidgetAvailableDisplayModes(fieldMetadataItem.type,fieldMetadataItem.relation?.type,@@ -151,15 +141,6 @@ export const FieldWidgetLayoutDropdownContent = () => {embeddedWidgetView?.type,);- const dropdownId = useAvailableComponentInstanceIdOrThrow(- DropdownComponentInstanceContext,- );-- const selectedItemId = useAtomComponentStateValue(- selectedItemIdComponentState,- dropdownId,- );-const { updateCurrentWidgetConfig } =useUpdateCurrentWidgetConfig(pageLayoutId);@@ -171,15 +152,12 @@ export const FieldWidgetLayoutDropdownContent = () => {widgetId: widgetInEditMode?.id ?? '',});- const { closeDropdown } = useCloseDropdown();-const handleSelectDisplayMode = (fieldDisplayMode: FieldDisplayMode) => {updateCurrentWidgetConfig({configToUpdate: {fieldDisplayMode,},});- closeDropdown();};const handleSelectViewLayout = (@@ -211,7 +189,6 @@ export const FieldWidgetLayoutDropdownContent = () => {// Draft view creation fails without the target object, so keep the current display modeif (!isDefined(viewId)) {- closeDropdown();return;}@@ -227,7 +204,6 @@ export const FieldWidgetLayoutDropdownContent = () => {defaultGroupByFieldMetadataItem,defaultCalendarFieldMetadataItem,});- closeDropdown();};const displayModeLabels: Record<string, string> = {@@ -237,53 +213,34 @@ export const FieldWidgetLayoutDropdownContent = () => {};return (- <DropdownMenuItemsContainer>- <SelectableList- selectableListInstanceId={dropdownId}- focusId={dropdownId}- selectableItemIdArray={[- ...inlineDisplayModes,- ...(hasEmbeddedViewLayouts- ? getSelectableLayoutViewTypes(layoutOptions)- : []),- ]}+ <ChartSettingsDropdownSection>+ <Dropdown.SelectionGroup+ aria-label={t`Layout`}+ value={+ isTableDisplayMode+ ? currentEmbeddedViewType+ : (currentDisplayMode ?? null)+ }>{inlineDisplayModes.map((displayMode) => (- <SelectableListItem+ <Dropdown.OptionItemkey={displayMode}- itemId={displayMode}- onEnter={() => {- handleSelectDisplayMode(displayMode);- }}+ value={displayMode}+ onSelect={() => handleSelectDisplayMode(displayMode)}+ startIcon={+ <SelectOptionIcon Icon={DISPLAY_MODE_ICONS[displayMode]} />+ }>- <ListItemButton- focused={selectedItemId === displayMode}- onClick={() => {- handleSelectDisplayMode(displayMode);- }}- role="option"- aria-selected={currentDisplayMode === displayMode}- selected={currentDisplayMode === displayMode}- indicator="check"- startIcon={- <SelectOptionIcon Icon={DISPLAY_MODE_ICONS[displayMode]} />- }- >- {displayModeLabels[displayMode]}- </ListItemButton>- </SelectableListItem>+ {displayModeLabels[displayMode]}+ </Dropdown.OptionItem>))}{hasEmbeddedViewLayouts && (<RecordTableWidgetLayoutMenuItemslayoutOptions={layoutOptions}- selectedViewType={- isTableDisplayMode ? currentEmbeddedViewType : undefined- }- focusedItemId={selectedItemId}onSelect={handleSelectViewLayout}/>)}- </SelectableList>- </DropdownMenuItemsContainer>+ </Dropdown.SelectionGroup>+ </ChartSettingsDropdownSection>);};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/FieldWidgetNestedFieldDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/FieldWidgetNestedFieldDropdownContent.tsxindex a4859c2122a..0d2b773964b 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/FieldWidgetNestedFieldDropdownContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/FieldWidgetNestedFieldDropdownContent.tsx@@ -1,110 +1,69 @@-import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';-import {- StyledPageLayoutDropdownContentContainer,- StyledPageLayoutDropdownMenuItemsContainer,-} from '@/side-panel/pages/page-layout/components/dropdown-content/PageLayoutDropdownContentContainer';-import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';-import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';-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 { IconChevronLeft, useIcons } from 'twenty-ui/icon';-import { ListItemButton } from 'twenty-ui/components/navigation';+import { ChartSettingsDropdownSection } from '@/side-panel/pages/page-layout/components/chart-settings/ChartSettingsDropdownSection';+import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';+import { Dropdown } from 'twenty-ui/components/navigation';+import { useIcons } from 'twenty-ui/icon';type FieldWidgetNestedFieldDropdownContentProps = {drillInFieldMetadataItem: FieldMetadataItem;nestedFieldCandidates: FieldMetadataItem[];checkedItemId: string | undefined;- onBack: () => void;onSelectField: (fieldMetadataItem: FieldMetadataItem) => void;- onSelectNestedField: (- parentFieldMetadataItem: FieldMetadataItem,- nestedFieldMetadataItem: FieldMetadataItem,- ) => void;+ onSelectNestedField: (selection: {+ parentFieldMetadataItem: FieldMetadataItem;+ nestedFieldMetadataItem: FieldMetadataItem;+ }) => void;};export const FieldWidgetNestedFieldDropdownContent = ({drillInFieldMetadataItem,nestedFieldCandidates,checkedItemId,- onBack,onSelectField,onSelectNestedField,}: FieldWidgetNestedFieldDropdownContentProps) => {- const dropdownId = useAvailableComponentInstanceIdOrThrow(- DropdownComponentInstanceContext,- );-- const selectedItemId = useAtomComponentStateValue(- selectedItemIdComponentState,- dropdownId,- );-const { getIcon } = useIcons();- const renderOption = (- fieldMetadataItem: FieldMetadataItem,- onSelect: () => void,- ) => (- <SelectableListItem- key={fieldMetadataItem.id}- itemId={fieldMetadataItem.id}- onEnter={onSelect}- >- <ListItemButton- focused={selectedItemId === fieldMetadataItem.id}- onClick={onSelect}- role="option"- aria-selected={checkedItemId === fieldMetadataItem.id}- selected={checkedItemId === fieldMetadataItem.id}- indicator="check"- startIcon={<SelectOptionIcon Icon={getIcon(fieldMetadataItem.icon)} />}- >- {fieldMetadataItem.label}- </ListItemButton>- </SelectableListItem>- );-return (- <StyledPageLayoutDropdownContentContainer>- <DropdownMenuHeader- StartComponent={- <DropdownMenuHeaderLeftComponent- onClick={onBack}- Icon={IconChevronLeft}- />- }- >- {drillInFieldMetadataItem.label}- </DropdownMenuHeader>- <StyledPageLayoutDropdownMenuItemsContainer>- <SelectableList- selectableListInstanceId={dropdownId}- focusId={dropdownId}- selectableItemIdArray={[- drillInFieldMetadataItem.id,- ...nestedFieldCandidates.map((field) => field.id),- ]}+ <Dropdown.Page id={drillInFieldMetadataItem.id}>+ <Dropdown.Back>{drillInFieldMetadataItem.label}</Dropdown.Back>+ <Dropdown.Separator />+ <ChartSettingsDropdownSection>+ <Dropdown.SelectionGroup+ value={checkedItemId ?? null}+ aria-label={drillInFieldMetadataItem.label}>- {renderOption(drillInFieldMetadataItem, () =>- onSelectField(drillInFieldMetadataItem),- )}- <DropdownMenuSeparator />- {nestedFieldCandidates.map((nestedFieldMetadataItem) =>- renderOption(nestedFieldMetadataItem, () =>- onSelectNestedField(- drillInFieldMetadataItem,- nestedFieldMetadataItem,- ),- ),- )}- </SelectableList>- </StyledPageLayoutDropdownMenuItemsContainer>- </StyledPageLayoutDropdownContentContainer>+ <Dropdown.OptionItem+ value={drillInFieldMetadataItem.id}+ onSelect={() => onSelectField(drillInFieldMetadataItem)}+ startIcon={+ <SelectOptionIcon Icon={getIcon(drillInFieldMetadataItem.icon)} />+ }+ >+ {drillInFieldMetadataItem.label}+ </Dropdown.OptionItem>+ <Dropdown.Separator />+ {nestedFieldCandidates.map((nestedFieldMetadataItem) => (+ <Dropdown.OptionItem+ key={nestedFieldMetadataItem.id}+ value={nestedFieldMetadataItem.id}+ onSelect={() =>+ onSelectNestedField({+ parentFieldMetadataItem: drillInFieldMetadataItem,+ nestedFieldMetadataItem,+ })+ }+ startIcon={+ <SelectOptionIcon+ Icon={getIcon(nestedFieldMetadataItem.icon)}+ />+ }+ >+ {nestedFieldMetadataItem.label}+ </Dropdown.OptionItem>+ ))}+ </Dropdown.SelectionGroup>+ </ChartSettingsDropdownSection>+ </Dropdown.Page>);};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/MoveToTabDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/MoveToTabDropdownContent.tsxindex df1f10dcee4..de6f69e3390 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/MoveToTabDropdownContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/MoveToTabDropdownContent.tsx@@ -1,15 +1,12 @@-import { ListItemButton } from 'twenty-ui/components/navigation';-import { ListItem } from 'twenty-ui/primitives/navigation';+import { Dropdown } from 'twenty-ui/components/navigation';import { useMoveWidgetToTab } from '@/page-layout/hooks/useMoveWidgetToTab';import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';import { pageLayoutEditingWidgetIdComponentState } from '@/page-layout/states/pageLayoutEditingWidgetIdComponentState';import { canVerticalListAcceptWidget } from '@/page-layout/utils/canVerticalListAcceptWidget';import { usePageLayoutSidePanelTarget } from '@/side-panel/pages/page-layout/hooks/usePageLayoutSidePanelTarget';-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { t } from '@lingui/core/macro';-import { isDefined } from 'twenty-shared/utils';+import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';import { PageLayoutTabLayoutMode } from '~/generated-metadata/graphql';export const MoveToTabDropdownContent = () => {@@ -27,8 +24,6 @@ export const MoveToTabDropdownContent = () => {const { moveWidgetToTab } = useMoveWidgetToTab(pageLayoutId);- const { closeDropdown } = useCloseDropdown();-const currentTab = isDefined(pageLayoutEditingWidgetId)? pageLayoutDraft.tabs.find((tab) =>tab.widgets.some((widget) => widget.id === pageLayoutEditingWidgetId),@@ -54,27 +49,28 @@ export const MoveToTabDropdownContent = () => {return null;}- if (eligibleTabs.length === 0) {+ if (!isNonEmptyArray(eligibleTabs)) {return (- <DropdownMenuItemsContainer>- <ListItem disabled>{t`No available tabs`}</ListItem>- </DropdownMenuItemsContainer>+ <Dropdown.Section>+ <Dropdown.ActionItem+ disabled+ >{t`No available tabs`}</Dropdown.ActionItem>+ </Dropdown.Section>);}return (- <DropdownMenuItemsContainer>+ <Dropdown.Section scrollable>{eligibleTabs.map((tab) => (- <ListItemButton+ <Dropdown.ActionItemkey={tab.id}onClick={() => {moveWidgetToTab(pageLayoutEditingWidgetId, tab.id);- closeDropdown();}}>{tab.title ?? ''}- </ListItemButton>+ </Dropdown.ActionItem>))}- </DropdownMenuItemsContainer>+ </Dropdown.Section>);};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.tsxdeleted file mode 100644index a5bc34ac9b5..00000000000--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/PageLayoutDropdownContentContainer.tsx+++ /dev/null@@ -1,18 +0,0 @@-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';--export const StyledPageLayoutDropdownContentContainer = styled.div`- display: flex;- flex-direction: column;- max-height: ${PAGE_LAYOUT_DROPDOWN_CONTENT_MAX_HEIGHT}px;- min-height: 0;- overflow: hidden;-`;--export const StyledPageLayoutDropdownMenuItemsContainer = styled(- DropdownMenuItemsContainer,-)`- flex: 1;- min-height: 0;-`;diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/SingleWidgetTabVisibilityDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/SingleWidgetTabVisibilityDropdownContent.tsxindex 147155c30f6..6e5dd285a13 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/SingleWidgetTabVisibilityDropdownContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/SingleWidgetTabVisibilityDropdownContent.tsx@@ -2,7 +2,6 @@ import { useUpdatePageLayoutWidget } from '@/page-layout/hooks/useUpdatePageLayoimport { WidgetVisibilityOptionsList } from '@/side-panel/pages/page-layout/components/dropdown-content/WidgetVisibilityOptionsList';import { expressionToOptionId } from '@/side-panel/pages/page-layout/utils/expressionToOptionId';import { optionIdToExpression } from '@/side-panel/pages/page-layout/utils/optionIdToExpression';-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';type SingleWidgetTabVisibilityDropdownContentProps = {widgetId: string;@@ -17,13 +16,10 @@ export const SingleWidgetTabVisibilityDropdownContent = ({}: SingleWidgetTabVisibilityDropdownContentProps) => {const { updatePageLayoutWidget } = useUpdatePageLayoutWidget(pageLayoutId);- const { closeDropdown } = useCloseDropdown();-const handleSelectVisibility = (optionId: string) => {updatePageLayoutWidget(widgetId, {conditionalAvailabilityExpression: optionIdToExpression(optionId),});- closeDropdown();};return (diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/WidgetVisibilityDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/WidgetVisibilityDropdownContent.tsxindex ac4bd335d20..d5011ff3507 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/WidgetVisibilityDropdownContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/WidgetVisibilityDropdownContent.tsx@@ -4,7 +4,6 @@ import { useUpdateCurrentWidgetConfig } from '@/side-panel/pages/page-layout/hooimport { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';import { expressionToOptionId } from '@/side-panel/pages/page-layout/utils/expressionToOptionId';import { optionIdToExpression } from '@/side-panel/pages/page-layout/utils/optionIdToExpression';-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';export const WidgetVisibilityDropdownContent = () => {const { pageLayoutId } = usePageLayoutSidePanelTarget();@@ -14,13 +13,10 @@ export const WidgetVisibilityDropdownContent = () => {const { updateCurrentWidgetConfig } =useUpdateCurrentWidgetConfig(pageLayoutId);- const { closeDropdown } = useCloseDropdown();-const handleSelectVisibility = (optionId: string) => {updateCurrentWidgetConfig({conditionalAvailabilityExpression: optionIdToExpression(optionId),});- closeDropdown();};return (diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/WidgetVisibilityOptionsList.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/WidgetVisibilityOptionsList.tsxindex 7493b638448..754e6aac363 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/WidgetVisibilityOptionsList.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/WidgetVisibilityOptionsList.tsx@@ -1,13 +1,7 @@import { VISIBILITY_OPTIONS } from '@/side-panel/pages/page-layout/constants/VisibilityOptions';import { useVisibilityLabels } from '@/side-panel/pages/page-layout/hooks/useVisibilityLabels';-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 { ListItemButton } from 'twenty-ui/components/navigation';+import { useLingui } from '@lingui/react/macro';+import { Dropdown } from 'twenty-ui/components/navigation';type WidgetVisibilityOptionsListProps = {currentOptionId: string;@@ -18,47 +12,25 @@ export const WidgetVisibilityOptionsList = ({currentOptionId,onSelectVisibility,}: WidgetVisibilityOptionsListProps) => {- const dropdownId = useAvailableComponentInstanceIdOrThrow(- DropdownComponentInstanceContext,- );-- const selectedItemId = useAtomComponentStateValue(- selectedItemIdComponentState,- dropdownId,- );-+ const { t } = useLingui();const visibilityLabels = useVisibilityLabels();return (- <DropdownMenuItemsContainer>- <SelectableList- selectableListInstanceId={dropdownId}- focusId={dropdownId}- selectableItemIdArray={VISIBILITY_OPTIONS.map((option) => option.id)}+ <Dropdown.Section>+ <Dropdown.SelectionGroup+ aria-label={t`Visibility restriction`}+ value={currentOptionId}>{VISIBILITY_OPTIONS.map((option) => (- <SelectableListItem+ <Dropdown.OptionItemkey={option.id}- itemId={option.id}- onEnter={() => {- onSelectVisibility(option.id);- }}+ value={option.id}+ onSelect={() => onSelectVisibility(option.id)}>- <ListItemButton- focused={selectedItemId === option.id}- onClick={() => {- onSelectVisibility(option.id);- }}- role="option"- aria-selected={currentOptionId === option.id}- selected={currentOptionId === option.id}- indicator="check"- >- {visibilityLabels[option.id]}- </ListItemButton>- </SelectableListItem>+ {visibilityLabels[option.id]}+ </Dropdown.OptionItem>))}- </SelectableList>- </DropdownMenuItemsContainer>+ </Dropdown.SelectionGroup>+ </Dropdown.Section>);};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-page/SidePanelRecordPageFieldSettings.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-page/SidePanelRecordPageFieldSettings.tsxindex 9640386721a..665f9dd12ce 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-page/SidePanelRecordPageFieldSettings.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-page/SidePanelRecordPageFieldSettings.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 { CommandMenuItemSwitch } from '@/command-menu/components/CommandMenuItemSwitch';import { useFieldMetadataItemById } from '@/object-metadata/hooks/useFieldMetadataItemById';import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';@@ -29,7 +29,9 @@ import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidimport { useWidgetSettingsPlacementSelectableItemIds } from '@/side-panel/pages/page-layout/hooks/useWidgetSettingsPlacementSelectableItemIds';import { getWidgetViewLayoutSettingsItemIds } from '@/side-panel/pages/page-layout/utils/getWidgetViewLayoutSettingsItemIds';import { SidePanelSubPages } from '@/side-panel/types/SidePanelSubPages';-import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';+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 { styled } from '@linaria/react';import { useLingui } from '@lingui/react/macro';@@ -56,6 +58,7 @@ const StyledSidePanelContainer = styled.div`export const SidePanelRecordPageFieldSettings = () => {const { t } = useLingui();+ const { openDropdown } = useOpenDropdown();const { pageLayoutId } = usePageLayoutSidePanelTarget();const { placementSelectableItemIds, widgetSettingsPlacement } =@@ -205,37 +208,51 @@ export const SidePanelRecordPageFieldSettings = () => {<StyledSidePanelContainer><SidePanelList selectableItemIds={selectableItemIds}><SidePanelGroup heading={t`Data and display`}>- <SelectableListItem itemId="field">- <CommandMenuItemDropdown- id="field"- label={t`Field`}- Icon={IconListDetails}- dropdownId="field"- dropdownComponents={- <LegacyDropdownContent>- <FieldWidgetFieldDropdownContent />- </LegacyDropdownContent>- }- dropdownPlacement="bottom-end"- description={fieldLabel}- contextualTextPosition="right"- />+ <SelectableListItem+ itemId="field"+ onEnter={() =>+ openDropdown({ dropdownComponentInstanceIdFromProps: 'field' })+ }+ >+ <DropdownRoot dropdownId="field" type="picker">+ <CommandMenuItemDropdownTrigger+ id="field"+ label={t`Field`}+ Icon={IconListDetails}+ description={fieldLabel}+ contextualTextPosition="right"+ />+ <DropdownContent+ side="bottom"+ align="end"+ collisionPadding={{ left: 0, right: 0 }}+ >+ <FieldWidgetFieldDropdownContent />+ </DropdownContent>+ </DropdownRoot></SelectableListItem>- <SelectableListItem itemId="layout">- <CommandMenuItemDropdown- id="layout"- label={t`Layout`}- Icon={layoutRowIcon}- dropdownId="layout"- dropdownComponents={- <LegacyDropdownContent>- <FieldWidgetLayoutDropdownContent />- </LegacyDropdownContent>- }- dropdownPlacement="bottom-end"- description={layoutLabel}- contextualTextPosition="right"- />+ <SelectableListItem+ itemId="layout"+ onEnter={() =>+ openDropdown({ dropdownComponentInstanceIdFromProps: 'layout' })+ }+ >+ <DropdownRoot dropdownId="layout" type="picker">+ <CommandMenuItemDropdownTrigger+ id="layout"+ label={t`Layout`}+ Icon={layoutRowIcon}+ description={layoutLabel}+ contextualTextPosition="right"+ />+ <DropdownContent+ side="bottom"+ align="end"+ collisionPadding={{ left: 0, right: 0 }}+ >+ <FieldWidgetLayoutDropdownContent />+ </DropdownContent>+ </DropdownRoot></SelectableListItem>{isTableDisplayMode &&isDefined(targetObjectMetadataId) &&diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-page/__stories__/FieldWidgetSettingsStory.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-page/__stories__/FieldWidgetSettingsStory.tsxnew file mode 100644index 00000000000..2e0848655cc--- /dev/null+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-page/__stories__/FieldWidgetSettingsStory.tsx@@ -0,0 +1,49 @@+import { SIDE_PANEL_CLICK_OUTSIDE_ID } from '@/side-panel/constants/SidePanelClickOutsideId';+import { SIDE_PANEL_CONSTRAINTS } from '@/side-panel/constants/SidePanelConstraints';+import { FIELD_WIDGET_SETTINGS_STORY_DATA } from '@/side-panel/pages/page-layout/components/record-page/__stories__/fieldWidgetSettingsStoryData';+import { SidePanelRecordPageFieldSettings } from '@/side-panel/pages/page-layout/components/record-page/SidePanelRecordPageFieldSettings';+import { PageLayoutSidePanelTargetContext } from '@/side-panel/pages/page-layout/contexts/PageLayoutSidePanelTargetContext';+import { SidePanelPageComponentInstanceContext } from '@/side-panel/states/contexts/SidePanelPageComponentInstanceContext';+import { LayoutRenderingProvider } from '@/ui/layout/contexts/LayoutRenderingContext';+import { ParentClickOutsideIdContext } from '@/ui/utilities/pointer-event/contexts/ParentClickOutsideIdContext';+import { styled } from '@linaria/react';+import { PageLayoutType } from '~/generated-metadata/graphql';++const StyledPanel = styled.div`+ align-self: stretch;+ margin-left: auto;+ width: ${SIDE_PANEL_CONSTRAINTS.min}px;+`;++export const FieldWidgetSettingsStory = () => {+ const { pageLayoutId, recordId } = FIELD_WIDGET_SETTINGS_STORY_DATA;+ const targetRecordIdentifier = {+ targetObjectNameSingular: 'company',+ id: recordId,+ };++ return (+ <SidePanelPageComponentInstanceContext.Provider+ value={{ instanceId: pageLayoutId }}+ >+ <LayoutRenderingProvider+ value={{+ layoutType: PageLayoutType.RECORD_PAGE,+ targetRecordIdentifier,+ }}+ >+ <PageLayoutSidePanelTargetContext.Provider+ value={{ pageLayoutId, targetRecordIdentifier }}+ >+ <ParentClickOutsideIdContext.Provider+ value={SIDE_PANEL_CLICK_OUTSIDE_ID}+ >+ <StyledPanel data-click-outside-id={SIDE_PANEL_CLICK_OUTSIDE_ID}>+ <SidePanelRecordPageFieldSettings />+ </StyledPanel>+ </ParentClickOutsideIdContext.Provider>+ </PageLayoutSidePanelTargetContext.Provider>+ </LayoutRenderingProvider>+ </SidePanelPageComponentInstanceContext.Provider>+ );+};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-page/__stories__/SidePanelRecordPageFieldSettings.stories.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-page/__stories__/SidePanelRecordPageFieldSettings.stories.tsxnew file mode 100644index 00000000000..2d216950bc7--- /dev/null+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-page/__stories__/SidePanelRecordPageFieldSettings.stories.tsx@@ -0,0 +1,186 @@+import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';+import { recordTableWidgetViewDraftComponentState } from '@/page-layout/states/recordTableWidgetViewDraftComponentState';+import { FIELD_WIDGET_SETTINGS_STORY_DATA } from '@/side-panel/pages/page-layout/components/record-page/__stories__/fieldWidgetSettingsStoryData';+import { FieldWidgetSettingsStory } from '@/side-panel/pages/page-layout/components/record-page/__stories__/FieldWidgetSettingsStory';+import { initializeFieldWidgetSettingsStory } from '@/side-panel/pages/page-layout/components/record-page/__stories__/initializeFieldWidgetSettingsStory';+import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';+import { type Meta, type StoryObj } from '@storybook/react-vite';+import { expect, userEvent, waitFor, within } from 'storybook/test';+import { ComponentDecorator } from 'twenty-ui/testing';+import { FieldDisplayMode, ViewType } from '~/generated-metadata/graphql';+import { MemoryRouterDecorator } from '~/testing/decorators/MemoryRouterDecorator';+import { ObjectMetadataItemsDecorator } from '~/testing/decorators/ObjectMetadataItemsDecorator';+import { ToastDecorator } from '~/testing/decorators/ToastDecorator';+import { getMockFieldMetadataItemOrThrow } from '~/testing/utils/getMockFieldMetadataItemOrThrow';+import { getMockObjectMetadataItemOrThrow } from '~/testing/utils/getMockObjectMetadataItemOrThrow';++const getCurrentWidget = () =>+ jotaiStore.get(+ pageLayoutDraftComponentState.atomFamily({+ instanceId: FIELD_WIDGET_SETTINGS_STORY_DATA.pageLayoutId,+ }),+ ).tabs[0].widgets[0];++const meta: Meta<typeof FieldWidgetSettingsStory> = {+ title: 'Modules/SidePanel/PageLayout/SidePanelRecordPageFieldSettings',+ component: FieldWidgetSettingsStory,+ decorators: [+ ComponentDecorator,+ MemoryRouterDecorator,+ ObjectMetadataItemsDecorator,+ ToastDecorator,+ ],+ parameters: { container: { width: 640, height: 640 } },+ beforeEach: () => initializeFieldWidgetSettingsStory(),+};++export default meta;+type Story = StoryObj<typeof meta>;++export const SearchAndDisplayMode: Story = {+ play: async ({ canvasElement }) => {+ const canvas = within(canvasElement);+ const body = within(canvasElement.ownerDocument.body);+ const trigger = await canvas.findByRole('button', { name: /^Field/ });+ const company = getMockObjectMetadataItemOrThrow('company');+ const tagline = getMockFieldMetadataItemOrThrow({+ objectMetadataItem: company,+ fieldName: 'tagline',+ });++ await userEvent.click(trigger);+ const search = await body.findByRole('searchbox', {+ name: 'Search fields',+ });+ await userEvent.type(search, 'tagline');+ await userEvent.keyboard('{Enter}');+ await waitFor(() => {+ expect(getCurrentWidget()).toMatchObject({+ title: tagline.label,+ configuration: {+ fieldMetadataId: tagline.id,+ nestedRelationFieldMetadataId: null,+ },+ });+ expect(trigger).toHaveAttribute('aria-expanded', 'false');+ expect(trigger).toHaveFocus();+ });++ const layoutTrigger = canvas.getByRole('button', { name: /^Layout/ });+ await userEvent.click(layoutTrigger);+ await userEvent.click(await body.findByRole('option', { name: 'Editor' }));+ await waitFor(() => {+ expect(getCurrentWidget().configuration).toMatchObject({+ fieldDisplayMode: FieldDisplayMode.EDITOR,+ });+ expect(layoutTrigger).toHaveAttribute('aria-expanded', 'false');+ expect(layoutTrigger).toHaveFocus();+ });++ await userEvent.click(trigger);+ expect(+ await body.findByRole('searchbox', { name: 'Search fields' }),+ ).toHaveValue('');+ expect(+ body.getByRole('option', { name: 'Tagline', selected: true }),+ ).toBeVisible();+ await userEvent.keyboard('{Escape}');+ },+};++export const NestedFieldBackAndSelection: Story = {+ play: async ({ canvasElement }) => {+ const canvas = within(canvasElement);+ const body = within(canvasElement.ownerDocument.body);+ const trigger = await canvas.findByRole('button', { name: /^Field/ });+ const company = getMockObjectMetadataItemOrThrow('company');+ const person = getMockObjectMetadataItemOrThrow('person');+ const opportunity = getMockObjectMetadataItemOrThrow('opportunity');+ const people = getMockFieldMetadataItemOrThrow({+ objectMetadataItem: company,+ fieldName: 'people',+ });+ const opportunities = getMockFieldMetadataItemOrThrow({+ objectMetadataItem: person,+ fieldName: 'pointOfContactForOpportunities',+ });++ await userEvent.click(trigger);+ const search = await body.findByRole('searchbox', {+ name: 'Search fields',+ });+ await userEvent.type(search, 'people');+ const peopleOpener = body.getByRole('button', { name: 'People' });+ await userEvent.click(peopleOpener);+ await userEvent.click(await body.findByRole('button', { name: 'People' }));+ await waitFor(() => expect(peopleOpener).toHaveFocus());+ expect(search).toHaveValue('people');+ await userEvent.click(peopleOpener);+ await userEvent.click(+ await body.findByRole('option', { name: 'Opportunities' }),+ );++ await waitFor(() => {+ expect(getCurrentWidget()).toMatchObject({+ title: 'People → Opportunities',+ configuration: {+ fieldMetadataId: people.id,+ nestedRelationFieldMetadataId: opportunities.id,+ fieldDisplayMode: FieldDisplayMode.TABLE,+ },+ });+ expect(+ jotaiStore.get(+ recordTableWidgetViewDraftComponentState.atomFamily({+ instanceId: FIELD_WIDGET_SETTINGS_STORY_DATA.pageLayoutId,+ }),+ )[FIELD_WIDGET_SETTINGS_STORY_DATA.widgetId].view,+ ).toMatchObject({ objectMetadataId: opportunity.id });+ expect(trigger).toHaveAttribute('aria-expanded', 'false');+ expect(trigger).toHaveFocus();+ });++ await userEvent.click(trigger);+ expect(+ await body.findByRole('searchbox', { name: 'Search fields' }),+ ).toHaveValue('');+ expect(body.getByRole('button', { name: 'People' })).toBeVisible();+ await userEvent.keyboard('{Escape}');+ },+};++export const DisabledEmbeddedLayout: Story = {+ beforeEach: () =>+ initializeFieldWidgetSettingsStory({+ fieldName: 'people',+ fieldDisplayMode: FieldDisplayMode.CARD,+ }),+ play: async ({ canvasElement }) => {+ const canvas = within(canvasElement);+ const body = within(canvasElement.ownerDocument.body);+ const trigger = await canvas.findByRole('button', { name: /^Layout/ });++ await userEvent.click(trigger);+ const kanban = await body.findByRole('option', { name: /Kanban/ });+ expect(kanban).toBeDisabled();+ await userEvent.click(kanban);+ expect(getCurrentWidget().configuration).toMatchObject({+ fieldDisplayMode: FieldDisplayMode.CARD,+ });+ expect(trigger).toHaveAttribute('aria-expanded', 'true');+ await userEvent.click(body.getByRole('option', { name: 'List' }));+ await waitFor(() => {+ expect(getCurrentWidget().configuration).toMatchObject({+ fieldDisplayMode: FieldDisplayMode.TABLE,+ });+ expect(+ jotaiStore.get(+ recordTableWidgetViewDraftComponentState.atomFamily({+ instanceId: FIELD_WIDGET_SETTINGS_STORY_DATA.pageLayoutId,+ }),+ )[FIELD_WIDGET_SETTINGS_STORY_DATA.widgetId].view,+ ).toMatchObject({ type: ViewType.LIST_WIDGET });+ expect(trigger).toHaveAttribute('aria-expanded', 'false');+ });+ },+};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-page/__stories__/fieldWidgetSettingsStoryData.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-page/__stories__/fieldWidgetSettingsStoryData.tsnew file mode 100644index 00000000000..c59ade51811--- /dev/null+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-page/__stories__/fieldWidgetSettingsStoryData.ts@@ -0,0 +1,6 @@+export const FIELD_WIDGET_SETTINGS_STORY_DATA = {+ pageLayoutId: 'field-widget-settings-story',+ widgetId: 'field-widget',+ tabId: 'overview',+ recordId: 'field-widget-story-record',+};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-page/__stories__/initializeFieldWidgetSettingsStory.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-page/__stories__/initializeFieldWidgetSettingsStory.tsnew file mode 100644index 00000000000..acede1d042b--- /dev/null+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-page/__stories__/initializeFieldWidgetSettingsStory.ts@@ -0,0 +1,84 @@+import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';+import { pageLayoutEditingWidgetIdComponentState } from '@/page-layout/states/pageLayoutEditingWidgetIdComponentState';+import { recordTableWidgetViewDraftComponentState } from '@/page-layout/states/recordTableWidgetViewDraftComponentState';+import {+ makeDraft,+ makeTab,+ makeWidget,+} from '@/page-layout/testing/pageLayoutDraftFixtures';+import { SIDE_PANEL_FOCUS_ID } from '@/side-panel/constants/SidePanelFocusId';+import { FIELD_WIDGET_SETTINGS_STORY_DATA } from '@/side-panel/pages/page-layout/components/record-page/__stories__/fieldWidgetSettingsStoryData';+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 {+ FieldDisplayMode,+ WidgetConfigurationType,+ WidgetType,+} from '~/generated-metadata/graphql';+import { getMockFieldMetadataItemOrThrow } from '~/testing/utils/getMockFieldMetadataItemOrThrow';+import { getMockObjectMetadataItemOrThrow } from '~/testing/utils/getMockObjectMetadataItemOrThrow';++export const initializeFieldWidgetSettingsStory = ({+ fieldName = 'name',+ fieldDisplayMode = FieldDisplayMode.FIELD,+}: {+ fieldName?: string;+ fieldDisplayMode?: FieldDisplayMode;+} = {}) => {+ const { pageLayoutId, widgetId, tabId } = FIELD_WIDGET_SETTINGS_STORY_DATA;+ const objectMetadataItem = getMockObjectMetadataItemOrThrow('company');+ const fieldMetadataItem = getMockFieldMetadataItemOrThrow({+ objectMetadataItem,+ fieldName,+ });++ jotaiStore.set(+ pageLayoutDraftComponentState.atomFamily({ instanceId: pageLayoutId }),+ {+ ...makeDraft([+ makeTab(tabId, [+ {+ ...makeWidget(widgetId, 0, tabId),+ type: WidgetType.FIELD,+ objectMetadataId: objectMetadataItem.id,+ title: fieldMetadataItem.label,+ configuration: {+ __typename: 'FieldConfiguration',+ configurationType: WidgetConfigurationType.FIELD,+ fieldMetadataId: fieldMetadataItem.id,+ fieldDisplayMode,+ },+ },+ ]),+ ]),+ id: pageLayoutId,+ objectMetadataId: objectMetadataItem.id,+ },+ );+ jotaiStore.set(+ pageLayoutEditingWidgetIdComponentState.atomFamily({+ instanceId: pageLayoutId,+ }),+ widgetId,+ );+ jotaiStore.set(+ recordTableWidgetViewDraftComponentState.atomFamily({+ instanceId: pageLayoutId,+ }),+ {},+ );+ 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/record-table-settings/RecordTableCalendarFieldDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableCalendarFieldDropdownContent.tsxindex 4505b13a997..01aaed0dcd5 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableCalendarFieldDropdownContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableCalendarFieldDropdownContent.tsx@@ -1,17 +1,11 @@+import { t } from '@lingui/core/macro';+import { ChartSettingsDropdownSection } from '@/side-panel/pages/page-layout/components/chart-settings/ChartSettingsDropdownSection';import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';import { useRecordTableWidgetLayoutCallbacks } from '@/page-layout/widgets/record-table/hooks/useRecordTableWidgetLayoutCallbacks';import { isFieldMetadataItemAvailableAsCalendarField } from '@/object-record/record-calendar/utils/isFieldMetadataItemAvailableAsCalendarField';-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 { useIcons } from 'twenty-ui/icon';-import { ListItemButton } from 'twenty-ui/components/navigation';+import { Dropdown } from 'twenty-ui/components/navigation';type RecordTableCalendarFieldDropdownContentProps = {pageLayoutId: string;@@ -34,17 +28,6 @@ export const RecordTableCalendarFieldDropdownContent = ({objectMetadataItemToFind.id === objectMetadataId,);- const dropdownId = useAvailableComponentInstanceIdOrThrow(- DropdownComponentInstanceContext,- );-- const selectedItemId = useAtomComponentStateValue(- selectedItemIdComponentState,- dropdownId,- );-- const { closeDropdown } = useCloseDropdown();-const { handleCalendarFieldChange } = useRecordTableWidgetLayoutCallbacks({pageLayoutId,widgetId,@@ -55,44 +38,24 @@ export const RecordTableCalendarFieldDropdownContent = ({);return (- <DropdownMenuItemsContainer hasMaxHeight>- <SelectableList- selectableListInstanceId={dropdownId}- selectableItemIdArray={dateFields.map(- (fieldMetadataItem) => fieldMetadataItem.id,- )}- focusId={dropdownId}+ <ChartSettingsDropdownSection>+ <Dropdown.SelectionGroup+ aria-label={t`Date field`}+ value={currentCalendarFieldMetadataId}>{dateFields.map((fieldMetadataItem) => (- <SelectableListItem+ <Dropdown.OptionItemkey={fieldMetadataItem.id}- itemId={fieldMetadataItem.id}- onEnter={() => {- handleCalendarFieldChange(fieldMetadataItem);- closeDropdown();- }}+ value={fieldMetadataItem.id}+ onSelect={() => handleCalendarFieldChange(fieldMetadataItem)}+ startIcon={+ <SelectOptionIcon Icon={getIcon(fieldMetadataItem.icon)} />+ }>- <ListItemButton- focused={selectedItemId === fieldMetadataItem.id}- onClick={() => {- handleCalendarFieldChange(fieldMetadataItem);- closeDropdown();- }}- role="option"- aria-selected={- currentCalendarFieldMetadataId === fieldMetadataItem.id- }- selected={currentCalendarFieldMetadataId === fieldMetadataItem.id}- indicator="check"- startIcon={- <SelectOptionIcon Icon={getIcon(fieldMetadataItem.icon)} />- }- >- {fieldMetadataItem.label}- </ListItemButton>- </SelectableListItem>+ {fieldMetadataItem.label}+ </Dropdown.OptionItem>))}- </SelectableList>- </DropdownMenuItemsContainer>+ </Dropdown.SelectionGroup>+ </ChartSettingsDropdownSection>);};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableCalendarLayoutDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableCalendarLayoutDropdownContent.tsxindex 361f556339c..47f28e711b2 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableCalendarLayoutDropdownContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableCalendarLayoutDropdownContent.tsx@@ -1,20 +1,13 @@+import { ChartSettingsDropdownSection } from '@/side-panel/pages/page-layout/components/chart-settings/ChartSettingsDropdownSection';import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';import { useRecordTableWidgetLayoutCallbacks } from '@/page-layout/widgets/record-table/hooks/useRecordTableWidgetLayoutCallbacks';-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 { t } from '@lingui/core/macro';import {IconCalendarEvent,IconCalendarMonth,IconCalendarWeek,} from 'twenty-ui/icon';-import { ListItemButton } from 'twenty-ui/components/navigation';+import { Dropdown } from 'twenty-ui/components/navigation';import { ViewCalendarLayout } from '~/generated-metadata/graphql';type RecordTableCalendarLayoutDropdownContentProps = {@@ -28,27 +21,11 @@ export const RecordTableCalendarLayoutDropdownContent = ({widgetId,currentCalendarLayout,}: RecordTableCalendarLayoutDropdownContentProps) => {- const dropdownId = useAvailableComponentInstanceIdOrThrow(- DropdownComponentInstanceContext,- );-- const selectedItemId = useAtomComponentStateValue(- selectedItemIdComponentState,- dropdownId,- );-- const { closeDropdown } = useCloseDropdown();-const { handleCalendarLayoutChange } = useRecordTableWidgetLayoutCallbacks({pageLayoutId,widgetId,});- const handleSelect = (calendarLayout: ViewCalendarLayout) => {- handleCalendarLayoutChange(calendarLayout);- closeDropdown();- };-const calendarLayoutOptions = [{ value: ViewCalendarLayout.DAY, label: t`Day`, Icon: IconCalendarEvent },{ value: ViewCalendarLayout.WEEK, label: t`Week`, Icon: IconCalendarWeek },@@ -60,32 +37,22 @@ export const RecordTableCalendarLayoutDropdownContent = ({];return (- <DropdownMenuItemsContainer>- <SelectableList- selectableListInstanceId={dropdownId}- selectableItemIdArray={calendarLayoutOptions.map(({ value }) => value)}- focusId={dropdownId}+ <ChartSettingsDropdownSection>+ <Dropdown.SelectionGroup+ aria-label={t`Calendar view`}+ value={currentCalendarLayout}>{calendarLayoutOptions.map(({ value, label, Icon }) => (- <SelectableListItem+ <Dropdown.OptionItemkey={value}- itemId={value}- onEnter={() => handleSelect(value)}+ value={value}+ onSelect={() => handleCalendarLayoutChange(value)}+ startIcon={<SelectOptionIcon Icon={Icon} />}>- <ListItemButton- focused={selectedItemId === value}- onClick={() => handleSelect(value)}- role="option"- aria-selected={currentCalendarLayout === value}- selected={currentCalendarLayout === value}- indicator="check"- startIcon={<SelectOptionIcon Icon={Icon} />}- >- {label}- </ListItemButton>- </SelectableListItem>+ {label}+ </Dropdown.OptionItem>))}- </SelectableList>- </DropdownMenuItemsContainer>+ </Dropdown.SelectionGroup>+ </ChartSettingsDropdownSection>);};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableDataSourceDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableDataSourceDropdownContent.tsxindex c382df03f97..619faa686bb 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableDataSourceDropdownContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableDataSourceDropdownContent.tsx@@ -1,3 +1,4 @@+import { ChartSettingsDropdownSection } from '@/side-panel/pages/page-layout/components/chart-settings/ChartSettingsDropdownSection';import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';import { ObjectMetadataIcon } from '@/object-metadata/components/ObjectMetadataIcon';import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';@@ -9,20 +10,10 @@ import { useRemoveDraftViewForRecordTableWidget } from '@/page-layout/widgets/reimport { 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 { 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 { t } from '@lingui/core/macro';import { useState } from 'react';-import { isDefined } from 'twenty-shared/utils';-import { ListItemButton } from 'twenty-ui/components/navigation';+import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';+import { Dropdown } from 'twenty-ui/components/navigation';import { filterBySearchQuery } from '~/utils/filterBySearchQuery';export const RecordTableDataSourceDropdownContent = () => {@@ -36,28 +27,14 @@ export const RecordTableDataSourceDropdownContent = () => {| string| undefined;- const dropdownId = useAvailableComponentInstanceIdOrThrow(- DropdownComponentInstanceContext,- );-- const selectedItemId = useAtomComponentStateValue(- selectedItemIdComponentState,- dropdownId,- );-const { updateCurrentWidgetConfig } =useUpdateCurrentWidgetConfig(pageLayoutId);-const { addDraftViewForRecordTableWidget } =useAddDraftViewForRecordTableWidget(pageLayoutId);-const { removeDraftViewForRecordTableWidget } =useRemoveDraftViewForRecordTableWidget(pageLayoutId);-const { updatePageLayoutWidget } = useUpdatePageLayoutWidget(pageLayoutId);- const { closeDropdown } = useCloseDropdown();-const readableActiveObjectMetadataItems =filterReadableActiveObjectMetadataItems(objectMetadataItems,@@ -80,7 +57,6 @@ export const RecordTableDataSourceDropdownContent = () => {const handleSelectSource = (newObjectMetadataItemId: string) => {if (currentObjectMetadataItemId === newObjectMetadataItemId) {- closeDropdown();return;}@@ -109,63 +85,44 @@ export const RecordTableDataSourceDropdownContent = () => {title: selectedObjectMetadataItem.labelPlural,});}-- closeDropdown();};return (<>- <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 />- <DropdownMenuItemsContainer>- <SelectableList- selectableListInstanceId={dropdownId}- focusId={dropdownId}- selectableItemIdArray={filteredObjects.map(- (objectMetadataItem) => objectMetadataItem.id,- )}+ <ChartSettingsDropdownSection>+ <Dropdown.SelectionGroup+ aria-label={t`Source`}+ value={currentObjectMetadataItemId ?? null}>{filteredObjects.map((objectMetadataItem) => (- <SelectableListItem+ <Dropdown.OptionItemkey={objectMetadataItem.id}- itemId={objectMetadataItem.id}- onEnter={() => {- handleSelectSource(objectMetadataItem.id);- }}+ value={objectMetadataItem.id}+ onSelect={() => handleSelectSource(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>- </DropdownMenuItemsContainer>+ </Dropdown.SelectionGroup>+ {!isNonEmptyArray(filteredObjects) && (+ <Dropdown.Empty>{t`No results found`}</Dropdown.Empty>+ )}+ </ChartSettingsDropdownSection></>);};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableFieldsDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableFieldsDropdownContent.tsxindex c08c8f33493..4c9d9696f69 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableFieldsDropdownContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableFieldsDropdownContent.tsx@@ -1,10 +1,11 @@+import { RECORD_TABLE_FIELDS_DROPDOWN_PAGE } from '@/side-panel/pages/page-layout/components/record-table-settings/constants/RecordTableFieldsDropdownPage';import { useObjectMetadataItemById } from '@/object-metadata/hooks/useObjectMetadataItemById';import { type RecordField } from '@/object-record/record-field/types/RecordField';import { RecordFieldsComponentInstanceContext } from '@/object-record/record-field/states/context/RecordFieldsComponentInstanceContext';import { getRecordIndexIdFromObjectNamePluralAndViewId } from '@/object-record/utils/getRecordIndexIdFromObjectNamePluralAndViewId';import { RecordTableFieldsDropdownHiddenFieldsContent } from '@/side-panel/pages/page-layout/components/record-table-settings/RecordTableFieldsDropdownHiddenFieldsContent';import { RecordTableFieldsDropdownVisibleFieldsContent } from '@/side-panel/pages/page-layout/components/record-table-settings/RecordTableFieldsDropdownVisibleFieldsContent';-import { useState } from 'react';+import { Dropdown } from 'twenty-ui/components/navigation';type RecordTableFieldsDropdownContentProps = {viewId: string;@@ -31,28 +32,28 @@ export const RecordTableFieldsDropdownContent = ({viewId,);- const [showHiddenFields, setShowHiddenFields] = useState(false);-return (<RecordFieldsComponentInstanceContext.Providervalue={{ instanceId: recordIndexId }}>- {showHiddenFields ? (- <RecordTableFieldsDropdownHiddenFieldsContent+ <Dropdown.Page id={RECORD_TABLE_FIELDS_DROPDOWN_PAGE.ROOT} type="panel">+ <RecordTableFieldsDropdownVisibleFieldsContentobjectMetadataId={objectMetadataId}recordIndexId={recordIndexId}- onBack={() => setShowHiddenFields(false)}onFieldUpdated={onFieldUpdated}- onFieldCreated={onFieldCreated}/>- ) : (- <RecordTableFieldsDropdownVisibleFieldsContent+ </Dropdown.Page>+ <Dropdown.Page+ id={RECORD_TABLE_FIELDS_DROPDOWN_PAGE.HIDDEN_FIELDS}+ type="panel"+ >+ <RecordTableFieldsDropdownHiddenFieldsContentobjectMetadataId={objectMetadataId}recordIndexId={recordIndexId}- onShowHiddenFields={() => setShowHiddenFields(true)}onFieldUpdated={onFieldUpdated}+ onFieldCreated={onFieldCreated}/>- )}+ </Dropdown.Page></RecordFieldsComponentInstanceContext.Provider>);};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableFieldsDropdownHiddenFieldsContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableFieldsDropdownHiddenFieldsContent.tsxindex d7afb2ea2fd..6df5bb2d97f 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableFieldsDropdownHiddenFieldsContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableFieldsDropdownHiddenFieldsContent.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 { useActiveFieldMetadataItems } from '@/object-metadata/hooks/useActiveFieldMetadataItems';import { useObjectMetadataItemById } from '@/object-metadata/hooks/useObjectMetadataItemById';import { useUpdateRecordField } from '@/object-record/record-field/hooks/useUpdateRecordField';@@ -5,15 +7,11 @@ import { useUpsertRecordField } from '@/object-record/record-field/hooks/useUpseimport { currentRecordFieldsComponentState } from '@/object-record/record-field/states/currentRecordFieldsComponentState';import { type RecordField } from '@/object-record/record-field/types/RecordField';import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';-import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';-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 { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { t } from '@lingui/core/macro';import { isDefined } from 'twenty-shared/utils';import { LightIconButton } from 'twenty-ui/components/input';-import { IconChevronLeft, IconEye, useIcons } from 'twenty-ui/icon';+import { IconEye, useIcons } from 'twenty-ui/icon';import { ListItem } from 'twenty-ui/primitives/navigation';import { v4 } from 'uuid';import { sortByProperty } from '~/utils/array/sortByProperty';@@ -21,7 +19,6 @@ import { sortByProperty } from '~/utils/array/sortByProperty';type RecordTableFieldsDropdownHiddenFieldsContentProps = {objectMetadataId: string;recordIndexId: string;- onBack: () => void;onFieldUpdated?: (viewFieldId: string,update: Partial<{ isVisible: boolean }>,@@ -32,7 +29,6 @@ type RecordTableFieldsDropdownHiddenFieldsContentProps = {export const RecordTableFieldsDropdownHiddenFieldsContent = ({objectMetadataId,recordIndexId,- onBack,onFieldUpdated,onFieldCreated,}: RecordTableFieldsDropdownHiddenFieldsContentProps) => {@@ -71,37 +67,29 @@ export const RecordTableFieldsDropdownHiddenFieldsContent = ({if (isDefined(existingRecordField)) {updateRecordField(fieldMetadataId, { isVisible: true });onFieldUpdated?.(existingRecordField.id, { isVisible: true });- } else {- const lastPosition =- currentRecordFields.toSorted(sortByProperty('position', 'desc'))?.[0]- ?.position ?? 0;+ return;+ }- const newRecordField: RecordField = {- id: v4(),- fieldMetadataItemId: fieldMetadataId,- size: 100,- isVisible: true,- position: lastPosition + 1,- };+ const lastPosition =+ currentRecordFields.toSorted(sortByProperty('position', 'desc'))?.[0]+ ?.position ?? 0;- upsertRecordField(newRecordField);- onFieldCreated?.(newRecordField);- }+ const newRecordField: RecordField = {+ id: v4(),+ fieldMetadataItemId: fieldMetadataId,+ size: 100,+ isVisible: true,+ position: lastPosition + 1,+ };++ upsertRecordField(newRecordField);+ onFieldCreated?.(newRecordField);};return (- <LegacyDropdownContent>- <DropdownMenuHeader- StartComponent={- <DropdownMenuHeaderLeftComponent- onClick={onBack}- Icon={IconChevronLeft}- />- }- >- {t`Hidden Fields`}- </DropdownMenuHeader>- <DropdownMenuItemsContainer>+ <>+ <Dropdown.Back>{t`Hidden Fields`}</Dropdown.Back>+ <ChartSettingsDropdownSection>{hiddenFieldMetadataItems.map((fieldMetadataItem) => (<ListItemkey={fieldMetadataItem.id}@@ -110,7 +98,7 @@ export const RecordTableFieldsDropdownHiddenFieldsContent = ({}actions={<LightIconButton- aria-label={t`Show field`}+ aria-label={t`Show ${fieldMetadataItem.label}`}onClick={() => handleShowField(fieldMetadataItem.id)}><IconEye />@@ -120,7 +108,7 @@ export const RecordTableFieldsDropdownHiddenFieldsContent = ({{fieldMetadataItem.label}</ListItem>))}- </DropdownMenuItemsContainer>- </LegacyDropdownContent>+ </ChartSettingsDropdownSection>+ </>);};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableFieldsDropdownVisibleFieldsContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableFieldsDropdownVisibleFieldsContent.tsxindex 32db9e8dd1c..1f76d964528 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableFieldsDropdownVisibleFieldsContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableFieldsDropdownVisibleFieldsContent.tsx@@ -1,3 +1,5 @@+import { RECORD_TABLE_FIELDS_DROPDOWN_PAGE } from '@/side-panel/pages/page-layout/components/record-table-settings/constants/RecordTableFieldsDropdownPage';+import { ChartSettingsDropdownSection } from '@/side-panel/pages/page-layout/components/chart-settings/ChartSettingsDropdownSection';import { DraggableListRow } from '@/ui/layout/draggable-list/components/DraggableListRow';import { ApplicationStackIcon } from '@/applications/components/ApplicationStackIcon';import { useGetFieldMetadataItemByIdOrThrow } from '@/object-metadata/hooks/useGetFieldMetadataItemById';@@ -9,21 +11,17 @@ import { visibleRecordFieldsComponentSelector } from '@/object-record/record-fieimport { DraggableItem } from '@/ui/layout/draggable-list/components/DraggableItem';import { DraggableList } from '@/ui/layout/draggable-list/components/DraggableList';import { type DraggableListDropResult } from '@/ui/layout/draggable-list/types/DraggableListDropResult';-import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';-import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';import { t } from '@lingui/core/macro';-import { isDefined } from 'twenty-shared/utils';+import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';import { LightIconButton } from 'twenty-ui/components/input';-import { ListItemButton } from 'twenty-ui/components/navigation';+import { Dropdown } from 'twenty-ui/components/navigation';import { IconEyeOff, useIcons } from 'twenty-ui/icon';import { sortByProperty } from '~/utils/array/sortByProperty';type RecordTableFieldsDropdownVisibleFieldsContentProps = {objectMetadataId: string;recordIndexId: string;- onShowHiddenFields: () => void;onFieldUpdated?: (viewFieldId: string,update: Partial<{ position: number; isVisible: boolean }>,@@ -33,7 +31,6 @@ type RecordTableFieldsDropdownVisibleFieldsContentProps = {export const RecordTableFieldsDropdownVisibleFieldsContent = ({objectMetadataId,recordIndexId,- onShowHiddenFields,onFieldUpdated,}: RecordTableFieldsDropdownVisibleFieldsContentProps) => {const { objectMetadataItem } = useObjectMetadataItemById({@@ -94,8 +91,8 @@ export const RecordTableFieldsDropdownVisibleFieldsContent = ({};return (- <LegacyDropdownContent>- <DropdownMenuItemsContainer>+ <>+ <ChartSettingsDropdownSection>{isDefined(fieldMetadataItemLabelIdentifier) && (<DraggableListRowstartIcon={@@ -111,7 +108,7 @@ export const RecordTableFieldsDropdownVisibleFieldsContent = ({{fieldMetadataItemLabelIdentifier.label}</DraggableListRow>)}- {draggableRecordFields.length > 0 && (+ {isNonEmptyArray(draggableRecordFields) && (<DraggableListonDragEnd={handleDragEnd}draggableItems={@@ -136,7 +133,7 @@ export const RecordTableFieldsDropdownVisibleFieldsContent = ({}actions={<LightIconButton- aria-label={t`Hide field`}+ aria-label={t`Hide ${fieldMetadataItem.label}`}onClick={() =>handleHideField(recordField.fieldMetadataItemId)}@@ -156,15 +153,16 @@ export const RecordTableFieldsDropdownVisibleFieldsContent = ({}/>)}- </DropdownMenuItemsContainer>- <DropdownMenuSeparator />- <DropdownMenuItemsContainer scrollable={false}>- <ListItemButton- onClick={onShowHiddenFields}+ </ChartSettingsDropdownSection>+ <Dropdown.Separator />+ <Dropdown.Section>+ <Dropdown.ActionItem+ page={RECORD_TABLE_FIELDS_DROPDOWN_PAGE.HIDDEN_FIELDS}startIcon={<IconEyeOff />}- hasSubmenu- >{t`Hidden Fields`}</ListItemButton>- </DropdownMenuItemsContainer>- </LegacyDropdownContent>+ >+ {t`Hidden Fields`}+ </Dropdown.ActionItem>+ </Dropdown.Section>+ </>);};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableGroupByDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableGroupByDropdownContent.tsxindex ce44ab9a0cf..1dcc9f09091 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableGroupByDropdownContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableGroupByDropdownContent.tsx@@ -1,22 +1,13 @@+import { ChartSettingsDropdownSection } from '@/side-panel/pages/page-layout/components/chart-settings/ChartSettingsDropdownSection';import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';import { useRecordTableWidgetLayoutCallbacks } from '@/page-layout/widgets/record-table/hooks/useRecordTableWidgetLayoutCallbacks';import { isFieldMetadataItemAvailableAsWidgetGroupByField } from '@/page-layout/widgets/record-table/utils/isFieldMetadataItemAvailableAsWidgetGroupByField';-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 { t } from '@lingui/core/macro';import { useState } from 'react';-import { isDefined } from 'twenty-shared/utils';+import { isNonEmptyArray } from 'twenty-shared/utils';import { useIcons } from 'twenty-ui/icon';-import { ListItemButton } from 'twenty-ui/components/navigation';+import { Dropdown } from 'twenty-ui/components/navigation';import { filterBySearchQuery } from '~/utils/filterBySearchQuery';const NO_GROUP_BY_ITEM_ID = 'no-group-by';@@ -45,17 +36,6 @@ export const RecordTableGroupByDropdownContent = ({objectMetadataItemToFind.id === objectMetadataId,);- const dropdownId = useAvailableComponentInstanceIdOrThrow(- DropdownComponentInstanceContext,- );-- const selectedItemId = useAtomComponentStateValue(- selectedItemIdComponentState,- dropdownId,- );-- const { closeDropdown } = useCloseDropdown();-const { handleGroupByFieldChange } = useRecordTableWidgetLayoutCallbacks({pageLayoutId,widgetId,@@ -71,79 +51,52 @@ export const RecordTableGroupByDropdownContent = ({getSearchableValues: (fieldMetadataItem) => [fieldMetadataItem.label],});- const selectableItemIds = [- ...(isClearable ? [NO_GROUP_BY_ITEM_ID] : []),- ...filteredFields.map((fieldMetadataItem) => fieldMetadataItem.id),- ];+ const shouldShowClearOption =+ isClearable &&+ isNonEmptyArray(+ filterBySearchQuery({+ items: [t`None`],+ searchQuery,+ getSearchableValues: (label) => [label],+ }),+ );return (<>- <DropdownMenuSearchInput- autoFocus+ <Dropdown.Search+ placeholder={t`Search fields`}+ aria-label={t`Search fields`}value={searchQuery}- onChange={(event) => setSearchQuery(event.target.value)}+ onValueChange={setSearchQuery}/>- <DropdownMenuSeparator />- <DropdownMenuItemsContainer hasMaxHeight>- <SelectableList- selectableListInstanceId={dropdownId}- selectableItemIdArray={selectableItemIds}- focusId={dropdownId}+ <ChartSettingsDropdownSection>+ <Dropdown.SelectionGroup+ aria-label={t`Group by`}+ value={currentMainGroupByFieldMetadataId ?? NO_GROUP_BY_ITEM_ID}>- {isClearable && (- <SelectableListItem- itemId={NO_GROUP_BY_ITEM_ID}- onEnter={() => {- handleGroupByFieldChange(null);- closeDropdown();- }}- >- <ListItemButton- focused={selectedItemId === NO_GROUP_BY_ITEM_ID}- onClick={() => {- handleGroupByFieldChange(null);- closeDropdown();- }}- role="option"- aria-selected={!isDefined(currentMainGroupByFieldMetadataId)}- selected={!isDefined(currentMainGroupByFieldMetadataId)}- indicator="check"- >{t`None`}</ListItemButton>- </SelectableListItem>+ {shouldShowClearOption && (+ <Dropdown.OptionItem+ value={NO_GROUP_BY_ITEM_ID}+ onSelect={() => handleGroupByFieldChange(null)}+ >{t`None`}</Dropdown.OptionItem>)}{filteredFields.map((fieldMetadataItem) => (- <SelectableListItem+ <Dropdown.OptionItemkey={fieldMetadataItem.id}- itemId={fieldMetadataItem.id}- onEnter={() => {- handleGroupByFieldChange(fieldMetadataItem);- closeDropdown();- }}+ value={fieldMetadataItem.id}+ onSelect={() => handleGroupByFieldChange(fieldMetadataItem)}+ startIcon={+ <SelectOptionIcon Icon={getIcon(fieldMetadataItem.icon)} />+ }>- <ListItemButton- focused={selectedItemId === fieldMetadataItem.id}- onClick={() => {- handleGroupByFieldChange(fieldMetadataItem);- closeDropdown();- }}- role="option"- aria-selected={- currentMainGroupByFieldMetadataId === fieldMetadataItem.id- }- selected={- currentMainGroupByFieldMetadataId === fieldMetadataItem.id- }- indicator="check"- startIcon={- <SelectOptionIcon Icon={getIcon(fieldMetadataItem.icon)} />- }- >- {fieldMetadataItem.label}- </ListItemButton>- </SelectableListItem>+ {fieldMetadataItem.label}+ </Dropdown.OptionItem>))}- </SelectableList>- </DropdownMenuItemsContainer>+ </Dropdown.SelectionGroup>+ {!shouldShowClearOption && !isNonEmptyArray(filteredFields) && (+ <Dropdown.Empty>{t`No results found`}</Dropdown.Empty>+ )}+ </ChartSettingsDropdownSection></>);};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableLayoutDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableLayoutDropdownContent.tsxindex 5b6c47a3303..74ca00d45d5 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableLayoutDropdownContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableLayoutDropdownContent.tsx@@ -1,19 +1,12 @@+import { t } from '@lingui/core/macro';+import { ChartSettingsDropdownSection } from '@/side-panel/pages/page-layout/components/chart-settings/ChartSettingsDropdownSection';+import { Dropdown } from 'twenty-ui/components/navigation';import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';import { useRecordTableWidgetLayoutCallbacks } from '@/page-layout/widgets/record-table/hooks/useRecordTableWidgetLayoutCallbacks';import { useRecordTableWidgetLayoutPickerOptions } from '@/page-layout/widgets/record-table/hooks/useRecordTableWidgetLayoutPickerOptions';import { type RecordTableWidgetLayoutViewType } from '@/page-layout/widgets/record-table/types/RecordTableWidgetLayoutViewType';-import {- getSelectableLayoutViewTypes,- isSelectableLayout,-} from '@/page-layout/widgets/record-table/utils/getRecordTableWidgetLayoutPickerOptions';+import { isSelectableLayout } from '@/page-layout/widgets/record-table/utils/getRecordTableWidgetLayoutPickerOptions';import { RecordTableWidgetLayoutMenuItems } from '@/side-panel/pages/page-layout/components/record-table-settings/RecordTableWidgetLayoutMenuItems';-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';-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 { DropdownComponentInstanceContext } from '@/ui/layout/dropdown/contexts/DropdownComponentInstanceContext';-import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';type RecordTableLayoutDropdownContentProps = {pageLayoutId: string;@@ -34,17 +27,6 @@ export const RecordTableLayoutDropdownContent = ({objectMetadataItemToFind.id === objectMetadataId,);- const dropdownId = useAvailableComponentInstanceIdOrThrow(- DropdownComponentInstanceContext,- );-- const selectedItemId = useAtomComponentStateValue(- selectedItemIdComponentState,- dropdownId,- );-- const { closeDropdown } = useCloseDropdown();-const { handleLayoutChange } = useRecordTableWidgetLayoutCallbacks({pageLayoutId,widgetId,@@ -67,23 +49,19 @@ export const RecordTableLayoutDropdownContent = ({defaultGroupByFieldMetadataItem,defaultCalendarFieldMetadataItem,});- closeDropdown();};return (- <DropdownMenuItemsContainer>- <SelectableList- selectableListInstanceId={dropdownId}- selectableItemIdArray={getSelectableLayoutViewTypes(layoutOptions)}- focusId={dropdownId}+ <ChartSettingsDropdownSection>+ <Dropdown.SelectionGroup+ aria-label={t`Layout`}+ value={currentLayoutViewType}><RecordTableWidgetLayoutMenuItemslayoutOptions={layoutOptions}- selectedViewType={currentLayoutViewType}- focusedItemId={selectedItemId}onSelect={handleSelectLayout}/>- </SelectableList>- </DropdownMenuItemsContainer>+ </Dropdown.SelectionGroup>+ </ChartSettingsDropdownSection>);};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableWidgetLayoutMenuItems.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableWidgetLayoutMenuItems.tsxindex 2d6cf361091..c1f0d7f8a89 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableWidgetLayoutMenuItems.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableWidgetLayoutMenuItems.tsx@@ -1,23 +1,17 @@import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';import { type RecordTableWidgetLayoutViewType } from '@/page-layout/widgets/record-table/types/RecordTableWidgetLayoutViewType';import { type RecordTableWidgetLayoutPickerOption } from '@/page-layout/widgets/record-table/utils/getRecordTableWidgetLayoutPickerOptions';-import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';import { useLingui } from '@lingui/react/macro';import { isDefined } from 'twenty-shared/utils';-import { ListItemButton } from 'twenty-ui/components/navigation';+import { Dropdown } from 'twenty-ui/components/navigation';type RecordTableWidgetLayoutMenuItemsProps = {layoutOptions: RecordTableWidgetLayoutPickerOption[];- // Undefined when no embedded view is shown, so no layout reads as selected- selectedViewType: RecordTableWidgetLayoutViewType | undefined;- focusedItemId: string | null;onSelect: (viewType: RecordTableWidgetLayoutViewType) => void;};export const RecordTableWidgetLayoutMenuItems = ({layoutOptions,- selectedViewType,- focusedItemId,onSelect,}: RecordTableWidgetLayoutMenuItemsProps) => {const { t } = useLingui();@@ -26,28 +20,19 @@ export const RecordTableWidgetLayoutMenuItems = ({<>{layoutOptions.map(({ viewType, Icon, label, isDisabled, unavailableReason }) => (- <SelectableListItem+ <Dropdown.OptionItemkey={viewType}- itemId={viewType}- onEnter={isDisabled ? undefined : () => onSelect(viewType)}+ value={viewType}+ disabled={isDisabled}+ onSelect={() => onSelect(viewType)}+ description={+ isDefined(unavailableReason) ? t(unavailableReason) : undefined+ }+ descriptionPlacement="end"+ startIcon={<SelectOptionIcon Icon={Icon} />}>- <ListItemButton- disabled={isDisabled}- focused={focusedItemId === viewType}- onClick={() => onSelect(viewType)}- role="option"- aria-selected={selectedViewType === viewType}- selected={selectedViewType === viewType}- indicator="check"- description={- isDefined(unavailableReason) ? t(unavailableReason) : undefined- }- descriptionPlacement={'end'}- startIcon={<SelectOptionIcon Icon={Icon} />}- >- {t(label)}- </ListItemButton>- </SelectableListItem>+ {t(label)}+ </Dropdown.OptionItem>),)}</>diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/WidgetViewLayoutSettingsRows.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/WidgetViewLayoutSettingsRows.tsxindex acf83c2ee33..fc4b81a1c57 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/WidgetViewLayoutSettingsRows.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/WidgetViewLayoutSettingsRows.tsx@@ -1,4 +1,4 @@-import { CommandMenuItemDropdown } from '@/command-menu/components/CommandMenuItemDropdown';+import { CommandMenuItemDropdownTrigger } from '@/command-menu/components/CommandMenuItemDropdownTrigger';import { CommandMenuItemSwitch } from '@/command-menu/components/CommandMenuItemSwitch';import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';import { useRecordTableWidgetLayoutCallbacks } from '@/page-layout/widgets/record-table/hooks/useRecordTableWidgetLayoutCallbacks';@@ -11,7 +11,9 @@ import { RecordTableCalendarFieldDropdownContent } from '@/side-panel/pages/pageimport { RecordTableCalendarLayoutDropdownContent } from '@/side-panel/pages/page-layout/components/record-table-settings/RecordTableCalendarLayoutDropdownContent';import { RecordTableGroupByDropdownContent } from '@/side-panel/pages/page-layout/components/record-table-settings/RecordTableGroupByDropdownContent';import { RecordTableLayoutDropdownContent } from '@/side-panel/pages/page-layout/components/record-table-settings/RecordTableLayoutDropdownContent';-import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';+import { useOpenDropdown } from '@/ui/layout/dropdown/hooks/useOpenDropdown';import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';import { useLingui } from '@lingui/react/macro';import { isDefined } from 'twenty-shared/utils';@@ -39,6 +41,7 @@ export const WidgetViewLayoutSettingsRows = ({isLayoutRowHidden = false,}: WidgetViewLayoutSettingsRowsProps) => {const { t } = useLingui();+ const { openDropdown } = useOpenDropdown();const { handleShouldHideEmptyGroupsChange } =useRecordTableWidgetLayoutCallbacks({@@ -101,99 +104,133 @@ export const WidgetViewLayoutSettingsRows = ({return (<>{!isLayoutRowHidden && (- <SelectableListItem itemId="object-view-layout">- <CommandMenuItemDropdown- Icon={CurrentLayoutIcon}- label={t`Layout`}- id="object-view-layout"- dropdownId="object-view-layout"- dropdownComponents={- <LegacyDropdownContent>- <RecordTableLayoutDropdownContent- pageLayoutId={pageLayoutId}- widgetId={widgetId}- objectMetadataId={objectMetadataId}- currentLayoutViewType={currentLayoutViewType}- />- </LegacyDropdownContent>- }- dropdownPlacement="bottom-end"- hasSubMenu- description={t(currentLayoutLabel)}- contextualTextPosition="right"- />+ <SelectableListItem+ itemId="object-view-layout"+ onEnter={() =>+ openDropdown({+ dropdownComponentInstanceIdFromProps: 'object-view-layout',+ })+ }+ >+ <DropdownRoot dropdownId="object-view-layout" type="picker">+ <CommandMenuItemDropdownTrigger+ Icon={CurrentLayoutIcon}+ label={t`Layout`}+ id="object-view-layout"+ description={t(currentLayoutLabel)}+ contextualTextPosition="right"+ />+ <DropdownContent+ side="bottom"+ align="end"+ collisionPadding={{ left: 0, right: 0 }}+ >+ <RecordTableLayoutDropdownContent+ pageLayoutId={pageLayoutId}+ widgetId={widgetId}+ objectMetadataId={objectMetadataId}+ currentLayoutViewType={currentLayoutViewType}+ />+ </DropdownContent>+ </DropdownRoot></SelectableListItem>)}{isCalendarLayout && (- <SelectableListItem itemId="record-table-calendar-field">- <CommandMenuItemDropdown- Icon={IconCalendarEvent}- label={t`Date field`}- id="record-table-calendar-field"- dropdownId="record-table-calendar-field"- dropdownComponents={- <LegacyDropdownContent>- <RecordTableCalendarFieldDropdownContent- pageLayoutId={pageLayoutId}- widgetId={widgetId}- objectMetadataId={objectMetadataId}- currentCalendarFieldMetadataId={calendarFieldMetadataId}- />- </LegacyDropdownContent>- }- dropdownPlacement="bottom-end"- hasSubMenu- description={calendarFieldLabel}- contextualTextPosition="right"- />+ <SelectableListItem+ itemId="record-table-calendar-field"+ onEnter={() =>+ openDropdown({+ dropdownComponentInstanceIdFromProps:+ 'record-table-calendar-field',+ })+ }+ >+ <DropdownRoot dropdownId="record-table-calendar-field" type="picker">+ <CommandMenuItemDropdownTrigger+ Icon={IconCalendarEvent}+ label={t`Date field`}+ id="record-table-calendar-field"+ description={calendarFieldLabel}+ contextualTextPosition="right"+ />+ <DropdownContent+ side="bottom"+ align="end"+ collisionPadding={{ left: 0, right: 0 }}+ >+ <RecordTableCalendarFieldDropdownContent+ pageLayoutId={pageLayoutId}+ widgetId={widgetId}+ objectMetadataId={objectMetadataId}+ currentCalendarFieldMetadataId={calendarFieldMetadataId}+ />+ </DropdownContent>+ </DropdownRoot></SelectableListItem>)}{isCalendarLayout && (- <SelectableListItem itemId="record-table-calendar-layout">- <CommandMenuItemDropdown- Icon={IconCalendar}- label={t`Calendar view`}- id="record-table-calendar-layout"- dropdownId="record-table-calendar-layout"- dropdownComponents={- <LegacyDropdownContent>- <RecordTableCalendarLayoutDropdownContent- pageLayoutId={pageLayoutId}- widgetId={widgetId}- currentCalendarLayout={currentCalendarLayout}- />- </LegacyDropdownContent>- }- dropdownPlacement="bottom-end"- hasSubMenu- description={calendarLayoutLabel}- contextualTextPosition="right"- />+ <SelectableListItem+ itemId="record-table-calendar-layout"+ onEnter={() =>+ openDropdown({+ dropdownComponentInstanceIdFromProps:+ 'record-table-calendar-layout',+ })+ }+ >+ <DropdownRoot dropdownId="record-table-calendar-layout" type="picker">+ <CommandMenuItemDropdownTrigger+ Icon={IconCalendar}+ label={t`Calendar view`}+ id="record-table-calendar-layout"+ description={calendarLayoutLabel}+ contextualTextPosition="right"+ />+ <DropdownContent+ side="bottom"+ align="end"+ collisionPadding={{ left: 0, right: 0 }}+ >+ <RecordTableCalendarLayoutDropdownContent+ pageLayoutId={pageLayoutId}+ widgetId={widgetId}+ currentCalendarLayout={currentCalendarLayout}+ />+ </DropdownContent>+ </DropdownRoot></SelectableListItem>)}{!isCalendarLayout && (- <SelectableListItem itemId="record-table-group-by">- <CommandMenuItemDropdown- Icon={IconLayoutList}- label={t`Group by`}- id="record-table-group-by"- dropdownId="record-table-group-by"- dropdownComponents={- <LegacyDropdownContent>- <RecordTableGroupByDropdownContent- pageLayoutId={pageLayoutId}- widgetId={widgetId}- objectMetadataId={objectMetadataId}- currentMainGroupByFieldMetadataId={mainGroupByFieldMetadataId}- isClearable={!isKanbanLayout}- />- </LegacyDropdownContent>- }- dropdownPlacement="bottom-end"- hasSubMenu- description={mainGroupByFieldLabel}- contextualTextPosition="right"- />+ <SelectableListItem+ itemId="record-table-group-by"+ onEnter={() =>+ openDropdown({+ dropdownComponentInstanceIdFromProps: 'record-table-group-by',+ })+ }+ >+ <DropdownRoot dropdownId="record-table-group-by" type="picker">+ <CommandMenuItemDropdownTrigger+ Icon={IconLayoutList}+ label={t`Group by`}+ id="record-table-group-by"+ description={mainGroupByFieldLabel}+ contextualTextPosition="right"+ />+ <DropdownContent+ side="bottom"+ align="end"+ collisionPadding={{ left: 0, right: 0 }}+ >+ <RecordTableGroupByDropdownContent+ pageLayoutId={pageLayoutId}+ widgetId={widgetId}+ objectMetadataId={objectMetadataId}+ currentMainGroupByFieldMetadataId={mainGroupByFieldMetadataId}+ isClearable={!isKanbanLayout}+ />+ </DropdownContent>+ </DropdownRoot></SelectableListItem>)}{!isCalendarLayout && hasGroupBy && (diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/__stories__/RecordTableWidgetLayoutMenuItems.stories.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/__stories__/RecordTableWidgetLayoutMenuItems.stories.tsxnew file mode 100644index 00000000000..a3126427953--- /dev/null+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/__stories__/RecordTableWidgetLayoutMenuItems.stories.tsx@@ -0,0 +1,71 @@+import { RecordTableWidgetLayoutMenuItems } from '@/side-panel/pages/page-layout/components/record-table-settings/RecordTableWidgetLayoutMenuItems';+import { getRecordTableWidgetLayoutPickerOptions } from '@/page-layout/widgets/record-table/utils/getRecordTableWidgetLayoutPickerOptions';+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';+import { type Meta, type StoryObj } from '@storybook/react-vite';+import { expect, fn, userEvent, waitFor, within } from 'storybook/test';+import { LightButton } from 'twenty-ui/components/input';+import { Dropdown } from 'twenty-ui/components/navigation';+import { ComponentDecorator } from 'twenty-ui/testing';+import { ViewType } from '~/generated-metadata/graphql';++const onSelect = fn();+const meta: Meta<typeof RecordTableWidgetLayoutMenuItems> = {+ title: 'Modules/SidePanel/PageLayout/RecordTableWidgetLayoutMenuItems',+ component: RecordTableWidgetLayoutMenuItems,+ decorators: [ComponentDecorator],+ args: {+ layoutOptions: getRecordTableWidgetLayoutPickerOptions({+ isKanbanAvailable: false,+ isCalendarAvailable: false,+ }),+ onSelect,+ },+ beforeEach: () => {+ onSelect.mockClear();+ },+ render: (args) => (+ <DropdownRoot dropdownId="unavailable-table-layout-story" type="picker">+ <Dropdown.Trigger render={<LightButton />}>Layout</Dropdown.Trigger>+ <DropdownContent>+ <Dropdown.Section>+ <Dropdown.SelectionGroup+ aria-label="Layout"+ value={ViewType.TABLE_WIDGET}+ >+ <RecordTableWidgetLayoutMenuItems+ layoutOptions={args.layoutOptions}+ onSelect={args.onSelect}+ />+ </Dropdown.SelectionGroup>+ </Dropdown.Section>+ </DropdownContent>+ </DropdownRoot>+ ),+};++export default meta;+type Story = StoryObj<typeof meta>;++export const UnavailableLayoutsStayDisabled: Story = {+ play: async ({ canvasElement }) => {+ const body = within(canvasElement.ownerDocument.body);+ const trigger = body.getByRole('button', { name: 'Layout' });+ await userEvent.click(trigger);+ const kanban = await body.findByRole('option', { name: /Kanban/ });+ const calendar = body.getByRole('option', { name: /Calendar/ });+ expect(kanban).toBeDisabled();+ expect(kanban).toHaveTextContent('Needs a Select field');+ expect(calendar).toBeDisabled();+ expect(calendar).toHaveTextContent('Needs a Date field');+ await userEvent.click(kanban);+ await userEvent.click(calendar);+ expect(onSelect).not.toHaveBeenCalled();+ expect(trigger).toHaveAttribute('aria-expanded', 'true');+ await userEvent.click(body.getByRole('option', { name: 'List' }));+ expect(onSelect).toHaveBeenCalledWith(ViewType.LIST_WIDGET);+ await waitFor(() =>+ expect(trigger).toHaveAttribute('aria-expanded', 'false'),+ );+ },+};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/__tests__/RecordTableLayoutDropdownContent.test.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/__tests__/RecordTableLayoutDropdownContent.test.tsxdeleted file mode 100644index b90a7064009..00000000000--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/__tests__/RecordTableLayoutDropdownContent.test.tsx+++ /dev/null@@ -1,165 +0,0 @@-import { i18n } from '@lingui/core';-import { I18nProvider } from '@lingui/react';-import { fireEvent, render, screen } from '@testing-library/react';--import { type RecordTableWidgetLayoutViewType } from '@/page-layout/widgets/record-table/types/RecordTableWidgetLayoutViewType';-import { RecordTableLayoutDropdownContent } from '@/side-panel/pages/page-layout/components/record-table-settings/RecordTableLayoutDropdownContent';-import { ViewType } from '~/generated-metadata/graphql';--const OBJECT_METADATA_ID = '11111111-1111-4111-8111-111111111111';--const mockHandleLayoutChange = jest.fn();-const mockCloseDropdown = jest.fn();-const mockIsAvailableAsGroupByField = jest.fn();-const mockIsAvailableAsCalendarField = jest.fn();--jest.mock('@/object-metadata/hooks/useObjectMetadataItems', () => ({- useObjectMetadataItems: jest.fn(() => ({- objectMetadataItems: [- { id: OBJECT_METADATA_ID, readableFields: [{ id: 'field-id' }] },- ],- })),-}));-jest.mock(- '@/object-record/record-calendar/utils/isFieldMetadataItemAvailableAsCalendarField',- () => ({- isFieldMetadataItemAvailableAsCalendarField: (...args: unknown[]) =>- mockIsAvailableAsCalendarField(...args),- }),-);-jest.mock(- '@/page-layout/widgets/record-table/utils/isFieldMetadataItemAvailableAsWidgetGroupByField',- () => ({- isFieldMetadataItemAvailableAsWidgetGroupByField: (...args: unknown[]) =>- mockIsAvailableAsGroupByField(...args),- }),-);-jest.mock(- '@/page-layout/widgets/record-table/hooks/useRecordTableWidgetLayoutCallbacks',- () => ({- useRecordTableWidgetLayoutCallbacks: jest.fn(() => ({- handleLayoutChange: mockHandleLayoutChange,- })),- }),-);-jest.mock('@/ui/layout/dropdown/components/DropdownMenuItemsContainer', () => ({- DropdownMenuItemsContainer: ({ children }: { children: React.ReactNode }) =>- children,-}));-jest.mock('@/ui/layout/dropdown/hooks/useCloseDropdown', () => ({- useCloseDropdown: jest.fn(() => ({ closeDropdown: mockCloseDropdown })),-}));-jest.mock('@/ui/layout/selectable-list/components/SelectableList', () => ({- SelectableList: ({ children }: { children: React.ReactNode }) => children,-}));-jest.mock('@/ui/layout/selectable-list/components/SelectableListItem', () => ({- SelectableListItem: ({ children }: { children: React.ReactNode }) => children,-}));-jest.mock(- '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow',- () => ({- useAvailableComponentInstanceIdOrThrow: jest.fn(() => 'dropdown-id'),- }),-);-jest.mock(- '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue',- () => ({- useAtomComponentStateValue: jest.fn(() => null),- }),-);-jest.mock('twenty-ui/components/navigation', () => ({- ListItemButton: ({- description,- disabled,- onClick,- selected,- children,- }: {- description?: React.ReactNode;- disabled?: boolean;- onClick?: () => void;- selected: boolean;- children: React.ReactNode;- }) => (- <button data-selected={selected} disabled={disabled} onClick={onClick}>- <span>{children}</span>- {description}- </button>- ),-}));--const renderDropdown = (- currentLayoutViewType: RecordTableWidgetLayoutViewType = ViewType.TABLE_WIDGET,-) =>- render(- <I18nProvider i18n={i18n}>- <RecordTableLayoutDropdownContent- pageLayoutId="page-layout-id"- widgetId="widget-id"- objectMetadataId={OBJECT_METADATA_ID}- currentLayoutViewType={currentLayoutViewType}- />- </I18nProvider>,- );--const layoutLabels = () =>- screen- .getAllByRole('button')- .map((button) => button.querySelector('span')?.textContent);--describe('RecordTableLayoutDropdownContent', () => {- beforeEach(() => {- jest.clearAllMocks();- mockIsAvailableAsGroupByField.mockReturnValue(true);- mockIsAvailableAsCalendarField.mockReturnValue(true);- });-- it('should offer every layout in picker order', () => {- renderDropdown();-- expect(layoutLabels()).toEqual(['Table', 'Kanban', 'List', 'Calendar']);- });-- it('should mark the current layout as selected', () => {- renderDropdown(ViewType.LIST_WIDGET);-- expect(screen.getByText('List').closest('button')?.dataset.selected).toBe(- 'true',- );- expect(screen.getByText('Table').closest('button')?.dataset.selected).toBe(- 'false',- );- });-- it('should switch the widget to the picked layout and close the dropdown', () => {- renderDropdown();-- fireEvent.click(screen.getByText('List').closest('button') as HTMLElement);-- expect(mockHandleLayoutChange).toHaveBeenCalledWith(- expect.objectContaining({ targetViewType: ViewType.LIST_WIDGET }),- );- expect(mockCloseDropdown).toHaveBeenCalled();- });-- it.each([- ['Kanban', 'Needs a Select field', mockIsAvailableAsGroupByField],- ['Calendar', 'Needs a Date field', mockIsAvailableAsCalendarField],- ])(- 'should keep %s visible but disabled with its reason when unavailable',- (label, reason, availability) => {- availability.mockReturnValue(false);-- renderDropdown();-- const button = screen.getByText(label).closest('button');-- expect(button).toBeDisabled();- expect(button?.textContent).toContain(reason);-- fireEvent.click(button as HTMLElement);-- expect(mockHandleLayoutChange).not.toHaveBeenCalled();- },- );-});diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/__tests__/WidgetViewLayoutSettingsRows.test.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/__tests__/WidgetViewLayoutSettingsRows.test.tsxdeleted file mode 100644index ed8c42a401e..00000000000--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/__tests__/WidgetViewLayoutSettingsRows.test.tsx+++ /dev/null@@ -1,115 +0,0 @@-import { i18n } from '@lingui/core';-import { I18nProvider } from '@lingui/react';-import { render, screen } from '@testing-library/react';--import { WidgetViewLayoutSettingsRows } from '@/side-panel/pages/page-layout/components/record-table-settings/WidgetViewLayoutSettingsRows';-import { ViewType } from '~/generated-metadata/graphql';--const mockUseRecordTableWidgetViewForDisplay = jest.fn();--jest.mock('@/object-metadata/hooks/useObjectMetadataItems', () => ({- useObjectMetadataItems: jest.fn(() => ({ objectMetadataItems: [] })),-}));-jest.mock(- '@/page-layout/widgets/record-table/hooks/useRecordTableWidgetLayoutCallbacks',- () => ({- useRecordTableWidgetLayoutCallbacks: jest.fn(() => ({- handleShouldHideEmptyGroupsChange: jest.fn(),- })),- }),-);-jest.mock(- '@/page-layout/widgets/record-table/hooks/useRecordTableWidgetViewForDisplay',- () => ({- useRecordTableWidgetViewForDisplay: () =>- mockUseRecordTableWidgetViewForDisplay(),- }),-);-jest.mock(- '@/side-panel/pages/page-layout/components/record-table-settings/RecordTableCalendarFieldDropdownContent',- () => ({ RecordTableCalendarFieldDropdownContent: () => null }),-);-jest.mock(- '@/side-panel/pages/page-layout/components/record-table-settings/RecordTableCalendarLayoutDropdownContent',- () => ({ RecordTableCalendarLayoutDropdownContent: () => null }),-);-jest.mock(- '@/side-panel/pages/page-layout/components/record-table-settings/RecordTableGroupByDropdownContent',- () => ({ RecordTableGroupByDropdownContent: () => null }),-);-jest.mock(- '@/side-panel/pages/page-layout/components/record-table-settings/RecordTableLayoutDropdownContent',- () => ({ RecordTableLayoutDropdownContent: () => null }),-);-jest.mock('@/ui/layout/dropdown/components/LegacyDropdownContent', () => ({- LegacyDropdownContent: ({ children }: { children: React.ReactNode }) =>- children,-}));-jest.mock('@/ui/layout/selectable-list/components/SelectableListItem', () => ({- SelectableListItem: ({ children }: { children: React.ReactNode }) => children,-}));-jest.mock('@/command-menu/components/CommandMenuItemSwitch', () => ({- CommandMenuItemSwitch: () => null,-}));-jest.mock('@/command-menu/components/CommandMenuItemDropdown', () => ({- CommandMenuItemDropdown: ({- Icon,- label,- description,- }: {- Icon?: { displayName?: string; name?: string };- label: string;- description?: React.ReactNode;- }) => (- <div data-testid={`row-${label}`}>- <span data-icon={Icon?.displayName ?? Icon?.name ?? 'unknown'} />- <span>{description}</span>- </div>- ),-}));--const renderLayoutRows = (widgetViewType: ViewType) => {- mockUseRecordTableWidgetViewForDisplay.mockReturnValue({- view: { id: 'view-id', type: widgetViewType },- });-- render(- <I18nProvider i18n={i18n}>- <WidgetViewLayoutSettingsRows- pageLayoutId="page-layout-id"- widgetId="widget-id"- objectMetadataId="object-metadata-id"- viewId="view-id"- />- </I18nProvider>,- );-- return screen.getByTestId('row-Layout');-};--describe('WidgetViewLayoutSettingsRows', () => {- beforeEach(() => jest.clearAllMocks());-- it('includes calendar layout settings without a feature flag', () => {- renderLayoutRows(ViewType.CALENDAR_WIDGET);-- expect(screen.getByTestId('row-Calendar view')).toHaveTextContent('Month');- });-- it.each([- [ViewType.TABLE_WIDGET, 'Table', 'Table'],- [ViewType.KANBAN_WIDGET, 'Kanban', 'LayoutKanban'],- [ViewType.LIST_WIDGET, 'List', 'List'],- [ViewType.CALENDAR_WIDGET, 'Calendar', 'Calendar'],- ])(- 'should describe a %s widget with its own label and icon',- (widgetViewType, expectedLabel, expectedIcon) => {- const layoutRow = renderLayoutRows(widgetViewType);-- expect(layoutRow).toHaveTextContent(expectedLabel);- expect(- layoutRow.querySelector('[data-icon]')?.getAttribute('data-icon'),- ).toBe(expectedIcon);- },- );-});diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/constants/RecordTableFieldsDropdownPage.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/constants/RecordTableFieldsDropdownPage.tsnew file mode 100644index 00000000000..ecb0bb0ed52--- /dev/null+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/constants/RecordTableFieldsDropdownPage.ts@@ -0,0 +1,4 @@+export const RECORD_TABLE_FIELDS_DROPDOWN_PAGE = {+ ROOT: 'root',+ HIDDEN_FIELDS: 'hidden-fields',+};diff --git a/packages/twenty-front/src/modules/side-panel/pages/snooze-ai-chat/components/SidePanelSnoozeAiChatPage.tsx b/packages/twenty-front/src/modules/side-panel/pages/snooze-ai-chat/components/SidePanelSnoozeAiChatPage.tsxindex b7f993a576f..396593b5ad9 100644--- a/packages/twenty-front/src/modules/side-panel/pages/snooze-ai-chat/components/SidePanelSnoozeAiChatPage.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/snooze-ai-chat/components/SidePanelSnoozeAiChatPage.tsx@@ -11,12 +11,14 @@ import {getAgentChatThreadSnoozeOptions,} from '@/ai/utils/getAgentChatThreadSnoozeOptions';import { CommandMenuItem } from '@/command-menu/components/CommandMenuItem';-import { CommandMenuItemDropdown } from '@/command-menu/components/CommandMenuItemDropdown';+import { CommandMenuItemDropdownTrigger } from '@/command-menu/components/CommandMenuItemDropdownTrigger';import { SidePanelList } from '@/side-panel/components/SidePanelList';import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';import { SnoozeAiChatUntilDatePicker } from '@/side-panel/pages/snooze-ai-chat/components/SnoozeAiChatUntilDatePicker';import { snoozeAiChatThreadIdsComponentState } from '@/side-panel/pages/snooze-ai-chat/states/snoozeAiChatThreadIdsComponentState';import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';import { useUserTimezone } from '@/ui/input/components/internal/date/hooks/useUserTimezone';import { useOpenDropdown } from '@/ui/layout/dropdown/hooks/useOpenDropdown';import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';@@ -104,19 +106,24 @@ export const SidePanelSnoozeAiChatPage = () => {})}>- <CommandMenuItemDropdown- id={SNOOZE_UNTIL_DATE_ITEM_ID}- Icon={IconCalendar}- label={t`Day & Time`}- dropdownId={untilDateDropdownId}- dropdownPlacement="bottom-start"- dropdownComponents={+ <DropdownRoot dropdownId={untilDateDropdownId} type="panel">+ <CommandMenuItemDropdownTrigger+ id={SNOOZE_UNTIL_DATE_ITEM_ID}+ Icon={IconCalendar}+ label={t`Day & Time`}+ />+ <DropdownContent+ side="bottom"+ align="start"+ width="auto"+ collisionPadding={{ left: 0, right: 0 }}+ ><SnoozeAiChatUntilDatePickerthreadIds={snoozeAiChatThreadIds}onSnoozed={closeSidePanelMenu}/>- }- />+ </DropdownContent>+ </DropdownRoot></SelectableListItem></SidePanelList>);diff --git a/packages/twenty-front/src/modules/side-panel/pages/snooze-ai-chat/components/__stories__/SidePanelSnoozeAiChatPage.stories.tsx b/packages/twenty-front/src/modules/side-panel/pages/snooze-ai-chat/components/__stories__/SidePanelSnoozeAiChatPage.stories.tsxindex 2fcdd5ad14f..71afdee7dc5 100644--- a/packages/twenty-front/src/modules/side-panel/pages/snooze-ai-chat/components/__stories__/SidePanelSnoozeAiChatPage.stories.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/snooze-ai-chat/components/__stories__/SidePanelSnoozeAiChatPage.stories.tsx@@ -5,20 +5,24 @@ import { ComponentDecorator } from 'twenty-ui/testing';import { SidePanelSnoozeAiChatPage } from '@/side-panel/pages/snooze-ai-chat/components/SidePanelSnoozeAiChatPage';import { snoozeAiChatThreadIdsComponentState } from '@/side-panel/pages/snooze-ai-chat/states/snoozeAiChatThreadIdsComponentState';import { SidePanelPageComponentInstanceContext } from '@/side-panel/states/contexts/SidePanelPageComponentInstanceContext';+import { ParentClickOutsideIdContext } from '@/ui/utilities/pointer-event/contexts/ParentClickOutsideIdContext';import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';import { MemoryRouterDecorator } from '~/testing/decorators/MemoryRouterDecorator';import { ToastDecorator } from '~/testing/decorators/ToastDecorator';const PAGE_CONTEXT = { instanceId: 'snooze-ai-chat-story' };+const CLICK_OUTSIDE_ID = 'snooze-ai-chat-story-click-outside';const meta = {title: 'Modules/SidePanel/SnoozeAiChat',component: SidePanelSnoozeAiChatPage,decorators: [(Story) => (- <SidePanelPageComponentInstanceContext.Provider value={PAGE_CONTEXT}>- <Story />- </SidePanelPageComponentInstanceContext.Provider>+ <ParentClickOutsideIdContext.Provider value={CLICK_OUTSIDE_ID}>+ <SidePanelPageComponentInstanceContext.Provider value={PAGE_CONTEXT}>+ <Story />+ </SidePanelPageComponentInstanceContext.Provider>+ </ParentClickOutsideIdContext.Provider>),MemoryRouterDecorator,ComponentDecorator,@@ -43,6 +47,12 @@ export const DayAndTimePicker: Story = {await userEvent.click(trigger);+ const popup = await body.findByRole('dialog', { name: 'Day & Time' });++ await expect(popup).toHaveAttribute(+ 'data-click-outside-id',+ CLICK_OUTSIDE_ID,+ );await expect(await body.findByRole('button', { name: /^Snooze until/ }),).toBeVisible();@@ -55,7 +65,7 @@ export const DayAndTimePicker: Story = {expect(trigger).toHaveAttribute('aria-expanded', 'false'),);- trigger.focus();+ await waitFor(() => expect(trigger).toHaveFocus());await userEvent.keyboard('{Enter}');await expect(