modelcontextprotocol/inspector
Watch
1
0
Fork
You've already forked inspector
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

feat(sort): add SortToggle for Logs, History, and Network (#1371) (#1372)

Browse source 
* feat(sort): add SortToggle for Logs, History, and Network (#1371)

Introduces a reusable SortToggle element and wires it into the Logs,
History, and Network screens so users can flip chronological order.
Selection is persisted per-screen to localStorage under the
inspector.sortDirection.* namespace, with invalid stored values falling
back to the newest-first default.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* fix(logs): move auto-scroll checkbox left of the sort selector

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* refactor(logs): remove auto-scroll checkbox; ListToggle left of SortToggle

- Drops the Logs auto-scroll checkbox and its plumbing through
  LoggingScreen / InspectorView.
- Moves the ListToggle to the left of the SortToggle on the History
  and Network panel toolbars.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* refactor(sort): address review on #1372

- Hydrate sort direction synchronously (getInitialValueInEffect: false)
  to remove the one-frame newest-first flicker on first paint.
- Drop the redundant `[...matched].sort()` copy across the three panels;
  `.filter()` already returns a fresh array.
- Document why serializeSortDirection bypasses Mantine's default JSON
  stringify (raw enum value in storage).
- MemoryStorage.getItem: collapse `has` + `!` to `?? null`.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* fix(history): default the request list to collapsed for parity with Network

The History list opened expanded while Network opened collapsed; align
History with Network so both panels start in the same compact view.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* feat(history,network): persist list compact state to localStorage

Lifts the per-panel `compact` flag out of HistoryListPanel /
NetworkStreamPanel and into InspectorView's localStorage hooks, mirroring
the sort-direction shape:

  inspector.listCompact.history
  inspector.listCompact.network

Defaults to collapsed (compact=true) on both, with a corrupted-value
deserializer that clamps unknown strings back to the default.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* feat(servers,resources): persist ListToggle state to localStorage

Lifts the per-screen compact preference out of ServerListScreen and
ResourceControls into InspectorView's localStorage hooks, matching the
History/Network shape:

  inspector.listCompact.servers
  inspector.listCompact.resources

Servers and Resources both default to expanded (compact=false). For
ResourceControls the displayed compact is still derived from openSections
(so per-section accordion clicks still work locally), and only explicit
ListToggle clicks update the persisted preference — the handler computes
the next compact value from the click outcome rather than blindly
flipping, so a half-open accordion still records the right post-state.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* refactor(sort-toggle): switch to icon button matching ListToggle style

Replaces the Mantine Select with a subtle Button (or ActionIcon for the
subtle variant), using TbSortDescending2 for newest-first and
TbSortAscending2 for oldest-first. Clicking the button flips between the
two values.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* refactor(sort-toggle): restore Select with sort icon in rightSection

Reverts SortToggle to a Mantine Select with simplified labels ("Newest
First" / "Oldest First") and the corresponding TbSortDescending2 /
TbSortAscending2 icon in the rightSection, replacing the default chevron.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* fix(sort-toggle): swap icons so they match label direction

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* fix(sort-toggle): use down arrow for newest, up arrow for oldest

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* refactor(inspector-view): extract useSortDirection / useListCompact

Collapses seven near-identical useLocalStorage call sites in
InspectorView into two scoped helpers. Each helper carries the shared
namespace, serialize/deserialize adapters, and getInitialValueInEffect:
false; the call sites now read as "this screen has sort persisted to
this scope" rather than re-stating the storage shape every time.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* fix(sort-toggle): apply prettier formatting

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
Cliff Hall 2026-05-29 14:47:19 -04:00 • committed by GitHub
commit dd0f5de820
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 812 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

4
clients/web/src/components/groups/HistoryListPanel/HistoryListPanel.stories.tsx
View file

@ -13,6 +13,10 @@ const meta: Meta<typeof HistoryListPanel> = {
onExport: fn(),
onReplay: fn(),
onTogglePin: fn(),
sortDirection: "newest-first",
onSortChange: fn(),
compact: true,
onToggleCompact: fn(),
},
};

82
clients/web/src/components/groups/HistoryListPanel/HistoryListPanel.test.tsx
View file

@ -66,6 +66,10 @@ const baseProps = {
onExport: vi.fn(),
onReplay: vi.fn(),
onTogglePin: vi.fn(),
sortDirection: "newest-first" as const,
onSortChange: vi.fn(),
compact: true,
onToggleCompact: vi.fn(),
};
describe("HistoryListPanel", () => {
@ -219,22 +223,82 @@ describe("HistoryListPanel", () => {
expect(onTogglePin).toHaveBeenCalledWith("req-1");
});
it("toggles compact list state when ListToggle is clicked", async () => {
const user = userEvent.setup();
it("renders entries newest-first by default", () => {
renderWithMantine(
<HistoryListPanel {...baseProps} entries={sampleEntries} />,
);
// Initially expanded — Collapse buttons exist on each entry, and the
// ListToggle exposes its aria-label as "Collapse all".
expect(
screen.getAllByRole("button", { name: "Collapse" }).length,
).toBeGreaterThan(0);
const methods = screen.getAllByText(
/tools\/call|resources\/read|tools\/list/,
);
expect(methods[0]).toHaveTextContent("tools/list");
expect(methods[methods.length - 1]).toHaveTextContent("tools/call");
});
await user.click(screen.getByRole("button", { name: "Collapse all" }));
it("reorders entries when sortDirection is oldest-first", () => {
renderWithMantine(
<HistoryListPanel
{...baseProps}
entries={sampleEntries}
sortDirection="oldest-first"
/>,
);
const methods = screen.getAllByText(
/tools\/call|resources\/read|tools\/list/,
);
expect(methods[0]).toHaveTextContent("tools/call");
expect(methods[methods.length - 1]).toHaveTextContent("tools/list");
});
// After toggle, entries collapsed — they show Expand
it("invokes onSortChange when the user picks a new sort", async () => {
const user = userEvent.setup();
const onSortChange = vi.fn();
renderWithMantine(
<HistoryListPanel
{...baseProps}
entries={sampleEntries}
onSortChange={onSortChange}
/>,
);
await user.click(
screen.getByRole("textbox", { name: "History sort direction" }),
);
await user.click(await screen.findByText("Oldest First"));
expect(onSortChange).toHaveBeenCalledWith("oldest-first");
});
it("renders entries collapsed when compact is true (default parity with Network)", () => {
renderWithMantine(
<HistoryListPanel {...baseProps} entries={sampleEntries} compact />,
);
expect(
screen.getAllByRole("button", { name: "Expand" }).length,
).toBeGreaterThan(0);
});
it("renders entries expanded when compact is false", () => {
renderWithMantine(
<HistoryListPanel
{...baseProps}
entries={sampleEntries}
compact={false}
/>,
);
expect(
screen.getAllByRole("button", { name: "Collapse" }).length,
).toBeGreaterThan(0);
});
it("invokes onToggleCompact when the ListToggle is clicked", async () => {
const user = userEvent.setup();
const onToggleCompact = vi.fn();
renderWithMantine(
<HistoryListPanel
{...baseProps}
entries={sampleEntries}
onToggleCompact={onToggleCompact}
/>,
);
await user.click(screen.getByRole("button", { name: "Expand all" }));
expect(onToggleCompact).toHaveBeenCalledTimes(1);
});
});

38
clients/web/src/components/groups/HistoryListPanel/HistoryListPanel.tsx
View file

@ -1,4 +1,4 @@
import { useMemo, useState } from "react";
import { useMemo } from "react";
import {
Button,
Group,
@ -11,6 +11,10 @@ import {
import type { MessageEntry, MessageMethod } from "@inspector/core/mcp/types.js";
import { HistoryEntry } from "../HistoryEntry/HistoryEntry";
import { ListToggle } from "../../elements/ListToggle/ListToggle";
import {
SortToggle,
type SortDirection,
} from "../../elements/SortToggle/SortToggle";
import { extractMethod } from "../historyUtils.js";
export interface HistoryListPanelProps {
@ -22,6 +26,10 @@ export interface HistoryListPanelProps {
onExport: () => void;
onReplay: (id: string) => void;
onTogglePin: (id: string) => void;
sortDirection: SortDirection;
onSortChange: (next: SortDirection) => void;
compact: boolean;
onToggleCompact: () => void;
}
const PanelContainer = Paper.withProps({
@ -71,13 +79,19 @@ export function HistoryListPanel({
onExport,
onReplay,
onTogglePin,
sortDirection,
onSortChange,
compact,
onToggleCompact,
}: HistoryListPanelProps) {
const [compact, setCompact] = useState(false);
const filteredEntries = useMemo(
() => entries.filter((e) => matchesFilters(e, searchText, methodFilter)),
[entries, searchText, methodFilter],
);
const filteredEntries = useMemo(() => {
// `.filter()` returns a fresh array, so sorting in-place is safe.
const sorted = entries
.filter((e) => matchesFilters(e, searchText, methodFilter))
.sort((a, b) => a.timestamp.getTime() - b.timestamp.getTime());
if (sortDirection === "newest-first") sorted.reverse();
return sorted;
}, [entries, searchText, methodFilter, sortDirection]);
const pinnedEntries = useMemo(
() => filteredEntries.filter((e) => pinnedIds.has(e.id)),
@ -97,11 +111,13 @@ export function HistoryListPanel({
<Title order={4}>Requests</Title>
<Group gap="xs">
{hasResults && (
<ListToggle
compact={compact}
onToggle={() => setCompact((c) => !c)}
/>
<ListToggle compact={compact} onToggle={onToggleCompact} />
)}
<SortToggle
value={sortDirection}
onChange={onSortChange}
aria-label="History sort direction"
/>
<Button
variant="default"
onClick={onClearAll}

4
clients/web/src/components/groups/LogStreamPanel/LogStreamPanel.stories.tsx
View file

@ -19,10 +19,10 @@ const meta: Meta<typeof LogStreamPanel> = {
alert: true,
emergency: true,
},
autoScroll: true,
onToggleAutoScroll: fn(),
onClear: fn(),
onExport: fn(),
sortDirection: "newest-first",
onSortChange: fn(),
},
};

45
clients/web/src/components/groups/LogStreamPanel/LogStreamPanel.test.tsx
View file

@ -43,10 +43,10 @@ const baseProps = {
entries,
filterText: "",
visibleLevels: allVisible,
autoScroll: true,
onToggleAutoScroll: vi.fn(),
onClear: vi.fn(),
onExport: vi.fn(),
sortDirection: "newest-first" as const,
onSortChange: vi.fn(),
};
describe("LogStreamPanel", () => {
@ -149,18 +149,39 @@ describe("LogStreamPanel", () => {
expect(onExport).toHaveBeenCalledTimes(1);
});
it("invokes onToggleAutoScroll when the auto-scroll checkbox is clicked", async () => {
const user = userEvent.setup();
const onToggleAutoScroll = vi.fn();
renderWithMantine(
<LogStreamPanel {...baseProps} onToggleAutoScroll={onToggleAutoScroll} />,
it("renders entries newest-first by default", () => {
renderWithMantine(<LogStreamPanel {...baseProps} />);
const items = screen.getAllByText(
/Server started|Failed to read|Loading config|deprecated/,
);
await user.click(screen.getByLabelText("Auto-scroll"));
expect(onToggleAutoScroll).toHaveBeenCalledTimes(1);
// Newest receivedAt is the warning entry; oldest is "Server started".
expect(items[0]).toHaveTextContent('{"code":42,"msg":"deprecated"}');
expect(items[items.length - 1]).toHaveTextContent("Server started");
});
it("renders auto-scroll checkbox with correct checked state", () => {
renderWithMantine(<LogStreamPanel {...baseProps} autoScroll={false} />);
expect(screen.getByLabelText("Auto-scroll")).not.toBeChecked();
it("reorders entries when sortDirection is oldest-first", () => {
renderWithMantine(
<LogStreamPanel {...baseProps} sortDirection="oldest-first" />,
);
const items = screen.getAllByText(
/Server started|Failed to read|Loading config|deprecated/,
);
expect(items[0]).toHaveTextContent("Server started");
expect(items[items.length - 1]).toHaveTextContent(
'{"code":42,"msg":"deprecated"}',
);
});
it("invokes onSortChange when the user picks a new sort", async () => {
const user = userEvent.setup();
const onSortChange = vi.fn();
renderWithMantine(
<LogStreamPanel {...baseProps} onSortChange={onSortChange} />,
);
await user.click(
screen.getByRole("textbox", { name: "Logs sort direction" }),
);
await user.click(await screen.findByText("Oldest First"));
expect(onSortChange).toHaveBeenCalledWith("oldest-first");
});
});

33
clients/web/src/components/groups/LogStreamPanel/LogStreamPanel.tsx
View file

@ -1,7 +1,6 @@
import { useMemo } from "react";
import {
Button,
Checkbox,
Group,
Paper,
ScrollArea,
@ -12,15 +11,19 @@ import {
import type { LoggingLevel } from "@modelcontextprotocol/sdk/types.js";
import { LogEntry } from "../../elements/LogEntry/LogEntry";
import type { LogEntryData } from "../../elements/LogEntry/LogEntry";
import {
SortToggle,
type SortDirection,
} from "../../elements/SortToggle/SortToggle";
export interface LogStreamPanelProps {
entries: LogEntryData[];
filterText: string;
visibleLevels: Record<LoggingLevel, boolean>;
autoScroll: boolean;
onToggleAutoScroll: () => void;
onClear: () => void;
onExport: () => void;
sortDirection: SortDirection;
onSortChange: (next: SortDirection) => void;
}
const PanelContainer = Paper.withProps({
@ -61,25 +64,29 @@ export function LogStreamPanel({
entries,
filterText,
visibleLevels,
autoScroll,
onToggleAutoScroll,
onClear,
onExport,
sortDirection,
onSortChange,
}: LogStreamPanelProps) {
const filteredEntries = useMemo(
() => entries.filter((e) => matchesFilters(e, filterText, visibleLevels)),
[entries, filterText, visibleLevels],
);
const filteredEntries = useMemo(() => {
// `.filter()` returns a fresh array, so sorting in-place is safe.
const sorted = entries
.filter((e) => matchesFilters(e, filterText, visibleLevels))
.sort((a, b) => a.receivedAt.getTime() - b.receivedAt.getTime());
if (sortDirection === "newest-first") sorted.reverse();
return sorted;
}, [entries, filterText, visibleLevels, sortDirection]);
return (
<PanelContainer>
<Group justify="space-between" mb="sm">
<Title order={4}>Log Stream</Title>
<Group>
<Checkbox
label="Auto-scroll"
checked={autoScroll}
onChange={onToggleAutoScroll}
<SortToggle
value={sortDirection}
onChange={onSortChange}
aria-label="Logs sort direction"
/>
<Button
variant="default"

4
clients/web/src/components/groups/NetworkStreamPanel/NetworkStreamPanel.stories.tsx
View file

@ -12,6 +12,10 @@ const meta: Meta<typeof NetworkStreamPanel> = {
visibleCategories: { auth: true, transport: true },
onClear: fn(),
onExport: fn(),
sortDirection: "newest-first",
onSortChange: fn(),
compact: true,
onToggleCompact: fn(),
},
};

88
clients/web/src/components/groups/NetworkStreamPanel/NetworkStreamPanel.test.tsx
View file

@ -27,6 +27,10 @@ const baseProps = {
visibleCategories: { auth: true, transport: true } as const,
onClear: vi.fn(),
onExport: vi.fn(),
sortDirection: "newest-first" as const,
onSortChange: vi.fn(),
compact: true,
onToggleCompact: vi.fn(),
};
describe("NetworkStreamPanel", () => {
@ -124,14 +128,88 @@ describe("NetworkStreamPanel", () => {
expect(screen.getByRole("button", { name: "Export" })).toBeDisabled();
});
it("toggles between compact and expanded list views", async () => {
const user = userEvent.setup();
renderWithMantine(<NetworkStreamPanel {...baseProps} />);
// List starts compact -> entry should show Expand button
it("renders entries collapsed when compact is true", () => {
renderWithMantine(<NetworkStreamPanel {...baseProps} compact />);
expect(screen.getByRole("button", { name: "Expand" })).toBeInTheDocument();
await user.click(screen.getByRole("button", { name: "Expand all" }));
});
it("renders entries expanded when compact is false", () => {
renderWithMantine(<NetworkStreamPanel {...baseProps} compact={false} />);
expect(
screen.getByRole("button", { name: "Collapse" }),
).toBeInTheDocument();
});
it("invokes onToggleCompact when the ListToggle is clicked", async () => {
const user = userEvent.setup();
const onToggleCompact = vi.fn();
renderWithMantine(
<NetworkStreamPanel {...baseProps} onToggleCompact={onToggleCompact} />,
);
await user.click(screen.getByRole("button", { name: "Expand all" }));
expect(onToggleCompact).toHaveBeenCalledTimes(1);
});
it("renders entries newest-first by default", () => {
const older: FetchRequestEntry = {
...entry,
id: "older",
url: "https://example.com/older",
timestamp: new Date("2026-03-17T09:00:00Z"),
};
const newer: FetchRequestEntry = {
...entry,
id: "newer",
url: "https://example.com/newer",
timestamp: new Date("2026-03-17T11:00:00Z"),
};
renderWithMantine(
<NetworkStreamPanel {...baseProps} entries={[older, newer]} />,
);
const urls = screen.getAllByText(/example\.com\//);
expect(urls[0]).toHaveTextContent("https://example.com/newer");
expect(urls[urls.length - 1]).toHaveTextContent(
"https://example.com/older",
);
});
it("reorders entries when sortDirection is oldest-first", () => {
const older: FetchRequestEntry = {
...entry,
id: "older",
url: "https://example.com/older",
timestamp: new Date("2026-03-17T09:00:00Z"),
};
const newer: FetchRequestEntry = {
...entry,
id: "newer",
url: "https://example.com/newer",
timestamp: new Date("2026-03-17T11:00:00Z"),
};
renderWithMantine(
<NetworkStreamPanel
{...baseProps}
entries={[newer, older]}
sortDirection="oldest-first"
/>,
);
const urls = screen.getAllByText(/example\.com\//);
expect(urls[0]).toHaveTextContent("https://example.com/older");
expect(urls[urls.length - 1]).toHaveTextContent(
"https://example.com/newer",
);
});
it("invokes onSortChange when the user picks a new sort", async () => {
const user = userEvent.setup();
const onSortChange = vi.fn();
renderWithMantine(
<NetworkStreamPanel {...baseProps} onSortChange={onSortChange} />,
);
await user.click(
screen.getByRole("textbox", { name: "Network sort direction" }),
);
await user.click(await screen.findByText("Oldest First"));
expect(onSortChange).toHaveBeenCalledWith("oldest-first");
});
});

39
clients/web/src/components/groups/NetworkStreamPanel/NetworkStreamPanel.tsx
View file

@ -1,4 +1,4 @@
import { useMemo, useState } from "react";
import { useMemo } from "react";
import {
Button,
Group,
@ -14,6 +14,10 @@ import type {
} from "@inspector/core/mcp/types.js";
import { NetworkEntry } from "../NetworkEntry/NetworkEntry";
import { ListToggle } from "../../elements/ListToggle/ListToggle";
import {
SortToggle,
type SortDirection,
} from "../../elements/SortToggle/SortToggle";
export interface NetworkStreamPanelProps {
entries: FetchRequestEntry[];
@ -21,6 +25,10 @@ export interface NetworkStreamPanelProps {
visibleCategories: Record<FetchRequestCategory, boolean>;
onClear: () => void;
onExport: () => void;
sortDirection: SortDirection;
onSortChange: (next: SortDirection) => void;
compact: boolean;
onToggleCompact: () => void;
}
const PanelContainer = Paper.withProps({
@ -82,14 +90,19 @@ export function NetworkStreamPanel({
visibleCategories,
onClear,
onExport,
sortDirection,
onSortChange,
compact,
onToggleCompact,
}: NetworkStreamPanelProps) {
const [compact, setCompact] = useState(true);
const filteredEntries = useMemo(
() =>
entries.filter((e) => matchesFilters(e, filterText, visibleCategories)),
[entries, filterText, visibleCategories],
);
const filteredEntries = useMemo(() => {
// `.filter()` returns a fresh array, so sorting in-place is safe.
const sorted = entries
.filter((e) => matchesFilters(e, filterText, visibleCategories))
.sort((a, b) => a.timestamp.getTime() - b.timestamp.getTime());
if (sortDirection === "newest-first") sorted.reverse();
return sorted;
}, [entries, filterText, visibleCategories, sortDirection]);
const hasEntries = entries.length > 0;
const hasResults = filteredEntries.length > 0;
@ -100,11 +113,13 @@ export function NetworkStreamPanel({
<Title order={4}>{formatTitle(filteredEntries.length)}</Title>
<Group gap="xs">
{hasResults && (
<ListToggle
compact={compact}
onToggle={() => setCompact((c) => !c)}
/>
<ListToggle compact={compact} onToggle={onToggleCompact} />
)}
<SortToggle
value={sortDirection}
onChange={onSortChange}
aria-label="Network sort direction"
/>
<Button variant="default" onClick={onClear} disabled={!hasEntries}>
Clear
</Button>

2
clients/web/src/components/groups/ResourceControls/ResourceControls.stories.tsx
View file

@ -16,6 +16,8 @@ const meta: Meta<typeof ResourceControls> = {
onSelectTemplate: fn(),
onUnsubscribeResource: fn(),
listChanged: false,
compact: false,
onCompactChange: fn(),
},
};

49
clients/web/src/components/groups/ResourceControls/ResourceControls.test.tsx
View file

@ -33,6 +33,8 @@ const baseProps = {
onSelectUri: vi.fn(),
onSelectTemplate: vi.fn(),
onUnsubscribeResource: vi.fn(),
compact: false,
onCompactChange: vi.fn(),
};
describe("ResourceControls", () => {
@ -150,23 +152,40 @@ describe("ResourceControls", () => {
expect(screen.getByText("Subscriptions (0)")).toBeInTheDocument();
});
it("toggles all sections via the ListToggle button", async () => {
it("seeds the accordion to all-open when compact is false", () => {
renderWithMantine(<ResourceControls {...baseProps} compact={false} />);
// All three sections open → ListToggle reads "Collapse all".
expect(
screen.getByRole("button", { name: "Collapse all" }),
).toBeInTheDocument();
});
it("seeds the accordion to all-closed when compact is true", () => {
renderWithMantine(<ResourceControls {...baseProps} compact />);
// All three sections closed → ListToggle reads "Expand all".
expect(
screen.getByRole("button", { name: "Expand all" }),
).toBeInTheDocument();
});
it("invokes onCompactChange with the new preference when the ListToggle is clicked", async () => {
const user = userEvent.setup();
renderWithMantine(<ResourceControls {...baseProps} />);
const toggleButtons = screen.getAllByRole("button");
// The list toggle is the last in the search row; just exercise it.
// Since all three sections start open, clicking it should collapse them.
const toggle = toggleButtons.find(
(btn) => btn.querySelector("svg") && btn !== toggleButtons[0],
const onCompactChange = vi.fn();
renderWithMantine(
<ResourceControls
{...baseProps}
compact={false}
onCompactChange={onCompactChange}
/>,
);
if (toggle) {
await user.click(toggle);
}
// After collapse, click again to re-expand.
if (toggle) {
await user.click(toggle);
}
expect(screen.getByText("URIs (2)")).toBeInTheDocument();
// All sections start open → ListToggle reads "Collapse all"; clicking
// it collapses everything and records compact=true.
await user.click(screen.getByRole("button", { name: "Collapse all" }));
expect(onCompactChange).toHaveBeenCalledWith(true);
// Now collapsed → ListToggle reads "Expand all"; clicking re-expands
// and records compact=false.
await user.click(screen.getByRole("button", { name: "Expand all" }));
expect(onCompactChange).toHaveBeenLastCalledWith(false);
});
it("filters by resource title when title is set", async () => {

38
clients/web/src/components/groups/ResourceControls/ResourceControls.tsx
View file

@ -28,6 +28,13 @@ export interface ResourceControlsProps {
onSelectUri: (uri: string) => void;
onSelectTemplate: (uriTemplate: string) => void;
onUnsubscribeResource: (uri: string) => void;
/**
* Persisted preference for the ListToggle. Seeds initial accordion state
* on mount; the user can still toggle individual sections during a session
* without affecting this value. Only an explicit ListToggle click updates it.
*/
compact: boolean;
onCompactChange: (next: boolean) => void;
}
function panelMaxHeight(openCount: number): string {
@ -52,6 +59,8 @@ export function ResourceControls({
onSelectUri,
onSelectTemplate,
onUnsubscribeResource,
compact: initialCompact,
onCompactChange,
}: ResourceControlsProps) {
const [searchText, setSearchText] = useState("");
const query = searchText.toLowerCase();
@ -74,17 +83,27 @@ export function ResourceControls({
s.resource.uri.toLowerCase().includes(query),
);
const defaultOpen = [
...(filteredResources.length > 0 ? ["resources"] : []),
...(filteredTemplates.length > 0 ? ["templates"] : []),
...(filteredSubscriptions.length > 0 ? ["subscriptions"] : []),
];
const allSections = ["resources", "templates", "subscriptions"];
const [openSections, setOpenSections] = useState<string[]>(defaultOpen);
// Seed the accordion from the persisted preference: empty when the user
// last left the panel compact, all three open when they explicitly
// expanded. Per-section accordion clicks during a session update the
// local list but don't change the persisted preference.
const [openSections, setOpenSections] = useState<string[]>(
initialCompact ? [] : [...allSections],
);
const allExpanded = openSections.length === allSections.length;
const maxHeight = panelMaxHeight(openSections.length);
function handleToggleList() {
// Compute the next compact value from what the click will produce so a
// half-open accordion (user toggled a single section) still persists the
// right preference: clicking "expand all" should record `compact=false`
// even if the visible state was already partially expanded.
const nextCompact = allExpanded;
setOpenSections(nextCompact ? [] : [...allSections]);
onCompactChange(nextCompact);
}
return (
<Stack gap="sm">
<Group justify="space-between">
@ -98,10 +117,7 @@ export function ResourceControls({
value={searchText}
onChange={(e) => setSearchText(e.currentTarget.value)}
/>
<ListToggle
compact={!allExpanded}
onToggle={() => setOpenSections(allExpanded ? [] : [...allSections])}
/>
<ListToggle compact={!allExpanded} onToggle={handleToggleList} />
</Group>
<Accordion multiple value={openSections} onChange={setOpenSections}>
<Accordion.Item value="resources">