From 7321e32e2f06c6b90a9caa142b8df2cd3645dda8 Mon Sep 17 00:00:00 2001 From: angrojo Date: Fri, 20 Nov 2026 22:35:14 +0100 Subject: [PATCH] fix(web): respect browser preference when opening PR links from PR panel MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When opening a pull request on GitHub via '⋯ → Open on GitHub' or by clicking the PR number link in the PR panel, the system browser was opened directly via shell.openExternal, ignoring the 'Open links in' setting. Route PR and repository host links through useOpenLink with the active threadRef so that when 'Open links in' is set to 'T3 Code', the page opens in an in-app Browser tab in the current thread, while preserving external opening when configured or when modified by Ctrl/Cmd/middle-click. gemini-3.8-flash via Antigravity --- .../web/src/browser/browserLinkTarget.test.ts | 50 +++++++++++++++++++ .../PullRequestActionsMenu.browser.test.tsx | 40 +++++++++++++-- .../pullRequest/PullRequestActionsMenu.tsx | 17 ++++++- .../pullRequest/PullRequestDetailCrumbs.tsx | 43 ++++++++++++++-- ...stDetailPanel.permissions.browser.test.tsx | 34 +++++++++++-- .../pullRequest/PullRequestDetailPanel.tsx | 3 ++ .../pullRequest/PullRequestGhosts.tsx | 26 ++++++++-- 7 files changed, 196 insertions(+), 17 deletions(-) diff --git a/apps/web/src/browser/browserLinkTarget.test.ts b/apps/web/src/browser/browserLinkTarget.test.ts index 55bf7c3be8ee9..e7492213884c0 100644 --- a/apps/web/src/browser/browserLinkTarget.test.ts +++ b/apps/web/src/browser/browserLinkTarget.test.ts @@ -20,4 +20,54 @@ describe("resolveLinkTarget", () => { ); } }); + + it("resolves to app when preference is app, in-app opening is available, and url is web url", () => { + expect( + resolveLinkTarget({ + url: "https://github.com/owner/repo/pull/1", + event: click, + preference: "app", + canOpenInApp: true, + }), + ).toBe("app"); + }); + + it("resolves to system when preference is system", () => { + expect( + resolveLinkTarget({ + url: "https://github.com/owner/repo/pull/1", + event: click, + preference: "system", + canOpenInApp: true, + }), + ).toBe("system"); + }); + + it("resolves to system when modified with meta or ctrl or middle-clicked", () => { + for (const event of [ + { metaKey: true, ctrlKey: false }, + { metaKey: false, ctrlKey: true }, + { metaKey: false, ctrlKey: false, button: 1 }, + ]) { + expect( + resolveLinkTarget({ + url: "https://github.com/owner/repo/pull/1", + event, + preference: "app", + canOpenInApp: true, + }), + ).toBe("system"); + } + }); + + it("resolves to system when in-app opening is unavailable", () => { + expect( + resolveLinkTarget({ + url: "https://github.com/owner/repo/pull/1", + event: click, + preference: "app", + canOpenInApp: false, + }), + ).toBe("system"); + }); }); diff --git a/apps/web/src/components/pullRequest/PullRequestActionsMenu.browser.test.tsx b/apps/web/src/components/pullRequest/PullRequestActionsMenu.browser.test.tsx index 521d9c47f316e..1c9f59ed2cd5b 100644 --- a/apps/web/src/components/pullRequest/PullRequestActionsMenu.browser.test.tsx +++ b/apps/web/src/components/pullRequest/PullRequestActionsMenu.browser.test.tsx @@ -1,4 +1,5 @@ import "~/index.css"; +import type { ScopedThreadRef } from "@t3tools/contracts"; import { EnvironmentId, ProjectId } from "@t3tools/contracts"; import { sourceControlClients } from "@t3tools/client-runtime/source-control-clients"; import { Cause } from "effect"; @@ -9,6 +10,7 @@ const mocks = vi.hoisted(() => ({ update: vi.fn<(input: unknown) => Promise<{ _tag: "Success" } | { _tag: "Failure"; cause: unknown }>>(), notify: vi.fn(), + openLink: vi.fn<(url: string, options?: unknown) => Promise>(), })); vi.mock( import("~/state/pullRequests"), @@ -20,9 +22,14 @@ vi.mock( ); vi.mock(import("../ui/toast"), () => ({ toastManager: { add: mocks.notify } }) as never); -vi.mock(import("~/state/server"), async () => { +vi.mock(import("~/browser/useOpenLink"), () => ({ + useOpenLink: (threadRef: unknown) => (url: string, options?: unknown) => + mocks.openLink(url, { ...(options as object | undefined), threadRef }), +})); +vi.mock(import("~/state/server"), async (original) => { + const actual = await original(); const { Atom } = await import("effect/reactivity"); - return { primaryServerKeybindingsAtom: Atom.make([]) } as never; + return { ...actual, primaryServerKeybindingsAtom: Atom.make([]) } as never; }); vi.mock(import("./PullRequestThreadLinks"), () => ({ PullRequestThreadLinks: () => null })); vi.mock( @@ -68,13 +75,15 @@ const openDetail: Detail = { function setup() { mocks.update.mockReset().mockResolvedValue({ _tag: "Success" }); mocks.notify.mockReset(); - return (detail: Detail = openDetail) => ( + mocks.openLink.mockReset().mockResolvedValue(undefined); + return (detail: Detail = openDetail, threadRef: ScopedThreadRef | null = null) => ( {}} refreshing={false} @@ -210,3 +219,28 @@ it.each<[string, Detail]>([ await expect.element(page.getByRole("menuitem", { name: "Open on GitHub" })).toBeVisible(); expect(document.querySelector('[role="menuitemcheckbox"]')).toBeNull(); }); + +it("opens on host through openLink when Open on GitHub is clicked", async () => { + const control = setup(); + await using screen = await render(control()); + await screen.getByRole("button", { name: "More pull request actions" }).click(); + const openOnHost = page.getByRole("menuitem", { name: "Open on GitHub" }); + await openOnHost.click(); + expect(mocks.openLink).toHaveBeenCalledWith( + openDetail.url, + expect.objectContaining({ threadRef: null }), + ); +}); + +it("passes threadRef to openLink when Open on GitHub is clicked", async () => { + const threadRef = { environmentId, threadId: "thread-1" as never }; + const control = setup(); + await using screen = await render(control(openDetail, threadRef)); + await screen.getByRole("button", { name: "More pull request actions" }).click(); + const openOnHost = page.getByRole("menuitem", { name: "Open on GitHub" }); + await openOnHost.click(); + expect(mocks.openLink).toHaveBeenCalledWith( + openDetail.url, + expect.objectContaining({ threadRef }), + ); +}); diff --git a/apps/web/src/components/pullRequest/PullRequestActionsMenu.tsx b/apps/web/src/components/pullRequest/PullRequestActionsMenu.tsx index eeb26a6f6a244..bd2312ddfb9b5 100644 --- a/apps/web/src/components/pullRequest/PullRequestActionsMenu.tsx +++ b/apps/web/src/components/pullRequest/PullRequestActionsMenu.tsx @@ -32,7 +32,7 @@ import { useId, useState } from "react"; import { m } from "~/i18n/messages"; import { shortcutLabelForCommand } from "~/keybindings"; -import { readLocalApi } from "~/localApi"; +import { useOpenLink } from "~/browser/useOpenLink"; import { pullRequestEnvironment } from "~/state/pullRequests"; import { primaryServerKeybindingsAtom } from "~/state/server"; import { useAtomCommand } from "~/state/use-atom-command"; @@ -71,6 +71,7 @@ export function PullRequestActionsMenu({ pullRequestKey, detail, terminology, + threadRef = null, linkThreadRef, onThreadPickerOpenChange, refreshing, @@ -123,6 +124,7 @@ export function PullRequestActionsMenu({ | "observedAt" >; terminology: ChangeRequestTerminology; + threadRef?: ScopedThreadRef | null | undefined; linkThreadRef: ScopedThreadRef | null; onThreadPickerOpenChange: (open: boolean) => void; refreshing: boolean; @@ -162,6 +164,7 @@ export function PullRequestActionsMenu({ }) { const gt = useGT(); const resolve = useMessages(); + const openLink = useOpenLink(threadRef); const keybindings = useAtomValue(primaryServerKeybindingsAtom); const inlineConfirm = useInlineActionConfirm(pullRequestKey); const actionPending = pendingAction !== null; @@ -434,7 +437,17 @@ export function PullRequestActionsMenu({ ) : null} ) : null} - void readLocalApi()?.shell.openExternal(detail.url)}> + { + void openLink(detail.url, { event }).catch((error: unknown) => { + console.error(error); + toastManager.add({ + type: "error", + title: m(msg("Could not open the link")), + }); + }); + }} + > {openOnHostText} diff --git a/apps/web/src/components/pullRequest/PullRequestDetailCrumbs.tsx b/apps/web/src/components/pullRequest/PullRequestDetailCrumbs.tsx index c2422767a25dc..0c2c912fc73a3 100644 --- a/apps/web/src/components/pullRequest/PullRequestDetailCrumbs.tsx +++ b/apps/web/src/components/pullRequest/PullRequestDetailCrumbs.tsx @@ -1,11 +1,14 @@ +import type { ScopedThreadRef } from "@t3tools/contracts"; import { sourceControlClients } from "@t3tools/client-runtime/source-control-clients"; -import { T, useGT } from "gt-react"; +import { msg, T, useGT } from "gt-react"; import { ArrowLeftIcon, ExternalLinkIcon } from "lucide-react"; import type { MouseEvent as ReactMouseEvent } from "react"; +import { useOpenLink } from "~/browser/useOpenLink"; +import { m } from "~/i18n/messages"; import { cn } from "~/lib/utils"; -import { readLocalApi } from "~/localApi"; import { Button } from "../ui/button"; +import { toastManager } from "../ui/toast"; import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip"; import { openOnHostLabel, showPullRequestLinkContextMenu } from "./pullRequestLinkContextMenu"; @@ -62,13 +65,25 @@ function NumberLink({ toneClassName, openOnHostText, focusable, + threadRef = null, }: { detail: CrumbsPullRequest; toneClassName: string; openOnHostText: string; focusable: boolean; + threadRef?: ScopedThreadRef | null | undefined; }) { const gt = useGT(); + const openLink = useOpenLink(threadRef); + const handleOpen = (event: ReactMouseEvent) => { + void openLink(detail.url, { event }).catch((error: unknown) => { + console.error(error); + toastManager.add({ + type: "error", + title: m(msg("Could not open the link")), + }); + }); + }; return ( void readLocalApi()?.shell.openExternal(detail.url)} + onClick={(event) => handleOpen(event)} onAuxClick={(event) => { - if (event.button === 1) void readLocalApi()?.shell.openExternal(detail.url); + if (event.button === 1) handleOpen(event); }} onContextMenu={(event) => openNumberContextMenu(event, detail)} className={cn( @@ -116,6 +131,7 @@ export function PullRequestDetailCrumbs({ repositoryUrl, openOnHostText, onBack, + threadRef = null, }: { detail: CrumbsPullRequest | null; toneClassName: string | null; @@ -123,8 +139,20 @@ export function PullRequestDetailCrumbs({ repositoryUrl: string | null; openOnHostText: string; onBack: (() => void) | undefined; + threadRef?: ScopedThreadRef | null | undefined; }) { const gt = useGT(); + const openLink = useOpenLink(threadRef); + const handleOpenRepository = (event: ReactMouseEvent) => { + if (!repositoryUrl) return; + void openLink(repositoryUrl, { event }).catch((error: unknown) => { + console.error(error); + toastManager.add({ + type: "error", + title: m(msg("Could not open the link")), + }); + }); + }; const ready = detail !== null && toneClassName !== null; return (
@@ -148,7 +176,10 @@ export function PullRequestDetailCrumbs({ repositoryUrl ? (