The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Right-click menu on list rows and inbox chats (#27189)
Félix Malfaitc1c155752994
diff --git a/packages/twenty-front/src/modules/ai/components/AiChatInboxCommandMenuScope.tsx b/packages/twenty-front/src/modules/ai/components/AiChatInboxCommandMenuScope.tsxnew file mode 100644index 00000000000..9ddea2d5978--- /dev/null+++ b/packages/twenty-front/src/modules/ai/components/AiChatInboxCommandMenuScope.tsx@@ -0,0 +1,37 @@+import { type ReactNode } from 'react';++import { AiChatInboxSelectionToContextStoreEffect } from '@/ai/components/AiChatInboxSelectionToContextStoreEffect';+import { AiChatThreadCommandMenuItems } from '@/ai/components/AiChatThreadCommandMenuItems';+import { AI_CHAT_INBOX_INSTANCE_ID } from '@/ai/constants/AiChatInboxInstanceId';+import { CommandMenuDropdownAtCursor } from '@/command-menu-item/components/CommandMenuDropdownAtCursor';+import { CommandMenuContextProvider } from '@/command-menu-item/contexts/CommandMenuContextProvider';+import { CommandMenuItemContainerType } from '@/command-menu-item/types/CommandMenuItemContainerType';+import { CommandMenuComponentInstanceContext } from '@/command-menu/states/contexts/CommandMenuComponentInstanceContext';+import { ContextStoreComponentInstanceContext } from '@/context-store/states/contexts/ContextStoreComponentInstanceContext';++type AiChatInboxCommandMenuScopeProps = {+ children: ReactNode;+};++export const AiChatInboxCommandMenuScope = ({+ children,+}: AiChatInboxCommandMenuScopeProps) => (+ <ContextStoreComponentInstanceContext.Provider+ value={{ instanceId: AI_CHAT_INBOX_INSTANCE_ID }}+ >+ <CommandMenuComponentInstanceContext.Provider+ value={{ instanceId: AI_CHAT_INBOX_INSTANCE_ID }}+ >+ <AiChatInboxSelectionToContextStoreEffect />+ <CommandMenuContextProvider+ displayType="dropdownItem"+ containerType={CommandMenuItemContainerType.IndexPageDropdown}+ >+ <CommandMenuDropdownAtCursor>+ <AiChatThreadCommandMenuItems />+ </CommandMenuDropdownAtCursor>+ </CommandMenuContextProvider>+ {children}+ </CommandMenuComponentInstanceContext.Provider>+ </ContextStoreComponentInstanceContext.Provider>+);diff --git a/packages/twenty-front/src/modules/ai/components/AiChatInboxSelectionPane.tsx b/packages/twenty-front/src/modules/ai/components/AiChatInboxSelectionPane.tsxindex 3acb511bdef..589cfc1eaec 100644--- a/packages/twenty-front/src/modules/ai/components/AiChatInboxSelectionPane.tsx+++ b/packages/twenty-front/src/modules/ai/components/AiChatInboxSelectionPane.tsx@@ -4,13 +4,9 @@ import { Key } from 'ts-key-enum';import { IconX } from 'twenty-ui/icon';import { Button } from 'twenty-ui/primitives/input';-import { AiChatInboxSelectionToContextStoreEffect } from '@/ai/components/AiChatInboxSelectionToContextStoreEffect';-import { AI_CHAT_INBOX_INSTANCE_ID } from '@/ai/constants/AiChatInboxInstanceId';import { CommandMenuContextProvider } from '@/command-menu-item/contexts/CommandMenuContextProvider';import { PinnedCommandMenuItemButtons } from '@/command-menu-item/display/components/PinnedCommandMenuItemButtons';import { CommandMenuItemContainerType } from '@/command-menu-item/types/CommandMenuItemContainerType';-import { CommandMenuComponentInstanceContext } from '@/command-menu/states/contexts/CommandMenuComponentInstanceContext';-import { ContextStoreComponentInstanceContext } from '@/context-store/states/contexts/ContextStoreComponentInstanceContext';import { useResetRecordSelection } from '@/object-record/record-selection/hooks/useResetRecordSelection';import { selectedRecordIdsComponentSelector } from '@/object-record/record-selection/states/selectors/selectedRecordIdsComponentSelector';import { EmptyState } from '@/ui/feedback/empty-state/components/EmptyState';@@ -34,46 +30,37 @@ export const AiChatInboxSelectionPane = () => {});return (- <ContextStoreComponentInstanceContext.Provider- value={{ instanceId: AI_CHAT_INBOX_INSTANCE_ID }}- >- <CommandMenuComponentInstanceContext.Provider- value={{ instanceId: AI_CHAT_INBOX_INSTANCE_ID }}- >- <PageCardLayout- header={- <PageCardHeader- actionButton={- <CommandMenuContextProvider- displayType="button"- containerType={CommandMenuItemContainerType.ShowPageHeader}- >- <PinnedCommandMenuItemButtons />- </CommandMenuContextProvider>- }- />+ <PageCardLayout+ header={+ <PageCardHeader+ actionButton={+ <CommandMenuContextProvider+ displayType="button"+ containerType={CommandMenuItemContainerType.ShowPageHeader}+ >+ <PinnedCommandMenuItemButtons />+ </CommandMenuContextProvider>}+ />+ }+ >+ <EmptyState.Root>+ <EmptyState.Content>+ <EmptyState.Title>+ {plural(selectedRecordIds.length, {+ one: '# chat selected',+ other: '# chats selected',+ })}+ </EmptyState.Title>+ </EmptyState.Content>+ <Button+ variant="outline"+ startIcon={<IconX />}+ onClick={resetRecordSelection}>- <AiChatInboxSelectionToContextStoreEffect />- <EmptyState.Root>- <EmptyState.Content>- <EmptyState.Title>- {plural(selectedRecordIds.length, {- one: '# chat selected',- other: '# chats selected',- })}- </EmptyState.Title>- </EmptyState.Content>- <Button- variant="outline"- startIcon={<IconX />}- onClick={resetRecordSelection}- >- {t`Clear selection`}- </Button>- </EmptyState.Root>- </PageCardLayout>- </CommandMenuComponentInstanceContext.Provider>- </ContextStoreComponentInstanceContext.Provider>+ {t`Clear selection`}+ </Button>+ </EmptyState.Root>+ </PageCardLayout>);};diff --git a/packages/twenty-front/src/modules/ai/components/AiChatInboxThreadList.tsx b/packages/twenty-front/src/modules/ai/components/AiChatInboxThreadList.tsxnew file mode 100644index 00000000000..0db90813697--- /dev/null+++ b/packages/twenty-front/src/modules/ai/components/AiChatInboxThreadList.tsx@@ -0,0 +1,35 @@+import { type MouseEvent } from 'react';++import { AiChatThreadList } from '@/ai/components/AiChatThreadList';+import { AI_CHAT_THREAD_ACTIONS_SURFACE } from '@/ai/constants/AiChatThreadActionsSurface';+import { type AgentChatThreadRecord } from '@/ai/types/AgentChatThreadRecord';+import { useOpenRecordContextMenu } from '@/object-record/record-selection/hooks/useOpenRecordContextMenu';++type AiChatInboxThreadListProps = {+ threads: AgentChatThreadRecord[];+ selectedThreadIds: string[];+ onThreadClick: (+ thread: AgentChatThreadRecord,+ event: MouseEvent<HTMLDivElement>,+ ) => void;+};++export const AiChatInboxThreadList = ({+ threads,+ selectedThreadIds,+ onThreadClick,+}: AiChatInboxThreadListProps) => {+ const { openRecordContextMenu } = useOpenRecordContextMenu();++ return (+ <AiChatThreadList+ threads={threads}+ surface={AI_CHAT_THREAD_ACTIONS_SURFACE.INBOX_PAGE}+ selectedThreadIds={selectedThreadIds}+ onThreadClick={onThreadClick}+ onThreadContextMenu={(thread, event) =>+ openRecordContextMenu({ event, recordId: thread.id })+ }+ />+ );+};diff --git a/packages/twenty-front/src/modules/ai/components/AiChatThreadActionsDropdown.tsx b/packages/twenty-front/src/modules/ai/components/AiChatThreadActionsDropdown.tsxindex 421aa36a165..de16b28f8de 100644--- a/packages/twenty-front/src/modules/ai/components/AiChatThreadActionsDropdown.tsx+++ b/packages/twenty-front/src/modules/ai/components/AiChatThreadActionsDropdown.tsx@@ -1,19 +1,18 @@import { useLingui } from '@lingui/react/macro';-import { type ReactElement, type MouseEvent, useContext } from 'react';+import { type ReactElement, type MouseEvent } from 'react';import { CoreObjectNameSingular } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';import { Dropdown, LightIconButton } from 'twenty-ui/components';import { IconDotsVertical, IconPencil, IconUnlink } from 'twenty-ui/icon';+import { AiChatThreadCommandMenuItems } from '@/ai/components/AiChatThreadCommandMenuItems';import { useRefreshAgentChatThreadPermissions } from '@/ai/hooks/useRefreshAgentChatThreadPermissions';import { useTargetAiChatThreadsInContextStore } from '@/ai/hooks/useTargetAiChatThreadsInContextStore';import { agentChatThreadPermissionsFamilySelector } from '@/ai/states/selectors/agentChatThreadPermissionsFamilySelector';import { type AiChatThreadActionsSurface } from '@/ai/types/AiChatThreadActionsSurface';import { getAiChatThreadActionsInstanceId } from '@/ai/utils/getAiChatThreadActionsInstanceId';import { getAiChatThreadItemMenuDropdownId } from '@/ai/utils/getAiChatThreadItemMenuDropdownId';-import { CommandMenuContext } from '@/command-menu-item/contexts/CommandMenuContext';import { CommandMenuContextProvider } from '@/command-menu-item/contexts/CommandMenuContextProvider';-import { CommandMenuItemRenderer } from '@/command-menu-item/display/components/CommandMenuItemRenderer';import { CommandMenuItemContainerType } from '@/command-menu-item/types/CommandMenuItemContainerType';import { CommandMenuComponentInstanceContext } from '@/command-menu/states/contexts/CommandMenuComponentInstanceContext';import { ContextStoreComponentInstanceContext } from '@/context-store/states/contexts/ContextStoreComponentInstanceContext';@@ -22,10 +21,6 @@ import { useUpsertRecordsInStore } from '@/object-record/record-store/hooks/useUimport { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilySelectorValue';-import {- CommandMenuItemAvailabilityType,- EngineComponentKey,-} from '~/generated-metadata/graphql';type AiChatThreadActionsDropdownProps = {thread: {@@ -40,20 +35,6 @@ type AiChatThreadActionsDropdownProps = {trigger?: ReactElement;};-const AiChatThreadCommandMenuItems = () => {- const { commandMenuItems } = useContext(CommandMenuContext);-- // A row is not the chat page, so it does not start a new chat- return commandMenuItems- .filter(- (item) =>- item.availabilityType ===- CommandMenuItemAvailabilityType.RECORD_SELECTION &&- item.engineComponentKey !== EngineComponentKey.NEW_AI_CHAT,- )- .map((item) => <CommandMenuItemRenderer item={item} key={item.id} />);-};-export const AiChatThreadActionsDropdown = ({thread,surface,diff --git a/packages/twenty-front/src/modules/ai/components/AiChatThreadCommandMenuItems.tsx b/packages/twenty-front/src/modules/ai/components/AiChatThreadCommandMenuItems.tsxnew file mode 100644index 00000000000..abaaea7bb65--- /dev/null+++ b/packages/twenty-front/src/modules/ai/components/AiChatThreadCommandMenuItems.tsx@@ -0,0 +1,22 @@+import { useContext } from 'react';++import { CommandMenuContext } from '@/command-menu-item/contexts/CommandMenuContext';+import { CommandMenuItemRenderer } from '@/command-menu-item/display/components/CommandMenuItemRenderer';+import {+ CommandMenuItemAvailabilityType,+ EngineComponentKey,+} from '~/generated-metadata/graphql';++export const AiChatThreadCommandMenuItems = () => {+ const { commandMenuItems } = useContext(CommandMenuContext);++ // A row is not the chat page, so it does not start a new chat+ return commandMenuItems+ .filter(+ (item) =>+ item.availabilityType ===+ CommandMenuItemAvailabilityType.RECORD_SELECTION &&+ item.engineComponentKey !== EngineComponentKey.NEW_AI_CHAT,+ )+ .map((item) => <CommandMenuItemRenderer item={item} key={item.id} />);+};diff --git a/packages/twenty-front/src/modules/ai/components/AiChatThreadList.tsx b/packages/twenty-front/src/modules/ai/components/AiChatThreadList.tsxindex 64b45d6efae..eea949af450 100644--- a/packages/twenty-front/src/modules/ai/components/AiChatThreadList.tsx+++ b/packages/twenty-front/src/modules/ai/components/AiChatThreadList.tsx@@ -24,6 +24,10 @@ type AiChatThreadListProps = {thread: AgentChatThreadRecord,event: MouseEvent<HTMLDivElement>,) => void;+ onThreadContextMenu?: (+ thread: AgentChatThreadRecord,+ event: MouseEvent<HTMLDivElement>,+ ) => void;onDetachThread?: (threadId: string) => void;};@@ -32,6 +36,7 @@ export const AiChatThreadList = ({surface,selectedThreadIds = [],onThreadClick,+ onThreadContextMenu,onDetachThread,}: AiChatThreadListProps) => {const selectedThreadIdSet = new Set(selectedThreadIds);@@ -43,6 +48,7 @@ export const AiChatThreadList = ({surface={surface}isSelected={selectedThreadIdSet.has(thread.id)}onClick={onThreadClick}+ onContextMenu={onThreadContextMenu}onDetach={isDefined(onDetachThread) ? () => onDetachThread(thread.id) : undefined}diff --git a/packages/twenty-front/src/modules/ai/components/AiChatThreadListItem.tsx b/packages/twenty-front/src/modules/ai/components/AiChatThreadListItem.tsxindex d58bd48b313..3636b34804d 100644--- a/packages/twenty-front/src/modules/ai/components/AiChatThreadListItem.tsx+++ b/packages/twenty-front/src/modules/ai/components/AiChatThreadListItem.tsx@@ -126,6 +126,10 @@ type AiChatThreadListItemProps = {thread: AgentChatThreadRecord,event: MouseEvent<HTMLDivElement>,) => void;+ onContextMenu?: (+ thread: AgentChatThreadRecord,+ event: MouseEvent<HTMLDivElement>,+ ) => void;onDetach?: () => void;};@@ -135,6 +139,7 @@ export const AiChatThreadListItem = ({surface,isSelected,onClick,+ onContextMenu,onDetach,}: AiChatThreadListItemProps) => {const { t } = useLingui();@@ -209,6 +214,11 @@ export const AiChatThreadListItem = ({onClick(thread, event);}}}+ onContextMenu={(event) => {+ if (!isRenaming) {+ onContextMenu?.(thread, event);+ }+ }}><StyledLeading><WorkspaceMemberAvatarStackdiff --git a/packages/twenty-front/src/modules/command-menu-item/components/CommandMenuDropdownAtCursor.tsx b/packages/twenty-front/src/modules/command-menu-item/components/CommandMenuDropdownAtCursor.tsxnew file mode 100644index 00000000000..77efbe369f7--- /dev/null+++ b/packages/twenty-front/src/modules/command-menu-item/components/CommandMenuDropdownAtCursor.tsx@@ -0,0 +1,51 @@+import { useLingui } from '@lingui/react/macro';+import { type ReactNode } from 'react';+import { Dropdown } from 'twenty-ui/components';++import { COMMAND_MENU_DROPDOWN_CLICK_OUTSIDE_ID } from '@/command-menu-item/constants/CommandMenuDropdownClickOutsideId';+import { recordIndexCommandMenuDropdownPositionComponentState } from '@/command-menu-item/states/recordIndexCommandMenuDropdownPositionComponentState';+import { createVirtualElementFromPosition } from '@/command-menu-item/utils/createVirtualElementFromPosition';+import { getCommandMenuDropdownIdFromCommandMenuId } from '@/command-menu-item/utils/getCommandMenuDropdownIdFromCommandMenuId';+import { CommandMenuComponentInstanceContext } from '@/command-menu/states/contexts/CommandMenuComponentInstanceContext';+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';+import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';+import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';++type CommandMenuDropdownAtCursorProps = {+ children: ReactNode;+};++export const CommandMenuDropdownAtCursor = ({+ children,+}: CommandMenuDropdownAtCursorProps) => {+ const { t } = useLingui();++ const commandMenuId = useAvailableComponentInstanceIdOrThrow(+ CommandMenuComponentInstanceContext,+ );++ const dropdownId = getCommandMenuDropdownIdFromCommandMenuId(commandMenuId);++ const recordIndexCommandMenuDropdownPosition = useAtomComponentStateValue(+ recordIndexCommandMenuDropdownPositionComponentState,+ dropdownId,+ );++ return (+ <DropdownRoot dropdownId={dropdownId} type="menu">+ <DropdownContent+ anchor={createVirtualElementFromPosition(+ recordIndexCommandMenuDropdownPosition,+ )}+ aria-label={t`Actions`}+ >+ <Dropdown.Section+ data-click-outside-id={COMMAND_MENU_DROPDOWN_CLICK_OUTSIDE_ID}+ >+ {children}+ </Dropdown.Section>+ </DropdownContent>+ </DropdownRoot>+ );+};diff --git a/packages/twenty-front/src/modules/command-menu-item/components/RecordIndexCommandMenuDropdown.tsx b/packages/twenty-front/src/modules/command-menu-item/components/RecordIndexCommandMenuDropdown.tsxindex f05819ffdab..40b7e1349e6 100644--- a/packages/twenty-front/src/modules/command-menu-item/components/RecordIndexCommandMenuDropdown.tsx+++ b/packages/twenty-front/src/modules/command-menu-item/components/RecordIndexCommandMenuDropdown.tsx@@ -1,16 +1,8 @@-import { COMMAND_MENU_DROPDOWN_CLICK_OUTSIDE_ID } from '@/command-menu-item/constants/CommandMenuDropdownClickOutsideId';+import { CommandMenuDropdownAtCursor } from '@/command-menu-item/components/CommandMenuDropdownAtCursor';import { CommandMenuContext } from '@/command-menu-item/contexts/CommandMenuContext';import { CommandMenuItemRenderer } from '@/command-menu-item/display/components/CommandMenuItemRenderer';-import { recordIndexCommandMenuDropdownPositionComponentState } from '@/command-menu-item/states/recordIndexCommandMenuDropdownPositionComponentState';-import { createVirtualElementFromPosition } from '@/command-menu-item/utils/createVirtualElementFromPosition';-import { getCommandMenuDropdownIdFromCommandMenuId } from '@/command-menu-item/utils/getCommandMenuDropdownIdFromCommandMenuId';-import { CommandMenuComponentInstanceContext } from '@/command-menu/states/contexts/CommandMenuComponentInstanceContext';import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';-import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';import { useWorkspaceSurface } from '@/ui/layout/hooks/useWorkspaceSurface';-import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { useLingui } from '@lingui/react/macro';import { useContext } from 'react';import { Dropdown } from 'twenty-ui/components';@@ -29,43 +21,21 @@ export const RecordIndexCommandMenuDropdown = () => {CommandMenuItemAvailabilityType.RECORD_SELECTION,);- const commandMenuId = useAvailableComponentInstanceIdOrThrow(- CommandMenuComponentInstanceContext,- );-- const dropdownId = getCommandMenuDropdownIdFromCommandMenuId(commandMenuId);-- const recordIndexCommandMenuDropdownPosition = useAtomComponentStateValue(- recordIndexCommandMenuDropdownPositionComponentState,- dropdownId,- );-const { openSidePanelMenu } = useSidePanelMenu();return (- <DropdownRoot dropdownId={dropdownId} type="menu">- <DropdownContent- anchor={createVirtualElementFromPosition(- recordIndexCommandMenuDropdownPosition,- )}- aria-label={t`Actions`}- >- <Dropdown.Section- data-click-outside-id={COMMAND_MENU_DROPDOWN_CLICK_OUTSIDE_ID}+ <CommandMenuDropdownAtCursor>+ {recordIndexCommandMenuItems.map((item) => (+ <CommandMenuItemRenderer item={item} key={item.id} />+ ))}+ {shouldShowMoreActions && (+ <Dropdown.ActionItem+ startIcon={<IconLayoutSidebarRightExpand />}+ onClick={() => openSidePanelMenu()}>- {recordIndexCommandMenuItems.map((item) => (- <CommandMenuItemRenderer item={item} key={item.id} />- ))}- {shouldShowMoreActions && (- <Dropdown.ActionItem- startIcon={<IconLayoutSidebarRightExpand />}- onClick={() => openSidePanelMenu()}- >- {t`More actions`}- </Dropdown.ActionItem>- )}- </Dropdown.Section>- </DropdownContent>- </DropdownRoot>+ {t`More actions`}+ </Dropdown.ActionItem>+ )}+ </CommandMenuDropdownAtCursor>);};diff --git a/packages/twenty-front/src/modules/command-menu-item/components/__stories__/RecordIndexCommandMenuDropdown.stories.tsx b/packages/twenty-front/src/modules/command-menu-item/components/__stories__/RecordIndexCommandMenuDropdown.stories.tsxindex ae38ee34c7e..ae630e281b3 100644--- a/packages/twenty-front/src/modules/command-menu-item/components/__stories__/RecordIndexCommandMenuDropdown.stories.tsx+++ b/packages/twenty-front/src/modules/command-menu-item/components/__stories__/RecordIndexCommandMenuDropdown.stories.tsx@@ -9,7 +9,8 @@ import { CommandMenuItemContainerType } from '@/command-menu-item/types/CommandMimport { getCommandMenuDropdownIdFromCommandMenuId } from '@/command-menu-item/utils/getCommandMenuDropdownIdFromCommandMenuId';import { getCommandMenuIdFromRecordIndexId } from '@/command-menu-item/utils/getCommandMenuIdFromRecordIndexId';import { CommandMenuComponentInstanceContext } from '@/command-menu/states/contexts/CommandMenuComponentInstanceContext';-import { useTriggerCommandMenuDropdown } from '@/object-record/record-table/record-table-cell/hooks/useTriggerCommandMenuDropdown';+import { useOpenRecordContextMenu } from '@/object-record/record-selection/hooks/useOpenRecordContextMenu';+import { RecordSelectionComponentInstanceContext } from '@/object-record/record-selection/states/contexts/RecordSelectionComponentInstanceContext';import { isRecordSelectedComponentFamilyState } from '@/object-record/record-selection/states/isRecordSelectedComponentFamilyState';import { isSidePanelOpenedState } from '@/side-panel/states/isSidePanelOpenedState';import { isDropdownOpenComponentState } from '@/ui/layout/dropdown/states/isDropdownOpenComponentState';@@ -114,9 +115,7 @@ const rightClickRecord = async ({};const StoryRecordTable = () => {- const { triggerCommandMenuDropdown } = useTriggerCommandMenuDropdown({- recordTableId: RECORD_TABLE_ID,- });+ const { openRecordContextMenu } = useOpenRecordContextMenu();return (<table>@@ -125,7 +124,7 @@ const StoryRecordTable = () => {<tr key={recordName}><tdonContextMenu={(event) =>- triggerCommandMenuDropdown(event, recordName)+ openRecordContextMenu({ event, recordId: recordName })}>{recordName}@@ -155,7 +154,11 @@ const meta: Meta<typeof RecordIndexCommandMenuDropdown> = {isInPreviewMode: false,}}>- <StoryRecordTable />+ <RecordSelectionComponentInstanceContext.Provider+ value={{ instanceId: RECORD_TABLE_ID }}+ >+ <StoryRecordTable />+ </RecordSelectionComponentInstanceContext.Provider><Story /></CommandMenuContext.Provider></CommandMenuComponentInstanceContext.Provider>diff --git a/packages/twenty-front/src/modules/command-menu-item/hooks/useOpenCommandMenuDropdownAtCursor.ts b/packages/twenty-front/src/modules/command-menu-item/hooks/useOpenCommandMenuDropdownAtCursor.tsnew file mode 100644index 00000000000..d10b32a5f04--- /dev/null+++ b/packages/twenty-front/src/modules/command-menu-item/hooks/useOpenCommandMenuDropdownAtCursor.ts@@ -0,0 +1,71 @@+import { useStore } from 'jotai';+import { type MouseEvent, useCallback } from 'react';+import { isDefined } from 'twenty-shared/utils';++import { recordIndexCommandMenuDropdownPositionComponentState } from '@/command-menu-item/states/recordIndexCommandMenuDropdownPositionComponentState';+import { getCommandMenuDropdownIdFromCommandMenuId } from '@/command-menu-item/utils/getCommandMenuDropdownIdFromCommandMenuId';+import { CommandMenuComponentInstanceContext } from '@/command-menu/states/contexts/CommandMenuComponentInstanceContext';+import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';+import { useOpenDropdown } from '@/ui/layout/dropdown/hooks/useOpenDropdown';+import { useWorkspaceSurface } from '@/ui/layout/hooks/useWorkspaceSurface';+import { useAvailableComponentInstanceId } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceId';++export type CommandMenuDropdownTriggerEvent = Pick<+ MouseEvent,+ 'preventDefault' | 'clientX' | 'clientY'+>;++export const useOpenCommandMenuDropdownAtCursor = () => {+ const store = useStore();+ const { openDropdown } = useOpenDropdown();+ const { closeSidePanelMenu } = useSidePanelMenu();+ const workspaceSurface = useWorkspaceSurface();++ const commandMenuInstanceId = useAvailableComponentInstanceId(+ CommandMenuComponentInstanceContext,+ );++ const isCommandMenuAvailable = isDefined(commandMenuInstanceId);++ const openCommandMenuDropdownAtCursor = useCallback(+ (event: CommandMenuDropdownTriggerEvent) => {+ if (!isDefined(commandMenuInstanceId)) {+ return;+ }++ event.preventDefault();++ const commandMenuDropdownId = getCommandMenuDropdownIdFromCommandMenuId(+ commandMenuInstanceId,+ );++ store.set(+ recordIndexCommandMenuDropdownPositionComponentState.atomFamily({+ instanceId: commandMenuDropdownId,+ }),+ { x: event.clientX, y: event.clientY },+ );++ if (workspaceSurface.type === 'main') {+ closeSidePanelMenu();+ }++ openDropdown({+ dropdownComponentInstanceIdFromProps: commandMenuDropdownId,+ globalHotkeysConfig: {+ enableGlobalHotkeysWithModifiers: true,+ enableGlobalHotkeysConflictingWithKeyboard: false,+ },+ });+ },+ [+ closeSidePanelMenu,+ commandMenuInstanceId,+ openDropdown,+ store,+ workspaceSurface.type,+ ],+ );++ return { isCommandMenuAvailable, openCommandMenuDropdownAtCursor };+};diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCard.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCard.tsxindex 3d0cc7cc5eb..dc04a9313bf 100644--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCard.tsx+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCard.tsx@@ -1,9 +1,7 @@-import { recordIndexCommandMenuDropdownPositionComponentState } from '@/command-menu-item/states/recordIndexCommandMenuDropdownPositionComponentState';-import { getCommandMenuDropdownIdFromCommandMenuId } from '@/command-menu-item/utils/getCommandMenuDropdownIdFromCommandMenuId';-import { getCommandMenuIdFromRecordIndexId } from '@/command-menu-item/utils/getCommandMenuIdFromRecordIndexId';import { RecordBoardCardContext } from '@/object-record/record-board/record-board-card/contexts/RecordBoardCardContext';import { isRecordBoardCardActiveComponentFamilyState } from '@/object-record/record-board/states/isRecordBoardCardActiveComponentFamilyState';import { isRecordBoardCardFocusedComponentFamilyState } from '@/object-record/record-board/states/isRecordBoardCardFocusedComponentFamilyState';+import { useOpenRecordContextMenu } from '@/object-record/record-selection/hooks/useOpenRecordContextMenu';import { isRecordSelectedComponentFamilyState } from '@/object-record/record-selection/states/isRecordSelectedComponentFamilyState';import { useActiveRecordBoardCard } from '@/object-record/record-board/hooks/useActiveRecordBoardCard';@@ -22,14 +20,11 @@ import { isRecordIdPrimaryDragMultipleComponentFamilyState } from '@/object-recoimport { isRecordIdSecondaryDragMultipleComponentFamilyState } from '@/object-record/record-drag/states/isRecordIdSecondaryDragMultipleComponentFamilyState';import { primaryDraggedRecordIdComponentState } from '@/object-record/record-drag/states/primaryDraggedRecordIdComponentState';import { useOpenRecordFromIndexView } from '@/object-record/record-index/hooks/useOpenRecordFromIndexView';-import { useOpenDropdown } from '@/ui/layout/dropdown/hooks/useOpenDropdown';import { useDisableDragSelectOnPointerDown } from '@/ui/utilities/drag-select/hooks/useDisableDragSelectOnPointerDown';import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';-import { useAtomComponentFamilyState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyState';import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';import { useAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentState';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';import { useGetCurrentViewOnly } from '@/views/hooks/useGetCurrentViewOnly';import { styled } from '@linaria/react';import { useContext } from 'react';@@ -82,7 +77,7 @@ export const RecordBoardCard = () => {`record-board-card-${recordId}`,);- const [isRecordSelected, setIsRecordSelected] = useAtomComponentFamilyState(+ const isRecordSelected = useAtomComponentFamilyStateValue(isRecordSelectedComponentFamilyState,recordId,);@@ -103,17 +98,7 @@ export const RecordBoardCard = () => {},);- const commandMenuId = getCommandMenuIdFromRecordIndexId(recordBoardId);-- const commandMenuDropdownId =- getCommandMenuDropdownIdFromCommandMenuId(commandMenuId);-- const setRecordIndexCommandMenuDropdownPosition = useSetAtomComponentState(- recordIndexCommandMenuDropdownPositionComponentState,- commandMenuDropdownId,- );-- const { openDropdown } = useOpenDropdown();+ const { openRecordContextMenu } = useOpenRecordContextMenu();const { openRecordFromIndexView } = useOpenRecordFromIndexView();const { activateBoardCard } = useActiveRecordBoardCard(recordBoardId);@@ -126,19 +111,7 @@ export const RecordBoardCard = () => {} = useDisableDragSelectOnPointerDown();const handleContextMenuOpen = (event: React.MouseEvent) => {- event.preventDefault();- setIsRecordSelected(true);- setRecordIndexCommandMenuDropdownPosition({- x: event.clientX,- y: event.clientY,- });- openDropdown({- dropdownComponentInstanceIdFromProps: commandMenuDropdownId,- globalHotkeysConfig: {- enableGlobalHotkeysWithModifiers: true,- enableGlobalHotkeysConflictingWithKeyboard: false,- },- });+ openRecordContextMenu({ event, recordId });};const handleCardClick = () => {diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCard.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCard.tsxindex 9056794f69a..f04f3f7b952 100644--- a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCard.tsx+++ b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCard.tsx@@ -1,6 +1,4 @@-import { recordIndexCommandMenuDropdownPositionComponentState } from '@/command-menu-item/states/recordIndexCommandMenuDropdownPositionComponentState';-import { getCommandMenuDropdownIdFromCommandMenuId } from '@/command-menu-item/utils/getCommandMenuDropdownIdFromCommandMenuId';-import { getCommandMenuIdFromRecordIndexId } from '@/command-menu-item/utils/getCommandMenuIdFromRecordIndexId';+import { useOpenCommandMenuDropdownAtCursor } from '@/command-menu-item/hooks/useOpenCommandMenuDropdownAtCursor';import { RecordCalendarCardCellEditModePortal } from '@/object-record/record-calendar/record-calendar-card/anchored-portal/components/RecordCalendarCardCellEditModePortal';import { RecordCalendarCardCellHoveredPortal } from '@/object-record/record-calendar/record-calendar-card/anchored-portal/components/RecordCalendarCardCellHoveredPortal';import { RecordCalendarCardBody } from '@/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardBody';@@ -8,7 +6,6 @@ import { RecordCalendarCardHeader } from '@/object-record/record-calendar/recordimport { RECORD_CALENDAR_CARD_CLICK_OUTSIDE_ID } from '@/object-record/record-calendar/record-calendar-card/constants/RecordCalendarCardClickOutsideId';import { RecordCalendarCardComponentInstanceContext } from '@/object-record/record-calendar/record-calendar-card/states/contexts/RecordCalendarCardComponentInstanceContext';import { isRecordCalendarCardSelectedComponentFamilyState } from '@/object-record/record-calendar/record-calendar-card/states/isRecordCalendarCardSelectedComponentFamilyState';-import { RecordCalendarComponentInstanceContext } from '@/object-record/record-calendar/states/contexts/RecordCalendarComponentInstanceContext';import { RecordCard } from '@/object-record/record-card/components/RecordCard';import { RecordDragMultiDragStack } from '@/object-record/record-drag/components/RecordDragMultiDragStack';import { isDraggingRecordComponentState } from '@/object-record/record-drag/states/isDraggingRecordComponentState';@@ -16,12 +13,9 @@ import { isRecordIdPrimaryDragMultipleComponentFamilyState } from '@/object-recoimport { isRecordIdSecondaryDragMultipleComponentFamilyState } from '@/object-record/record-drag/states/isRecordIdSecondaryDragMultipleComponentFamilyState';import { primaryDraggedRecordIdComponentState } from '@/object-record/record-drag/states/primaryDraggedRecordIdComponentState';import { useOpenRecordFromIndexView } from '@/object-record/record-index/hooks/useOpenRecordFromIndexView';-import { useOpenDropdown } from '@/ui/layout/dropdown/hooks/useOpenDropdown';-import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';import { useAtomComponentFamilyState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyState';import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';import { useGetCurrentViewOnly } from '@/views/hooks/useGetCurrentViewOnly';import { styled } from '@linaria/react';import { Collapsible } from 'twenty-ui/primitives/layout';@@ -89,21 +83,8 @@ export const RecordCalendarCard = ({recordId,);- const recordCalendarId = useAvailableComponentInstanceIdOrThrow(- RecordCalendarComponentInstanceContext,- );-- const commandMenuId = getCommandMenuIdFromRecordIndexId(recordCalendarId);-- const commandMenuDropdownId =- getCommandMenuDropdownIdFromCommandMenuId(commandMenuId);-- const setRecordIndexCommandMenuDropdownPosition = useSetAtomComponentState(- recordIndexCommandMenuDropdownPositionComponentState,- commandMenuDropdownId,- );-- const { openDropdown } = useOpenDropdown();+ const { isCommandMenuAvailable, openCommandMenuDropdownAtCursor } =+ useOpenCommandMenuDropdownAtCursor();const handleCardClick = () => {if (isDraggingRecord) {@@ -114,19 +95,12 @@ export const RecordCalendarCard = ({};const handleContextMenuOpen = (event: React.MouseEvent) => {- event.preventDefault();+ if (!isCommandMenuAvailable) {+ return;+ }++ openCommandMenuDropdownAtCursor(event);setIsRecordCalendarCardSelected(true);- setRecordIndexCommandMenuDropdownPosition({- x: event.clientX,- y: event.clientY,- });- openDropdown({- dropdownComponentInstanceIdFromProps: commandMenuDropdownId,- globalHotkeysConfig: {- enableGlobalHotkeysWithModifiers: true,- enableGlobalHotkeysConflictingWithKeyboard: false,- },- });};return (diff --git a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListRow.tsx b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListRow.tsxindex 375a468c201..e266224253d 100644--- a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListRow.tsx+++ b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListRow.tsx@@ -10,6 +10,7 @@ import { RECORD_LIST_ROW_OVERFLOW_CHIP_SLOT_WIDTH } from '@/object-record/recordimport { useRecordListContextOrThrow } from '@/object-record/record-list/contexts/RecordListContext';import { recordListRowWidthComponentState } from '@/object-record/record-list/states/recordListRowWidthComponentState';import { computeRecordListDisplayedFields } from '@/object-record/record-list/utils/computeRecordListDisplayedFields';+import { useOpenRecordContextMenu } from '@/object-record/record-selection/hooks/useOpenRecordContextMenu';import { useResetRecordSelection } from '@/object-record/record-selection/hooks/useResetRecordSelection';import { useToggleRecordSelection } from '@/object-record/record-selection/hooks/useToggleRecordSelection';import { isRecordSelectedComponentFamilyState } from '@/object-record/record-selection/states/isRecordSelectedComponentFamilyState';@@ -104,6 +105,7 @@ export const RecordListRow = ({ recordId, rowRef }: RecordListRowProps) => {);const { toggleRecordSelection } = useToggleRecordSelection();const { resetRecordSelection } = useResetRecordSelection();+ const { openRecordContextMenu } = useOpenRecordContextMenu();if (!isDefined(recordStore)) {return null;@@ -184,6 +186,7 @@ export const RecordListRow = ({ recordId, rowRef }: RecordListRowProps) => {}}}onClick={openRecord}+ onContextMenu={(event) => openRecordContextMenu({ event, recordId })}onKeyDown={(event) => {if (event.target !== event.currentTarget) {return;diff --git a/packages/twenty-front/src/modules/object-record/record-selection/hooks/__tests__/useOpenRecordContextMenu.test.tsx b/packages/twenty-front/src/modules/object-record/record-selection/hooks/__tests__/useOpenRecordContextMenu.test.tsxnew file mode 100644index 00000000000..9742c2eca81--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-selection/hooks/__tests__/useOpenRecordContextMenu.test.tsx@@ -0,0 +1,83 @@+import { act, renderHook } from '@testing-library/react';+import { Provider as JotaiProvider } from 'jotai';+import { type ReactNode } from 'react';++import { getCommandMenuDropdownIdFromCommandMenuId } from '@/command-menu-item/utils/getCommandMenuDropdownIdFromCommandMenuId';+import { CommandMenuComponentInstanceContext } from '@/command-menu/states/contexts/CommandMenuComponentInstanceContext';+import { useOpenRecordContextMenu } from '@/object-record/record-selection/hooks/useOpenRecordContextMenu';+import { RecordSelectionComponentInstanceContext } from '@/object-record/record-selection/states/contexts/RecordSelectionComponentInstanceContext';+import { isRecordSelectedComponentFamilyState } from '@/object-record/record-selection/states/isRecordSelectedComponentFamilyState';+import {+ jotaiStore,+ resetJotaiStore,+} from '@/ui/utilities/state/jotai/jotaiStore';++const instanceId = 'record-index-id';+const commandMenuInstanceId = 'command-menu-id';+const recordId = 'record-1';++const isRecordSelectedAtom = isRecordSelectedComponentFamilyState.atomFamily({+ instanceId,+ familyKey: recordId,+});++const mockOpenDropdown = jest.fn();+// Closing the side panel in layout customization mode resets the selection+const mockCloseSidePanelMenu = jest.fn(() =>+ jotaiStore.set(isRecordSelectedAtom, false),+);++jest.mock('@/ui/layout/dropdown/hooks/useOpenDropdown', () => ({+ useOpenDropdown: () => ({ openDropdown: mockOpenDropdown }),+}));++jest.mock('@/side-panel/hooks/useSidePanelMenu', () => ({+ useSidePanelMenu: () => ({ closeSidePanelMenu: mockCloseSidePanelMenu }),+}));++jest.mock('@/ui/layout/hooks/useWorkspaceSurface', () => ({+ useWorkspaceSurface: () => ({ type: 'main' }),+}));++const Wrapper = ({ children }: { children: ReactNode }) => (+ <JotaiProvider store={jotaiStore}>+ <RecordSelectionComponentInstanceContext.Provider value={{ instanceId }}>+ <CommandMenuComponentInstanceContext.Provider+ value={{ instanceId: commandMenuInstanceId }}+ >+ {children}+ </CommandMenuComponentInstanceContext.Provider>+ </RecordSelectionComponentInstanceContext.Provider>+ </JotaiProvider>+);++describe('useOpenRecordContextMenu', () => {+ beforeEach(() => {+ resetJotaiStore();+ jest.clearAllMocks();+ });++ it('should keep the right-clicked record selected once the side panel has closed', () => {+ const { result } = renderHook(() => useOpenRecordContextMenu(), {+ wrapper: Wrapper,+ });+ const preventDefault = jest.fn();++ act(() => {+ result.current.openRecordContextMenu({+ event: { preventDefault, clientX: 10, clientY: 20 },+ recordId,+ });+ });++ expect(preventDefault).toHaveBeenCalled();+ expect(mockCloseSidePanelMenu).toHaveBeenCalled();+ expect(jotaiStore.get(isRecordSelectedAtom)).toBe(true);+ expect(mockOpenDropdown).toHaveBeenCalledWith(+ expect.objectContaining({+ dropdownComponentInstanceIdFromProps:+ getCommandMenuDropdownIdFromCommandMenuId(commandMenuInstanceId),+ }),+ );+ });+});diff --git a/packages/twenty-front/src/modules/object-record/record-selection/hooks/useOpenRecordContextMenu.ts b/packages/twenty-front/src/modules/object-record/record-selection/hooks/useOpenRecordContextMenu.tsnew file mode 100644index 00000000000..0fecc85be6c--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-selection/hooks/useOpenRecordContextMenu.ts@@ -0,0 +1,48 @@+import { useStore } from 'jotai';+import { useCallback } from 'react';++import {+ type CommandMenuDropdownTriggerEvent,+ useOpenCommandMenuDropdownAtCursor,+} from '@/command-menu-item/hooks/useOpenCommandMenuDropdownAtCursor';+import { isRecordSelectedComponentFamilyState } from '@/object-record/record-selection/states/isRecordSelectedComponentFamilyState';+import { useAtomComponentFamilyStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateCallbackState';++export const useOpenRecordContextMenu = () => {+ const store = useStore();++ const isRecordSelectedFamilyState = useAtomComponentFamilyStateCallbackState(+ isRecordSelectedComponentFamilyState,+ );++ const { isCommandMenuAvailable, openCommandMenuDropdownAtCursor } =+ useOpenCommandMenuDropdownAtCursor();++ const openRecordContextMenu = useCallback(+ ({+ event,+ recordId,+ }: {+ event: CommandMenuDropdownTriggerEvent;+ recordId: string;+ }) => {+ if (!isCommandMenuAvailable) {+ return;+ }++ // Opening the menu can close the side panel, which resets the selection+ // in layout customization mode+ openCommandMenuDropdownAtCursor(event);++ store.set(isRecordSelectedFamilyState(recordId), true);+ },+ [+ isCommandMenuAvailable,+ isRecordSelectedFamilyState,+ openCommandMenuDropdownAtCursor,+ store,+ ],+ );++ return { openRecordContextMenu };+};diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableNoRecordGroupBodyContextProvider.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableNoRecordGroupBodyContextProvider.tsxindex 2db4117696c..bb461d4f66f 100644--- a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableNoRecordGroupBodyContextProvider.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableNoRecordGroupBodyContextProvider.tsx@@ -5,7 +5,7 @@ import { useRecordTableMoveFocusedCell } from '@/object-record/record-table/hookimport { useCloseRecordTableCellNoGroup } from '@/object-record/record-table/record-table-cell/hooks/internal/useCloseRecordTableCellNoGroup';import { useMoveHoverToCurrentCell } from '@/object-record/record-table/record-table-cell/hooks/useMoveHoverToCurrentCell';import { useOpenRecordTableCell } from '@/object-record/record-table/record-table-cell/hooks/useOpenRecordTableCell';-import { useTriggerCommandMenuDropdown } from '@/object-record/record-table/record-table-cell/hooks/useTriggerCommandMenuDropdown';+import { useOpenRecordContextMenu } from '@/object-record/record-selection/hooks/useOpenRecordContextMenu';import { hasUserSelectedAllRecordsComponentState } from '@/object-record/record-selection/states/hasUserSelectedAllRecordsComponentState';import { type MoveFocusDirection } from '@/object-record/record-table/types/MoveFocusDirection';import { type TableCellPosition } from '@/object-record/record-table/types/TableCellPosition';@@ -45,15 +45,13 @@ export const RecordTableNoRecordGroupBodyContextProvider = ({moveHoverToCurrentCell(cellPosition);};- const { triggerCommandMenuDropdown } = useTriggerCommandMenuDropdown({- recordTableId,- });+ const { openRecordContextMenu } = useOpenRecordContextMenu();const handleCommandMenuDropdown = (event: React.MouseEvent,recordId: string,) => {- triggerCommandMenuDropdown(event, recordId);+ openRecordContextMenu({ event, recordId });};const hasUserSelectedAllRecords = useAtomComponentStateValue(diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableRecordGroupBodyContextProvider.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableRecordGroupBodyContextProvider.tsxindex 522060b4f76..c54234a023d 100644--- a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableRecordGroupBodyContextProvider.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableRecordGroupBodyContextProvider.tsx@@ -5,7 +5,7 @@ import { useRecordTableMoveFocusedCell } from '@/object-record/record-table/hookimport { useCloseRecordTableCellInGroup } from '@/object-record/record-table/record-table-cell/hooks/internal/useCloseRecordTableCellInGroup';import { useMoveHoverToCurrentCell } from '@/object-record/record-table/record-table-cell/hooks/useMoveHoverToCurrentCell';import { useOpenRecordTableCell } from '@/object-record/record-table/record-table-cell/hooks/useOpenRecordTableCell';-import { useTriggerCommandMenuDropdown } from '@/object-record/record-table/record-table-cell/hooks/useTriggerCommandMenuDropdown';+import { useOpenRecordContextMenu } from '@/object-record/record-selection/hooks/useOpenRecordContextMenu';import { type MoveFocusDirection } from '@/object-record/record-table/types/MoveFocusDirection';import { type TableCellPosition } from '@/object-record/record-table/types/TableCellPosition';import { type ReactNode } from 'react';@@ -43,15 +43,13 @@ export const RecordTableRecordGroupBodyContextProvider = ({moveHoverToCurrentCell(cellPosition);};- const { triggerCommandMenuDropdown } = useTriggerCommandMenuDropdown({- recordTableId,- });+ const { openRecordContextMenu } = useOpenRecordContextMenu();const handleCommandMenuDropdown = (event: React.MouseEvent,recordId: string,) => {- triggerCommandMenuDropdown(event, recordId);+ openRecordContextMenu({ event, recordId });};return (diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useTriggerCommandMenuDropdown.ts b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useTriggerCommandMenuDropdown.tsdeleted file mode 100644index ec4e4b1ce91..00000000000--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useTriggerCommandMenuDropdown.ts+++ /dev/null@@ -1,79 +0,0 @@-import { useCallback } from 'react';-import { useStore } from 'jotai';--import { CommandMenuComponentInstanceContext } from '@/command-menu/states/contexts/CommandMenuComponentInstanceContext';-import { recordIndexCommandMenuDropdownPositionComponentState } from '@/command-menu-item/states/recordIndexCommandMenuDropdownPositionComponentState';-import { getCommandMenuDropdownIdFromCommandMenuId } from '@/command-menu-item/utils/getCommandMenuDropdownIdFromCommandMenuId';-import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';-import { isRecordSelectedComponentFamilyState } from '@/object-record/record-selection/states/isRecordSelectedComponentFamilyState';-import { useOpenDropdown } from '@/ui/layout/dropdown/hooks/useOpenDropdown';-import { useWorkspaceSurface } from '@/ui/layout/hooks/useWorkspaceSurface';-import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';-import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';-import { useAtomComponentFamilyStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateCallbackState';--export const useTriggerCommandMenuDropdown = ({- recordTableId,-}: {- recordTableId: string;-}) => {- const commandMenuInstanceId = useAvailableComponentInstanceIdOrThrow(- CommandMenuComponentInstanceContext,- );-- const isRowSelectedFamilyState = useAtomComponentFamilyStateCallbackState(- isRecordSelectedComponentFamilyState,- recordTableId,- );-- const commandMenuDropdownId = getCommandMenuDropdownIdFromCommandMenuId(- commandMenuInstanceId,- );-- const recordIndexCommandMenuDropdownPositionCallbackState =- useAtomComponentStateCallbackState(- recordIndexCommandMenuDropdownPositionComponentState,- commandMenuDropdownId,- );-- const { openDropdown } = useOpenDropdown();- const { closeSidePanelMenu } = useSidePanelMenu();- const workspaceSurface = useWorkspaceSurface();- const store = useStore();-- const triggerCommandMenuDropdown = useCallback(- (event: React.MouseEvent, recordId: string) => {- event.preventDefault();-- store.set(recordIndexCommandMenuDropdownPositionCallbackState, {- x: event.clientX,- y: event.clientY,- });-- const isRowSelected = store.get(isRowSelectedFamilyState(recordId));-- if (isRowSelected !== true) {- store.set(isRowSelectedFamilyState(recordId), true);- }-- if (workspaceSurface.type === 'main') {- closeSidePanelMenu();- }-- openDropdown({- dropdownComponentInstanceIdFromProps: commandMenuDropdownId,- });- },- [- recordIndexCommandMenuDropdownPositionCallbackState,- isRowSelectedFamilyState,- closeSidePanelMenu,- openDropdown,- commandMenuDropdownId,- store,- workspaceSurface.type,- ],- );-- return { triggerCommandMenuDropdown };-};diff --git a/packages/twenty-front/src/pages/ai-chat/AiChatInboxPage.tsx b/packages/twenty-front/src/pages/ai-chat/AiChatInboxPage.tsxindex dfa319ee97d..e4fa4294684 100644--- a/packages/twenty-front/src/pages/ai-chat/AiChatInboxPage.tsx+++ b/packages/twenty-front/src/pages/ai-chat/AiChatInboxPage.tsx@@ -13,11 +13,11 @@ import { useIsMobile } from 'twenty-ui/utilities';import { SkeletonLoader } from '@/activities/components/SkeletonLoader';import { AgentChatThreadsFetchMoreTrigger } from '@/ai/components/AgentChatThreadsFetchMoreTrigger';import { AiChatInboxSelectionEffect } from '@/ai/components/AiChatInboxSelectionEffect';+import { AiChatInboxCommandMenuScope } from '@/ai/components/AiChatInboxCommandMenuScope';import { AiChatInboxSelectionPane } from '@/ai/components/AiChatInboxSelectionPane';-import { AiChatThreadList } from '@/ai/components/AiChatThreadList';+import { AiChatInboxThreadList } from '@/ai/components/AiChatInboxThreadList';import { AGENT_CHAT_THREAD_FILTER_STATUS_ICONS } from '@/ai/constants/AgentChatThreadFilterStatusIcons';import { AGENT_CHAT_THREAD_FILTER_STATUS_LABELS } from '@/ai/constants/AgentChatThreadFilterStatusLabels';-import { AI_CHAT_THREAD_ACTIONS_SURFACE } from '@/ai/constants/AiChatThreadActionsSurface';import { useChatThreads } from '@/ai/hooks/useChatThreads';import { useSwitchToNewAiChat } from '@/ai/hooks/useSwitchToNewAiChat';import { agentChatThreadFilterStatusState } from '@/ai/states/agentChatThreadFilterStatusState';@@ -145,69 +145,70 @@ const AiChatInboxPageContent = () => {threads={threads}/>)}- {isListShown && (- <StyledListPane $isFullWidth={isMobile}>- <PageCardLayout- showInformationBanner={isMobile}- header={- <PageCardHeader- icon={<FilterStatusIcon size={theme.icon.size.md} />}- title={t(- AGENT_CHAT_THREAD_FILTER_STATUS_LABELS[- agentChatThreadFilterStatus- ],- )}- actionButton={- <Button- size="sm"- variant="solid"- color="accent"- startIcon={<IconPlus />}- onClick={switchToNewChat}- >- {t`New chat`}- </Button>- }- />- }- >- <StyledThreadListContainer ref={threadListContainerRef}>- <StyledThreadList>- {loading && threads.length === 0 ? (- <SkeletonLoader />- ) : threads.length === 0 ? (- <EmptyState.Root>- <AnimatedPlaceholder type="emptyInbox" />- <EmptyState.Content>- <EmptyState.Title>{t`No conversations`}</EmptyState.Title>- <EmptyState.Description>- {t`Conversations you can open will appear here.`}- </EmptyState.Description>- </EmptyState.Content>- </EmptyState.Root>- ) : (- <AiChatThreadList- threads={threads}- surface={AI_CHAT_THREAD_ACTIONS_SURFACE.INBOX_PAGE}- selectedThreadIds={highlightedThreadIds}- onThreadClick={handleThreadClick}+ <AiChatInboxCommandMenuScope>+ {isListShown && (+ <StyledListPane $isFullWidth={isMobile}>+ <PageCardLayout+ showInformationBanner={isMobile}+ header={+ <PageCardHeader+ icon={<FilterStatusIcon size={theme.icon.size.md} />}+ title={t(+ AGENT_CHAT_THREAD_FILTER_STATUS_LABELS[+ agentChatThreadFilterStatus+ ],+ )}+ actionButton={+ <Button+ size="sm"+ variant="solid"+ color="accent"+ startIcon={<IconPlus />}+ onClick={switchToNewChat}+ >+ {t`New chat`}+ </Button>+ }+ />+ }+ >+ <StyledThreadListContainer ref={threadListContainerRef}>+ <StyledThreadList>+ {loading && threads.length === 0 ? (+ <SkeletonLoader />+ ) : threads.length === 0 ? (+ <EmptyState.Root>+ <AnimatedPlaceholder type="emptyInbox" />+ <EmptyState.Content>+ <EmptyState.Title>{t`No conversations`}</EmptyState.Title>+ <EmptyState.Description>+ {t`Conversations you can open will appear here.`}+ </EmptyState.Description>+ </EmptyState.Content>+ </EmptyState.Root>+ ) : (+ <AiChatInboxThreadList+ threads={threads}+ selectedThreadIds={highlightedThreadIds}+ onThreadClick={handleThreadClick}+ />+ )}+ <AgentChatThreadsFetchMoreTrigger />+ </StyledThreadList>+ {!isMobile && (+ <RecordSelectionDragSelect+ selectableItemsContainerRef={threadListContainerRef}/>)}- <AgentChatThreadsFetchMoreTrigger />- </StyledThreadList>- {!isMobile && (- <RecordSelectionDragSelect- selectableItemsContainerRef={threadListContainerRef}- />- )}- </StyledThreadListContainer>- </PageCardLayout>- </StyledListPane>- )}+ </StyledThreadListContainer>+ </PageCardLayout>+ </StyledListPane>+ )}+ {isThreadShown && isSelectionShown && <AiChatInboxSelectionPane />}+ </AiChatInboxCommandMenuScope>{isThreadShown &&- (isSelectionShown ? (- <AiChatInboxSelectionPane />- ) : isDefined(selectedThreadId) ? (+ !isSelectionShown &&+ (isDefined(selectedThreadId) ? (<><AiChatPageEffects /><AiChatThreadPageContentdiff --git a/packages/twenty-front/src/pages/ai-chat/__tests__/AiChatInboxPage.test.tsx b/packages/twenty-front/src/pages/ai-chat/__tests__/AiChatInboxPage.test.tsxindex 7e90f4ca040..70192d31eb1 100644--- a/packages/twenty-front/src/pages/ai-chat/__tests__/AiChatInboxPage.test.tsx+++ b/packages/twenty-front/src/pages/ai-chat/__tests__/AiChatInboxPage.test.tsx@@ -7,12 +7,14 @@ import { MemoryRouter, Route, Routes } from 'react-router-dom';import { AppPath } from 'twenty-shared/types';import { SOURCE_LOCALE } from 'twenty-shared/translations';+import { getCommandMenuDropdownIdFromCommandMenuId } from '@/command-menu-item/utils/getCommandMenuDropdownIdFromCommandMenuId';import { CommandMenuComponentInstanceContext } from '@/command-menu/states/contexts/CommandMenuComponentInstanceContext';import { contextStoreTargetedRecordsRuleComponentState } from '@/context-store/states/contextStoreTargetedRecordsRuleComponentState';import { ContextStoreComponentInstanceContext } from '@/context-store/states/contexts/ContextStoreComponentInstanceContext';import { AI_CHAT_INBOX_INSTANCE_ID } from '@/ai/constants/AiChatInboxInstanceId';import { type AgentChatThreadRecord } from '@/ai/types/AgentChatThreadRecord';import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';+import { isDropdownOpenComponentState } from '@/ui/layout/dropdown/states/isDropdownOpenComponentState';import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';import {resetJotaiStore,@@ -58,6 +60,7 @@ jest.mock('@/ai/components/AiChatThreadList', () => ({threads,selectedThreadIds,onThreadClick,+ onThreadContextMenu,}: {threads: AgentChatThreadRecord[];selectedThreadIds: string[];@@ -65,12 +68,17 @@ jest.mock('@/ai/components/AiChatThreadList', () => ({thread: AgentChatThreadRecord,event: React.MouseEvent<HTMLButtonElement>,) => void;+ onThreadContextMenu?: (+ thread: AgentChatThreadRecord,+ event: React.MouseEvent<HTMLButtonElement>,+ ) => void;}) =>threads.map((thread) => (<buttonkey={thread.id}aria-pressed={selectedThreadIds.includes(thread.id)}onClick={(event) => onThreadClick(thread, event)}+ onContextMenu={(event) => onThreadContextMenu?.(thread, event)}>{thread.title}</button>@@ -173,6 +181,34 @@ describe('AiChatInboxPage', () => {expect(isRowHighlighted('Third chat')).toBe(true);});+ it('opens the command menu on the right-clicked chats', () => {+ renderInbox();++ fireEvent.contextMenu(screen.getByRole('button', { name: 'Second chat' }));+ fireEvent.contextMenu(screen.getByRole('button', { name: 'Third chat' }));++ expect(screen.getByText('2 chats selected')).toBeInTheDocument();+ expect(+ jotaiStore.get(+ contextStoreTargetedRecordsRuleComponentState.atomFamily({+ instanceId: AI_CHAT_INBOX_INSTANCE_ID,+ }),+ ),+ ).toEqual({+ mode: 'selection',+ selectedRecordIds: [secondThread.id, thirdThread.id],+ });+ expect(+ jotaiStore.get(+ isDropdownOpenComponentState.atomFamily({+ instanceId: getCommandMenuDropdownIdFromCommandMenuId(+ AI_CHAT_INBOX_INSTANCE_ID,+ ),+ }),+ ),+ ).toBe(true);+ });+it('selects every chat from the one on screen with shift+click', () => {renderInbox();