Skip to content

Commit e53672d

Browse files
Bil0000claudejuliusmarminge
authored
fix(web): long server lists in thread details now page 4 at a time (pingdotgg#28684)
Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: Julius Marminge <[email protected]>
1 parent 3d369d5 commit e53672d

4 files changed

Lines changed: 113 additions & 8 deletions

File tree

‎apps/web/src/components/chat/ThreadDetailsCard.browser.test.tsx‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ function Card({
4444
fixture,
4545
rows = 1,
4646
automationRows = 0,
47+
serverOverflowRows = 0,
4748
}: {
4849
threadRef: ScopedThreadRef;
4950
inline: boolean;
@@ -52,6 +53,8 @@ function Card({
5253
rows?: number;
5354
/** Rows of 100px in an automations list shown at full density. */
5455
automationRows?: number;
56+
/** Rows of 100px that expanded server lists add, which density ignores. */
57+
serverOverflowRows?: number;
5558
}) {
5659
return (
5760
// The web root renders in StrictMode, which re-runs ref callbacks on every mount.
@@ -83,6 +86,12 @@ function Card({
8386
{density === "full" && automationRows > 0 ? (
8487
<section data-thread-automations-panel style={{ height: automationRows * 100 }} />
8588
) : null}
89+
{density === "full" && serverOverflowRows > 0 ? (
90+
<div
91+
data-thread-details-server-overflow
92+
style={{ height: serverOverflowRows * 100 }}
93+
/>
94+
) : null}
8695
</>
8796
)}
8897
</ThreadDetailsCard>
@@ -177,3 +186,13 @@ it("keeps full density when many automations make the content tall", async () =>
177186
.element(page.getByRole("region", { name: "Thread details" }))
178187
.toHaveAttribute("data-density", "full");
179188
});
189+
190+
it("stays full while expanded server rows overflow", async () => {
191+
using fixture = setup();
192+
await using _screen = await render(
193+
<Card threadRef={threadB} inline fixture={fixture} rows={2} serverOverflowRows={4} />,
194+
);
195+
await expect
196+
.element(page.getByRole("region", { name: "Thread details" }))
197+
.toHaveAttribute("data-density", "full");
198+
});

‎apps/web/src/components/chat/ThreadDetailsCard.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@ export function ThreadDetailsCard({
7878
const measure = () => {
7979
const frame = element.closest<HTMLElement>("[data-thread-details-card]");
8080
const next = element.offsetHeight + (frame ? frame.offsetHeight - frame.clientHeight : 0);
81-
// PR lists, lineage, side chats and automations scroll as they grow. Counting them toward
82-
// density would hide the section and workspace controls when the user asks to see more rows.
81+
// PR lists, servers, lineage, side chats and automations scroll as they grow. Counting them
82+
// toward density would hide the section and workspace controls when the user asks to see more.
8383
const lists = element.querySelectorAll<HTMLElement>(
84-
"[data-thread-relationships-panel], [data-thread-side-chats-panel], [data-thread-details-pr-list], [data-thread-automations-panel]",
84+
"[data-thread-relationships-panel], [data-thread-side-chats-panel], [data-thread-details-pr-list], [data-thread-automations-panel], [data-thread-details-server-overflow]",
8585
);
8686
const fittingHeight =
8787
next - Array.from(lists).reduce((sum, list) => sum + list.offsetHeight, 0);
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
import { EnvironmentId, ThreadId, type DiscoveredLocalServer } from "@t3tools/contracts";
2+
import { expect, it, vi } from "vite-plus/test";
3+
import { page } from "vite-plus/test/browser";
4+
5+
vi.mock(import("../../portDiscoveryState"), async (importOriginal) => ({
6+
...(await importOriginal()),
7+
useThreadDiscoveredPorts: () =>
8+
Array.from(
9+
{ length: 10 },
10+
(_, index) =>
11+
({
12+
pid: index,
13+
port: 3000 + index,
14+
url: `http://localhost:${3000 + index}`,
15+
terminal: null,
16+
processName: "node",
17+
}) as DiscoveredLocalServer,
18+
),
19+
}));
20+
21+
import { render } from "../../../test/render";
22+
import { ThreadServersPanel } from "./ThreadServersPanel";
23+
24+
const panel = (threadId: string) => (
25+
<ThreadServersPanel
26+
environmentId={EnvironmentId.make("env")}
27+
threadId={ThreadId.make(threadId)}
28+
/>
29+
);
30+
31+
it("pages servers four at a time, collapses back, and resets on thread switch", async () => {
32+
await using screen = await render(panel("a"));
33+
const count = (selector: string) => screen.container.querySelectorAll(selector).length;
34+
const expectRows = (rows: number) => vi.waitFor(() => expect(count("li")).toBe(rows));
35+
36+
await expectRows(4);
37+
await page.getByRole("button", { name: "Show 4 more" }).click();
38+
await expectRows(8);
39+
expect(count("[data-thread-details-server-overflow]")).toBe(4);
40+
await page.getByRole("button", { name: "Show 2 more" }).click();
41+
await expectRows(10);
42+
await page.getByRole("button", { name: "Show less" }).click();
43+
await expectRows(4);
44+
45+
await page.getByRole("button", { name: "Show 4 more" }).click();
46+
await expectRows(8);
47+
await screen.rerender(panel("b"));
48+
await expectRows(4);
49+
await screen.rerender(panel("a"));
50+
await expectRows(4);
51+
});

‎apps/web/src/components/chat/ThreadServersPanel.tsx‎

Lines changed: 40 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import {
1010
isAtomCommandInterrupted,
1111
squashAtomCommandFailure,
1212
} from "@t3tools/client-runtime/state/runtime";
13+
import { ChevronDown, ChevronUp } from "lucide";
1314
import { GlobeIcon, LoaderCircleIcon, SquareIcon } from "lucide-react";
1415
import { type MouseEvent, useState } from "react";
1516

@@ -21,20 +22,29 @@ import { useEnvironment } from "../../state/environments";
2122
import { previewEnvironment } from "../../state/preview";
2223
import { useEnvironmentScope } from "../../state/session";
2324
import { useAtomCommand } from "../../state/use-atom-command";
25+
import { MorphIcon } from "../MorphIcon";
2426
import { openDiscoveredPort } from "../preview/openDiscoveredPort";
2527
import { stackedThreadToast, toastManager } from "../ui/toast";
2628
import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
2729
import { ThreadDetailsControl } from "./ThreadDetailsControl";
2830
import { ThreadDetailsSection } from "./ThreadDetailsSection";
2931
import { THREAD_DETAILS_PANEL_ICON_CLASS } from "./threadDetailsPanelStyles";
3032

33+
const SERVER_PAGE_COUNT = 4;
34+
3135
const serverKey = (server: DiscoveredLocalServer) => `${server.pid}:${server.port}`;
3236

33-
/** Local servers the thread's terminals and agent started. Hidden while none run. */
34-
export function ThreadServersPanel(props: {
37+
interface ThreadServersPanelProps {
3538
readonly environmentId: EnvironmentId;
3639
readonly threadId: ThreadId;
37-
}) {
40+
}
41+
42+
/** Local servers the thread's terminals and agent started. Hidden while none run. */
43+
export function ThreadServersPanel(props: ThreadServersPanelProps) {
44+
return <ThreadServersList key={`${props.environmentId}:${props.threadId}`} {...props} />;
45+
}
46+
47+
function ThreadServersList(props: ThreadServersPanelProps) {
3848
const servers = useThreadDiscoveredPorts(props);
3949
const canOpen = useEnvironmentScope(props.environmentId, AuthPreviewOperateScope);
4050
const canStop = useAtomValue(
@@ -48,10 +58,12 @@ export function ThreadServersPanel(props: {
4858
label: "thread server stop",
4959
});
5060
const [stoppingKey, setStoppingKey] = useState<string | null>(null);
61+
const [visibleCount, setVisibleCount] = useState(SERVER_PAGE_COUNT);
5162

5263
if (servers.length === 0) return null;
5364
const externalClickLabel = isMacPlatform(navigator.platform) ? "⌘-click" : "Ctrl-click";
5465
const threadRef = scopeThreadRef(props.environmentId, props.threadId);
66+
const hiddenCount = Math.max(0, servers.length - visibleCount);
5567

5668
const reportFailure = (title: string, error: unknown) => {
5769
toastManager.add(
@@ -96,11 +108,15 @@ export function ThreadServersPanel(props: {
96108
return (
97109
<ThreadDetailsSection headingId="thread-details-servers-heading" title="Servers">
98110
<ul className="m-0 list-none p-0">
99-
{servers.map((server) => {
111+
{servers.slice(0, visibleCount).map((server, index) => {
100112
const key = serverKey(server);
101113
const stoppable = canStop && supportsStop && server.pid !== null;
102114
return (
103-
<li key={key} className="group relative flex items-center rounded-lg">
115+
<li
116+
key={key}
117+
data-thread-details-server-overflow={index >= SERVER_PAGE_COUNT || undefined}
118+
className="group relative flex items-center rounded-lg"
119+
>
104120
<Tooltip>
105121
<TooltipTrigger
106122
delay={200}
@@ -163,6 +179,25 @@ export function ThreadServersPanel(props: {
163179
);
164180
})}
165181
</ul>
182+
{servers.length > SERVER_PAGE_COUNT ? (
183+
<ThreadDetailsControl
184+
variant="ghost"
185+
size="sm"
186+
onClick={() =>
187+
setVisibleCount(hiddenCount > 0 ? visibleCount + SERVER_PAGE_COUNT : SERVER_PAGE_COUNT)
188+
}
189+
part="row"
190+
tone="muted"
191+
className="w-full active:scale-100"
192+
>
193+
<MorphIcon
194+
aria-hidden
195+
className="size-4 shrink-0"
196+
icon={hiddenCount > 0 ? ChevronDown : ChevronUp}
197+
/>
198+
{hiddenCount > 0 ? `Show ${Math.min(hiddenCount, SERVER_PAGE_COUNT)} more` : "Show less"}
199+
</ThreadDetailsControl>
200+
) : null}
166201
</ThreadDetailsSection>
167202
);
168203
}

0 commit comments

Comments
 (0)