Skip to content

Commit e230f38

Browse files
aqandrewaqandrew
committed
refactor: replace PopoverTrigger with TooltipTrigger in AgentStatus
1 parent fba9492 commit e230f38

File tree

1 file changed

+29
-27
lines changed

1 file changed

+29
-27
lines changed

‎site/src/modules/resources/AgentStatus.tsx

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ import type {
66
WorkspaceAgentDevcontainer,
77
} from "api/typesGenerated";
88
import { ChooseOne, Cond } from "components/Conditionals/ChooseOne";
9-
import { PopoverTrigger } from "components/deprecated/Popover/Popover";
109
import {
1110
HelpTooltip,
1211
HelpTooltipContent,
1312
HelpTooltipText,
1413
HelpTooltipTitle,
1514
} from "components/HelpTooltip/HelpTooltip";
15+
import { TooltipProvider, TooltipTrigger } from "components/Tooltip/Tooltip";
1616
import { TriangleAlertIcon } from "lucide-react";
1717
import type { FC } from "react";
1818

@@ -62,9 +62,9 @@ interface DevcontainerStatusProps {
6262
const StartTimeoutLifecycle: FC<AgentStatusProps> = ({ agent }) => {
6363
return (
6464
<HelpTooltip>
65-
<PopoverTrigger role="status" aria-label="Agent timeout">
65+
<TooltipTrigger asChild role="status" aria-label="Agent timeout">
6666
<TriangleAlertIcon css={styles.timeoutWarning} />
67-
</PopoverTrigger>
67+
</TooltipTrigger>
6868

6969
<HelpTooltipContent>
7070
<HelpTooltipTitle>Agent is taking too long to start</HelpTooltipTitle>
@@ -87,9 +87,9 @@ const StartTimeoutLifecycle: FC<AgentStatusProps> = ({ agent }) => {
8787
const StartErrorLifecycle: FC<AgentStatusProps> = ({ agent }) => {
8888
return (
8989
<HelpTooltip>
90-
<PopoverTrigger role="status" aria-label="Start error">
90+
<TooltipTrigger asChild role="status" aria-label="Start error">
9191
<TriangleAlertIcon css={styles.errorWarning} />
92-
</PopoverTrigger>
92+
</TooltipTrigger>
9393
<HelpTooltipContent>
9494
<HelpTooltipTitle>Error starting the agent</HelpTooltipTitle>
9595
<HelpTooltipText>
@@ -123,9 +123,9 @@ const ShuttingDownLifecycle: FC = () => {
123123
const ShutdownTimeoutLifecycle: FC<AgentStatusProps> = ({ agent }) => {
124124
return (
125125
<HelpTooltip>
126-
<PopoverTrigger role="status" aria-label="Stop timeout">
126+
<TooltipTrigger asChild role="status" aria-label="Stop timeout">
127127
<TriangleAlertIcon css={styles.timeoutWarning} />
128-
</PopoverTrigger>
128+
</TooltipTrigger>
129129
<HelpTooltipContent>
130130
<HelpTooltipTitle>Agent is taking too long to stop</HelpTooltipTitle>
131131
<HelpTooltipText>
@@ -147,9 +147,9 @@ const ShutdownTimeoutLifecycle: FC<AgentStatusProps> = ({ agent }) => {
147147
const ShutdownErrorLifecycle: FC<AgentStatusProps> = ({ agent }) => {
148148
return (
149149
<HelpTooltip>
150-
<PopoverTrigger role="status" aria-label="Stop error">
150+
<TooltipTrigger asChild role="status" aria-label="Stop error">
151151
<TriangleAlertIcon css={styles.errorWarning} />
152-
</PopoverTrigger>
152+
</TooltipTrigger>
153153
<HelpTooltipContent>
154154
<HelpTooltipTitle>Error stopping the agent</HelpTooltipTitle>
155155
<HelpTooltipText>
@@ -243,9 +243,9 @@ const ConnectingStatus: FC = () => {
243243
const TimeoutStatus: FC<AgentStatusProps> = ({ agent }) => {
244244
return (
245245
<HelpTooltip>
246-
<PopoverTrigger role="status" aria-label="Timeout">
246+
<TooltipTrigger asChild role="status" aria-label="Timeout">
247247
<TriangleAlertIcon css={styles.timeoutWarning} />
248-
</PopoverTrigger>
248+
</TooltipTrigger>
249249
<HelpTooltipContent>
250250
<HelpTooltipTitle>Agent is taking too long to connect</HelpTooltipTitle>
251251
<HelpTooltipText>
@@ -266,20 +266,22 @@ const TimeoutStatus: FC<AgentStatusProps> = ({ agent }) => {
266266

267267
export const AgentStatus: FC<AgentStatusProps> = ({ agent }) => {
268268
return (
269-
<ChooseOne>
270-
<Cond condition={agent.status === "connected"}>
271-
<ConnectedStatus agent={agent} />
272-
</Cond>
273-
<Cond condition={agent.status === "disconnected"}>
274-
<DisconnectedStatus />
275-
</Cond>
276-
<Cond condition={agent.status === "timeout"}>
277-
<TimeoutStatus agent={agent} />
278-
</Cond>
279-
<Cond>
280-
<ConnectingStatus />
281-
</Cond>
282-
</ChooseOne>
269+
<TooltipProvider>
270+
<ChooseOne>
271+
<Cond condition={agent.status === "connected"}>
272+
<ConnectedStatus agent={agent} />
273+
</Cond>
274+
<Cond condition={agent.status === "disconnected"}>
275+
<DisconnectedStatus />
276+
</Cond>
277+
<Cond condition={agent.status === "timeout"}>
278+
<TimeoutStatus agent={agent} />
279+
</Cond>
280+
<Cond>
281+
<ConnectingStatus />
282+
</Cond>
283+
</ChooseOne>
284+
</TooltipProvider>
283285
);
284286
};
285287

@@ -308,9 +310,9 @@ const SubAgentStatus: FC<SubAgentStatusProps> = ({ agent }) => {
308310
const DevcontainerStartError: FC<AgentStatusProps> = ({ agent }) => {
309311
return (
310312
<HelpTooltip>
311-
<PopoverTrigger role="status" aria-label="Start error">
313+
<TooltipTrigger asChild role="status" aria-label="Start error">
312314
<TriangleAlertIcon css={styles.errorWarning} />
313-
</PopoverTrigger>
315+
</TooltipTrigger>
314316
<HelpTooltipContent>
315317
<HelpTooltipTitle>
316318
Error starting the devcontainer agent

0 commit comments

Comments
 (0)