Skip to content

feat(web): use Sidebar V2 #PR number badges on classic thread rows #159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
patroza merged 1 commit into from
Jul 28, 2026
Merged

feat(web): use Sidebar V2 #PR number badges on classic thread rows #159

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
81 changes: 44 additions & 37 deletions apps/web/src/components/Sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import {
TriangleAlertIcon,
} from "lucide-react";
import {
ChangeRequestStatusIcon,
prStatusIndicator,
PrStatusTooltipContent,
resolveThreadPr,
Expand Down Expand Up @@ -794,25 +793,6 @@ export const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThr
onContextMenu={handleRowContextMenu}
>
<div className="flex min-w-0 flex-1 items-center gap-1.5 text-left">
{prStatus && (
<Tooltip>
<TooltipTrigger
render={
<button
type="button"
aria-label={prStatus.tooltip}
className={`inline-flex items-center justify-center ${prStatus.colorClass} cursor-pointer rounded-sm outline-hidden focus-visible:ring-1 focus-visible:ring-ring`}
onClick={handlePrClick}
>
<ChangeRequestStatusIcon className="size-3" />
</button>
}
/>
<TooltipPopup side="top">
<PrStatusTooltipContent status={prStatus} />
</TooltipPopup>
</Tooltip>
)}
{threadStatus && <ThreadStatusLabel status={threadStatus} />}
{renamingThreadKey === threadKey ? (
<input
Expand Down Expand Up @@ -842,6 +822,28 @@ export const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThr
</TooltipPopup>
</Tooltip>
)}
{prStatus && pr ? (
<Tooltip>
<TooltipTrigger
render={
<button
type="button"
aria-label={prStatus.tooltip}
className={cn(
"shrink-0 cursor-pointer font-mono text-xs hover:underline outline-hidden focus-visible:ring-1 focus-visible:ring-ring",
prStatus.colorClass,
)}
onClick={handlePrClick}
/>
}
>
#{pr.number}
</TooltipTrigger>
<TooltipPopup side="top">
<PrStatusTooltipContent status={prStatus} />
</TooltipPopup>
</Tooltip>
) : null}
</div>
<div className="ml-auto flex shrink-0 items-center gap-1.5">
{discoveredPorts.length > 0 && (
Expand Down Expand Up @@ -3391,23 +3393,6 @@ const SidebarRecentThreadRow = memo(function SidebarRecentThreadRow(props: {
</Tooltip>
<div className="flex min-w-0 flex-1 flex-col gap-0.5">
<div className="flex min-w-0 items-center gap-1.5">
{prStatus ? (
<Tooltip>
<TooltipTrigger
render={
<button
type="button"
aria-label={prStatus.tooltip}
className={`inline-flex shrink-0 items-center justify-center ${prStatus.colorClass}`}
onClick={(event) => openPrLink(event, prStatus.url)}
/>
}
>
<ChangeRequestStatusIcon className="size-3" />
</TooltipTrigger>
<TooltipPopup>{prStatus.tooltip}</TooltipPopup>
</Tooltip>
) : null}
{threadStatus ? <ThreadStatusLabel status={threadStatus} /> : null}
{isRenaming ? (
<input
Expand All @@ -3431,6 +3416,28 @@ const SidebarRecentThreadRow = memo(function SidebarRecentThreadRow(props: {
) : (
<span className="min-w-0 flex-1 truncate text-xs">{thread.title}</span>
)}
{prStatus && pr ? (
<Tooltip>
<TooltipTrigger
render={
<button
type="button"
aria-label={prStatus.tooltip}
className={cn(
"shrink-0 cursor-pointer font-mono text-xs hover:underline outline-hidden focus-visible:ring-1 focus-visible:ring-ring",
prStatus.colorClass,
)}
onClick={(event) => openPrLink(event, prStatus.url)}
/>
}
>
#{pr.number}
</TooltipTrigger>
<TooltipPopup>
<PrStatusTooltipContent status={prStatus} />
</TooltipPopup>
</Tooltip>
) : null}
</div>
{/* Cross-project recency rows: project · server, matching mobile +
Sidebar V2's environment context (icon when remote). */}
Expand Down
Loading