Skip to content

Commit 5fe1523

Browse files
committed
fix(web): server update banner only offers details when its text is clipped
The update banner rendered its title and stage as one cursor-help button with a tooltip that repeated the visible line. Pass them through the notice title and description instead, so the banner stack's existing clipped-description details control handles long failure messages.
1 parent 0442f5b commit 5fe1523

2 files changed

Lines changed: 12 additions & 63 deletions

File tree

‎apps/web/src/components/ChatView.tsx‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -585,12 +585,9 @@ import {
585585
AlertDialogTitle,
586586
} from "./ui/alert-dialog";
587587
import { Tooltip, TooltipPopup, TooltipTrigger } from "./ui/tooltip";
588-
import { ServerUpdateAction } from "./ServerUpdateAction";
588+
import { ServerUpdateAction, serverUpdateStageLabel } from "./ServerUpdateAction";
589589
import { useAutoBalanceUpdateBanner } from "./chat/useAutoBalanceUpdateBanner";
590-
import {
591-
ComposerServerUpdateIcon,
592-
ComposerServerUpdateStatus,
593-
} from "./chat/ComposerServerUpdateStatus";
590+
import { ComposerServerUpdateIcon } from "./chat/ComposerServerUpdateStatus";
594591
import {
595592
buildVersionMismatchDismissalKey,
596593
dismissServerUpdateFailure,
@@ -3155,10 +3152,7 @@ export default function ChatView(props: ChatViewProps) {
31553152
icon: <ComposerServerUpdateIcon status={serverUpdateState.status} />,
31563153
title:
31573154
updateInProgress || updateFailed ? (
3158-
<ComposerServerUpdateStatus
3159-
state={serverUpdateState}
3160-
serverLabel={versionMismatchServerLabel}
3161-
/>
3155+
`${updateFailed ? "Could not update" : "Updating"} ${versionMismatchServerLabel}`
31623156
) : versionMismatch ? (
31633157
<Tooltip>
31643158
<TooltipTrigger
@@ -3180,12 +3174,15 @@ export default function ChatView(props: ChatViewProps) {
31803174
"Server update available"
31813175
),
31823176
description:
3183-
!updateInProgress &&
3184-
!updateFailed &&
3185-
versionMismatchSelfUpdate !== null &&
3186-
(versionMismatchSelfUpdate !== "desktop-managed" || !versionMismatchDesktopAppUpdate)
3187-
? serverUpdateGuidance(versionMismatchSelfUpdate)
3188-
: undefined,
3177+
serverUpdateState.status === "failed"
3178+
? serverUpdateState.message
3179+
: serverUpdateState.status === "running"
3180+
? serverUpdateStageLabel(serverUpdateState.stage)
3181+
: versionMismatchSelfUpdate !== null &&
3182+
(versionMismatchSelfUpdate !== "desktop-managed" ||
3183+
!versionMismatchDesktopAppUpdate)
3184+
? serverUpdateGuidance(versionMismatchSelfUpdate)
3185+
: undefined,
31893186
actions: updateInProgress ? (
31903187
disconnectAction
31913188
) : !versionMismatch ||
Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
import { Spinner } from "~/components/ui/spinner";
22
import type { ServerUpdateState } from "@t3tools/client-runtime/state/server";
33
import { CircleAlertIcon, DownloadIcon } from "lucide-react";
4-
import { useId, useState } from "react";
5-
6-
import { serverUpdateStageLabel } from "../ServerUpdateAction";
7-
import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
8-
import { ComposerBanner } from "./ComposerBanner";
94

105
export function ComposerServerUpdateIcon({
116
status,
@@ -20,46 +15,3 @@ export function ComposerServerUpdateIcon({
2015
}
2116
return <DownloadIcon aria-hidden />;
2217
}
23-
24-
/** One text line, clipped at the end so the error detail never squeezes its title. */
25-
export function ComposerServerUpdateStatus({
26-
state,
27-
serverLabel = "server",
28-
}: {
29-
readonly state: Exclude<ServerUpdateState, { status: "idle" }>;
30-
readonly serverLabel?: string;
31-
}) {
32-
const [detailsOpen, setDetailsOpen] = useState(false);
33-
const triggerId = useId();
34-
const title = `${state.status === "failed" ? "Could not update" : "Updating"} ${serverLabel}`;
35-
const detail = state.status === "failed" ? state.message : serverUpdateStageLabel(state.stage);
36-
return (
37-
<span
38-
role={state.status === "failed" ? "alert" : "status"}
39-
className="min-w-0"
40-
data-composer-server-update-status={state.status}
41-
>
42-
<Tooltip open={detailsOpen} onOpenChange={setDetailsOpen} triggerId={triggerId}>
43-
<TooltipTrigger
44-
id={triggerId}
45-
closeOnClick={false}
46-
render={
47-
<button
48-
type="button"
49-
aria-label={`${title}: ${detail}`}
50-
className="block max-w-full cursor-help truncate rounded-sm text-left outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring"
51-
onClick={() => setDetailsOpen(true)}
52-
>
53-
{title}
54-
<ComposerBanner.Separator />
55-
<span className="font-normal text-muted-foreground">{detail}</span>
56-
</button>
57-
}
58-
/>
59-
<TooltipPopup side="top">
60-
{title}: {detail}
61-
</TooltipPopup>
62-
</Tooltip>
63-
</span>
64-
);
65-
}

0 commit comments

Comments
 (0)