π OpenHands: AI-Driven Development
hotfix(frontend): Fix context menu closing (#9822)
sp.wack78306b1ee740
diff --git a/frontend/__tests__/components/features/conversation-panel/conversation-card.test.tsx b/frontend/__tests__/components/features/conversation-panel/conversation-card.test.tsxindex 8ea1b559a5..e27afc1a10 100644--- a/frontend/__tests__/components/features/conversation-panel/conversation-card.test.tsx+++ b/frontend/__tests__/components/features/conversation-panel/conversation-card.test.tsx@@ -16,8 +16,6 @@ import { ConversationCard } from "#/components/features/conversation-panel/conveimport { clickOnEditButton } from "./utils";// We'll use the actual i18next implementation but override the translation function-import { I18nextProvider } from "react-i18next";-import i18n from "i18next";// Mock the t function to return our custom translationsvi.mock("react-i18next", async () => {@@ -124,7 +122,8 @@ describe("ConversationCard", () => {it("should toggle a context menu when clicking the ellipsis button", async () => {const user = userEvent.setup();- renderWithProviders(+ const onContextMenuToggle = vi.fn();+ const { rerender } = renderWithProviders(<ConversationCardonDelete={onDelete}onChangeTitle={onChangeTitle}@@ -132,6 +131,8 @@ describe("ConversationCard", () => {title="Conversation 1"selectedRepository={null}lastUpdatedAt="2021-10-01T12:00:00Z"+ contextMenuOpen={false}+ onContextMenuToggle={onContextMenuToggle}/>,);@@ -140,15 +141,32 @@ describe("ConversationCard", () => {const ellipsisButton = screen.getByTestId("ellipsis-button");await user.click(ellipsisButton);+ expect(onContextMenuToggle).toHaveBeenCalledWith(true);++ // Simulate context menu being opened by parent+ rerender(+ <ConversationCard+ onDelete={onDelete}+ onChangeTitle={onChangeTitle}+ isActive+ title="Conversation 1"+ selectedRepository={null}+ lastUpdatedAt="2021-10-01T12:00:00Z"+ contextMenuOpen+ onContextMenuToggle={onContextMenuToggle}+ />,+ );+screen.getByTestId("context-menu");await user.click(ellipsisButton);- expect(screen.queryByTestId("context-menu")).not.toBeInTheDocument();+ expect(onContextMenuToggle).toHaveBeenCalledWith(false);});it("should call onDelete when the delete button is clicked", async () => {const user = userEvent.setup();+ const onContextMenuToggle = vi.fn();renderWithProviders(<ConversationCardonDelete={onDelete}@@ -157,18 +175,18 @@ describe("ConversationCard", () => {title="Conversation 1"selectedRepository={null}lastUpdatedAt="2021-10-01T12:00:00Z"+ contextMenuOpen+ onContextMenuToggle={onContextMenuToggle}/>,);- const ellipsisButton = screen.getByTestId("ellipsis-button");- await user.click(ellipsisButton);-const menu = screen.getByTestId("context-menu");const deleteButton = within(menu).getByTestId("delete-button");await user.click(deleteButton);expect(onDelete).toHaveBeenCalled();+ expect(onContextMenuToggle).toHaveBeenCalledWith(false);});test("clicking the selectedRepository should not trigger the onClick handler", async () => {@@ -198,7 +216,11 @@ describe("ConversationCard", () => {test("conversation title should call onChangeTitle when changed and blurred", async () => {const user = userEvent.setup();- renderWithProviders(+ let menuOpen = true;+ const onContextMenuToggle = vi.fn((isOpen: boolean) => {+ menuOpen = isOpen;+ });+ const { rerender } = renderWithProviders(<ConversationCardonDelete={onDelete}isActive@@ -206,10 +228,27 @@ describe("ConversationCard", () => {selectedRepository={null}lastUpdatedAt="2021-10-01T12:00:00Z"onChangeTitle={onChangeTitle}+ contextMenuOpen={menuOpen}+ onContextMenuToggle={onContextMenuToggle}/>,);await clickOnEditButton(user);++ // Re-render with updated state+ rerender(+ <ConversationCard+ onDelete={onDelete}+ isActive+ title="Conversation 1"+ selectedRepository={null}+ lastUpdatedAt="2021-10-01T12:00:00Z"+ onChangeTitle={onChangeTitle}+ contextMenuOpen={menuOpen}+ onContextMenuToggle={onContextMenuToggle}+ />,+ );+const title = screen.getByTestId("conversation-card-title");expect(title).toBeEnabled();@@ -227,6 +266,7 @@ describe("ConversationCard", () => {it("should reset title and not call onChangeTitle when the title is empty", async () => {const user = userEvent.setup();+ const onContextMenuToggle = vi.fn();renderWithProviders(<ConversationCardonDelete={onDelete}@@ -235,6 +275,8 @@ describe("ConversationCard", () => {title="Conversation 1"selectedRepository={null}lastUpdatedAt="2021-10-01T12:00:00Z"+ contextMenuOpen+ onContextMenuToggle={onContextMenuToggle}/>,);@@ -271,6 +313,7 @@ describe("ConversationCard", () => {test("clicking the title should not trigger the onClick handler if edit mode", async () => {const user = userEvent.setup();+ const onContextMenuToggle = vi.fn();renderWithProviders(<ConversationCardonDelete={onDelete}@@ -279,6 +322,8 @@ describe("ConversationCard", () => {title="Conversation 1"selectedRepository={null}lastUpdatedAt="2021-10-01T12:00:00Z"+ contextMenuOpen+ onContextMenuToggle={onContextMenuToggle}/>,);@@ -292,6 +337,7 @@ describe("ConversationCard", () => {test("clicking the delete button should not trigger the onClick handler", async () => {const user = userEvent.setup();+ const onContextMenuToggle = vi.fn();renderWithProviders(<ConversationCardonDelete={onDelete}@@ -300,12 +346,11 @@ describe("ConversationCard", () => {title="Conversation 1"selectedRepository={null}lastUpdatedAt="2021-10-01T12:00:00Z"+ contextMenuOpen+ onContextMenuToggle={onContextMenuToggle}/>,);- const ellipsisButton = screen.getByTestId("ellipsis-button");- await user.click(ellipsisButton);-const menu = screen.getByTestId("context-menu");const deleteButton = within(menu).getByTestId("delete-button");@@ -315,7 +360,7 @@ describe("ConversationCard", () => {});it("should show display cost button only when showOptions is true", async () => {- const user = userEvent.setup();+ const onContextMenuToggle = vi.fn();const { rerender } = renderWithProviders(<ConversationCardonDelete={onDelete}@@ -324,21 +369,17 @@ describe("ConversationCard", () => {title="Conversation 1"selectedRepository={null}lastUpdatedAt="2021-10-01T12:00:00Z"+ contextMenuOpen+ onContextMenuToggle={onContextMenuToggle}/>,);- const ellipsisButton = screen.getByTestId("ellipsis-button");- await user.click(ellipsisButton);-// Wait for context menu to appearconst menu = await screen.findByTestId("context-menu");expect(within(menu).queryByTestId("display-cost-button"),).not.toBeInTheDocument();- // Close menu- await user.click(ellipsisButton);-rerender(<ConversationCardonDelete={onDelete}@@ -348,12 +389,11 @@ describe("ConversationCard", () => {title="Conversation 1"selectedRepository={null}lastUpdatedAt="2021-10-01T12:00:00Z"+ contextMenuOpen+ onContextMenuToggle={onContextMenuToggle}/>,);- // Open menu again- await user.click(ellipsisButton);-// Wait for context menu to appear and check for display cost buttonconst newMenu = await screen.findByTestId("context-menu");within(newMenu).getByTestId("display-cost-button");@@ -361,6 +401,7 @@ describe("ConversationCard", () => {it("should show metrics modal when clicking the display cost button", async () => {const user = userEvent.setup();+ const onContextMenuToggle = vi.fn();renderWithProviders(<ConversationCardonDelete={onDelete}@@ -370,12 +411,11 @@ describe("ConversationCard", () => {selectedRepository={null}lastUpdatedAt="2021-10-01T12:00:00Z"showOptions+ contextMenuOpen+ onContextMenuToggle={onContextMenuToggle}/>,);- const ellipsisButton = screen.getByTestId("ellipsis-button");- await user.click(ellipsisButton);-const menu = screen.getByTestId("context-menu");const displayCostButton = within(menu).getByTestId("display-cost-button");@@ -386,7 +426,7 @@ describe("ConversationCard", () => {});it("should not display the edit or delete options if the handler is not provided", async () => {- const user = userEvent.setup();+ const onContextMenuToggle = vi.fn();const { rerender } = renderWithProviders(<ConversationCardonClick={onClick}@@ -394,19 +434,15 @@ describe("ConversationCard", () => {title="Conversation 1"selectedRepository={null}lastUpdatedAt="2021-10-01T12:00:00Z"+ contextMenuOpen+ onContextMenuToggle={onContextMenuToggle}/>,);- const ellipsisButton = screen.getByTestId("ellipsis-button");- await user.click(ellipsisButton);-const menu = await screen.findByTestId("context-menu");expect(within(menu).queryByTestId("edit-button")).toBeInTheDocument();expect(within(menu).queryByTestId("delete-button")).not.toBeInTheDocument();- // toggle to hide the context menu- await user.click(ellipsisButton);-rerender(<ConversationCardonClick={onClick}@@ -414,10 +450,11 @@ describe("ConversationCard", () => {title="Conversation 1"selectedRepository={null}lastUpdatedAt="2021-10-01T12:00:00Z"+ contextMenuOpen+ onContextMenuToggle={onContextMenuToggle}/>,);- await user.click(ellipsisButton);const newMenu = await screen.findByTestId("context-menu");expect(within(newMenu).queryByTestId("edit-button"),diff --git a/frontend/src/components/features/conversation-panel/conversation-card.tsx b/frontend/src/components/features/conversation-panel/conversation-card.tsxindex 4635302c29..59039bda7f 100644--- a/frontend/src/components/features/conversation-panel/conversation-card.tsx+++ b/frontend/src/components/features/conversation-panel/conversation-card.tsx@@ -35,6 +35,8 @@ interface ConversationCardProps {conversationStatus?: ConversationStatus;variant?: "compact" | "default";conversationId?: string; // Optional conversation ID for VS Code URL+ contextMenuOpen?: boolean;+ onContextMenuToggle?: (isOpen: boolean) => void;}const MAX_TIME_BETWEEN_CREATION_AND_UPDATE = 1000 * 60 * 30; // 30 minutes@@ -55,10 +57,11 @@ export function ConversationCard({conversationStatus = "STOPPED",variant = "default",conversationId,+ contextMenuOpen = false,+ onContextMenuToggle,}: ConversationCardProps) {const { t } = useTranslation();const { parsedEvents } = useWsClient();- const [contextMenuVisible, setContextMenuVisible] = React.useState(false);const [titleMode, setTitleMode] = React.useState<"view" | "edit">("view");const [metricsModalVisible, setMetricsModalVisible] = React.useState(false);const [systemModalVisible, setSystemModalVisible] = React.useState(false);@@ -101,21 +104,21 @@ export function ConversationCard({event.preventDefault();event.stopPropagation();onDelete?.();- setContextMenuVisible(false);+ onContextMenuToggle?.(false);};const handleStop = (event: React.MouseEvent<HTMLButtonElement>) => {event.preventDefault();event.stopPropagation();onStop?.();- setContextMenuVisible(false);+ onContextMenuToggle?.(false);};const handleEdit = (event: React.MouseEvent<HTMLButtonElement>) => {event.preventDefault();event.stopPropagation();setTitleMode("edit");- setContextMenuVisible(false);+ onContextMenuToggle?.(false);};const handleDownloadViaVSCode = async (@@ -141,7 +144,7 @@ export function ConversationCard({}}- setContextMenuVisible(false);+ onContextMenuToggle?.(false);};const handleDisplayCost = (event: React.MouseEvent<HTMLButtonElement>) => {@@ -224,15 +227,15 @@ export function ConversationCard({onClick={(event) => {event.preventDefault();event.stopPropagation();- setContextMenuVisible((prev) => !prev);+ onContextMenuToggle?.(!contextMenuOpen);}}/></div>)}<div className="relative">- {contextMenuVisible && (+ {contextMenuOpen && (<ConversationCardContextMenu- onClose={() => setContextMenuVisible(false)}+ onClose={() => onContextMenuToggle?.(false)}onDelete={onDelete && handleDelete}onStop={conversationStatus !== "STOPPED"diff --git a/frontend/src/components/features/conversation-panel/conversation-panel.tsx b/frontend/src/components/features/conversation-panel/conversation-panel.tsxindex 27ab0b59f1..1d9d9fc164 100644--- a/frontend/src/components/features/conversation-panel/conversation-panel.tsx+++ b/frontend/src/components/features/conversation-panel/conversation-panel.tsx@@ -36,6 +36,9 @@ export function ConversationPanel({ onClose }: ConversationPanelProps) {const [selectedConversationId, setSelectedConversationId] = React.useState<string | null>(null);+ const [openContextMenuId, setOpenContextMenuId] = React.useState<+ string | null+ >(null);const { data: conversations, isFetching, error } = useUserConversations();@@ -144,6 +147,10 @@ export function ConversationPanel({ onClose }: ConversationPanelProps) {createdAt={project.created_at}conversationStatus={project.status}conversationId={project.conversation_id}+ contextMenuOpen={openContextMenuId === project.conversation_id}+ onContextMenuToggle={(isOpen) =>+ setOpenContextMenuId(isOpen ? project.conversation_id : null)+ }/>)}</NavLink>