Skip to content

Commit a261a71

Browse files
fix(web): server update banner only offers details when its text is clipped (pingdotgg#17933)
Co-authored-by: Julius Marminge <[email protected]>
1 parent 32e3b90 commit a261a71

2 files changed

Lines changed: 7 additions & 58 deletions

File tree

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

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -542,12 +542,9 @@ import { useOrchestrationCommand } from "../state/use-orchestration-command";
542542
import { useAtomQueryRunner } from "../state/use-atom-query-runner";
543543
import { Button, InlineButton } from "./ui/button";
544544
import { Tooltip, TooltipPopup, TooltipTrigger } from "./ui/tooltip";
545-
import { ServerUpdateAction } from "./ServerUpdateAction";
545+
import { ServerUpdateAction, serverUpdateStageLabel } from "./ServerUpdateAction";
546546
import { useAutoBalanceUpdateBanner } from "./chat/useAutoBalanceUpdateBanner";
547-
import {
548-
ComposerServerUpdateIcon,
549-
ComposerServerUpdateStatus,
550-
} from "./chat/ComposerServerUpdateStatus";
547+
import { ComposerServerUpdateIcon } from "./chat/ComposerServerUpdateStatus";
551548
import {
552549
dismissServerUpdateFailure,
553550
isServerUpdateFailureDismissed,
@@ -2328,12 +2325,11 @@ export default function ChatView(props: ChatViewProps) {
23282325
variant: updateFailed ? "error" : "default",
23292326
priority: updateInProgress ? "urgent" : "notice",
23302327
icon: <ComposerServerUpdateIcon status={serverUpdateState.status} />,
2331-
title: (
2332-
<ComposerServerUpdateStatus
2333-
state={serverUpdateState}
2334-
serverLabel={versionMismatchServerLabel}
2335-
/>
2336-
),
2328+
title: `${updateFailed ? "Could not update" : "Updating"} ${versionMismatchServerLabel}`,
2329+
description:
2330+
serverUpdateState.status === "failed"
2331+
? serverUpdateState.message
2332+
: serverUpdateStageLabel(serverUpdateState.stage),
23372333
actions: updateInProgress ? (
23382334
disconnectAction
23392335
) : !versionMismatch ||
Lines changed: 0 additions & 47 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,45 +15,3 @@ export function ComposerServerUpdateIcon({
2015
}
2116
return <DownloadIcon aria-hidden />;
2217
}
23-
24-
export function ComposerServerUpdateStatus({
25-
state,
26-
serverLabel = "server",
27-
}: {
28-
readonly state: Exclude<ServerUpdateState, { status: "idle" }>;
29-
readonly serverLabel?: string;
30-
}) {
31-
const [detailsOpen, setDetailsOpen] = useState(false);
32-
const triggerId = useId();
33-
const title = `${state.status === "failed" ? "Could not update" : "Updating"} ${serverLabel}`;
34-
const detail = state.status === "failed" ? state.message : serverUpdateStageLabel(state.stage);
35-
return (
36-
<span
37-
role={state.status === "failed" ? "alert" : "status"}
38-
className="min-w-0"
39-
data-composer-server-update-status={state.status}
40-
>
41-
<Tooltip open={detailsOpen} onOpenChange={setDetailsOpen} triggerId={triggerId}>
42-
<TooltipTrigger
43-
id={triggerId}
44-
closeOnClick={false}
45-
render={
46-
<button
47-
type="button"
48-
aria-label={`${title}: ${detail}`}
49-
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"
50-
onClick={() => setDetailsOpen(true)}
51-
>
52-
{title}
53-
<ComposerBanner.Separator />
54-
<span className="font-normal text-muted-foreground">{detail}</span>
55-
</button>
56-
}
57-
/>
58-
<TooltipPopup side="top">
59-
{title}: {detail}
60-
</TooltipPopup>
61-
</Tooltip>
62-
</span>
63-
);
64-
}

0 commit comments

Comments
 (0)