Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
2 changes: 1 addition & 1 deletion site/src/components/InfoTooltip/InfoTooltip.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
TooltipTrigger,
} from "#/components/Tooltip/Tooltip";

type InfoTooltipType = "info" | "warning";
export type InfoTooltipType = "info" | "warning";

type InfoTooltipSize = "small" | "medium";

Expand Down
36 changes: 16 additions & 20 deletions site/src/modules/resources/AgentLatency.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ import { cn } from "cn";
import type { FC } from "react";
import type { DERPRegion, WorkspaceAgent } from "#/api/typesGenerated";
import {
HelpPopover,
HelpPopoverContent,
HelpPopoverText,
HelpPopoverTitle,
HelpPopoverTrigger,
} from "#/components/HelpPopover/HelpPopover";
Tooltip,
TooltipContent,
TooltipMessage,
TooltipTitle,
TooltipTrigger,
} from "#/components/Tooltip/Tooltip";
import { getLatencyColor } from "#/utils/latency";

const getDisplayLatency = (agent: WorkspaceAgent) => {
Expand Down Expand Up @@ -41,22 +41,18 @@ export const AgentLatency: FC<AgentLatencyProps> = ({ agent }) => {
}

return (
<HelpPopover>
<HelpPopoverTrigger asChild>
<button
type="button"
aria-label="latency"
className={cn("cursor-pointer", latency.color)}
>
<Tooltip>
<TooltipTrigger asChild>
<button type="button" aria-label="latency" className={latency.color}>
{Math.round(latency.latency_ms)}ms
</button>
</HelpPopoverTrigger>
<HelpPopoverContent>
<HelpPopoverTitle>Latency</HelpPopoverTitle>
<HelpPopoverText>
</TooltipTrigger>
<TooltipContent className="max-w-xs">
<TooltipTitle>Latency</TooltipTitle>
<TooltipMessage>
This is the latency overhead on non peer to peer connections. The
first row is the preferred relay.
</HelpPopoverText>
</TooltipMessage>
<div className="flex-col gap-1 mt-4">
{Object.entries(agent.latency)
.sort(([, a], [, b]) => a.latency_ms - b.latency_ms)
Expand All @@ -73,7 +69,7 @@ export const AgentLatency: FC<AgentLatencyProps> = ({ agent }) => {
</div>
))}
</div>
</HelpPopoverContent>
</HelpPopover>
</TooltipContent>
</Tooltip>
);
};
4 changes: 2 additions & 2 deletions site/src/modules/resources/AgentStatus.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ async function expectTooltip(
hasTroubleshootLink: boolean,
) {
const icon = screen.getByRole("status", { name: ariaLabel });
await userEvent.click(icon);
await userEvent.hover(icon);
await waitFor(() => {
const tooltip = screen.getByRole("dialog");
const tooltip = screen.getByRole("tooltip");
expect(tooltip).toHaveTextContent(title);
expect(tooltip).toHaveTextContent(detail);
if (hasTroubleshootLink) {
Expand Down
30 changes: 14 additions & 16 deletions site/src/modules/resources/AgentStatus.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,12 @@ import type {
WorkspaceAgent,
WorkspaceAgentDevcontainer,
} from "#/api/typesGenerated";
import {
HelpPopover,
HelpPopoverContent,
HelpPopoverText,
HelpPopoverTitle,
HelpPopoverTrigger,
} from "#/components/HelpPopover/HelpPopover";
import { Link } from "#/components/Link/Link";
import {
Tooltip,
TooltipContent,
TooltipMessage,
TooltipTitle,
TooltipTrigger,
} from "#/components/Tooltip/Tooltip";
import {
Expand Down Expand Up @@ -57,25 +52,28 @@ const AgentWarningTooltip: FC<AgentWarningTooltipProps> = ({
variant = "warning",
}) => {
return (
<HelpPopover>
<HelpPopoverTrigger asChild role="status" aria-label={ariaLabel}>
<Tooltip>
<TooltipTrigger asChild>
<TriangleAlertIcon
role="status"
aria-label={ariaLabel}
className={cn(
"relative size-3.5",
variant === "warning"
? "text-content-warning"
: "text-content-destructive",
)}
/>
</HelpPopoverTrigger>
<HelpPopoverContent>
<HelpPopoverTitle>{title}</HelpPopoverTitle>
<HelpPopoverText>
</TooltipTrigger>
<TooltipContent className="max-w-xs">
<TooltipTitle>{title}</TooltipTitle>
<TooltipMessage>
{detail}
{troubleshootingURL && (
<>
{" "}
<Link
size="sm"
target="_blank"
rel="noreferrer"
href={troubleshootingURL}
Expand All @@ -86,9 +84,9 @@ const AgentWarningTooltip: FC<AgentWarningTooltipProps> = ({
</Link>
</>
)}
</HelpPopoverText>
</HelpPopoverContent>
</HelpPopover>
</TooltipMessage>
</TooltipContent>
</Tooltip>
);
};

Expand Down
64 changes: 25 additions & 39 deletions site/src/modules/users/UserHelpPopovers.tsx
Original file line number Diff line number Diff line change
@@ -1,51 +1,37 @@
import type { FC } from "react";
import {
HelpPopover,
HelpPopoverContent,
HelpPopoverIconTrigger,
HelpPopoverLink,
HelpPopoverLinksGroup,
HelpPopoverText,
HelpPopoverTitle,
} from "#/components/HelpPopover/HelpPopover";
import { InfoTooltip } from "#/components/InfoTooltip/InfoTooltip";
import { Link } from "#/components/Link/Link";
import { TooltipMessage, TooltipTitle } from "#/components/Tooltip/Tooltip";
import { docs } from "#/utils/docs";

export const RolesHelpPopover: FC = () => {
return (
<HelpPopover>
<HelpPopoverIconTrigger size="small" />
<HelpPopoverContent>
<HelpPopoverTitle>What is a role?</HelpPopoverTitle>
<HelpPopoverText>
Coder role-based access control (RBAC) provides fine-grained access
management. View our docs on how to use the available roles.
</HelpPopoverText>
<HelpPopoverLinksGroup>
<HelpPopoverLink href={docs("/admin/users/groups-roles")}>
User Roles
</HelpPopoverLink>
</HelpPopoverLinksGroup>
</HelpPopoverContent>
</HelpPopover>
<InfoTooltip size="small">
<TooltipTitle>What is a role?</TooltipTitle>
<TooltipMessage>
Coder role-based access control (RBAC) provides fine-grained access
management. View our docs on how to use the available roles.
<br />
<Link size="sm" href={docs("/admin/users/groups-roles")}>
User Roles
</Link>
</TooltipMessage>
</InfoTooltip>
);
};

export const GroupsHelpPopover: FC = () => {
return (
<HelpPopover>
<HelpPopoverIconTrigger size="small" />
<HelpPopoverContent>
<HelpPopoverTitle>What is a group?</HelpPopoverTitle>
<HelpPopoverText>
Groups can be used with template RBAC to give groups of users access
to specific templates. View our docs on how to use groups.
</HelpPopoverText>
<HelpPopoverLinksGroup>
<HelpPopoverLink href={docs("/admin/users/groups-roles")}>
Groups
</HelpPopoverLink>
</HelpPopoverLinksGroup>
</HelpPopoverContent>
</HelpPopover>
<InfoTooltip size="small">
<TooltipTitle>What is a group?</TooltipTitle>
<TooltipMessage>
Groups can be used with template RBAC to give groups of users access to
specific templates. View our docs on how to use groups.
<br />
<Link size="sm" href={docs("/admin/users/groups-roles")}>
Groups
</Link>
</TooltipMessage>
</InfoTooltip>
);
};
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export const WorkspaceOutdatedTooltip: FC<WorkspaceOutdatedTooltipProps> = ({
{children ? (
<HelpPopoverTrigger asChild>
<span
className="flex items-center gap-1.5 cursor-help"
className="flex items-center gap-1.5"
onClick={stopPropagation}
onKeyDown={stopPropagation}
onKeyUp={stopPropagation}
Expand Down
39 changes: 14 additions & 25 deletions site/src/pages/AIBridgePage/AIBridgeHelpPopover.tsx
Original file line number Diff line number Diff line change
@@ -1,32 +1,21 @@
import type { FC } from "react";
import {
HelpPopover,
HelpPopoverContent,
HelpPopoverIconTrigger,
HelpPopoverLink,
HelpPopoverLinksGroup,
HelpPopoverText,
HelpPopoverTitle,
} from "#/components/HelpPopover/HelpPopover";
import { InfoTooltip } from "#/components/InfoTooltip/InfoTooltip";
import { Link } from "#/components/Link/Link";
import { TooltipMessage, TooltipTitle } from "#/components/Tooltip/Tooltip";
import { docs } from "#/utils/docs";

export const AIBridgeHelpPopover: FC = () => {
return (
<HelpPopover>
<HelpPopoverIconTrigger />

<HelpPopoverContent>
<HelpPopoverTitle>What is AI Gateway?</HelpPopoverTitle>
<HelpPopoverText>
AI Gateway is a smart gateway for AI that provides centralized
management, auditing, and attribution for LLM usage.
</HelpPopoverText>
<HelpPopoverLinksGroup>
<HelpPopoverLink href={docs("/ai-coder/ai-gateway")}>
Read the docs
</HelpPopoverLink>
</HelpPopoverLinksGroup>
</HelpPopoverContent>
</HelpPopover>
<InfoTooltip>
<TooltipTitle>What is AI Gateway?</TooltipTitle>
<TooltipMessage>
AI Gateway is a smart gateway for AI that provides centralized
management, auditing, and attribution for LLM usage.
<br />
<Link size="sm" href={docs("/ai-coder/ai-gateway")}>
Read the docs
</Link>
</TooltipMessage>
</InfoTooltip>
);
};
2 changes: 1 addition & 1 deletion site/src/pages/AIBridgePage/NetworkRequestStates.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { TooltipMessage } from "#/components/Tooltip/Tooltip";
export const NetworkMonitoringDisabled: FC = () => (
<span className="inline-flex items-center gap-1 whitespace-nowrap text-content-secondary">
Disabled
<InfoTooltip>
<InfoTooltip size="small">
<TooltipMessage>
Network request monitoring was not active for this session.
</TooltipMessage>
Expand Down
2 changes: 1 addition & 1 deletion site/src/pages/AgentsPage/components/UsageIndicator.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ const UsageSection: FC<{ section: UsageSectionData }> = ({ section }) => {
<TooltipTrigger asChild>
<button
type="button"
className="mt-0.5 inline-flex size-3.5 shrink-0 cursor-help items-center justify-center rounded-sm border-none bg-transparent p-0 text-content-secondary/70 outline-hidden transition-colors hover:text-content-primary focus-visible:ring-2 focus-visible:ring-content-link"
className="mt-0.5 inline-flex size-3.5 shrink-0 items-center justify-center rounded-sm border-none bg-transparent p-0 text-content-secondary/70 outline-hidden transition-colors hover:text-content-primary focus-visible:ring-2 focus-visible:ring-content-link"
aria-label={`${section.title} help`}
>
<InfoIcon className="size-3.5" />
Expand Down
38 changes: 13 additions & 25 deletions site/src/pages/AuditPage/AuditHelpPopover.tsx
Original file line number Diff line number Diff line change
@@ -1,32 +1,20 @@
import type { FC } from "react";
import {
HelpPopover,
HelpPopoverContent,
HelpPopoverIconTrigger,
HelpPopoverLink,
HelpPopoverLinksGroup,
HelpPopoverText,
HelpPopoverTitle,
} from "#/components/HelpPopover/HelpPopover";
import { InfoTooltip } from "#/components/InfoTooltip/InfoTooltip";
import { Link } from "#/components/Link/Link";
import { TooltipMessage, TooltipTitle } from "#/components/Tooltip/Tooltip";
import { docs } from "#/utils/docs";

export const AuditHelpPopover: FC = () => {
return (
<HelpPopover>
<HelpPopoverIconTrigger />

<HelpPopoverContent>
<HelpPopoverTitle>What is an audit log?</HelpPopoverTitle>
<HelpPopoverText>
An audit log is a record of events and changes made throughout a
system.
</HelpPopoverText>
<HelpPopoverLinksGroup>
<HelpPopoverLink href={docs("/admin/security/audit-logs")}>
Events we track
</HelpPopoverLink>
</HelpPopoverLinksGroup>
</HelpPopoverContent>
</HelpPopover>
<InfoTooltip>
<TooltipTitle>What is an audit log?</TooltipTitle>
<TooltipMessage>
An audit log is a record of events and changes made throughout a system.
<br />
<Link size="sm" href={docs("/admin/security/audit-logs")}>
Events we track
</Link>
</TooltipMessage>
</InfoTooltip>
);
};
41 changes: 15 additions & 26 deletions site/src/pages/ConnectionLogPage/ConnectionLogHelpPopover.tsx
Original file line number Diff line number Diff line change
@@ -1,33 +1,22 @@
import type { FC } from "react";
import {
HelpPopover,
HelpPopoverContent,
HelpPopoverIconTrigger,
HelpPopoverLink,
HelpPopoverLinksGroup,
HelpPopoverText,
HelpPopoverTitle,
} from "#/components/HelpPopover/HelpPopover";
import { InfoTooltip } from "#/components/InfoTooltip/InfoTooltip";
import { Link } from "#/components/Link/Link";
import { TooltipMessage, TooltipTitle } from "#/components/Tooltip/Tooltip";
import { docs } from "#/utils/docs";

export const ConnectionLogHelpPopover: FC = () => {
return (
<HelpPopover>
<HelpPopoverIconTrigger />

<HelpPopoverContent>
<HelpPopoverTitle>Why are some events missing?</HelpPopoverTitle>
<HelpPopoverText>
The connection log is a best-effort log of workspace access. Some
events are reported by workspace agents, and receipt of these events
by the server is not guaranteed.
</HelpPopoverText>
<HelpPopoverLinksGroup>
<HelpPopoverLink href={docs("/admin/monitoring/connection-logs")}>
Connection log documentation
</HelpPopoverLink>
</HelpPopoverLinksGroup>
</HelpPopoverContent>
</HelpPopover>
<InfoTooltip>
<TooltipTitle>Why are some events missing?</TooltipTitle>
<TooltipMessage>
The connection log is a best-effort log of workspace access. Some events
are reported by workspace agents, and receipt of these events by the
server is not guaranteed.
<br />
<Link size="sm" href={docs("/admin/monitoring/connection-logs")}>
Connection log documentation
</Link>
</TooltipMessage>
</InfoTooltip>
);
};
Loading
Loading