Skip to content

Commit d28b0d3

Browse files
wesbillmanBrain
andauthored
fix(ui): keep background loading from shifting populated views (#418)
Signed-off-by: Brain <1a02c72794dcd0f07058a353bc3a81f4028b8c77c92c87fce6d5c8b85970a20b@buzz.block.builderlab.xyz> Co-authored-by: Brain <1a02c72794dcd0f07058a353bc3a81f4028b8c77c92c87fce6d5c8b85970a20b@buzz.block.builderlab.xyz>
1 parent 3bf5da7 commit d28b0d3

25 files changed

Lines changed: 504 additions & 108 deletions

‎docs/shell-design.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,9 @@ Disabling Bestie removes its snake and open card without evicting a local link c
155155
The shell supplies the outer page gutter. Channel previews, roster labels, and routine refresh
156156
and freshness indicators are omitted. Channel Settings → Diagnostics keeps
157157
manual refresh, outbox inspection, and timing capture available on demand.
158+
Background thread reads and sidebar enrichment/reconnection do not insert progress
159+
rows into populated views. Initial empty loads still explain the wait; failures
160+
and their retry controls remain visible.
158161

159162
The composer preserves the session's text sending and keyboard behavior. Its
160163
rounded input and lavender send arrow follow the reference; unsupported upload,

‎src/app/shell/SearchResults.test.tsx‎

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import {
2222
} from "../../features/relay/testing";
2323
import type { LiveCallbacks } from "../../features/relay/live";
2424
import { SearchResults } from "./SearchResults";
25+
import { ChatCircleIcon } from "../../shared/design-system/icons/index";
2526

2627
afterEach(() => {
2728
cleanup();
@@ -353,3 +354,93 @@ it("does not reveal a revoked public hit queued before React commits its result"
353354
owner.dispose();
354355
}
355356
});
357+
358+
it.each(["", "Crew"])(
359+
"explains cold conversation loading without redundant banners (query=%s)",
360+
async (query) => {
361+
const relay = keypair();
362+
const viewer = keypair();
363+
const wire = scriptedTransport(viewer.pubkey, relay.pubkey);
364+
const discovery = [
365+
metadata(relay, "crew", "Crew"),
366+
roster(relay, "crew", [viewer.pubkey]),
367+
];
368+
const owner = createRelaySession({
369+
...wire.transport,
370+
query(filters, signal) {
371+
return filters.some((filter) => filter.kinds?.includes(39002))
372+
? wire.transport.query(filters, signal)
373+
: Promise.resolve(discovery);
374+
},
375+
});
376+
try {
377+
render(
378+
<SearchResults
379+
session={owner.session}
380+
query={query}
381+
onQueryChange={() => {}}
382+
input={createRef()}
383+
pages={[
384+
{
385+
key: "settings",
386+
label: "Settings",
387+
icon: ChatCircleIcon,
388+
run() {},
389+
},
390+
]}
391+
openConversation={() => {}}
392+
/>,
393+
);
394+
const pending = wire.next();
395+
expect(owner.session.channels.list().status).toBe("loading");
396+
expect(screen.getByRole("option", { name: /Settings/ })).toBeVisible();
397+
if (query) {
398+
expect(screen.getByText("Loading joined conversations…")).toBeVisible();
399+
expect(screen.queryByText("Loading recent conversations…")).toBeNull();
400+
} else {
401+
expect(screen.getByText("Loading recent conversations…")).toBeVisible();
402+
expect(screen.queryByText("Loading joined conversations…")).toBeNull();
403+
}
404+
await act(async () => pending.respond(discovery));
405+
expect(await screen.findByRole("option", { name: /Crew/ })).toBeVisible();
406+
expect(screen.queryByText("Loading joined conversations…")).toBeNull();
407+
expect(screen.getByRole("option", { name: /Settings/ })).toBeVisible();
408+
} finally {
409+
cleanup();
410+
owner.dispose();
411+
}
412+
},
413+
);
414+
415+
it("does not announce conversation enrichment over retained search choices", () => {
416+
const owner = createRelaySession(null);
417+
const session = {
418+
...owner.session,
419+
channels: {
420+
...owner.session.channels,
421+
list: () => list,
422+
ensureList() {},
423+
},
424+
};
425+
const list = {
426+
status: "loading" as const,
427+
channels: [{ id: "crew", name: "Crew", channelType: "stream" as const }],
428+
};
429+
try {
430+
render(
431+
<SearchResults
432+
session={session}
433+
query="Crew"
434+
onQueryChange={() => {}}
435+
input={createRef()}
436+
pages={[]}
437+
openConversation={() => {}}
438+
/>,
439+
);
440+
expect(screen.getByRole("option", { name: /Crew/ })).toBeVisible();
441+
expect(screen.queryByText("Loading joined conversations…")).toBeNull();
442+
} finally {
443+
cleanup();
444+
owner.dispose();
445+
}
446+
});

‎src/app/shell/SearchResults.tsx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,9 @@ export function SearchResults({
226226
className="space-y-2 px-3 text-body-sm text-subtle"
227227
aria-live="polite"
228228
>
229-
{list.status === "loading" && <p>Loading joined conversations…</p>}
229+
{list.status === "loading" && query.trim() && !list.channels.length && (
230+
<p>Loading joined conversations…</p>
231+
)}
230232
{list.status === "error" && (
231233
<div>
232234
<p>Couldn’t load all joined conversations.</p>

‎src/bundled/channels/ChannelMembersDialog.test.tsx‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ async function setup(
3939
let applyAddition = true;
4040
let searchFailure = false;
4141
let nameRetry: Promise<void> | undefined;
42+
let rosterRead: Promise<void> | undefined;
4243
let release: (() => void) | undefined;
4344
const publish = vi.fn(async (_event: RelayEvent) => {
4445
if (failure) throw new PublishRejected(failure);
@@ -64,6 +65,8 @@ async function setup(
6465
await nameRetry;
6566
throw new Error("Names unavailable");
6667
}
68+
if (filters.some((filter) => filter.kinds?.includes(39002)))
69+
await rosterRead;
6770
return [
6871
roster(relay, id, members, clock),
6972
signed(relay, {
@@ -136,6 +139,9 @@ async function setup(
136139
fail: (value: string) => {
137140
failure = value;
138141
},
142+
holdRoster: (pending: Promise<void> | undefined) => {
143+
rosterRead = pending;
144+
},
139145
holdNames: (pending: Promise<void>) => {
140146
nameRetry = pending;
141147
},
@@ -416,3 +422,42 @@ it.each(["none", "rejected", "lagging"])(
416422
expect(action).toHaveBeenCalledTimes(2);
417423
},
418424
);
425+
426+
it("keeps known members quiet while rechecking membership without enabling unverified additions", async () => {
427+
const t = await setup();
428+
await vi.waitFor(() =>
429+
expect(screen.queryByText("Loading members…")).toBeNull(),
430+
);
431+
expect(await t.search()).toBeEnabled();
432+
await t.user.keyboard("{Escape}");
433+
const rosterReads = () =>
434+
t.query.mock.calls.filter(([filters]) =>
435+
filters.some((filter) => filter.kinds?.includes(39002)),
436+
).length;
437+
const before = rosterReads();
438+
let release!: () => void;
439+
t.holdRoster(
440+
new Promise<void>((_resolve, reject) => {
441+
release = () => reject(new Error("Roster unavailable"));
442+
}),
443+
);
444+
try {
445+
await t.user.click(screen.getByRole("button", { name: "Channel members" }));
446+
await vi.waitFor(() => expect(rosterReads()).toBe(before + 1));
447+
expect(screen.getByText("Carl (you)")).toBeVisible();
448+
expect(screen.queryByText("Loading members…")).not.toBeInTheDocument();
449+
const add = await t.search();
450+
expect(add).toBeDisabled();
451+
// No matching members is not an empty roster.
452+
expect(screen.queryByText("Loading members…")).not.toBeInTheDocument();
453+
await act(async () => release());
454+
const retry = await screen.findByRole("button", { name: "Retry members" });
455+
expect(add).toBeDisabled();
456+
t.holdRoster(undefined);
457+
await t.user.click(retry);
458+
await vi.waitFor(() => expect(add).toBeEnabled());
459+
expect(t.publish).not.toHaveBeenCalled();
460+
} finally {
461+
await act(async () => release());
462+
}
463+
});

‎src/bundled/channels/ChannelMembersDialog.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ export function ChannelMembersDialog({
333333
: "Join this channel to add people and agents."}
334334
</p>
335335
)}
336-
{rosterBusy && (
336+
{rosterBusy && !members.size && (
337337
<p role="status" className="text-body-sm text-subtle">
338338
Loading members…
339339
</p>

‎src/bundled/mentions/MentionPicker.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ export function MentionPicker({
205205
</Button>
206206
</>
207207
)}
208-
{agents.status === "loading" && (
208+
{agents.status === "loading" && !candidates.length && (
209209
<p role="status">Loading agents…</p>
210210
)}
211211
{(agents.status === "error" || !!agents.error) && (

‎src/bundled/mentions/session-agents.test.tsx‎

Lines changed: 75 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ it("focuses search on open and supports clear, Escape, and outside dismissal", a
247247
const search = screen.getByRole("searchbox", {
248248
name: "Search community people and agents",
249249
});
250-
expect(search).toHaveFocus();
250+
await waitFor(() => expect(search).toHaveFocus());
251251
await user.type(search, "no matching name");
252252
expect(screen.getByText("No matching channel members.")).toBeVisible();
253253
await user.click(
@@ -2035,3 +2035,77 @@ it("names the choice set only while the picker is shown, and qualifies namesakes
20352035
names.dispose();
20362036
t.library.dispose();
20372037
});
2038+
2039+
it.each([false, true])(
2040+
"shows agent loading only without retained mention choices (warm=%s)",
2041+
async (warm) => {
2042+
const test = setup();
2043+
let release!: () => void;
2044+
const gate = new Promise<void>((resolve) => {
2045+
release = resolve;
2046+
});
2047+
let held = !warm;
2048+
const read = vi.fn(async () => {
2049+
if (held) await gate;
2050+
return {
2051+
definitions: [],
2052+
identities: [{ pubkey: test.key, name: "Outside agent" }],
2053+
};
2054+
});
2055+
const library = createAgentLibrary(read);
2056+
if (warm) await library.queries.refresh();
2057+
const session = {
2058+
...test.session,
2059+
agentChoices: createAgentChoices({
2060+
scope: "test",
2061+
library: library.queries,
2062+
signal: new AbortController().signal,
2063+
}),
2064+
};
2065+
const view = render(
2066+
<MentionPicker
2067+
session={session}
2068+
scope="test"
2069+
channelId="parent"
2070+
disabled={false}
2071+
inviteAgents
2072+
select={() => true}
2073+
/>,
2074+
);
2075+
try {
2076+
await userEvent
2077+
.setup()
2078+
.click(screen.getByRole("button", { name: "Mention a member" }));
2079+
if (warm) {
2080+
await screen.findByRole("button", {
2081+
name: `Outside agent ${test.key}`,
2082+
});
2083+
held = true;
2084+
act(() => {
2085+
void session.agentChoices.refresh();
2086+
});
2087+
}
2088+
await waitFor(() => expect(read).toHaveBeenCalledTimes(warm ? 2 : 1));
2089+
expect(session.agentChoices.snapshot().status).toBe("loading");
2090+
if (warm) {
2091+
expect(
2092+
screen.getByRole("button", { name: `Member ${test.member}` }),
2093+
).toBeVisible();
2094+
expect(screen.queryByText("Loading agents…")).not.toBeInTheDocument();
2095+
} else expect(screen.getByText("Loading agents…")).toBeVisible();
2096+
await act(async () => release());
2097+
await waitFor(() =>
2098+
expect(session.agentChoices.snapshot().status).toBe("ready"),
2099+
);
2100+
expect(
2101+
screen.getByRole("button", { name: `Outside agent ${test.key}` }),
2102+
).toBeEnabled();
2103+
expect(screen.queryByText("Loading agents…")).not.toBeInTheDocument();
2104+
} finally {
2105+
await act(async () => release());
2106+
view.unmount();
2107+
library.dispose();
2108+
test.library.dispose();
2109+
}
2110+
},
2111+
);
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
// @vitest-environment jsdom
2+
import "@testing-library/jest-dom/vitest";
3+
import { cleanup, render, screen } from "@testing-library/react";
4+
import { afterEach, expect, it } from "vitest";
5+
import { createRelaySession } from "../../features/relay/session";
6+
import type { RelayData } from "../../features/relay/service";
7+
import type { ChannelList } from "../../features/relay/contracts";
8+
import { SessionsPage } from "./SessionsPage";
9+
10+
afterEach(cleanup);
11+
it.each([false, true])(
12+
"shows initial session loading only without retained sessions (retained=%s)",
13+
(retained) => {
14+
const owner = createRelaySession(null);
15+
const list: ChannelList = {
16+
status: "loading",
17+
channels: retained
18+
? [{ id: "session", name: "Planning", channelType: "session" }]
19+
: [],
20+
};
21+
const session = {
22+
...owner.session,
23+
channels: {
24+
...owner.session.channels,
25+
list: () => list,
26+
ensureList() {},
27+
},
28+
};
29+
const snapshot = {
30+
status: "ready" as const,
31+
generation: 1,
32+
scope: "loading-test",
33+
session,
34+
};
35+
const relay: RelayData = {
36+
snapshot: () => snapshot,
37+
subscribe: () => () => {},
38+
retry() {},
39+
disconnect() {},
40+
async clearCache() {},
41+
};
42+
const empty = { snapshot: () => [], subscribe: () => () => {} };
43+
try {
44+
render(
45+
<SessionsPage
46+
relay={relay}
47+
extensions={{ tools: empty, inline: empty }}
48+
/>,
49+
);
50+
if (retained) {
51+
expect(screen.getByRole("button", { name: /Planning/ })).toBeVisible();
52+
expect(screen.queryByText("Loading sessions…")).toBeNull();
53+
} else expect(screen.getByText("Loading sessions…")).toBeVisible();
54+
} finally {
55+
cleanup();
56+
owner.dispose();
57+
}
58+
},
59+
);

‎src/bundled/sessions/SessionsPage.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ function LiveSessions({
131131
select("");
132132
}}
133133
listStatus={
134-
list.status === "loading" ? (
134+
list.status === "loading" && !sessions.length ? (
135135
<p role="status">Loading sessions…</p>
136136
) : list.status === "error" ? (
137137
<div role="alert">

0 commit comments

Comments
 (0)