Skip to content
TypeScript

fix(web): long server lists in thread details now page 4 at a time (#28684)

Bilal Bakre53672d8fc72
diff --git a/apps/web/src/components/chat/ThreadDetailsCard.browser.test.tsx b/apps/web/src/components/chat/ThreadDetailsCard.browser.test.tsx
index 673fe94ee10..e234686d6ff 100644
--- a/apps/web/src/components/chat/ThreadDetailsCard.browser.test.tsx
+++ b/apps/web/src/components/chat/ThreadDetailsCard.browser.test.tsx
@@ -44,6 +44,7 @@ function Card({
fixture,
rows = 1,
automationRows = 0,
+ serverOverflowRows = 0,
}: {
threadRef: ScopedThreadRef;
inline: boolean;
@@ -52,6 +53,8 @@ function Card({
rows?: number;
/** Rows of 100px in an automations list shown at full density. */
automationRows?: number;
+ /** Rows of 100px that expanded server lists add, which density ignores. */
+ serverOverflowRows?: number;
}) {
return (
// The web root renders in StrictMode, which re-runs ref callbacks on every mount.
@@ -83,6 +86,12 @@ function Card({
{density === "full" && automationRows > 0 ? (
<section data-thread-automations-panel style={{ height: automationRows * 100 }} />
) : null}
+ {density === "full" && serverOverflowRows > 0 ? (
+ <div
+ data-thread-details-server-overflow
+ style={{ height: serverOverflowRows * 100 }}
+ />
+ ) : null}
</>
)}
</ThreadDetailsCard>
@@ -177,3 +186,13 @@ it("keeps full density when many automations make the content tall", async () =>
.element(page.getByRole("region", { name: "Thread details" }))
.toHaveAttribute("data-density", "full");
});
+
+it("stays full while expanded server rows overflow", async () => {
+ using fixture = setup();
+ await using _screen = await render(
+ <Card threadRef={threadB} inline fixture={fixture} rows={2} serverOverflowRows={4} />,
+ );
+ await expect
+ .element(page.getByRole("region", { name: "Thread details" }))
+ .toHaveAttribute("data-density", "full");
+});
diff --git a/apps/web/src/components/chat/ThreadDetailsCard.tsx b/apps/web/src/components/chat/ThreadDetailsCard.tsx
index 969172c77a9..4e8a47a3979 100644
--- a/apps/web/src/components/chat/ThreadDetailsCard.tsx
+++ b/apps/web/src/components/chat/ThreadDetailsCard.tsx
@@ -78,10 +78,10 @@ export function ThreadDetailsCard({
const measure = () => {
const frame = element.closest<HTMLElement>("[data-thread-details-card]");
const next = element.offsetHeight + (frame ? frame.offsetHeight - frame.clientHeight : 0);
- // PR lists, lineage, side chats and automations scroll as they grow. Counting them toward
- // density would hide the section and workspace controls when the user asks to see more rows.
+ // PR lists, servers, lineage, side chats and automations scroll as they grow. Counting them
+ // toward density would hide the section and workspace controls when the user asks to see more.
const lists = element.querySelectorAll<HTMLElement>(
- "[data-thread-relationships-panel], [data-thread-side-chats-panel], [data-thread-details-pr-list], [data-thread-automations-panel]",
+ "[data-thread-relationships-panel], [data-thread-side-chats-panel], [data-thread-details-pr-list], [data-thread-automations-panel], [data-thread-details-server-overflow]",
);
const fittingHeight =
next - Array.from(lists).reduce((sum, list) => sum + list.offsetHeight, 0);
diff --git a/apps/web/src/components/chat/ThreadServersPanel.browser.test.tsx b/apps/web/src/components/chat/ThreadServersPanel.browser.test.tsx
new file mode 100644
index 00000000000..a2b35355481
--- /dev/null
+++ b/apps/web/src/components/chat/ThreadServersPanel.browser.test.tsx
@@ -0,0 +1,51 @@
+import { EnvironmentId, ThreadId, type DiscoveredLocalServer } from "@t3tools/contracts";
+import { expect, it, vi } from "vite-plus/test";
+import { page } from "vite-plus/test/browser";
+
+vi.mock(import("../../portDiscoveryState"), async (importOriginal) => ({
+ ...(await importOriginal()),
+ useThreadDiscoveredPorts: () =>
+ Array.from(
+ { length: 10 },
+ (_, index) =>
+ ({
+ pid: index,
+ port: 3000 + index,
+ url: `http://localhost:${3000 + index}`,
+ terminal: null,
+ processName: "node",
+ }) as DiscoveredLocalServer,
+ ),
+}));
+
+import { render } from "../../../test/render";
+import { ThreadServersPanel } from "./ThreadServersPanel";
+
+const panel = (threadId: string) => (
+ <ThreadServersPanel
+ environmentId={EnvironmentId.make("env")}
+ threadId={ThreadId.make(threadId)}
+ />
+);
+
+it("pages servers four at a time, collapses back, and resets on thread switch", async () => {
+ await using screen = await render(panel("a"));
+ const count = (selector: string) => screen.container.querySelectorAll(selector).length;
+ const expectRows = (rows: number) => vi.waitFor(() => expect(count("li")).toBe(rows));
+
+ await expectRows(4);
+ await page.getByRole("button", { name: "Show 4 more" }).click();
+ await expectRows(8);
+ expect(count("[data-thread-details-server-overflow]")).toBe(4);
+ await page.getByRole("button", { name: "Show 2 more" }).click();
+ await expectRows(10);
+ await page.getByRole("button", { name: "Show less" }).click();
+ await expectRows(4);
+
+ await page.getByRole("button", { name: "Show 4 more" }).click();
+ await expectRows(8);
+ await screen.rerender(panel("b"));
+ await expectRows(4);
+ await screen.rerender(panel("a"));
+ await expectRows(4);
+});
diff --git a/apps/web/src/components/chat/ThreadServersPanel.tsx b/apps/web/src/components/chat/ThreadServersPanel.tsx
index f1c8e1a1808..52a3119cc05 100644
--- a/apps/web/src/components/chat/ThreadServersPanel.tsx
+++ b/apps/web/src/components/chat/ThreadServersPanel.tsx
@@ -10,6 +10,7 @@ import {
isAtomCommandInterrupted,
squashAtomCommandFailure,
} from "@t3tools/client-runtime/state/runtime";
+import { ChevronDown, ChevronUp } from "lucide";
import { GlobeIcon, LoaderCircleIcon, SquareIcon } from "lucide-react";
import { type MouseEvent, useState } from "react";
@@ -21,6 +22,7 @@ import { useEnvironment } from "../../state/environments";
import { previewEnvironment } from "../../state/preview";
import { useEnvironmentScope } from "../../state/session";
import { useAtomCommand } from "../../state/use-atom-command";
+import { MorphIcon } from "../MorphIcon";
import { openDiscoveredPort } from "../preview/openDiscoveredPort";
import { stackedThreadToast, toastManager } from "../ui/toast";
import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
@@ -28,13 +30,21 @@ import { ThreadDetailsControl } from "./ThreadDetailsControl";
import { ThreadDetailsSection } from "./ThreadDetailsSection";
import { THREAD_DETAILS_PANEL_ICON_CLASS } from "./threadDetailsPanelStyles";
+const SERVER_PAGE_COUNT = 4;
+
const serverKey = (server: DiscoveredLocalServer) => `${server.pid}:${server.port}`;
-/** Local servers the thread's terminals and agent started. Hidden while none run. */
-export function ThreadServersPanel(props: {
+interface ThreadServersPanelProps {
readonly environmentId: EnvironmentId;
readonly threadId: ThreadId;
-}) {
+}
+
+/** Local servers the thread's terminals and agent started. Hidden while none run. */
+export function ThreadServersPanel(props: ThreadServersPanelProps) {
+ return <ThreadServersList key={`${props.environmentId}:${props.threadId}`} {...props} />;
+}
+
+function ThreadServersList(props: ThreadServersPanelProps) {
const servers = useThreadDiscoveredPorts(props);
const canOpen = useEnvironmentScope(props.environmentId, AuthPreviewOperateScope);
const canStop = useAtomValue(
@@ -48,10 +58,12 @@ export function ThreadServersPanel(props: {
label: "thread server stop",
});
const [stoppingKey, setStoppingKey] = useState<string | null>(null);
+ const [visibleCount, setVisibleCount] = useState(SERVER_PAGE_COUNT);
if (servers.length === 0) return null;
const externalClickLabel = isMacPlatform(navigator.platform) ? "⌘-click" : "Ctrl-click";
const threadRef = scopeThreadRef(props.environmentId, props.threadId);
+ const hiddenCount = Math.max(0, servers.length - visibleCount);
const reportFailure = (title: string, error: unknown) => {
toastManager.add(
@@ -96,11 +108,15 @@ export function ThreadServersPanel(props: {
return (
<ThreadDetailsSection headingId="thread-details-servers-heading" title="Servers">
<ul className="m-0 list-none p-0">
- {servers.map((server) => {
+ {servers.slice(0, visibleCount).map((server, index) => {
const key = serverKey(server);
const stoppable = canStop && supportsStop && server.pid !== null;
return (
- <li key={key} className="group relative flex items-center rounded-lg">
+ <li
+ key={key}
+ data-thread-details-server-overflow={index >= SERVER_PAGE_COUNT || undefined}
+ className="group relative flex items-center rounded-lg"
+ >
<Tooltip>
<TooltipTrigger
delay={200}
@@ -163,6 +179,25 @@ export function ThreadServersPanel(props: {
);
})}
</ul>
+ {servers.length > SERVER_PAGE_COUNT ? (
+ <ThreadDetailsControl
+ variant="ghost"
+ size="sm"
+ onClick={() =>
+ setVisibleCount(hiddenCount > 0 ? visibleCount + SERVER_PAGE_COUNT : SERVER_PAGE_COUNT)
+ }
+ part="row"
+ tone="muted"
+ className="w-full active:scale-100"
+ >
+ <MorphIcon
+ aria-hidden
+ className="size-4 shrink-0"
+ icon={hiddenCount > 0 ? ChevronDown : ChevronUp}
+ />
+ {hiddenCount > 0 ? `Show ${Math.min(hiddenCount, SERVER_PAGE_COUNT)} more` : "Show less"}
+ </ThreadDetailsControl>
+ ) : null}
</ThreadDetailsSection>
);
}