@@ -3,7 +3,6 @@ import { EnvironmentId, ProjectId, type ScopedThreadRef } from "@t3tools/contrac
33
44import {
55 readPullRequestDetailSnapshot ,
6- resolveDisplayedPullRequestDetail ,
76 resolvePullRequestReferenceHost ,
87} from "../components/pullRequest/pullRequestDetail.logic" ;
98import { gitHubPullRequestBrowserUrl } from "../lib/openPullRequestLink" ;
@@ -18,13 +17,11 @@ type PanelPullRequestSurface = Extract<
1817 { kind : "pull-request" }
1918> ;
2019
21- // The reference keys the detail query atom, so it must keep its identity across renders.
22- function usePanelPullRequestReference (
20+ function panelPullRequestReference (
2321 requestedReference : PanelPullRequestSurface | null ,
2422 supportsMultiplePullRequests : boolean ,
2523 repositoryIdentity : Parameters < typeof resolvePullRequestReferenceHost > [ 1 ] ,
2624) {
27- "use memo" ;
2825 if ( requestedReference === null ) return null ;
2926 const input = {
3027 projectId : ProjectId . make ( requestedReference . projectId ) ,
@@ -56,19 +53,14 @@ export function useOpenPanelPullRequestUrl(threadRef: ScopedThreadRef | null) {
5653 ? scopeProjectRef ( environmentId , ProjectId . make ( requestedReference . projectId ) )
5754 : null ,
5855 ) ;
59- const reference = usePanelPullRequestReference (
56+ const reference = panelPullRequestReference (
6057 requestedReference ,
6158 supportsMultiplePullRequests ,
6259 project ?. repositoryIdentity ,
6360 ) ;
64- const detail = useEnvironmentQuery (
65- reference && environmentId
66- ? pullRequestEnvironment . detail ( {
67- environmentId,
68- input : reference ,
69- } )
70- : null ,
71- ) . data ;
61+ // Everything that reads reference or the project runs before the query hook; a plain
62+ // call on either after it would leave reference, and the detail atom it keys, uncached.
63+ // The snapshot is already checked against reference, so live detail just wins below.
7264 const cachedDetail =
7365 reference && environmentId
7466 ? readPullRequestDetailSnapshot (
@@ -77,13 +69,21 @@ export function useOpenPanelPullRequestUrl(threadRef: ScopedThreadRef | null) {
7769 reference ,
7870 )
7971 : null ;
80- return reference
81- ? ( resolveDisplayedPullRequestDetail ( { live : detail , cached : cachedDetail , reference } ) ?. url ??
82- requestedReference ?. url ??
83- gitHubPullRequestBrowserUrl (
84- project ?. repositoryIdentity ,
85- reference . repository ,
86- reference . number ,
87- ) )
72+ const fallbackUrl = reference
73+ ? ( requestedReference ?. url ??
74+ gitHubPullRequestBrowserUrl (
75+ project ?. repositoryIdentity ,
76+ reference . repository ,
77+ reference . number ,
78+ ) )
8879 : undefined ;
80+ const detail = useEnvironmentQuery (
81+ reference && environmentId
82+ ? pullRequestEnvironment . detail ( {
83+ environmentId,
84+ input : reference ,
85+ } )
86+ : null ,
87+ ) . data ;
88+ return reference ? ( ( detail ?? cachedDetail ) ?. url ?? fallbackUrl ) : undefined ;
8989}
0 commit comments