Skip to content

Commit 38d993f

Browse files
t3dotgg1kunaclaude
authored
fix(web): finished provider updates no longer leave a hidden spinner in the sidebar (pingdotgg#22912)
Co-authored-by: 1kuna <[email protected]> Co-authored-by: Claude Opus 5.5 <[email protected]>
1 parent b9c1293 commit 38d993f

2 files changed

Lines changed: 99 additions & 15 deletions

File tree

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
import { ProviderDriverKind, ProviderInstanceId, type ServerProvider } from "@t3tools/contracts";
2+
import { describe, expect, it, vi } from "vite-plus/test";
3+
4+
import { act, fakeTimers, render } from "../../../test/render";
5+
import { SidebarProviderUpdatePill } from "./SidebarProviderUpdatePill";
6+
7+
const state = vi.hoisted(() => ({ providers: [] as ServerProvider[] }));
8+
vi.mock("@effect/atom-react", async (importOriginal) => ({
9+
...(await importOriginal<typeof import("@effect/atom-react")>()),
10+
useAtomValue: () => state.providers,
11+
}));
12+
vi.mock("../../state/server", () => ({ primaryServerProvidersAtom: {} }));
13+
14+
const checkedAt = "2026-10-19T03:00:00.000Z";
15+
16+
function provider(status: "running" | "succeeded" | "failed"): ServerProvider {
17+
return {
18+
instanceId: ProviderInstanceId.make("claude"),
19+
driver: ProviderDriverKind.make("claudeAgent"),
20+
enabled: true,
21+
installed: true,
22+
version: "2.1.303",
23+
status: "ready",
24+
auth: { status: "authenticated" },
25+
checkedAt,
26+
models: [],
27+
slashCommands: [],
28+
skills: [],
29+
updateState: {
30+
status,
31+
startedAt: checkedAt,
32+
finishedAt: status === "running" ? null : "2026-10-19T04:00:00.000Z",
33+
message: status === "failed" ? "Update failed." : "Provider updated.",
34+
output: null,
35+
},
36+
};
37+
}
38+
39+
function setup(providers: ServerProvider[]) {
40+
state.providers = providers;
41+
}
42+
43+
const advance = (ms: number) => act(() => vi.advanceTimersByTime(ms));
44+
45+
// Fake timers move past the exit before any real transitionend can fire, like a skipped or
46+
// cancelled transition in the app.
47+
describe("SidebarProviderUpdatePill exit", () => {
48+
it("replaces a finished update's spinner with success, then dismisses it", async () => {
49+
setup([provider("running")]);
50+
await using screen = await render(<SidebarProviderUpdatePill />);
51+
using _timers = fakeTimers();
52+
expect(screen.container.querySelector('[role="status"]')).not.toBeNull();
53+
54+
setup([provider("succeeded")]);
55+
await screen.rerender(<SidebarProviderUpdatePill />);
56+
await advance(180);
57+
expect(screen.container.textContent).toContain("Claude updated: v2.1.303");
58+
expect(screen.container.querySelector('[role="status"]')).toBeNull();
59+
60+
await advance(3_000);
61+
await advance(180);
62+
expect(screen.container.textContent).toBe("");
63+
});
64+
65+
it("removes a dismissed failure", async () => {
66+
setup([provider("failed")]);
67+
await using screen = await render(<SidebarProviderUpdatePill />);
68+
using _timers = fakeTimers();
69+
expect(screen.container.textContent).toContain("Claude update failed");
70+
71+
await act(() =>
72+
screen.container
73+
.querySelector<HTMLButtonElement>('[aria-label="Dismiss provider update notice"]')
74+
?.click(),
75+
);
76+
await advance(180);
77+
expect(screen.container.textContent).toBe("");
78+
});
79+
});

‎apps/web/src/components/sidebar/SidebarProviderUpdatePill.tsx‎

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ import {
1212
} from "../ProviderUpdateLaunchNotification.logic";
1313
import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
1414

15+
// Matches the pill's `duration-180` class.
16+
const PROVIDER_UPDATE_PILL_EXIT_MS = 180;
17+
1518
const PROVIDER_UPDATE_PILL_STYLES = {
1619
loading:
1720
"bg-sidebar-control-surface text-sidebar-foreground group-has-[button[data-provider-update-main]:hover]/provider-update:bg-sidebar-row-hover",
@@ -98,6 +101,23 @@ export function SidebarProviderUpdatePill() {
98101

99102
const exitAfterVisible = useEffectEvent((key: string) => startExit(key, null, key));
100103

104+
const finishExit = useEffectEvent(() => {
105+
if (dismissAfterExitKey !== null) {
106+
setDismissedKeys((previous) => new Set(previous).add(dismissAfterExitKey));
107+
}
108+
setRenderedView(pendingView);
109+
setPendingView(null);
110+
setExitingKey(null);
111+
setDismissAfterExitKey(null);
112+
});
113+
114+
useEffect(() => {
115+
if (exitingKey === null) return;
116+
// A cancelled or skipped CSS transition must not keep a hidden spinner mounted.
117+
const timeoutId = window.setTimeout(finishExit, PROVIDER_UPDATE_PILL_EXIT_MS);
118+
return () => window.clearTimeout(timeoutId);
119+
}, [exitingKey]);
120+
101121
useEffect(() => {
102122
if (!dismissAfterVisibleMs || !viewKey) {
103123
return;
@@ -125,21 +145,6 @@ export function SidebarProviderUpdatePill() {
125145
? "pointer-events-none translate-y-1.5 opacity-0"
126146
: "translate-y-0 opacity-100"
127147
}`}
128-
onTransitionEnd={(event) => {
129-
if (event.target !== event.currentTarget) {
130-
return;
131-
}
132-
if (!displayedView || exitingKey !== displayedView.key) {
133-
return;
134-
}
135-
if (dismissAfterExitKey === displayedView.key) {
136-
setDismissedKeys((previous) => new Set(previous).add(displayedView.key));
137-
}
138-
setRenderedView(pendingView);
139-
setPendingView(null);
140-
setExitingKey(null);
141-
setDismissAfterExitKey(null);
142-
}}
143148
>
144149
{showDismissProgress ? (
145150
<div

0 commit comments

Comments
 (0)