@@ -149,8 +149,8 @@ import {
149149 PULL_REQUEST_MERGE_METHOD_LABELS ,
150150 readableFailure ,
151151 readPullRequestDetailSnapshot ,
152- resolvePullRequestReferenceHost ,
153152 resolveDisplayedPullRequestDetail ,
153+ resolvePullRequestPanelReferences ,
154154 resolvePullRequestPrimaryControl ,
155155 allowsSinglePullRequestMerge ,
156156 resolveBaseFreshness ,
@@ -532,24 +532,22 @@ export function PullRequestDetailPanel({
532532 ) ?. repositoryIdentity ;
533533 const supportsThreadPullRequests =
534534 environmentConfigs . get ( environmentId ) ?. environment . capabilities . threadPullRequests === true ;
535- const reference = useMemo (
535+ const { reference, cacheReference } = useMemo (
536536 ( ) =>
537- supportsThreadPullRequests
538- ? resolvePullRequestReferenceHost ( requestedReference , repositoryIdentity )
539- : {
540- projectId : requestedReference . projectId ,
541- repository : requestedReference . repository ,
542- number : requestedReference . number ,
543- } ,
537+ resolvePullRequestPanelReferences (
538+ requestedReference ,
539+ repositoryIdentity ,
540+ supportsThreadPullRequests ,
541+ ) ,
544542 [ requestedReference , repositoryIdentity , supportsThreadPullRequests ] ,
545543 ) ;
546- const pullRequestKey = `${ reference . projectId } :${ reference . host ?? "" } :${ reference . repository } #${ reference . number } ` ;
544+ const pullRequestKey = `${ cacheReference . projectId } :${ cacheReference . host ?? "" } :${ cacheReference . repository } #${ cacheReference . number } ` ;
547545 const matchingListEntry =
548- listEntry ?. projectId === reference . projectId &&
549- listEntry . repository . toLowerCase ( ) === reference . repository . toLowerCase ( ) &&
550- ( reference . host === undefined ||
551- listEntry . host . toLowerCase ( ) === reference . host . toLowerCase ( ) ) &&
552- listEntry . number === reference . number
546+ listEntry ?. projectId === cacheReference . projectId &&
547+ listEntry . repository . toLowerCase ( ) === cacheReference . repository . toLowerCase ( ) &&
548+ ( cacheReference . host === undefined ||
549+ listEntry . host . toLowerCase ( ) === cacheReference . host . toLowerCase ( ) ) &&
550+ listEntry . number === cacheReference . number
553551 ? listEntry
554552 : null ;
555553 const [ threadPickerOpen , setThreadPickerOpen ] = useState ( false ) ;
@@ -648,47 +646,53 @@ export function PullRequestDetailPanel({
648646 readPullRequestDetailSnapshot (
649647 typeof window === "undefined" ? undefined : window . localStorage ,
650648 environmentId ,
651- reference ,
649+ cacheReference ,
652650 ) ,
653651 ) ;
654652 useEffect ( ( ) => {
655653 setCachedDetail (
656654 readPullRequestDetailSnapshot (
657655 typeof window === "undefined" ? undefined : window . localStorage ,
658656 environmentId ,
659- reference ,
657+ cacheReference ,
660658 ) ,
661659 ) ;
662- } , [ environmentId , pullRequestKey , reference . projectId , reference . repository , reference . number ] ) ;
660+ } , [
661+ environmentId ,
662+ pullRequestKey ,
663+ cacheReference . projectId ,
664+ cacheReference . repository ,
665+ cacheReference . number ,
666+ ] ) ;
663667 useEffect ( ( ) => {
664668 if ( detailQuery . data === null ) return ;
665669 writePullRequestDetailSnapshot (
666670 typeof window === "undefined" ? undefined : window . localStorage ,
667671 environmentId ,
668- reference ,
672+ cacheReference ,
669673 detailQuery . data ,
670674 ) ;
671675 setCachedDetail ( detailQuery . data ) ;
672676 } , [
673677 detailQuery . data ,
674678 environmentId ,
675679 pullRequestKey ,
676- reference . projectId ,
677- reference . repository ,
678- reference . number ,
680+ cacheReference . projectId ,
681+ cacheReference . repository ,
682+ cacheReference . number ,
679683 ] ) ;
680684 const resolvedCoreDetail = resolveDisplayedPullRequestDetail ( {
681685 live : detailQuery . data ,
682686 cached : cachedDetail ,
683- reference,
687+ reference : cacheReference ,
684688 } ) ;
685689 const listSummary = useMemo (
686690 ( ) => ( matchingListEntry === null ? null : pullRequestListEntryToSummary ( matchingListEntry ) ) ,
687691 [ matchingListEntry ] ,
688692 ) ;
689693 const observedSummary = useSharedPullRequestSummary (
690694 environmentId ,
691- reference ,
695+ cacheReference ,
692696 detailQuery . data ,
693697 detailQuery . dataUpdatedAt ,
694698 ) ;
0 commit comments