Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: fix merge
  • Loading branch information
jaaydenh committed Nov 21, 2025
commit 631764aa539992be4db0e0b14090e062500fb056
98 changes: 48 additions & 50 deletions site/src/components/CopyableValue/CopyableValue.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,55 +36,53 @@ export const CopyableValue: FC<CopyableValueProps> = ({
});

return (
<TooltipProvider>
<Tooltip
open={tooltipOpen}
onOpenChange={(shouldBeOpen) => {
// Always keep the tooltip open when in focus to handle issues when onOpenChange is unexpectedly false
if (!shouldBeOpen && isFocused) return;
setTooltipOpen(shouldBeOpen);
}}
>
<TooltipTrigger asChild>
<span
ref={clickableProps.ref}
{...attrs}
className={cn("cursor-pointer", className)}
role={role ?? clickableProps.role}
tabIndex={tabIndex ?? clickableProps.tabIndex}
onClick={(event) => {
clickableProps.onClick(event);
onClick?.(event);
}}
onKeyDown={(event) => {
clickableProps.onKeyDown(event);
onKeyDown?.(event);
}}
onKeyUp={(event) => {
clickableProps.onKeyUp(event);
onKeyUp?.(event);
}}
onMouseEnter={() => {
setIsFocused(true);
setTooltipOpen(true);
}}
onMouseLeave={() => {
setTooltipOpen(false);
}}
onFocus={() => {
setIsFocused(true);
}}
onBlur={() => {
setTooltipOpen(false);
}}
>
{children}
</span>
</TooltipTrigger>
<TooltipContent side={side}>
{showCopiedSuccess ? "Copied!" : "Click to copy"}
</TooltipContent>
</Tooltip>
</TooltipProvider>
<Tooltip
open={tooltipOpen}
onOpenChange={(shouldBeOpen) => {
// Always keep the tooltip open when in focus to handle issues when onOpenChange is unexpectedly false
if (!shouldBeOpen && isFocused) return;
setTooltipOpen(shouldBeOpen);
}}
>
<TooltipTrigger asChild>
<span
ref={clickableProps.ref}
{...attrs}
className={cn("cursor-pointer", className)}
role={role ?? clickableProps.role}
tabIndex={tabIndex ?? clickableProps.tabIndex}
onClick={(event) => {
clickableProps.onClick(event);
onClick?.(event);
}}
onKeyDown={(event) => {
clickableProps.onKeyDown(event);
onKeyDown?.(event);
}}
onKeyUp={(event) => {
clickableProps.onKeyUp(event);
onKeyUp?.(event);
}}
onMouseEnter={() => {
setIsFocused(true);
setTooltipOpen(true);
}}
onMouseLeave={() => {
setTooltipOpen(false);
}}
onFocus={() => {
setIsFocused(true);
}}
onBlur={() => {
setTooltipOpen(false);
}}
>
{children}
</span>
</TooltipTrigger>
<TooltipContent side={side}>
{showCopiedSuccess ? "Copied!" : "Click to copy"}
</TooltipContent>
</Tooltip>
);
};
13 changes: 5 additions & 8 deletions site/src/modules/tasks/TasksSidebar/TasksSidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -256,16 +256,13 @@ const TaskSidebarMenuItemStatus: FC<{ task: Task }> = ({ task }) => {
return (
<Tooltip>
<TooltipTrigger asChild>
<div
className={taskStatusVariants({
state: task.workspace.latest_app_status?.state ?? "default",
})}
>
<span className="sr-only">{statusText}</span>
</div>
<StatusIndicatorDot
variant={taskStatusToStatusIndicatorVariant[task.status]}
aria-label={task.status}
/>
</TooltipTrigger>
<TooltipContent className="first-letter:capitalize">
{statusText}
{task.status}
</TooltipContent>
</Tooltip>
);
Expand Down
6 changes: 5 additions & 1 deletion site/src/pages/TaskPage/TaskTopbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
} from "lucide-react";
import type { FC } from "react";
import { Link as RouterLink } from "react-router";
import type { TaskStartupWarningButton } from "./TaskStartupWarningButton";
import { TaskStartupWarningButton } from "./TaskStartupWarningButton";
import { TaskStatusLink } from "./TaskStatusLink";

type TaskTopbarProps = { task: Task; workspace: Workspace };
Expand Down Expand Up @@ -44,6 +44,10 @@ export const TaskTopbar: FC<TaskTopbarProps> = ({ task, workspace }) => {
)}

<div className="ml-auto gap-2 flex items-center">
<TaskStartupWarningButton
lifecycleState={task.workspace_agent_lifecycle}
/>

<Tooltip>
<TooltipTrigger asChild>
<Button variant="outline" size="sm">
Expand Down
Loading