Skip to content

πŸ™Œ OpenHands: AI-Driven Development

refactor: split filter-menu primitives into their own files (#1360)

Hiep Leae997c14f84e
diff --git a/__tests__/components/features/conversation-panel/conversation-panel-filter-menu.test.tsx b/__tests__/components/features/conversation-panel/conversation-panel-filter-menu.test.tsx
new file mode 100644
index 0000000000..ff71dd9523
--- /dev/null
+++ b/__tests__/components/features/conversation-panel/conversation-panel-filter-menu.test.tsx
@@ -0,0 +1,79 @@
+import { createRef } from "react";
+import { render, screen } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { describe, it, expect, vi } from "vitest";
+
+import {
+ ConversationPanelFilterMenu,
+ type ConversationPanelFilterMenuProps,
+} from "#/components/features/conversation-panel/conversation-panel-filter-menu";
+
+// ConversationPanelFilterMenu composes the extracted MenuHeading / MenuRow /
+// MenuSeparator components. Rendering it open exercises all three through
+// their real consumer, so these tests double as the regression guard for the
+// extraction.
+function renderFilterMenu(
+ overrides: Partial<ConversationPanelFilterMenuProps> = {},
+) {
+ const props: ConversationPanelFilterMenuProps = {
+ filterMenuOpen: true,
+ setFilterMenuOpen: vi.fn(),
+ menuRef: createRef<HTMLDivElement>(),
+ backendKind: "local",
+ organizeMode: "grouped",
+ setOrganizeMode: vi.fn(),
+ conversationSort: "created",
+ setConversationSort: vi.fn(),
+ threadScope: "all",
+ setThreadScope: vi.fn(),
+ showOlderConversations: false,
+ toggleShowOlderConversations: vi.fn(),
+ showRepoBranchMetadata: false,
+ toggleShowRepoBranchMetadata: vi.fn(),
+ showLlmProfiles: false,
+ toggleShowLlmProfiles: vi.fn(),
+ totalConversationsCount: 5,
+ onRequestDeleteAll: vi.fn(),
+ ...overrides,
+ };
+ render(<ConversationPanelFilterMenu {...props} />);
+ return props;
+}
+
+describe("ConversationPanelFilterMenu", () => {
+ it("renders the section headings and rows while open", () => {
+ // Arrange + Act
+ renderFilterMenu({ filterMenuOpen: true });
+
+ // Assert: a MenuHeading and representative MenuRows are present.
+ expect(
+ screen.getByTestId("older-conversations-filter-menu"),
+ ).toBeInTheDocument();
+ expect(screen.getByText("CONVERSATION_PANEL$ORGANIZE")).toBeInTheDocument();
+ expect(
+ screen.getByTestId("toggle-older-conversations"),
+ ).toBeInTheDocument();
+ expect(screen.getByTestId("delete-all-conversations")).toBeInTheDocument();
+ });
+
+ it("runs a row's action and closes the menu when the row is clicked", async () => {
+ // Arrange
+ const user = userEvent.setup();
+ const props = renderFilterMenu({ filterMenuOpen: true });
+
+ // Act
+ await user.click(screen.getByTestId("toggle-llm-profiles"));
+
+ // Assert
+ expect(props.toggleShowLlmProfiles).toHaveBeenCalledTimes(1);
+ expect(props.setFilterMenuOpen).toHaveBeenCalledWith(false);
+ });
+
+ it("disables the delete-all row when there are no conversations", () => {
+ // Arrange + Act
+ renderFilterMenu({ filterMenuOpen: true, totalConversationsCount: 0 });
+
+ // Assert
+ expect(screen.getByTestId("delete-all-conversations")).toBeDisabled();
+ });
+});
diff --git a/src/components/features/conversation-panel/conversation-panel-filter-menu.tsx b/src/components/features/conversation-panel/conversation-panel-filter-menu.tsx
index 8e8ac32d38..7d45a89789 100644
--- a/src/components/features/conversation-panel/conversation-panel-filter-menu.tsx
+++ b/src/components/features/conversation-panel/conversation-panel-filter-menu.tsx
@@ -3,7 +3,6 @@ import { useTranslation } from "react-i18next";
import {
Bot,
CalendarArrowDown,
- Check,
Clock3,
ClockArrowDown,
Eye,
@@ -17,11 +16,8 @@ import {
} from "lucide-react";
import { I18nKey } from "#/i18n/declaration";
import type { BackendKind } from "#/api/backend-registry/types";
-import { Divider } from "#/ui/divider";
import { cn } from "#/utils/utils";
import {
- dropdownMenuRowClassName,
- dropdownMenuRowIconClassName,
dropdownInstantColorClassName,
dropdownMenuListClassName,
dropdownMenuViewportScrollClassName,
@@ -31,108 +27,13 @@ import type {
OrganizeMode,
ThreadScope,
} from "./conversation-panel-list-helpers";
+import { MenuHeading } from "./menu-heading";
+import { MenuSeparator } from "./menu-separator";
+import { MenuRow } from "./menu-row";
const capitalizeLabel = (label: string) =>
label.length > 0 ? label.charAt(0).toUpperCase() + label.slice(1) : label;
-const MENU_SECTION_HEADING_PADDING = "px-2 pb-1 pt-1";
-const MENU_SECTION_HEADING_TEXT =
- "text-[11px] font-semibold uppercase tracking-wide text-[var(--oh-muted)]";
-
-function MenuHeading({
- children,
- suffix,
-}: {
- children: React.ReactNode;
- suffix?: React.ReactNode;
-}) {
- if (suffix != null) {
- return (
- <div
- role="presentation"
- className={cn(
- "flex items-baseline justify-between gap-2",
- MENU_SECTION_HEADING_PADDING,
- )}
- >
- <span
- className={cn(
- "min-w-0 truncate text-left",
- MENU_SECTION_HEADING_TEXT,
- )}
- >
- {children}
- </span>
- {suffix}
- </div>
- );
- }
-
- return (
- <div
- role="presentation"
- className={cn(MENU_SECTION_HEADING_PADDING, MENU_SECTION_HEADING_TEXT)}
- >
- {children}
- </div>
- );
-}
-
-function MenuSeparator() {
- return <Divider inset="menu" />;
-}
-
-function MenuRow({
- icon: Icon,
- label,
- selected,
- onClick,
- testId,
- disabled,
-}: {
- icon: React.ComponentType<{ className?: string; "aria-hidden"?: boolean }>;
- label: string;
- selected?: boolean;
- onClick: () => void;
- testId?: string;
- disabled?: boolean;
-}) {
- // Rows that show a selection checkmark are toggleable preferences, so
- // they get `role="menuitemradio"` when they're part of a selectable
- // group and `role="menuitemcheckbox"` when they're a standalone toggle.
- // For simplicity we use `menuitemradio` whenever `selected` is provided
- // (every selectable row in this menu is part of a mutually exclusive
- // group in practice) and fall back to plain `menuitem` otherwise.
- const role = selected === undefined ? "menuitem" : "menuitemradio";
- return (
- <button
- type="button"
- role={role}
- aria-checked={selected === undefined ? undefined : Boolean(selected)}
- data-testid={testId}
- disabled={disabled}
- onClick={onClick}
- className={cn(
- "group",
- dropdownMenuRowClassName,
- "text-[var(--oh-foreground)] disabled:opacity-50",
- )}
- >
- <Icon
- className={cn("h-3.5 w-3.5", dropdownMenuRowIconClassName)}
- aria-hidden
- />
- <span className="min-w-0 flex-1 truncate">{label}</span>
- {selected ? (
- <Check
- className="ml-auto h-3.5 w-3.5 shrink-0 text-white"
- aria-hidden
- />
- ) : null}
- </button>
- );
-}
-
export interface ConversationPanelFilterMenuProps {
filterMenuOpen: boolean;
setFilterMenuOpen: (open: boolean) => void;
diff --git a/src/components/features/conversation-panel/menu-heading.tsx b/src/components/features/conversation-panel/menu-heading.tsx
new file mode 100644
index 0000000000..31d067da33
--- /dev/null
+++ b/src/components/features/conversation-panel/menu-heading.tsx
@@ -0,0 +1,45 @@
+import React from "react";
+import { cn } from "#/utils/utils";
+
+const MENU_SECTION_HEADING_PADDING = "px-2 pb-1 pt-1";
+const MENU_SECTION_HEADING_TEXT =
+ "text-[11px] font-semibold uppercase tracking-wide text-[var(--oh-muted)]";
+
+export function MenuHeading({
+ children,
+ suffix,
+}: {
+ children: React.ReactNode;
+ suffix?: React.ReactNode;
+}) {
+ if (suffix != null) {
+ return (
+ <div
+ role="presentation"
+ className={cn(
+ "flex items-baseline justify-between gap-2",
+ MENU_SECTION_HEADING_PADDING,
+ )}
+ >
+ <span
+ className={cn(
+ "min-w-0 truncate text-left",
+ MENU_SECTION_HEADING_TEXT,
+ )}
+ >
+ {children}
+ </span>
+ {suffix}
+ </div>
+ );
+ }
+
+ return (
+ <div
+ role="presentation"
+ className={cn(MENU_SECTION_HEADING_PADDING, MENU_SECTION_HEADING_TEXT)}
+ >
+ {children}
+ </div>
+ );
+}
diff --git a/src/components/features/conversation-panel/menu-row.tsx b/src/components/features/conversation-panel/menu-row.tsx
new file mode 100644
index 0000000000..fc072354c2
--- /dev/null
+++ b/src/components/features/conversation-panel/menu-row.tsx
@@ -0,0 +1,58 @@
+import React from "react";
+import { Check } from "lucide-react";
+import { cn } from "#/utils/utils";
+import {
+ dropdownMenuRowClassName,
+ dropdownMenuRowIconClassName,
+} from "#/utils/dropdown-classes";
+
+export function MenuRow({
+ icon: Icon,
+ label,
+ selected,
+ onClick,
+ testId,
+ disabled,
+}: {
+ icon: React.ComponentType<{ className?: string; "aria-hidden"?: boolean }>;
+ label: string;
+ selected?: boolean;
+ onClick: () => void;
+ testId?: string;
+ disabled?: boolean;
+}) {
+ // Rows that show a selection checkmark are toggleable preferences, so
+ // they get `role="menuitemradio"` when they're part of a selectable
+ // group and `role="menuitemcheckbox"` when they're a standalone toggle.
+ // For simplicity we use `menuitemradio` whenever `selected` is provided
+ // (every selectable row in this menu is part of a mutually exclusive
+ // group in practice) and fall back to plain `menuitem` otherwise.
+ const role = selected === undefined ? "menuitem" : "menuitemradio";
+ return (
+ <button
+ type="button"
+ role={role}
+ aria-checked={selected === undefined ? undefined : Boolean(selected)}
+ data-testid={testId}
+ disabled={disabled}
+ onClick={onClick}
+ className={cn(
+ "group",
+ dropdownMenuRowClassName,
+ "text-[var(--oh-foreground)] disabled:opacity-50",
+ )}
+ >
+ <Icon
+ className={cn("h-3.5 w-3.5", dropdownMenuRowIconClassName)}
+ aria-hidden
+ />
+ <span className="min-w-0 flex-1 truncate">{label}</span>
+ {selected ? (
+ <Check
+ className="ml-auto h-3.5 w-3.5 shrink-0 text-white"
+ aria-hidden
+ />
+ ) : null}
+ </button>
+ );
+}
diff --git a/src/components/features/conversation-panel/menu-separator.tsx b/src/components/features/conversation-panel/menu-separator.tsx
new file mode 100644
index 0000000000..d073e7c48b
--- /dev/null
+++ b/src/components/features/conversation-panel/menu-separator.tsx
@@ -0,0 +1,5 @@
+import { Divider } from "#/ui/divider";
+
+export function MenuSeparator() {
+ return <Divider inset="menu" />;
+}